a54d0838b7
resolved conflicts for merge of 6666fbf0 to master
...
Change-Id: I92e53c11119cda4efa3816b5ae030c278bda1290
2014-11-02 11:00:40 -08:00
98ceb1d9ca
am b6785995: am 53e49db3: am 955b9f96: am d7192f02: Provider configuration for outlook, yahoo, gmx
...
* commit 'b678599530a437e90b8672d1fc4db1dc30d9cf7a':
Provider configuration for outlook, yahoo, gmx
2014-11-02 18:53:33 +00:00
94409eea47
am 56fd0d48: am 0fd02688: am d1599a86: am 72f6a243: Revert "Update notification icon asset names (Email)"
...
* commit '56fd0d48b620968cfcd7118b95e3c8da59c4dbe9':
Revert "Update notification icon asset names (Email)"
2014-11-02 18:53:24 +00:00
9e15a6537e
am c33016dc: am 56caa6e1: am bcbe5794: am cc82965a: Update notification icon asset names (Email)
...
* commit 'c33016dc12aa4cd743926fcffc3f39874f699e8c':
Update notification icon asset names (Email)
2014-11-02 18:53:23 +00:00
0989761529
am 92532b1c: am 9d3b1a8d: am 06cc928f: am 1927361b: Merge "Account authentication restyling" into ub-gmail-ur14-dev
...
* commit '92532b1c213f68aa476b18aded29025393d1de38':
Account authentication restyling
2014-11-02 18:53:10 +00:00
66af7782fe
am f24a5de9: am d606e825: am f62b6843: am 8c0253a1: Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev
...
* commit 'f24a5de95bbe5d4ee9fd92877bb24bb7c9198ed0':
Replace "Corporate" by "Exchange".
2014-11-02 18:53:09 +00:00
18e8b55b75
am 2b39de91: am 815252ad: am 31966801: am 746dcf06: Merge "Restyle account setup flow nav buttons" into ub-gmail-ur14-dev
...
* commit '2b39de91bd3ff844b2b57ef4a3ad49bff5b9279d':
Restyle account setup flow nav buttons
2014-11-02 18:53:07 +00:00
e1c103dc6e
am 93a6c2c3: am 80f4af5a: am cf3aad64: am 42a4f201: Move Email Icons (Email)
...
* commit '93a6c2c36adfa051192822c99c3dc2a834accab9':
Move Email Icons (Email)
2014-11-02 18:53:01 +00:00
7073065d34
am 2df883ac: am 3884149d: am a7d316c4: am 083a0138: Merge "Update Email Icons" into ub-gmail-ur14-dev
...
* commit '2df883ac0947958ed97cd83e90998d8a5ed02729':
Update Email Icons
2014-11-02 18:53:00 +00:00
0114c4017f
am 9486b751: am 6cef32da: am a4b5463d: am 36830d42: Merge "Revert "Clean-up Email Icons"" into ub-gmail-ur14-dev
...
* commit '9486b7512ee4eb30136593f29290ba6f56b8803d':
Revert "Clean-up Email Icons"
2014-11-02 18:52:59 +00:00
e57e10a434
am d2ad0933: am 67df0850: am 8a305452: am 6a533823: Merge "Clean-up Email Icons" into ub-gmail-ur14-dev
...
* commit 'd2ad0933973dcee022f57231ed946d848bcc8e8c':
Clean-up Email Icons
2014-11-02 18:52:57 +00:00
5d9a2f3df0
am c097bb3d: am 32bb6854: am 1b2a0df1: am f99328b0: minor: remove comment that primaryColor is used for ActionBar
...
* commit 'c097bb3d20a2824591a93fc07a6ffef8ddc95fa1':
minor: remove comment that primaryColor is used for ActionBar
2014-11-02 18:52:52 +00:00
22f8218ccf
am 678ca4ba: am 636fed7d: am 33cf634a: am a64435a6: Update colors in Email (ColorRefactor)
...
* commit '678ca4bad5c7091aa0f22b8e7643734a692d94a5':
Update colors in Email (ColorRefactor)
2014-11-02 18:52:48 +00:00
639c2f80b8
am 276f275c: am 3c38f6ac: am ef0dc0ac: am 809313bd: Merge "Add ability to clear migration state to debug screen" into ub-gmail-ur14-dev
...
* commit '276f275c542405f7dede5d5258532391fec322ea':
Add ability to clear migration state to debug screen
2014-11-02 18:52:42 +00:00
672eb2b278
am b3d30510: am a29c6884: am 8fd1a38c: am 9f252e1f: Renaming to support drawer under status bar.
...
* commit 'b3d305103951106045f524eb76f605558ce9060d':
Renaming to support drawer under status bar.
2014-11-02 18:52:38 +00:00
eaafa9a974
am 22538106: am d8800386: am 2d3730b5: am cb45d6fa: Merge "Change account type strings for AccountManager UI" into ub-gmail-ur14-dev
...
* commit '2253810635b44672c654cbf6c23f6babbf00c645':
Change account type strings for AccountManager UI
2014-11-02 18:52:23 +00:00
0fa53a3367
am 99219eb0: am 86dda976: am a79eed71: am c6d5ec49: No more big yellow envelope
...
* commit '99219eb0e301e75f392861b7282eec342864c62e':
No more big yellow envelope
2014-11-02 18:52:20 +00:00
6666fbf090
resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp
...
Change-Id: I28a5355b850c271bdead47874d586c557e4557f6
2014-11-02 10:49:50 -08:00
2ca250a9b7
am 47ee4637: resolved conflicts for merge of 19809304 to lmp-sprout-dev
...
* commit '47ee4637293ed77e9e03cc43c64ddc3cb1c6b525':
2014-11-02 18:36:49 +00:00
47ee463729
resolved conflicts for merge of 19809304 to lmp-sprout-dev
...
Change-Id: Idf62af52625ad5c5a5b99d9f0067d49e9128b5e9
2014-11-02 10:33:04 -08:00
95d12ced49
am e46c6c10: am 685f2f1d: am 784b61cc: am 34a686ab: am dfb7fe91: Remove password spaces warning
...
* commit 'e46c6c10c02c8a6041b1c6d725abb262b570725f':
Remove password spaces warning
2014-11-02 17:50:42 +00:00
a3806ec48c
am 31c4a2d0: am 47a2f0f7: am cd77bc1b: am 58310123: am 0ee42176: Merge "Fix spinners layout mangling" into ub-gmail-ur14-dev
...
* commit '31c4a2d0451f1467c96cdf89d4bd1f9ec8fcb266':
Fix spinners layout mangling
2014-11-02 17:50:41 +00:00
fdfa501250
am 8969e378: am 54013128: am 091ed0db: am b4986725: am 6a07fc19: Merge "Remove unused resource" into ub-gmail-ur14-dev
...
* commit '8969e378d990adddb4652b05953276406c7dfd24':
Remove unused resource
2014-11-02 17:50:40 +00:00
ccc15a7f47
am 386c3357: am 32a6138d: am 325afc41: am 04c77181: am 1be8b05b: The error message "This field can\'t be blank" can be ignored
...
* commit '386c33574c73f0abaad05fb137d20834ec99dc12':
The error message "This field can't be blank" can be ignored
2014-11-02 17:50:35 +00:00
6c8332b1ff
am 059c6f36: am 341c8ef2: am 33ab7b34: am 30d8d696: am 51c65364: Put debug screen back into settings
...
* commit '059c6f36c46e36092c71efacd95615fe09abef90':
Put debug screen back into settings
2014-11-02 17:50:31 +00:00
ab5dac4852
am 292cf390: am d0a67be9: am a357f81e: am 1991e2a9: Merge "Remove default search for Email" into ub-gmail-ur14-dev automerge: 9ac6ec7
...
* commit '292cf3904db5971272dd03cc83ec97814926ff6a':
Remove default search for Email
2014-11-02 17:50:23 +00:00
e46c6c10c0
am 685f2f1d: am 784b61cc: am 34a686ab: am dfb7fe91: Remove password spaces warning
...
* commit '685f2f1d649c499622ef1c1ded523ab9b11574cc':
Remove password spaces warning
2014-11-02 17:44:29 +00:00
31c4a2d045
am 47a2f0f7: am cd77bc1b: am 58310123: am 0ee42176: Merge "Fix spinners layout mangling" into ub-gmail-ur14-dev
...
* commit '47a2f0f73a5387de440cef1c42ff63d99189501d':
Fix spinners layout mangling
2014-11-02 17:44:28 +00:00
8969e378d9
am 54013128: am 091ed0db: am b4986725: am 6a07fc19: Merge "Remove unused resource" into ub-gmail-ur14-dev
...
* commit '54013128472cdcf313295ee2e20ccb59df076da1':
Remove unused resource
2014-11-02 17:44:27 +00:00
386c33574c
am 32a6138d: am 325afc41: am 04c77181: am 1be8b05b: The error message "This field can\'t be blank" can be ignored
...
* commit '32a6138d5afcc29b9a921928f5769f8a15e52d4c':
The error message "This field can't be blank" can be ignored
2014-11-02 17:44:21 +00:00
059c6f36c4
am 341c8ef2: am 33ab7b34: am 30d8d696: am 51c65364: Put debug screen back into settings
...
* commit '341c8ef2eca38c26f9837868b40dedcc47e6b470':
Put debug screen back into settings
2014-11-02 17:44:17 +00:00
292cf3904d
am d0a67be9: am a357f81e: am 1991e2a9: Merge "Remove default search for Email" into ub-gmail-ur14-dev automerge: 9ac6ec7
...
* commit 'd0a67be95098394fbb3fe7a05b13c9e432caff3b':
Remove default search for Email
2014-11-02 17:44:10 +00:00
53e49db33a
am 955b9f96: am d7192f02: Provider configuration for outlook, yahoo, gmx
...
* commit '955b9f96107559402a266fa81b98b6e8c90d32ea':
Provider configuration for outlook, yahoo, gmx
2014-11-02 17:30:31 +00:00
0fd0268871
am d1599a86: am 72f6a243: Revert "Update notification icon asset names (Email)"
...
* commit 'd1599a86d5e0f1d3ef3e2299466a0dc37949702b':
Revert "Update notification icon asset names (Email)"
2014-11-02 17:30:22 +00:00
56caa6e1c1
am bcbe5794: am cc82965a: Update notification icon asset names (Email)
...
* commit 'bcbe5794fe4746931ec23be266b4dac31756fd82':
Update notification icon asset names (Email)
2014-11-02 17:30:20 +00:00
9d3b1a8d0e
am 06cc928f: am 1927361b: Merge "Account authentication restyling" into ub-gmail-ur14-dev
...
* commit '06cc928fd3f1e535153027c9d519a064c7844388':
Account authentication restyling
2014-11-02 17:30:17 +00:00
d606e82521
am f62b6843: am 8c0253a1: Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev
...
* commit 'f62b684315cdfa06809629ed430206c9eaa3ba0a':
Replace "Corporate" by "Exchange".
2014-11-02 17:30:16 +00:00
815252ad3d
am 31966801: am 746dcf06: Merge "Restyle account setup flow nav buttons" into ub-gmail-ur14-dev
...
* commit '3196680159dc9752f7b601504dcf0a3b34be23e1':
Restyle account setup flow nav buttons
2014-11-02 17:30:15 +00:00
80f4af5a15
am cf3aad64: am 42a4f201: Move Email Icons (Email)
...
* commit 'cf3aad6411d5ca867756c7b504999a740f1ace62':
Move Email Icons (Email)
2014-11-02 17:30:09 +00:00
3884149d7c
am a7d316c4: am 083a0138: Merge "Update Email Icons" into ub-gmail-ur14-dev
...
* commit 'a7d316c40bc0533aa89009a5967b2a60ee0a1d1e':
Update Email Icons
2014-11-02 17:30:08 +00:00
6cef32da6f
am a4b5463d: am 36830d42: Merge "Revert "Clean-up Email Icons"" into ub-gmail-ur14-dev
...
* commit 'a4b5463df8e17f2f0bfab1e0b76de36201b3f842':
Revert "Clean-up Email Icons"
2014-11-02 17:30:07 +00:00
67df0850e4
am 8a305452: am 6a533823: Merge "Clean-up Email Icons" into ub-gmail-ur14-dev
...
* commit '8a3054525a1d9ad0e9c63f2d30df0ee50348869e':
Clean-up Email Icons
2014-11-02 17:30:06 +00:00
32bb6854fa
am 1b2a0df1: am f99328b0: minor: remove comment that primaryColor is used for ActionBar
...
* commit '1b2a0df1209227e519ca169d001f1a2989e1a713':
minor: remove comment that primaryColor is used for ActionBar
2014-11-02 17:30:01 +00:00
636fed7d0b
am 33cf634a: am a64435a6: Update colors in Email (ColorRefactor)
...
* commit '33cf634a6e82e2d1425a5eea927e8ccadaff8ca9':
Update colors in Email (ColorRefactor)
2014-11-02 17:29:57 +00:00
3c38f6ac95
am ef0dc0ac: am 809313bd: Merge "Add ability to clear migration state to debug screen" into ub-gmail-ur14-dev
...
* commit 'ef0dc0ac016776c704ccd5ea9805b610664bc46f':
Add ability to clear migration state to debug screen
2014-11-02 17:29:55 +00:00
a29c688439
am 8fd1a38c: am 9f252e1f: Renaming to support drawer under status bar.
...
* commit '8fd1a38c6af1f3622dd55aa709ff61a9478c0f17':
Renaming to support drawer under status bar.
2014-11-02 17:29:50 +00:00
d8800386f9
am 2d3730b5: am cb45d6fa: Merge "Change account type strings for AccountManager UI" into ub-gmail-ur14-dev
...
* commit '2d3730b5fdca6352b1cc1efcb31474a4e1dff8b5':
Change account type strings for AccountManager UI
2014-11-02 17:29:36 +00:00
86dda976c9
am a79eed71: am c6d5ec49: No more big yellow envelope
...
* commit 'a79eed714f106a5354730fe41b290bfb4a97d3b7':
No more big yellow envelope
2014-11-02 17:29:34 +00:00
c2da775970
am 3262a8d8: am f866891f: Merge "Remove unused resources" into ub-gmail-ur14-dev
...
* commit '3262a8d807a66999f1b00d05b3e5d7c195ff031b':
Remove unused resources
2014-11-02 17:29:33 +00:00
784b61cca1
am 34a686ab: am dfb7fe91: Remove password spaces warning
...
* commit '34a686ab019d4a748850f297687fc81278b69154':
Remove password spaces warning
2014-11-02 17:29:31 +00:00
cd77bc1b19
am 58310123: am 0ee42176: Merge "Fix spinners layout mangling" into ub-gmail-ur14-dev
...
* commit '58310123a7f227980c44dbe1c242bb5419383b74':
Fix spinners layout mangling
2014-11-02 17:29:30 +00:00
091ed0db8b
am b4986725: am 6a07fc19: Merge "Remove unused resource" into ub-gmail-ur14-dev
...
* commit 'b49867251facbd3ad04beb89a8b6e4e2bb60d497':
Remove unused resource
2014-11-02 17:29:29 +00:00
325afc41ac
am 04c77181: am 1be8b05b: The error message "This field can\'t be blank" can be ignored
...
* commit '04c771810ae3484f6a2dc1698615e262f6cff0f0':
The error message "This field can't be blank" can be ignored
2014-11-02 17:29:24 +00:00
33ab7b3453
am 30d8d696: am 51c65364: Put debug screen back into settings
...
* commit '30d8d696eaf5654ccc3ddb3e2714ebcd972451a9':
Put debug screen back into settings
2014-11-02 17:29:20 +00:00
a357f81eb9
am 1991e2a9: Merge "Remove default search for Email" into ub-gmail-ur14-dev automerge: 9ac6ec7
...
* commit '1991e2a93710f6f04e237f0d881365c3aa42d162':
Remove default search for Email
2014-11-02 17:28:23 +00:00
955b9f9610
am d7192f02: Provider configuration for outlook, yahoo, gmx
...
* commit 'd7192f0213d6468084c1e18d73ee3cb8c6387b61':
Provider configuration for outlook, yahoo, gmx
2014-11-02 15:33:35 +00:00
d1599a86d5
am 72f6a243: Revert "Update notification icon asset names (Email)"
...
* commit '72f6a2432ed3ca183e2311ffaa2f7fa87f3df915':
Revert "Update notification icon asset names (Email)"
2014-11-02 15:33:25 +00:00
bcbe5794fe
am cc82965a: Update notification icon asset names (Email)
...
* commit 'cc82965ac9a84d65c2e8e1152bd8f9929d5674cb':
Update notification icon asset names (Email)
2014-11-02 15:33:24 +00:00
06cc928fd3
am 1927361b: Merge "Account authentication restyling" into ub-gmail-ur14-dev
...
* commit '1927361b258b347c6afa457a4cd122f4fb131027':
Account authentication restyling
2014-11-02 15:33:20 +00:00
f62b684315
am 8c0253a1: Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev
...
* commit '8c0253a1f0d2ee064b183c9055bd4b80dfcf4333':
Replace "Corporate" by "Exchange".
2014-11-02 15:33:19 +00:00
3196680159
am 746dcf06: Merge "Restyle account setup flow nav buttons" into ub-gmail-ur14-dev
...
* commit '746dcf06db03e99156d77b066f4814d80e2e2fd6':
Restyle account setup flow nav buttons
2014-11-02 15:33:17 +00:00
cf3aad6411
am 42a4f201: Move Email Icons (Email)
...
* commit '42a4f201201e60cec049847aed9a0e587a793f9e':
Move Email Icons (Email)
2014-11-02 15:33:07 +00:00
a7d316c40b
am 083a0138: Merge "Update Email Icons" into ub-gmail-ur14-dev
...
* commit '083a01382678e4843c3f9b07b2586477a3303484':
Update Email Icons
2014-11-02 15:33:06 +00:00
a4b5463df8
am 36830d42: Merge "Revert "Clean-up Email Icons"" into ub-gmail-ur14-dev
...
* commit '36830d42f895cc7fc925298245422e97d4e1a6c5':
Revert "Clean-up Email Icons"
2014-11-02 15:33:04 +00:00
8a3054525a
am 6a533823: Merge "Clean-up Email Icons" into ub-gmail-ur14-dev
...
* commit '6a533823f35a555d09ea0a6cc1aca79b7ec6b853':
Clean-up Email Icons
2014-11-02 15:33:03 +00:00
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
33cf634a6e
am a64435a6: Update colors in Email (ColorRefactor)
...
* commit 'a64435a62f903ad865b97d750e5aa84d045fc7c4':
Update colors in Email (ColorRefactor)
2014-11-02 15:32:53 +00:00
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
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
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
a79eed714f
am c6d5ec49: No more big yellow envelope
...
* commit 'c6d5ec490ebb2eb0641771875f03bf381255c8dc':
No more big yellow envelope
2014-11-02 15:32:28 +00:00
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
34a686ab01
am dfb7fe91: Remove password spaces warning
...
* commit 'dfb7fe91e663fe9c0d4e2a645f0fac71be4dd316':
Remove password spaces warning
2014-11-02 15:32:21 +00:00
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
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
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
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
1991e2a937
Merge "Remove default search for Email" into ub-gmail-ur14-dev
...
automerge: 9ac6ec7
2014-11-02 07:09:35 +00:00
96ade4e2a4
Import translations. DO NOT MERGE
...
Change-Id: Id492c45b004f45795a944b0b7d87759d176a1b5f
Auto-generated-cl: translation import
2014-10-27 12:06:01 -07:00
1f79b2b17b
Import translations. DO NOT MERGE
...
Change-Id: Ib15b7fa8170c941cf3f7cc8bdc994f580a00e553
Auto-generated-cl: translation import
2014-10-27 12:05:01 -07:00
8b9f84665d
Import translations. DO NOT MERGE
...
Change-Id: I4b9d449c4004d7a12c0b2abd48ed12999cacbf5b
Auto-generated-cl: translation import
2014-10-20 11:24:58 -07:00
0ed53e8ad1
Import translations. DO NOT MERGE
...
Change-Id: I10f38478b4231318c117ceaac98cbe7e25e704d0
Auto-generated-cl: translation import
2014-10-20 11:23:18 -07:00
c2061fb34a
Import translations. DO NOT MERGE
...
Change-Id: I4c4f519792f0c6e0fc21d0c768de5c979852280c
Auto-generated-cl: translation import
2014-10-19 16:24:48 -07:00
d7192f0213
Provider configuration for outlook, yahoo, gmx
...
Use the defautl configuration for Outlook, Yahoo and GMX
on all regional variants, rather than just `.com`.
Bug: 18027714 The default configuration for outlook.fr is not correct
Bug: 17156903 Update providers.xml with more up-to-date data
Change-Id: I88b5a3d5e467eb0fc40e398264478fe0a24c33ee
2014-10-17 14:23:44 +02:00
586858745f
Import translations. DO NOT MERGE
...
Change-Id: Ib25f13dd8347d95126da1b6a8c1f21c1470723a5
Auto-generated-cl: translation import
2014-10-15 07:14:56 -07:00
4f99236678
Import translations. DO NOT MERGE
...
Change-Id: Ibc4ea82725f10f404512c97d8a06e85600cdd4b4
Auto-generated-cl: translation import
2014-10-15 07:13:44 -07:00
fc3b5cae3b
Import translations. DO NOT MERGE
...
Change-Id: I6b0cf46470c425b2c49207b0294c400476f84bef
Auto-generated-cl: translation import
2014-10-13 12:17:24 -07:00
87aec3cf32
Import translations. DO NOT MERGE
...
Change-Id: I20a1509211799260fabd79a7e613ae7aaa95c7db
Auto-generated-cl: translation import
2014-10-13 12:15:55 -07:00
72f6a2432e
Revert "Update notification icon asset names (Email)"
...
Need to revert - doesn't build on Mac OS
This reverts commit cc82965ac9
2014-10-13 18:58:56 +00:00
cc82965ac9
Update notification icon asset names (Email)
...
Bug: 17936539
Change-Id: Ia2b3d4a18a30f9cfbfcda2c68a3ef579c0c75086
2014-10-10 15:11:55 -07:00
1927361b25
Merge "Account authentication restyling" into ub-gmail-ur14-dev
2014-10-10 16:36:09 +00:00
8c0253a1f0
Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev
2014-10-10 15:30:39 +00:00
746dcf06db
Merge "Restyle account setup flow nav buttons" into ub-gmail-ur14-dev
2014-10-09 18:51:13 +00:00
19ebfab06d
Restyle account setup flow nav buttons
...
b/17266006
Change-Id: Ie60e56b493ba23465a06cce8a3c37d3fd9d061e5
2014-10-09 10:38:47 -07:00
24f2b19c92
Replace "Corporate" by "Exchange".
...
Bug: 17925116 Change "Corporate" to "Exchange"
Change-Id: Ia7f8a8c2e393924cf13eb9a0895ae29d8acc7eb4
2014-10-09 18:02:34 +02:00
f5b5fe1cb3
Account authentication restyling
...
- Add minWidth to fragment
- Remove extraneous LinearLayout and tweak margins to avoid layout jumps
- Change + asset
- Remove old + icon from prefs header from Email
b/8134410
Change-Id: If3371017359b47d9e4280b09fd3bb074b024c23c
2014-10-08 15:49:03 -07:00
2a1daaae4d
Import translations. DO NOT MERGE
...
Change-Id: Id77138c228e8a50336b8a9c6fce144b659fa6d29
Auto-generated-cl: translation import
2014-10-08 10:15:55 -07:00
12ddf6afb6
Import translations. DO NOT MERGE
...
Change-Id: I788681896fc2a8cc6aaeb29dd083f9e99fba0852
Auto-generated-cl: translation import
2014-10-06 11:45:52 -07:00
5f8a1bc088
Import translations. DO NOT MERGE
...
Change-Id: I68cb0d3702c9c0e43a10987c8f9df35398d6a96e
Auto-generated-cl: translation import
2014-10-04 09:43:28 -07:00
ab3ed2cb7a
Import translations. DO NOT MERGE
...
Change-Id: Id23c1d0e3e726ce009fd7c68e2a2cbd29c545466
Auto-generated-cl: translation import
2014-10-02 20:30:11 -07:00
42a4f20120
Move Email Icons (Email)
...
Got rid of ic_launcher_mail from Email folder (moved to
UnifiedEmail).
Bug: 16632478
Change-Id: I4ee261fb31afab7bcec7300315b1631910f27231
2014-10-02 10:38:21 -07:00
49dfa15527
Update Email Icons
...
Added icons with the light, subtle shadows.
Change-Id: Ib3c3893e6b099ea73f1ce5d925c28933b241f544
2014-10-01 17:44:40 -07:00
f22745169c
Revert "Clean-up Email Icons"
...
Need to update Email icons only (Unnecessary work added on for cherry-picking)
This reverts commit 11f5e48526
2014-10-02 00:26:55 +00:00
11f5e48526
Clean-up Email Icons
...
Around 2012, icons were submitted into the wrong folders.
Moved these out into UnifiedEmail.
Discovered as a result of shortcut CL - tagging the bug
in case any changes occur in the future.
Bug: 16632478
Change-Id: I2115f9324003a5c4d3e35b9e155405c377522a60
2014-10-01 15:44:17 -07:00
e2d5985788
Import translations. DO NOT MERGE
...
Change-Id: Id022d8cf7885cbf1011db22290bd95edc9887a2f
Auto-generated-cl: translation import
2014-09-29 22:41:11 -07:00
abd75d1adb
Import translations. DO NOT MERGE
...
Change-Id: I05757a0df1ee5bbffcbe6dff1b0856b1a4bba19a
Auto-generated-cl: translation import
2014-09-29 14:41:16 -07:00
f99328b07c
minor: remove comment that primaryColor is used for ActionBar
...
Remove unhelpful comment that primaryColor is used for ActionBar and
that primaryColordark is used for status bar.
Change-Id: Id27c80ecb79852084ffe4d11540d89eac03e9cb5
2014-09-29 18:50:18 +02:00
a64435a62f
Update colors in Email (ColorRefactor)
...
Change-Id: Ie611ccb3af9043fac73d80fa910f91960c6bbbac
2014-09-25 11:45:42 -07:00
1ea99a269a
Import translations. DO NOT MERGE
...
Change-Id: Ic5661293a2ebf74439928a127520fc8d4f25aa92
Auto-generated-cl: translation import
2014-09-24 22:34:25 -07:00
f987ef8f13
Add ability to clear migration state to debug screen
...
This makes it a lot easier to test migration code.
Change-Id: I22de8c06c34964b8eb7182571094e54f04d739b8
2014-09-24 11:48:46 -07:00
d54cebe5ec
Import translations. DO NOT MERGE
...
Change-Id: I2a3a04830ee77f12c0e03932fe1287eda569fba4
Auto-generated-cl: translation import
2014-09-20 11:36:41 -07:00
5ef8279c93
Import translations. DO NOT MERGE
...
Change-Id: I4b816a6e948f5102f11dfbe98894d34df4a4b6c7
Auto-generated-cl: translation import
2014-09-20 11:35:39 -07:00
9f252e1f54
Renaming to support drawer under status bar.
...
b/17569398
Change-Id: Iab1cea59956fb8a863025312a99f9bd206e2dcac
2014-09-18 15:04:38 -07:00
58aaba5759
Import translations. DO NOT MERGE
...
Change-Id: Ic0b93337f379eb395b8489684596dc26fae41c26
Auto-generated-cl: translation import
2014-09-16 09:25:16 -07:00
62acde8846
Import translations. DO NOT MERGE
...
Change-Id: I8cc6b6c8d657c792a29ec51e76d81e57bb61e9d1
Auto-generated-cl: translation import
2014-09-16 09:24:16 -07:00
25231ac72b
Import translations. DO NOT MERGE
...
Change-Id: Ice143264dc53f4f738e2f4808b3719155af4aa67
Auto-generated-cl: translation import
2014-09-14 16:49:18 -07:00
cb45d6fabe
Merge "Change account type strings for AccountManager UI" into ub-gmail-ur14-dev
2014-09-11 19:29:45 +00:00
a9f69fc4ce
Change account type strings for AccountManager UI
...
b/17365679
Change-Id: I9feafcb5a1b184706b98f288d292cb924107f38e
2014-09-11 11:47:02 -07:00
efca9af619
Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
2014-09-11 15:25:52 +00:00
c6d5ec490e
No more big yellow envelope
...
b/17266006
Change-Id: I80d91992430c7da30e81a8e0783e6308ba286303
2014-09-10 13:51:11 -07:00
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
dfb7fe91e6
Remove password spaces warning
...
b/17409681
Change-Id: Ia411999fc7652b520f17fa2538980d9ba4bd172a
2014-09-09 14:41:38 -07:00
0ee421760a
Merge "Fix spinners layout mangling" into ub-gmail-ur14-dev
2014-09-09 16:26:40 +00:00
6a07fc19f0
Merge "Remove unused resource" into ub-gmail-ur14-dev
2014-09-08 23:07:00 +00:00
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
96e7363894
Import translations. DO NOT MERGE
...
Change-Id: I2e4c6a34f20dc9e1e61020dea0d84ab709e7866d
Auto-generated-cl: translation import
2014-09-08 10:36:10 -07:00
7ed8bee10d
Import translations. DO NOT MERGE
...
Change-Id: Ic6a1c454e10883b1bd268e7ad015d923fe9f1183
Auto-generated-cl: translation import
2014-09-08 10:35:05 -07:00
da0603004d
Import translations. DO NOT MERGE
...
Change-Id: I13641ad92db6cfe7437cce06c16daae99bb00218
Auto-generated-cl: translation import
2014-09-08 10:31:49 -07:00
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
1be8b05bb5
The error message "This field can't be blank" can be ignored
...
b/17367647
The friendly name paired with the email address is now considered
optional when creating a new email account.
Change-Id: I9398ae48e29ee0554efc9c46e9f2f380e7f17cf9
2014-09-03 15:43:12 -07:00
efb6cb2523
Import translations. DO NOT MERGE
...
Change-Id: Ica2b0b6d4089ea625b523752a758d120981d4d95
Auto-generated-cl: translation import
2014-08-31 11:20:27 -07:00
51c653646d
Put debug screen back into settings
...
There is still work to be done here:
* The debug setting is not persisted in Exchange, so if
the exchange service is killed, when it restarts the logging
will not be active.
* Nothing in Exchange actually does any additional logging
if this logging is turned on.
Change-Id: Ic578e6956f70dd47fba9b2895385312f71c47abf
2014-08-28 11:53:51 -07:00
1c0aa4c0fc
Import translations. DO NOT MERGE
...
Change-Id: I9166fd2125b3151a994c654a1c52dd54d8ada643
Auto-generated-cl: translation import
2014-08-26 09:18:04 -07:00
ee727d398a
Import translations. DO NOT MERGE
...
Change-Id: Ie226833c566b4633e7690d53ae6f86399f7b298d
Auto-generated-cl: translation import
2014-08-26 09:17:04 -07:00
fbbba84302
Import translations. DO NOT MERGE
...
Change-Id: Ic2c6080e9372b706f00f60742ba55fe2f8832da8
Auto-generated-cl: translation import
2014-08-24 08:54:25 -07:00
c926864e4b
Remove default search for Email
...
b/17209360
Change-Id: I798139e5ab6f8cd29dde1dd475de17138330d8c5
2014-08-22 14:44:26 -07:00
3c2ffe62cf
Import translations. DO NOT MERGE
...
Change-Id: I408c22b31c33a03597b9e3613c1bfd861f7b1f17
Auto-generated-cl: translation import
2014-08-18 08:03:44 -07:00
3fd0cbaa91
am a8a185f7: Merge "Update Notifications Icon (Email)" into ub-gmail-ur14-dev
...
* commit 'a8a185f75c1173278d5930a07687a7a3d6bdfe1b':
Update Notifications Icon (Email)
2014-08-16 01:12:21 +00:00
a8a185f75c
Merge "Update Notifications Icon (Email)" into ub-gmail-ur14-dev
2014-08-15 18:45:09 +00:00
b5e710f447
Update Notifications Icon (Email)
...
Rest in pieces little gmail icon :(
Change-Id: I14459cba33cf61f6717d922bdb006d8d56ad893c
2014-08-15 17:54:08 -07:00
6d165bca6b
Import translations. DO NOT MERGE
...
Change-Id: Ice21d328d3d7e6364ec40a6d3b84b8b03ae6b81b
Auto-generated-cl: translation import
2014-08-14 22:19:23 -07:00
ea99a05733
Import translations. DO NOT MERGE
...
Change-Id: I8449b7fd0a2636b78453332a99452ac688daf15b
Auto-generated-cl: translation import
2014-08-14 20:28:06 -07:00
7941b406cf
Update Notifications (Email)
...
Switched out icons (For updated mail notify icon).
Bug: 16987147
Change-Id: I695b4c51daddc47eecbe7d856de642932190c4bb
2014-08-13 17:24:52 -07:00
9f14d6b0de
Extend MailboxSettings to handle full folder list
...
b/16541463
Change-Id: If428413ad258497a5654fa095d51cd60f6ed4e18
2014-08-13 14:18:01 -07:00
66ff95a561
Merge "End of Life screen for Email" into ub-gmail-ur14-dev
2014-08-12 23:14:33 +00:00
50591a7be4
End of Life screen for Email
...
b/16843301
This introduces a new build target: EmailGoogleTombstone.
Building with a tapas line that includes that target will
produce EmailGoogleTombstone.apk. The apk includes the
EmailProvider and AttachmentProvider (for migration to
Gmail) and an activity that explains to the user where to
find their email data.
Change-Id: Ib8192b46d9017e04f5c99f5c8e509531198eec07
2014-08-14 11:31:33 -07:00
a780beb0f8
Import translations. DO NOT MERGE
...
Change-Id: I860f4cdce83a78886cf33358d31118f5dafa9c89
Auto-generated-cl: translation import
2014-08-11 11:27:53 -07:00
ea0c40079c
Use margin instead of padding to work around ICS/JB bug
...
b/16897364
Change-Id: I777446331efcf7735a4d3de9eeedd7fa57dc8d36
2014-08-08 14:48:18 -07:00
0c4f45e854
Add chromium.org to providers.xml
...
Change-Id: Iea88c59bcd883e7d06b3e55dcd3edb74e3c5a324
2014-08-07 15:51:38 -07:00
36fd389381
Use ShortcutWidgetTheme.
...
Fixes b/16767953 and b/16131423.
Also removes the obsolete ic_launcher_shortcut_folder.
Change-Id: I73e800b1e83b95eaa05cd800178a7de86072c00d
2014-08-04 20:05:17 +00:00
Paul Westbrook