PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,925 Commits 1 Branch 0 Tags
ccf503c0a16f5180cd8e2d4136660beab94deef7
Commit Graph

49925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cameron Neale 00e727ebf6 Merge "Changes made to accomodate GSA in Google3 w/ Robolectric" into ub-now-master 2014-11-05 19:34:16 +00:00
Sunny Goyal 026f622cc7 Merge "Removing InstallWidgetReceiver related obsolete code." into ub-now-queens 2014-11-05 18:58:16 +00:00
Sunny Goyal 03a2cf1183 Removing InstallWidgetReceiver related obsolete code. 
Change-Id: I61700b363f8af6434e750bcb5323e0ad4e5bf011
 2014-11-05 10:34:43 -08:00
The Android Automerger 50756c1512 merge in ub-now-queens-release history after reset to 7e585dc71f 2014-11-04 10:44:27 +00:00
Adam Cohen 318198d462 am 7e585dc7: Merge "Updating page indicator assets" into ub-now-queens 
* commit '7e585dc71f9aec8a232a79105653f315af8007b2':
  Updating page indicator assets
 2014-11-04 00:52:02 +00:00
Adam Cohen 7e585dc71f Merge "Updating page indicator assets" into ub-now-queens 2014-11-04 00:24:39 +00:00
Adam Cohen 4e43a64ec5 Updating page indicator assets 
Bug: 17318376
Change-Id: I4e73bf4892575bbb31f28d2cf1a4e476f8895dfa
 2014-11-03 16:15:27 -08:00
Sunny Goyal 4595870a98 am 45634bf8: Merge "Moving methods which update internal sets on a separate thread" into ub-now-queens 
* commit '45634bf8fb5c9c59217795a620c4a36aced89a03':
  Moving methods which update internal sets on a separate thread
 2014-11-03 20:14:24 +00:00
Sunny Goyal 45634bf8fb Merge "Moving methods which update internal sets on a separate thread" into ub-now-queens 2014-11-03 20:11:05 +00:00
Sunny Goyal b9f261fd3a Clearing some android list errors/warnings. 
Change-Id: I2f1f991e61f9e41644ee9943f5a1a15971cca6c1
 2014-11-03 11:39:27 -08:00
Adam Cohen a380f06d39 am 96d2cc23: Fix folder hint text color. Likely a regression from upgrading the Activity theme 
* commit '96d2cc235dff94d6109cd480fef13afbefa459f1':
  Fix folder hint text color. Likely a regression from upgrading the Activity theme
 2014-11-01 00:22:40 +00:00
Adam Cohen 96d2cc235d Fix folder hint text color. Likely a regression from upgrading the Activity theme 
Bug: 18204650
Change-Id: I5e23df5f4f8f1f8ca7a22c8a62797e77c9a4a9e1
 2014-10-31 17:17:25 -07:00
Adam Cohen 14254b82f0 am c3e12c73: Overlay shouldn\'t show up above Intro screen 
* commit 'c3e12c733ea1bac942454237b897d5a321c01072':
  Overlay shouldn't show up above Intro screen
 2014-10-31 23:42:04 +00:00
Adam Cohen c3e12c733e Overlay shouldn't show up above Intro screen 
bug: 18173340
Change-Id: Icf738a55398023ab6bad5cced05b25e053dec0a2
 2014-10-31 16:34:42 -07:00
Cameron Neale 2775cb34b3 Changes made to accomodate GSA in Google3 w/ Robolectric 
dragViewOffset removed from WallpaperPicker as it was causing
a duplicate resource conflict with launcher3 and was not used
within the WallpaperPicker project.

Empty <application> tag added to WallpaperPicker manifest as required by
Robolectric

Removed <add-resource> tag from L3 manifest, unrecognized by Robolectric

Change-Id: I3744fc50731f82c3e6fdc01d9819e9a0302dc503
 2014-10-31 14:06:07 -07:00
Adam Cohen e6dfe7b1de am 3f9c971e: Adding a couple memory optimizations to Launcher 
* commit '3f9c971e761222dc9fb4e5866f81c5f7a3348992':
  Adding a couple memory optimizations to Launcher
 2014-10-31 20:39:35 +00:00
Adam Cohen 3f9c971e76 Adding a couple memory optimizations to Launcher 
-> Always dispose of widget page views when leaving the activity.
   These pages hold onto many bitmaps.
-> Clear database cache when leaving the activity.

Bug: 17967108
Change-Id: I10ebaaed14e7cd86f09a9afcabd73043705f21b8
 2014-10-31 12:15:09 -07: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
Sunny Goyal d90e938db0 Moving methods which update internal sets on a separate thread 
Bug: 18152117
Change-Id: I5fccd203b5fe65e79dcc5aead6cb1cb6c3b622fe
 2014-10-30 10:32:20 -07:00
Sunny Goyal 955f14c451 am 5fd733db: Failing restore, if we have an item outside screen bounds 
* commit '5fd733dbaeff3f07fff98f24947b2e1ab89eff7d':
  Failing restore, if we have an item outside screen bounds
 2014-10-29 23:18:27 +00:00
Sunny Goyal 5fd733dbae Failing restore, if we have an item outside screen bounds 
Bug: 17552590
Change-Id: I2d25847fd05d9579bc29ccbfa62e34809d4855d1
 2014-10-29 10:52:54 -07:00
Sunny Goyal c389fccee2 am 00105805: Merge "Updating backup restore logic" into ub-now-queens 
* commit '001058054a6957769e39c12c6bec636c85df6385':
  Updating backup restore logic
 2014-10-29 17:35:26 +00:00
Sunny Goyal 001058054a Merge "Updating backup restore logic" into ub-now-queens 2014-10-29 17:19:24 +00: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