Commit Graph

10069 Commits

Author SHA1 Message Date
Adam Cohen bbdd3ebd31 am 8562283a: am 2b69b70d: am c5b6ac72: am 2d7e7eda: Fix resource issue in folders of partner layouts
* commit '8562283acdb08fb4a68c23b78789d9e75e5f1fb6':
2015-01-31 02:00:53 +00:00
Geoff Mendal f9525ebcde am 61677b41: (-s ours) am 1bcebeae: (-s ours) Import translations. DO NOT MERGE
* commit '61677b41eb12afd0d6950771d5a18f1d33e339be':
  Import translations. DO NOT MERGE
2015-01-31 02:00:51 +00:00
Adam Cohen 8562283acd am 2b69b70d: am c5b6ac72: am 2d7e7eda: Fix resource issue in folders of partner layouts
* commit '2b69b70d7cb2a1c67b527f094820fb3497a3709f':
2015-01-31 01:07:12 +00:00
Geoff Mendal 61677b41eb am 1bcebeae: (-s ours) Import translations. DO NOT MERGE
* commit '1bcebeae71856c360972b86e1a22d53113bb3cc0':
  Import translations. DO NOT MERGE
2015-01-31 01:07:10 +00:00
Jeff Davidson bfb285b47f am 19a443e4: Merge "Update protobuf library from 2.3 to 2.6."
* commit '19a443e4e8bf3d37e544eda2c407604616cdae9d':
  Update protobuf library from 2.3 to 2.6.
2015-01-12 19:51:58 +00:00
Jeff Davidson 19a443e4e8 Merge "Update protobuf library from 2.3 to 2.6." 2015-01-12 19:37:47 +00:00
Baligh Uddin 00835d4e7e am 3e4c4987: (-s ours) Import translations. DO NOT MERGE
* commit '3e4c4987309b8cf76f524396738bfd75dd137498':
  Import translations. DO NOT MERGE
2014-10-31 17:20:42 +00:00
Baligh Uddin 3e4c498730 Import translations. DO NOT MERGE
Change-Id: I1e2d7749dba2e970c7d81b3b4357477d41414f0e
Auto-generated-cl: translation import
2014-10-30 16:10:49 -07:00
Neil Fuller acf5f23286 am 23582d7d: am f1340f18: Merge "Remove dependencies on FloatMath"
* commit '23582d7da022aac190dc86e9536d9e5b45a80220':
  Remove dependencies on FloatMath
2014-10-29 07:08:21 +00:00
Baligh Uddin 0566d8d505 am 24082c8a: am 3a9f3a78: am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658
* commit '24082c8a0de34df6fcd1c17781a6d9bbc522f083':
2014-10-29 07:08:20 +00:00
Huy Nguyen 33840825c8 am f6619645: am efaf2c85: am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit 'f6619645af9da5728170736ebb94976625e732b5':
2014-10-29 07:08:19 +00:00
Mark Ashdown 6bd055c5d6 am ee9d8dfd: am 16880deb: am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit 'ee9d8dfdf3a70741d65d24515c69c827d0f1fd28':
2014-10-29 07:08:18 +00:00
Huy Nguyen d75cfe184d am 7c2f8b47: am 9e5d50c6: (-s ours) am 49635c71: (-s ours) am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit '7c2f8b47cfb44bdb4cbdd05f081d5017a820e833':
2014-10-29 07:08:17 +00:00
Mark Ashdown 5f4f343582 am 29923f50: am 6cea6748: (-s ours) am a4d0ef3c: (-s ours) am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit '29923f5082093b6211894f49edc653c29b28d99b':
2014-10-29 07:08:06 +00:00
Mathew Inwood a565fb3c6c am 7118d9dd: am d6518c4b: (-s ours) am 48e725bd: (-s ours) am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit '7118d9dd17f51d998440f257935d6670c927383f':
2014-10-29 07:08:05 +00:00
Juan Silveira d1df79ffc3 am ede7e7e3: am 58dcef7b: am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit 'ede7e7e3188e3c1ff56ed2bd25e2462fba1bdce9':
2014-10-29 07:08:04 +00:00
Anton Hansson 65b2e67373 am d223b88f: am cd76f89f: (-s ours) am 6508fe1b: (-s ours) am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit 'd223b88f0dbff7cd66876e691345df5c1ede242b':
2014-10-29 07:08:03 +00:00
Adam Skory 08ac7d15c9 am 69925bb1: am 9c114bb7: (-s ours) am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit '69925bb1923f86f4b590962cdcd4299b98b9f30d':
2014-10-29 07:07:55 +00:00
Adam Skory 6d9a6398d7 am 2e124bc4: am 298a9c61: am 78d8510a: am 9e3ebf3c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit '2e124bc43dc148fd7d39f5d726738d2cdabf32ad':
2014-10-29 07:07:54 +00:00
Adam Skory 55a386a363 am 667ca4fe: am 3a540fc8: am 77ef6b2b: am 381fa3fb: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release
* commit '667ca4fe80afbfa4e95333de374fa453eb73b121':
2014-10-29 07:07:53 +00:00
Baligh Uddin ca2d4f1c4b am 0ef051bd: (-s ours) am a003c8ed: (-s ours) am 4487e0aa: (-s ours) am beb7bc60: (-s ours) Import translations. DO NOT MERGE
* commit '0ef051bd3da6b7b6dffbbf6251e15cad2eaef574':
  Import translations. DO NOT MERGE
