Commit Graph

13426 Commits

Author SHA1 Message Date
Tony Mantler
831bb0abfe am b0432334: Match dup accounts against all accounts, not just Email automerge: c1a760b
* commit 'b043233486ab845291d76aa9878378cd1e3368b1':
  Match dup accounts against all accounts, not just Email
2014-11-02 17:27:54 +00:00
Anthony Lee
ca31da91c8 am 9d1dc789: b/17135753. Make sure to free ServiceConnection. automerge: 8c65e50
* commit '9d1dc78916b56d47a907a3ffa7fbd2375bb503a4':
  b/17135753. Make sure to free ServiceConnection.
2014-11-02 17:27:53 +00:00
Andrew Sapperstein
ecb6fc314f am 69dda480: Merge "Use appcompat photoviewer." into ub-gmail-ur14-dev automerge: b042013
* commit '69dda4803ad5ddd1b436f84c9a29876f7baae097':
  Use appcompat photoviewer.
2014-11-02 17:27:52 +00:00
Tony Mantler
214cf5cf93 am e34c3677: Merge "Drawer resource updates" into ub-gmail-ur14-dev automerge: 1e6f26a
* commit 'e34c3677b429a935ac20443ae45136c49f62ca2f':
  Drawer resource updates
  Update Notifications (Email)
2014-11-02 17:27:51 +00:00
James Lemieux
826e61c003 am 69ba565b: Merge "Combined view should also display client-side sanitized HTML" into ub-gmail-ur14-dev
* commit '69ba565b62874d4957c28749494bef173490b0c1':
  Combined view should also display client-side sanitized HTML
2014-11-02 15:33:00 +00:00
James Lemieux
e811c77465 am 40236a89: Display sync errors using snackbar and not as a TL footer
* commit '40236a89316ab2151a8c93de0e286c2f1a9a8d37':
  Display sync errors using snackbar and not as a TL footer
2014-11-02 15:32:59 +00:00
Baligh Uddin
28a37183f0 am abd75d1a: (-s ours) Import translations. DO NOT MERGE
* commit 'abd75d1adb299237def0d5f072a186fefea77459':
  Import translations. DO NOT MERGE
2014-11-02 15:32:58 +00:00
Régis Décamps
1b2a0df120 am f99328b0: minor: remove comment that primaryColor is used for ActionBar
* commit 'f99328b07c7191ffd53e682d9c624bf9cdb80c16':
  minor: remove comment that primaryColor is used for ActionBar
2014-11-02 15:32:57 +00:00
Martin Hibdon
cacf4c53de am 3c2f782c: When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
* commit '3c2f782c357807befa9b9416ccdf0b15d5a316ab':
  When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
2014-11-02 15:32:56 +00:00
Martin Hibdon
e9a49c1793 am d10ae46e: Merge "Don\'t allow disabling of the camera with managed profiles" into ub-gmail-ur14-dev
* commit 'd10ae46e607570d0c860438d21f2d8f33a7cbf72':
  Don't allow disabling of the camera with managed profiles
2014-11-02 15:32:55 +00:00
Rohan Shah
33cf634a6e am a64435a6: Update colors in Email (ColorRefactor)
* commit 'a64435a62f903ad865b97d750e5aa84d045fc7c4':
  Update colors in Email (ColorRefactor)
2014-11-02 15:32:53 +00:00
Martin Hibdon
ef0dc0ac01 am 809313bd: Merge "Add ability to clear migration state to debug screen" into ub-gmail-ur14-dev
* commit '809313bda69d429b72a11c1d030907405533ec08':
  Add ability to clear migration state to debug screen
2014-11-02 15:32:52 +00:00
Martin Hibdon
4e79403856 am 123d4028: Make sure to close a cursor
* commit '123d40283e1411dcb5fa5def656ad352c101e5d0':
  Make sure to close a cursor
2014-11-02 15:32:50 +00:00
James Lemieux
32152d96e5 am f1b6b3af: Old paper clip asset is removed, which touches a test case here.
* commit 'f1b6b3afd97a372ec8492ac97fa5fb49c692da6e':
  Old paper clip asset is removed, which touches a test case here.
2014-11-02 15:32:49 +00:00
Baligh Uddin
bdfea7ffd0 am d54cebe5: (-s ours) Import translations. DO NOT MERGE
* commit 'd54cebe5ec0e0b0c0ab935fc281f1662a69e38f2':
  Import translations. DO NOT MERGE
2014-11-02 15:32:48 +00:00
Andrew Sapperstein
8fd1a38c6a am 9f252e1f: Renaming to support drawer under status bar.
* commit '9f252e1f546446d7d6f8567a2cdbb81aa8c2b185':
  Renaming to support drawer under status bar.
2014-11-02 15:32:47 +00:00
Baligh Uddin
928bbfeff2 am fc1ba99a: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit 'fc1ba99a378e50ee008883a161d3d5db1b4df520':
  Import translations. DO NOT MERGE
