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
Tony Mantler
65bf994534
Fix search mailbox status on early-out when searching
...
automerge: 207a35f
* commit '207a35f174a1004c6431b2e336d9ff29db47d0f5':
Fix search mailbox status on early-out when searching
2014-11-02 07:09:28 +00:00
Tony Mantler
c71afebb39
Fix some AOSP NPEs
...
automerge: 473ce1f
* commit '473ce1fa354c81fd7d5bbd84b6a85d629a039e72':
Fix some AOSP NPEs
2014-11-02 07:09:21 +00:00
Anthony Lee
982394da32
Merge "b/17193866. Update policies when we reconcile." into ub-gmail-ur14-dev
...
automerge: 355e9df
* commit '355e9dffc35fa9b3084a7f49ff985427fda2ea06':
b/17193866. Update policies when we reconcile.
2014-11-02 07:09:06 +00:00
Baligh Uddin
7e1932f727
Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
...
automerge: 67995a4
-s ours
* commit '67995a417aad0ac733229305542f84882d7af0b3':
Import translations. DO NOT MERGE
2014-11-02 07:08:52 +00:00
Tony Mantler
b043233486
Match dup accounts against all accounts, not just Email
...
automerge: c1a760b
* commit 'c1a760bf3609ee4d6bd7de0d78e1c6e2ffa151b1':
Match dup accounts against all accounts, not just Email
2014-11-02 07:07:43 +00:00
Anthony Lee
9d1dc78916
b/17135753. Make sure to free ServiceConnection.
...
automerge: 8c65e50
* commit '8c65e50bfe3b90b96985c2d87b8c459c348af6aa':
b/17135753. Make sure to free ServiceConnection.
2014-11-02 07:06:41 +00:00
Andrew Sapperstein
69dda4803a
Merge "Use appcompat photoviewer." into ub-gmail-ur14-dev
...
automerge: b042013
* commit 'b04201335cf33bded97e9019940e0b8f9ccfb6d9':
Use appcompat photoviewer.
2014-11-02 07:06:06 +00:00
Tony Mantler
e34c3677b4
Merge "Drawer resource updates" into ub-gmail-ur14-dev
...
automerge: 1e6f26a
* commit '1e6f26af804d32e4780599481a6e11152756348f':
Drawer resource updates
Update Notifications (Email)
2014-11-02 07:04:54 +00:00
Baligh Uddin
7fd7081491
am 4b6f2e7a: (-s ours) Import translations. DO NOT MERGE
...
* commit '4b6f2e7a38c83c9bfa368c8aedef1cb5d91b7c8b':
Import translations. DO NOT MERGE
2014-10-20 00:29:56 +00:00
Baligh Uddin
4b6f2e7a38
Import translations. DO NOT MERGE
...
Change-Id: I7dccf29ecb1954edcaf288ff4467e6aee2d29c15
Auto-generated-cl: translation import
2014-10-19 16:11:30 -07:00
Baligh Uddin
74abc87674
am bf868306: (-s ours) Import translations. DO NOT MERGE
...
* commit 'bf8683067bbffefa2fe4eb2b00811dcab41c693b':
Import translations. DO NOT MERGE
2014-09-29 20:47:19 +00:00
Baligh Uddin
bf8683067b
Import translations. DO NOT MERGE
...
Change-Id: Ifec0071ffe7e247f0fc4f0fecdef145713949382
Auto-generated-cl: translation import
2014-09-28 19:49:26 -07:00
Baligh Uddin
11e6451da3
am 611475df: (-s ours) Import translations. DO NOT MERGE
...
* commit '611475df609bbbd9c515313658ba41ceaa20047b':
Import translations. DO NOT MERGE
2014-09-15 02:53:59 +00:00
Baligh Uddin
611475df60
Import translations. DO NOT MERGE
...
Change-Id: Iafae6db0a11334dea0250f45ca01649db03902e4
Auto-generated-cl: translation import
2014-09-14 18:42:37 -07:00
Baligh Uddin
b11eaa1045
am 16ce4097: (-s ours) Import translations. DO NOT MERGE
...
* commit '16ce409730a82666ef53303884e56b39fd0c6332':
Import translations. DO NOT MERGE
2014-09-11 16:02:41 +00:00
Paul Westbrook
f866891f92
Merge "Remove unused resources" into ub-gmail-ur14-dev
2014-09-10 16:49:02 +00:00
Paul Westbrook
8f0f19c414
Remove unused resources
...
Also remove broken & disabled tests that referenced otherwise
unused resources
Change resource names to prevent duplicate resources.
Bug: 17414014
Change-Id: Iea9f9799ec19692707e2949473c6f97a3bd29f4b
2014-09-10 03:24:53 -07:00
Tony Mantler
8c6a01f876
Remove app icon from Setup and Mailbox Settings
...
b/16657133
Change-Id: I7ba77a3a355627c1df971aa7238969dfeeaebf28
2014-09-09 16:03:08 -07:00
Tony Mantler
dfb7fe91e6
Remove password spaces warning
...
b/17409681
Change-Id: Ia411999fc7652b520f17fa2538980d9ba4bd172a
2014-09-09 14:41:38 -07:00
Tony Mantler
0ee421760a
Merge "Fix spinners layout mangling" into ub-gmail-ur14-dev
2014-09-09 16:26:40 +00:00
Paul Westbrook
6a07fc19f0
Merge "Remove unused resource" into ub-gmail-ur14-dev
2014-09-08 23:07:00 +00:00
Tony Mantler
e5ac64a103
Fix spinners layout mangling
...
Setting the gravity to center_vertical seems to make them behave. Not asking.
Also clean up the layout file in general.
b/17380851
Change-Id: I45ac202825295c577dd1a13a3176ac685bd9b9d8
2014-09-08 15:51:05 -07:00
Martin Hibdon
c845295ffb
Merge "Fix the text of the authentication label on rotation" into ub-gmail-ur14-dev
2014-09-08 20:05:21 +00:00
Martin Hibdon
606213ea02
Fix the text of the authentication label on rotation
...
b/17410251
Change-Id: I1e902da85a8525e597d205d3be520e6eb6db7f50
2014-09-08 12:54:49 -07:00
Andrew Sapperstein
86e17ba199
Merge "Set recents color for photoviewer. b/17389434" into ub-gmail-ur14-dev
2014-09-08 19:03:00 +00:00
James Lemieux
3bdce9b515
Remove server-side sanitized HTML capability;
...
add client-side santized HTML capability
b/16896849
The semantics of the SANITIZED_HTML capability have narrowed. It now means
"Html email bodies for this account are assumed to be sanitized by the mail
server"
Consequently, accounts in Email no longer set this capability, but do set
the new capability permitting client-side sanitization of email bodies
Change-Id: Ie1343d8bedc2a17ab04e4df4b7c4ee14cfb01b64
2014-09-08 10:50:15 -07:00
Baligh Uddin
da0603004d
Import translations. DO NOT MERGE
...
Change-Id: I13641ad92db6cfe7437cce06c16daae99bb00218
Auto-generated-cl: translation import
2014-09-08 10:31:49 -07:00
Baligh Uddin
16ce409730
Import translations. DO NOT MERGE
...
Change-Id: I9d37015bcfe0ab83750ebe2e9d2a31b3e5933f3b
Auto-generated-cl: translation import
2014-09-08 10:30:58 -07:00
Andrew Sapperstein
74df95fa58
Set recents color for photoviewer. b/17389434
...
Change-Id: I9c34b9c18394d1a9bdd4baa0f6fb022b1b6c85fa
2014-09-07 16:48:14 -07:00
Paul Westbrook
9754cced47
Remove unused resource
...
Also, allow the widget preview to be overlayed, in the universal mail app
so there is ony one copy
Bug: 17414014
Change-Id: Ib58adb0b89d89feb025567258c0ea827e4d856ae
2014-09-07 11:57:29 -07:00