2014-10-29 07:07:52 +00:00
Geoff Mendal 5dd8165f9b am 38ede6d7: am 9bc59c20: (-s ours) Merge commit \'457e9215df2a8353f484a268950623d714afa01c\' into klp-dev-plus-aosp
* commit '38ede6d74bf3b70e86a6eb99307dae79df45976e':
2014-10-29 07:07:51 +00:00
Tom Stamm 38e7a05600 am 253e9df6: am a0010b81: am 279b0385: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kr
* commit '253e9df603d89af35765629b9e3fe14283295653':
2014-10-29 07:07:50 +00:00
Qiwen Zhao fdf012413a am a42634a5: am 76fd2e70: Merge branch \'klp-dev-plus-aosp\' of sso://googleplex-android.git.corp.google.com/a/platform/packages/apps/Launcher3 into klp-dev-plus-aosp
* commit 'a42634a571557f0826c519488a8c53c784abb952':
2014-10-29 07:07:49 +00:00
Qiwen Zhao ecbb0a5cec am 10383e29: am 0f3e2065: (-s ours) Merge commit \'8fa85d20\' into klp-dev-plus-aosp
* commit '10383e2992c0f23f1b10ddc31ef9d6d9d36129ca':
  Fix overlapping pages (issue 12551580)
  Properly saving migration cling keys.
2014-10-29 07:07:48 +00:00
Qiwen Zhao b515af45ea am 39363a4e: am ec3aad2e: (-s ours) Merge commit \'d5c6745b\' into klp-dev-plus-aosp
* commit '39363a4e113a35060cb4299806459463d4a75177':
  Tightening migration conditions. (Bug 11973614)
