Commit Graph

1693 Commits

Author SHA1 Message Date
Régis Décamps
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
Rohan Shah
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
Rohan Shah
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
Tony Mantler
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
Régis Décamps
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
Tony Mantler
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
Rohan Shah
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
Rohan Shah
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
Rohan Shah
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
Rohan Shah
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
Régis Décamps
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
Rohan Shah
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
Martin Hibdon
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
Andrew Sapperstein
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
Tony Mantler
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
Tony Mantler
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
Paul Westbrook
6666fbf090 resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp
Change-Id: I28a5355b850c271bdead47874d586c557e4557f6
2014-11-02 10:49:50 -08:00
Tony Mantler
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
Tony Mantler
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
Paul Westbrook
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
James Lemieux
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
Martin Hibdon
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
Jin Cao
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
Régis Décamps
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
Rohan Shah
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
Rohan Shah
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
Tony Mantler
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
Régis Décamps
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
Tony Mantler
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
Rohan Shah
80f4af5a15 am cf3aad64: am 42a4f201: Move Email Icons (Email)
* commit 'cf3aad6411d5ca867756c7b504999a740f1ace62':
  Move Email Icons (Email)
2014-11-02 17:30:09 +00:00
Rohan Shah
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
Rohan Shah
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
Rohan Shah
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
Régis Décamps
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
Rohan Shah
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
Martin Hibdon
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
Andrew Sapperstein
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
Tony Mantler
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
Tony Mantler
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
Paul Westbrook
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
Tony Mantler
784b61cca1 am 34a686ab: am dfb7fe91: Remove password spaces warning
* commit '34a686ab019d4a748850f297687fc81278b69154':
  Remove password spaces warning
2014-11-02 17:29:31 +00:00
Tony Mantler
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
Paul Westbrook
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
James Lemieux
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
Martin Hibdon
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
Jin Cao
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
Régis Décamps
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
Rohan Shah
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
Rohan Shah
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
Tony Mantler
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