2014-11-02 15:32:46 +00:00
Martin Hibdon
5ae1599a83 am 0b693a05: Merge "Fix subfolders of the inbox." into ub-gmail-ur14-dev
* commit '0b693a05565dd953d35e0ec4489d7669d6d2a7e6':
  Fix subfolders of the inbox.
2014-11-02 15:32:44 +00:00
Paul Westbrook
dcaf7988bd am 7f32e9c6: Prevent AccountSettingsFragment from being stripped
* commit '7f32e9c661651bd7a2cf59cb1cf07e459c6148a1':
  Prevent AccountSettingsFragment from being stripped
2014-11-02 15:32:43 +00:00
Paul Westbrook
26f193dab5 am bb68c13a: Changes to support smaller email tombstone apk size
* commit 'bb68c13afa630cae058eb40d3ce68644f3f3c8b9':
  Changes to support smaller email tombstone apk size
2014-11-02 15:32:42 +00:00
Andrew Sapperstein
6bf2975069 am 88929fd2: Switch to targetSdkVersion=21. b/16408109
* commit '88929fd2bce947475d7a494961b017b98c5e9b82':
  Switch to targetSdkVersion=21. b/16408109
2014-11-02 15:32:40 +00:00
Baligh Uddin
503f46388d am 3b47856d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit '3b47856dc2b97836a0ee4e2f515ee91c7b643eda':
  Import translations. DO NOT MERGE
2014-11-02 15:32:39 +00:00
Baligh Uddin
99cf59cbf4 am ff83aff9: (-s ours) am e421a5e1: (-s ours) Import translations. DO NOT MERGE
* commit 'ff83aff97d412975b026542baab611b58ae72ead':
  Import translations. DO NOT MERGE
2014-11-02 15:32:38 +00:00
Martin Hibdon
13666c7f92 am 8209d6c0: Display a warning if account is on security hold
* commit '8209d6c081243d58cf9957c1900e550b440af431':
  Display a warning if account is on security hold
2014-11-02 15:32:37 +00:00
Rohan Shah
8645bd8049 am 58d7f7b2: Merge "Tag Notifications with People (Email)" into ub-gmail-ur14-dev
* commit '58d7f7b2231ebb5c605b76567091bc22f6e06184':
  Tag Notifications with People (Email)
2014-11-02 15:32:35 +00:00
Tony Mantler
65d130ad2c am b3be4655: Merge "Sync account immediately upon restore" into ub-gmail-ur14-dev
* commit 'b3be4655a88d2289abf355f3d41dc9a4b5a5052d':
  Sync account immediately upon restore
2014-11-02 15:32:34 +00:00
Tony Mantler
ebfa64a742 am ce6e2de7: Merge "Use correct password dialog for outgoing settings" into ub-gmail-ur14-dev
* commit 'ce6e2de718e02d7cd572f282f55844c9dcb1ec30':
  Use correct password dialog for outgoing settings
2014-11-02 15:32:32 +00:00
Tony Mantler
2d3730b5fd am cb45d6fa: Merge "Change account type strings for AccountManager UI" into ub-gmail-ur14-dev
* commit 'cb45d6fabe8aca0cf5a733f17f42a40e077b80a4':
  Change account type strings for AccountManager UI
2014-11-02 15:32:31 +00:00
Baligh Uddin
dc956891aa am efca9af6: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit 'efca9af6192d9fa72e72cbb4e22ad7ce6ea5b2a6':
  Import translations. DO NOT MERGE
2014-11-02 15:32:29 +00:00
Tony Mantler
a79eed714f am c6d5ec49: No more big yellow envelope
* commit 'c6d5ec490ebb2eb0641771875f03bf381255c8dc':
  No more big yellow envelope
2014-11-02 15:32:28 +00:00
Paul Westbrook
3262a8d807 am f866891f: Merge "Remove unused resources" into ub-gmail-ur14-dev
* commit 'f866891f92dd01df6694302490212ccf4f8f4b31':
  Remove unused resources
2014-11-02 15:32:24 +00:00
Tony Mantler
800d544a81 am 8c6a01f8: Remove app icon from Setup and Mailbox Settings
* commit '8c6a01f876ae015167dd7b3097453ef97e4c2ae3':
  Remove app icon from Setup and Mailbox Settings
2014-11-02 15:32:23 +00:00
Tony Mantler
34a686ab01 am dfb7fe91: Remove password spaces warning
* commit 'dfb7fe91e663fe9c0d4e2a645f0fac71be4dd316':
  Remove password spaces warning
2014-11-02 15:32:21 +00:00
Tony Mantler
58310123a7 am 0ee42176: Merge "Fix spinners layout mangling" into ub-gmail-ur14-dev
* commit '0ee421760a93e04f451df7bb84899d5a22ef1faf':
  Fix spinners layout mangling