2014-10-29 07:07:46 +00:00
Adam Cohen 56335b7087 am 9f0c4b4e: am 51ac5ce5: am cf09fa12: am b54a5989: Adding optional first run activity to Launcher
* commit '9f0c4b4e12922b4cb3a4328d140b5cece73bb95d':
2014-10-29 07:07:45 +00:00
Adam Cohen eaa97f886b am cf00d3ca: am 537ecd45: am 8df1285d: am 0259c629: Merge "Fix issue where deleting item from folder leaves extra page" into jb-ub-now-kermit
* commit 'cf00d3ca592037e20053c2d2a7fd734c270e275f':
2014-10-29 07:07:44 +00:00
Chris Wren fd523263f4 am 4feb47db: am 84ae085d: am 1cf23e10: am 8661761c: better support for multiple files
* commit '4feb47db8c06d5bf1e33dedebaaf575fbc91a894':
2014-10-29 07:07:43 +00:00
Chris Wren c15dafa503 am 7eb59841: am de0fc51a: am 32911d21: am 33f4c2df: first backup should save things from the beginning of time
* commit '7eb5984112b9f082cf7d54ea847c2f7eb11812f5':
2014-10-29 07:07:42 +00:00
Yura 69589195dc am e1b6873e: am 7dae6109: am 946334b3: am 0bae5b22: Merge "Moved paddingStart to -v17 folder." into jb-ub-now-kermit
* commit 'e1b6873efe5d94b6f561a535e1e4c3ab4ad58e37':
2014-10-29 07:07:40 +00:00
Winson Chung 8a853c6ebf am dcb02a7b: am 01880c02: am 29a86c26: am 872e70e0: Merge "Accounting for new Package event extras when updating forward-locked apps. (Bug 11855584)" into jb-ub-now-kermit
* commit 'dcb02a7b6c9f88c34852eaaee544433b7572ca4d':
2014-10-29 07:07:39 +00:00
Dan Sandler c9433370be am ef129c27: am 425941d0: am 1d7cf660: am 155f3bc6: Merge "KEYCODE_MENU: hide all apps when entering overview mode" into jb-ub-now-kermit
* commit 'ef129c27fc23a379ec04a46edfa1926e0c110e8b':
2014-10-29 07:07:38 +00:00
Mihail Dumitrescu 32bb21c208 am 5e236b7d: am bd8d3e66: am e4c398d3: am 29e619c8: Merge "Remove a non-obvious fall through in a switch statement." into jb-ub-now-kermit
* commit '5e236b7d12c5eef34fb6a39a77437a6783dd8803':
2014-10-29 07:07:36 +00:00
Yura e2bda5e4d2 am b6697d53: am ad72d13f: am 792ed52a: am 83b0da1a: Removed paddingStart and paddingEnd when they are the same.
* commit 'b6697d53cd054cda4a58bbc8fdbbf0a952ec379c':
2014-10-29 07:07:35 +00:00
Nilesh Agrawal dadca6fdd4 am 93cdc523: am b5b7fd3c: am fbed86e6: am 579c8433: Merge "Allow scrolling folders in when all apps is disabled." into jb-ub-now-kermit
* commit '93cdc5236fa02061d8b68e93efeccb375c446710':
2014-10-29 07:07:34 +00:00
Sandeep Siddhartha 2803536e2f am df766cfc: am 8bea84e3: am eb870e15: am 8d36ffe5: Merge "Allow changing search bar hint in the cling on-the-fly" into jb-ub-now-kermit
* commit 'df766cfcc5b5185dcb83648839cbde2f9a10b1de':
2014-10-29 07:07:32 +00:00
Baligh Uddin 47cdc3aea5 am 33951d63: (-s ours) am c7cdc43e: (-s ours) am 72af7f8d: (-s ours) am 72b4c7c3: (-s ours) am 3e6b26da: (-s ours) am cff2d6a2: (-s ours) Import translations. DO NOT MERGE
* commit '33951d6383d943b47166980b58691589ebd38da0':
2014-10-29 07:07:31 +00:00
Baligh Uddin 2640f0499b am 5826c3c1: (-s ours) am 476e0045: (-s ours) am 7c4a9e55: (-s ours) am 37749ea3: (-s ours) Import translations. DO NOT MERGE
* commit '5826c3c15640635619a531c49cb30997ac922204':
2014-10-29 07:07:30 +00:00
Chris Wren 428e5e116e am 7e4c4087: am c2e2363b: am ef6b1b5c: am 5f85bb49: Merge "support multiple files and fix logcat smippets for launcher_protoutil" into jb-ub-now-kermit
* commit '7e4c40875dcb07f80bb418f391702bfa6f7738bd':
2014-10-29 07:07:28 +00:00
Nilesh Agrawal bb6d5924b8 am db9eca39: am d76403d6: am cdf8fe86: am 20e45a8e: Merge "Do not allow duplicate shortcuts when ALL_APPS is disabled." into jb-ub-now-kermit
* commit 'db9eca39e9cc1386b4c48300c294f0349c6d9762':
2014-10-29 07:07:27 +00:00
Baligh Uddin f6b2c46c61 am fc6dab31: (-s ours) am 9b4d5a42: (-s ours) am 65301b14: (-s ours) am 3d2fefae: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
* commit 'fc6dab311751300cde3031626d3dbacfd15614fc':
2014-10-29 07:07:26 +00:00
Chris Wren c30daa6c15 am 784bbb17: am 76fffaea: am 41307509: am f6a22ada: Add auto-detection of payload type
* commit '784bbb1793821349bf77c3e4764967f822b54bdd':
2014-10-29 07:07:25 +00:00
Adam Cohen d802a25b30 am 183cec2a: am e4618064: am 5d81c91a: am 309260ee: Merge "Don\'t notifyPageSwitchListener until page settles (issue 12069757)" into jb-ub-now-kermit
* commit '183cec2a2e0cdedfb476f7a5db3dd11564a5a6d7':
2014-10-29 07:07:24 +00:00
Michael Jurka 2d4e3898a2 am d1aeb26a: am d3d59187: am d2c865d8: am 31ff527a: Update script to pull latest files from Gallery
* commit 'd1aeb26ad7d825777568c56c0ecdaa8062da9e48':
2014-10-29 07:07:22 +00:00
Michael Jurka 9d9bf058a6 am 6c49d66a: am 454f4f5b: am 11c15ad0: am 34c2e6cf: Clean up imports
* commit '6c49d66addc55ed810ef37d5c0a20c55b127ca5c':
2014-10-29 07:07:21 +00:00
Michael Jurka df56310445 am 8783ac95: am 7d2e58dd: am 896b9cfc: am 7ad868b8: Create separate project for Wallpaper Picker
* commit '8783ac95741546db8d6dbbf341505fdcd7462214':
2014-10-29 07:07:20 +00:00
Adam Cohen 14d7226224 am c5022b54: am 71d0183c: am 19f7dcd5: am 69a10949: Merge "Fix NPE from feedback (issue 12106858)" into jb-ub-now-kermit
* commit 'c5022b54272485938f2ca9d15a09627119435b6d':
2014-10-29 07:07:19 +00:00
Nilesh Agrawal cdd05bcc4e am a5896d08: am 01e377b0: am 132ad329: am 306c1cf2: Show widgets when ALL_APPS is disabled.
* commit 'a5896d08fd490b351feeedc8b0f351456d84818f':
2014-10-29 07:07:17 +00:00
Baligh Uddin 37828eecda am b7bb3e73: (-s ours) am cd0f6e0c: (-s ours) am 6fc0c669: (-s ours) am 33cd5b9e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
* commit 'b7bb3e73ebad4f562cd390aae8df829a9614eb03':
2014-10-29 07:07:16 +00:00