Commit Graph

1699 Commits

Author SHA1 Message Date
Tony Mantler
c8fee48f2e am 18e8b55b: am 2b39de91: am 815252ad: am 31966801: am 746dcf06: Merge "Restyle account setup flow nav buttons" into ub-gmail-ur14-dev
* commit '18e8b55b75294704277b82ecab26ec13577e8d2b':
  Restyle account setup flow nav buttons
2014-11-02 19:02:59 +00:00
Rohan Shah
e9a520f9ef am e1c103dc: am 93a6c2c3: am 80f4af5a: am cf3aad64: am 42a4f201: Move Email Icons (Email)
* commit 'e1c103dc6ed458c980d1c3bea6c15781a99db650':
  Move Email Icons (Email)
2014-11-02 19:02:51 +00:00
Rohan Shah
7e40de1bcc am 7073065d: am 2df883ac: am 3884149d: am a7d316c4: am 083a0138: Merge "Update Email Icons" into ub-gmail-ur14-dev
* commit '7073065d34ec2b6a08b04199b860c7812d2902d3':
  Update Email Icons
2014-11-02 19:02:50 +00:00
Rohan Shah
45af012ad3 am 0114c401: am 9486b751: am 6cef32da: am a4b5463d: am 36830d42: Merge "Revert "Clean-up Email Icons"" into ub-gmail-ur14-dev
* commit '0114c4017fcf22852d1a03dd50496f8bfae53790':
  Revert "Clean-up Email Icons"
2014-11-02 19:02:48 +00:00
Rohan Shah
d14760b69b am e57e10a4: am d2ad0933: am 67df0850: am 8a305452: am 6a533823: Merge "Clean-up Email Icons" into ub-gmail-ur14-dev
* commit 'e57e10a434ebbd6ada801f18e945f386dc960dcc':
  Clean-up Email Icons
2014-11-02 19:02:47 +00:00
Régis Décamps
9fec8062d5 am 5d9a2f3d: am c097bb3d: am 32bb6854: am 1b2a0df1: am f99328b0: minor: remove comment that primaryColor is used for ActionBar
* commit '5d9a2f3df05cc39dc10857bd372c4fb1cc94effb':
  minor: remove comment that primaryColor is used for ActionBar
2014-11-02 19:02:38 +00:00
Rohan Shah
bad4e4694e am 22f8218c: am 678ca4ba: am 636fed7d: am 33cf634a: am a64435a6: Update colors in Email (ColorRefactor)
* commit '22f8218ccf8756fb4c7479d54dd0d19175ad1944':
  Update colors in Email (ColorRefactor)
2014-11-02 19:02:33 +00:00
Martin Hibdon
205845e61d am 639c2f80: am 276f275c: am 3c38f6ac: am ef0dc0ac: am 809313bd: Merge "Add ability to clear migration state to debug screen" into ub-gmail-ur14-dev
* commit '639c2f80b8a91f0b027f5310cb97fb5f08496405':
  Add ability to clear migration state to debug screen
2014-11-02 19:02:31 +00:00
Andrew Sapperstein
6c0795a3e5 am 672eb2b2: am b3d30510: am a29c6884: am 8fd1a38c: am 9f252e1f: Renaming to support drawer under status bar.
* commit '672eb2b2789a917d23a167c22a64c4ecdd56e375':
  Renaming to support drawer under status bar.
2014-11-02 19:02:25 +00:00
Tony Mantler
9115a12218 am eaafa9a9: am 22538106: am d8800386: am 2d3730b5: am cb45d6fa: Merge "Change account type strings for AccountManager UI" into ub-gmail-ur14-dev
* commit 'eaafa9a9748709187c998a8a563a9aacb7b35a70':
  Change account type strings for AccountManager UI
2014-11-02 19:02:02 +00:00
Tony Mantler
dd5a7dad81 am 0fa53a33: am 99219eb0: am 86dda976: am a79eed71: am c6d5ec49: No more big yellow envelope
* commit '0fa53a3367458100abed2cf2091482911c544495':
  No more big yellow envelope
2014-11-02 19:01:57 +00:00
Paul Westbrook
a54d0838b7 resolved conflicts for merge of 6666fbf0 to master
Change-Id: I92e53c11119cda4efa3816b5ae030c278bda1290
2014-11-02 11:00:40 -08: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
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
Tony Mantler
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
Paul Westbrook
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
James Lemieux
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
Martin Hibdon
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
Jin Cao
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
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
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