2014-11-02 15:32:19 +00:00
Paul Westbrook
b49867251f am 6a07fc19: Merge "Remove unused resource" into ub-gmail-ur14-dev
* commit '6a07fc19f04e113c53f4f2d8cdba2eb184a95625':
  Remove unused resource
2014-11-02 15:32:17 +00:00
Martin Hibdon
61e79746f8 am c845295f: Merge "Fix the text of the authentication label on rotation" into ub-gmail-ur14-dev
* commit 'c845295ffb23f45f4e6f2fb633b16b6d045c483e':
  Fix the text of the authentication label on rotation
2014-11-02 15:32:16 +00:00
Andrew Sapperstein
5b5d55859e am 86e17ba1: Merge "Set recents color for photoviewer. b/17389434" into ub-gmail-ur14-dev
* commit '86e17ba199bb0419003f4d4591b9312237a56baf':
  Set recents color for photoviewer. b/17389434
2014-11-02 15:32:15 +00:00
James Lemieux
7266502c44 am 3bdce9b5: Remove server-side sanitized HTML capability; add client-side santized HTML capability
* commit '3bdce9b515f6bde3506596a6b5d3bdbaff9b7423':
  Remove server-side sanitized HTML capability; add client-side santized HTML capability
2014-11-02 15:32:13 +00:00
Tony Mantler
d50e207f90 am 65669454: Set IME resize flag for AccountServerSettingsActivity
* commit '65669454926a28cdb887280dda6e5a01ecbc81ff':
  Set IME resize flag for AccountServerSettingsActivity
2014-11-02 15:32:11 +00:00
James Lemieux
04c771810a am 1be8b05b: The error message "This field can\'t be blank" can be ignored
* commit '1be8b05bb59c3e87fef0f4c474a24f678367b495':
  The error message "This field can't be blank" can be ignored
2014-11-02 15:32:10 +00:00
Baligh Uddin
9ea9d245f9 am efb6cb25: (-s ours) Import translations. DO NOT MERGE
* commit 'efb6cb2523779bd74ee787a0fb8d3d5397574a88':
  Import translations. DO NOT MERGE
2014-11-02 15:32:09 +00:00
Tony Mantler
882e1a89a7 am e068440f: Merge "Update search folder status in a finally block" into ub-gmail-ur14-dev
* commit 'e068440f6506358ee2b7fe199df9c23617e213a4':
  Update search folder status in a finally block
2014-11-02 15:32:08 +00:00
Martin Hibdon
2ff1a5cd88 am e87b38fa: Merge "Prevent account reconcilliation during migration" into ub-gmail-ur14-dev
* commit 'e87b38faf5e50e1d23055ce756570373e9344db2':
  Prevent account reconcilliation during migration
2014-11-02 15:32:06 +00:00
Martin Hibdon
30d8d696ea am 51c65364: Put debug screen back into settings
* commit '51c653646d14d841fbe527aee9fab7a1886338f8':
  Put debug screen back into settings
2014-11-02 15:32:05 +00:00
Baligh Uddin
94d76eb9c9 Import translations. DO NOT MERGE
automerge: 1c0aa4c  -s ours

* commit '1c0aa4c0fc1e77a917efb1168db42e14dc78231d':
  Import translations. DO NOT MERGE
2014-11-02 07:13:50 +00:00
Jin Cao
8d6c6348dc Should use stateAlwaysHidden for inputmode
automerge: aa705e6

* commit 'aa705e6853e121ef5d4077dbe448125e6ab2d836':
  Should use stateAlwaysHidden for inputmode
2014-11-02 07:13:29 +00:00
Jin Cao
b7a5a10db9 Merge "input mode to state hidden" into ub-gmail-ur14-dev
automerge: e9186cd

* commit 'e9186cddea76a1936838d7b1253fca24f9264128':
  input mode to state hidden
2014-11-02 07:13:07 +00:00
Anthony Lee
7ef664233b b/17209397. NOOP getServiceMap() if we are in the tombstone app.
automerge: 0397e7f

* commit '0397e7fb233bbf76f7ea30ab3e447f74d7c6bcce':
  b/17209397. NOOP getServiceMap() if we are in the tombstone app.
2014-11-02 07:12:31 +00:00
Jin Cao
0d2f843d89 Remove getSuggestionsAuthority
automerge: 65c2179

* commit '65c217943a13f42878f6d8a37475afbef1631472':
  Remove getSuggestionsAuthority
2014-11-02 07:09:42 +00:00
Jin Cao
1991e2a937 Merge "Remove default search for Email" into ub-gmail-ur14-dev
automerge: 9ac6ec7

* commit '9ac6ec72855980d4f79140bf17bc2c96c10d5b45':
  Remove default search for Email
2014-11-02 07:09:35 +00:00