PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
78,507 Commits 1 Branch 0 Tags
eedc7ab8fdb94de05201fa87537991558accbe8a
Commit Graph

78507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin 3ea0e06a90 am a003c8ed: (-s ours) am 4487e0aa: (-s ours) am beb7bc60: (-s ours) Import translations. DO NOT MERGE 
* commit 'a003c8ede8026fac754c059c90fde5bc9ba6e309':
  Import translations. DO NOT MERGE
 2014-02-20 22:46:02 +00:00
Baligh Uddin a003c8ede8 am 4487e0aa: (-s ours) am beb7bc60: (-s ours) Import translations. DO NOT MERGE 
* commit '4487e0aac4270f3ab429d27f454d4eb1efb19a6b':
  Import translations. DO NOT MERGE
 2014-02-20 22:40:46 +00:00
Geoff Mendal 4d05024331 am 9bc59c20: Merge commit \'457e9215df2a8353f484a268950623d714afa01c\' into klp-dev-plus-aosp 
* commit '9bc59c20d0bc0683c537560ea92c581eeaf1ebe9':
 2014-02-20 22:37:24 +00:00
Geoff Mendal 9bc59c20d0 Merge commit '457e9215df2a8353f484a268950623d714afa01c' into klp-dev-plus-aosp 
Conflicts:
	res/values-lo-rLA/strings.xml
 2014-02-20 14:34:09 -08:00
Baligh Uddin 4487e0aac4 am beb7bc60: (-s ours) Import translations. DO NOT MERGE 
* commit 'beb7bc6028eeeea160b17df800b0a886eecd1c9b':
  Import translations. DO NOT MERGE
 2014-02-20 21:13:05 +00:00
Baligh Uddin 36c123ec6b am 9594e887: (-s ours) am 37fe7d2b: (-s ours) am f42cf7de: (-s ours) Import translations. DO NOT MERGE 
* commit '9594e887712d8dfca47c0f160a24cfb7a8262cb8':
  Import translations. DO NOT MERGE
 2014-02-20 13:12:42 -08:00
Baligh Uddin 9594e88771 am 37fe7d2b: (-s ours) am f42cf7de: (-s ours) Import translations. DO NOT MERGE 
* commit '37fe7d2b99dc514f567b31e5931d054bacefe377':
  Import translations. DO NOT MERGE
 2014-02-20 13:10:18 -08:00
Baligh Uddin 37fe7d2b99 am f42cf7de: (-s ours) Import translations. DO NOT MERGE 
* commit 'f42cf7de53f9f500ae06b62b9097b9edc7884a2b':
  Import translations. DO NOT MERGE
 2014-02-20 13:08:48 -08:00
Baligh Uddin beb7bc6028 Import translations. DO NOT MERGE 
Change-Id: I6fb7884fae6cc8e09ca5fe51f28f5f80b183e9b5
Auto-generated-cl: translation import
 2014-02-20 09:42:49 -08:00
Baligh Uddin f42cf7de53 Import translations. DO NOT MERGE 
Change-Id: I4fb41af97a881f6669af15ddd6db1af4f3429765
Auto-generated-cl: translation import
 2014-02-20 09:39:20 -08:00
Yura ab63184453 am c0bb4a19: Fix for Can\'t convert to dimension: type=0x12 Crash on JB deviecs. 
* commit 'c0bb4a19bb421045be67eae226280bb12fe2c6aa':
  Fix for Can't convert to dimension: type=0x12 Crash on JB deviecs.
 2014-02-18 05:35:44 -08:00
Juan Silveira 07130d400c Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release 2014-02-18 10:33:27 +00:00
Tom Stamm 08dabcc222 am a0010b81: am 279b0385: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kr 
* commit 'a0010b81ad0e179a8336f84da84f7aed3dd54cb5':
  Ensure we don't call getLayoutDirection() for devices not running JB MR1+. (Bug 12906355)
 2014-02-15 00:31:07 +00:00
Qiwen Zhao 7c22c9689c 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 '76fd2e70bd28668a09edd1e7bb30348b6536b5ad':
 2014-02-15 00:27:31 +00:00
Qiwen Zhao 63904d678a am 0f3e2065: Merge commit \'8fa85d20\' into klp-dev-plus-aosp 
* commit '0f3e20658a2386b68f23c71a83e18b9423e939e9':
  Import translations. DO NOT MERGE
 2014-02-15 00:27:31 +00:00
Tom Stamm a0010b81ad am 279b0385: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kr 
* commit '279b0385d04427d039c10bc22df2a2aaafd99a4a':
  Ensure we don't call getLayoutDirection() for devices not running JB MR1+. (Bug 12906355)
 2014-02-15 00:26:11 +00:00
Ian Parkinson 68f99541fd am 6b524fe0: am 8944f244: Merge Launcher3 jb-ub-now-kermit to kermit-release 
* commit '6b524fe0b23cb698154896415290eef94f4b7ae5':
  Defend against missing DB during migration.
 2014-02-15 00:24:02 +00:00
Huy Nguyen 575f1c6625 am c0275608: am 6a996e7d: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kermit-release 
* commit 'c027560893d994d675d55bb79e60cb2c47189f3c':
  Import translations. DO NOT MERGE
  Adding tighter first run checks for migration clings. (Bug 12626290)
  Avoid NPE from delayed Runnable
 2014-02-15 00:24:02 +00:00
Jim Guggemos 0d68c0cf95 am 5c7c3c9b: am 608401ac: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kermit-release 
* commit '5c7c3c9b8d9d2bc91b40e4d0cfe12dc31787720b':
  Adding specific buckets for N5 in dynamic grid. (Bug 12604220)
  Fix overlapping pages (issue 12551580)
 2014-02-15 00:24:01 +00:00
Adam Cohen 41610caa87 am b5abf2a0: am 930514df: Fix overlapping pages (issue 12551580) 
* commit 'b5abf2a0c8b61ba4e78da62c9ef34ec159e3ead5':
  Fix overlapping pages (issue 12551580)
 2014-02-15 00:24:00 +00:00
Jim Guggemos 6e14b2fcd8 am 1fb0035a: am b608ae67: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kermit-release 
* commit '1fb0035acef67b99b197808158e0ac19f74d57af':
  Dismissing search and other overlays when the menu button is pressed. (Bug 12524591)
 2014-02-15 00:24:00 +00:00
Mark Ashdown f88c0f881e am 8c8abe93: am 8ffe7b76: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kermit-release 
* commit '8c8abe936d21e95cf8f68689e750d56b6b98c04c': (24 commits)
  Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)
  Updating screen background assets. (Bug 12136457)
  Updating Tablet clings. (Bug 11973614)
  Migration update: ensuring all folders go first
  Lazy load the widget preview loader class
  Don't migrate shortcuts for components that no longer exist
  Import translations. DO NOT MERGE
  rationalize launcher backup logging
  Tightening migration conditions. (Bug 11973614)
  Replace "hotseat" with "Favorites tray" in user visible strings.
  Remove settings in overview mode for Launcher3.
  Fixing drop targets in phone / small tablet landscape (issue 12192781)
  Ensure that hasFirstRunActivity is only called when necessary
  Keep selected wallpaper on configuration change.
  search for a valid journal
  Fix NPE in Workspace.onDropCompleted
  Properly saving migration cling keys.
  restore app favorites and screens
  Fix longpress crash.
  Add ability to center the crop (disabled)
  ...
 2014-02-15 00:23:59 +00:00
Adam Cohen 95334fcac6 am 4227263c: am 71c92b35: Merge "Properly saving migration cling keys." into jb-ub-now-kermit-release 
* commit '4227263c212e3264003dd0c7fcc619bdc751cc04':
  Properly saving migration cling keys.
 2014-02-15 00:23:58 +00:00
Qiwen Zhao 76fd2e70bd Merge branch 'klp-dev-plus-aosp' of sso://googleplex-android.git.corp.google.com/a/platform/packages/apps/Launcher3 into klp-dev-plus-aosp 2014-02-14 16:23:01 -08:00
Qiwen Zhao 0f3e20658a Merge commit '8fa85d20' into klp-dev-plus-aosp 
Conflicts:
	res/values-lo-rLA/strings.xml
 2014-02-14 16:22:50 -08:00
Ian Parkinson 6b524fe0b2 am 8944f244: Merge Launcher3 jb-ub-now-kermit to kermit-release 
* commit '8944f244d55a5f60cfb4d69b464c5694d11d097d':
  Defend against missing DB during migration.
 2014-02-15 00:20:32 +00:00
Huy Nguyen c027560893 am 6a996e7d: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kermit-release 
* commit '6a996e7d3470a582a953032f772674b174873f32':
  Import translations. DO NOT MERGE
  Adding tighter first run checks for migration clings. (Bug 12626290)
  Avoid NPE from delayed Runnable
 2014-02-15 00:20:32 +00:00
Jim Guggemos 5c7c3c9b8d am 608401ac: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kermit-release 
* commit '608401ac43fa1840dd95be9c1e2fad472fa47027':
  Adding specific buckets for N5 in dynamic grid. (Bug 12604220)
  Fix overlapping pages (issue 12551580)
 2014-02-15 00:20:31 +00:00
Adam Cohen b5abf2a0c8 am 930514df: Fix overlapping pages (issue 12551580) 
* commit '930514df0529ff5316bb00f3e45a4de036b7f5aa':
  Fix overlapping pages (issue 12551580)
 2014-02-15 00:20:31 +00:00
Jim Guggemos 1fb0035ace am b608ae67: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kermit-release 
* commit 'b608ae672d7ef85b85d9f45e7c36371c22ab8645':
  Dismissing search and other overlays when the menu button is pressed. (Bug 12524591)
 2014-02-15 00:20:30 +00:00
Mark Ashdown 8c8abe936d am 8ffe7b76: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kermit-release 
* commit '8ffe7b76acda07a09a9c2a9eec1eb3d0c1542763': (24 commits)
  Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)
  Updating screen background assets. (Bug 12136457)
  Updating Tablet clings. (Bug 11973614)
  Migration update: ensuring all folders go first
  Lazy load the widget preview loader class
  Don't migrate shortcuts for components that no longer exist
  Import translations. DO NOT MERGE
  rationalize launcher backup logging
  Tightening migration conditions. (Bug 11973614)
  Replace "hotseat" with "Favorites tray" in user visible strings.
  Remove settings in overview mode for Launcher3.
  Fixing drop targets in phone / small tablet landscape (issue 12192781)
  Ensure that hasFirstRunActivity is only called when necessary
  Keep selected wallpaper on configuration change.
  search for a valid journal
  Fix NPE in Workspace.onDropCompleted
  Properly saving migration cling keys.
  restore app favorites and screens
  Fix longpress crash.
  Add ability to center the crop (disabled)
  ...
 2014-02-15 00:20:29 +00:00
Adam Cohen 4227263c21 am 71c92b35: Merge "Properly saving migration cling keys." into jb-ub-now-kermit-release 
* commit '71c92b356099c90d52a848981855be3fef5c895f':
  Properly saving migration cling keys.
 2014-02-15 00:20:29 +00:00
Qiwen Zhao 8757491afe am ec3aad2e: Merge commit \'d5c6745b\' into klp-dev-plus-aosp 
* commit 'ec3aad2e30ead7923f659c197c57f843cc55c913':
  Tightening migration conditions. (Bug 11973614)
  Increasing string length for translation (Bug 12524122)
  Import translations. DO NOT MERGE
  Set App context from WallpaperChanged receiver. (Bug 12525684)
  Updating assets and text for migration cling. (Bug 11973614)
  Adding migration Clings. (Bug 11973614)
  New launcher2 icon migration algorithm.
  Quick patch for b/12446428.
  Allow DISABLE_ALL_APPS to be set using a system property.
 2014-02-15 00:06:35 +00:00
Qiwen Zhao ec3aad2e30 Merge commit 'd5c6745b' into klp-dev-plus-aosp 
Conflicts:
	res/values-ar/strings.xml
	res/values-de/strings.xml
	res/values-fa/strings.xml
	res/values-iw/strings.xml
 2014-02-14 16:04:37 -08:00
Qiwen Zhao 457e9215df reset to klp-dev at 9a69cbb with history 2014-02-14 14:35:05 -08:00
Adam Cohen f3e2124636 am 51ac5ce5: am cf09fa12: am b54a5989: Adding optional first run activity to Launcher 
* commit '51ac5ce545ea800ca8378767a5d7ab17bb6bc884':
  Adding optional first run activity to Launcher
 2014-02-14 21:02:57 +00:00
Adam Cohen 36286c8deb am 537ecd45: am 8df1285d: am 0259c629: Merge "Fix issue where deleting item from folder leaves extra page" into jb-ub-now-kermit 
* commit '537ecd451b021545b8d9c4009879fe961bff3de6':
  Fix issue where deleting item from folder leaves extra page
 2014-02-14 21:02:56 +00:00
Chris Wren 4646fd7899 am 84ae085d: am 1cf23e10: am 8661761c: better support for multiple files 
* commit '84ae085dc7f37e03d4fe50fc7747f675df32fbb3':
  better support for multiple files
 2014-02-14 21:02:55 +00:00
Chris Wren 9c2895fb0e am de0fc51a: am 32911d21: am 33f4c2df: first backup should save things from the beginning of time 
* commit 'de0fc51acf071b42a5a337291af9467307917651':
  first backup should save things from the beginning of time
 2014-02-14 21:02:55 +00:00
Yura 54b80a6b05 am 7dae6109: am 946334b3: am 0bae5b22: Merge "Moved paddingStart to -v17 folder." into jb-ub-now-kermit 
* commit '7dae6109dbae41d7d0d8278c8646023d790693bd':
  Moved paddingStart to -v17 folder.
 2014-02-14 21:02:54 +00:00
Winson Chung c2c22a80f0 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 '01880c02f5200e2faad1459fb8531dfeb5cf38cb':
  Accounting for new Package event extras when updating forward-locked apps. (Bug 11855584)
 2014-02-14 21:02:54 +00:00
Dan Sandler d67fb201e9 am 425941d0: am 1d7cf660: am 155f3bc6: Merge "KEYCODE_MENU: hide all apps when entering overview mode" into jb-ub-now-kermit 
* commit '425941d0c20dd242dfb939407e9e95247a19946b':
  KEYCODE_MENU: hide all apps when entering overview mode
 2014-02-14 21:02:53 +00:00
Mihail Dumitrescu b4bddde421 am bd8d3e66: am e4c398d3: am 29e619c8: Merge "Remove a non-obvious fall through in a switch statement." into jb-ub-now-kermit 
* commit 'bd8d3e665ab84a0e65eb274d899000d16770487e':
  Remove a non-obvious fall through in a switch statement.
 2014-02-14 21:02:52 +00:00
Yura 81a877ac1c am ad72d13f: am 792ed52a: am 83b0da1a: Removed paddingStart and paddingEnd when they are the same. 
* commit 'ad72d13f431ea841d8bbf0a1ac6e5490715435b3':
  Removed paddingStart and paddingEnd when they are the same.
 2014-02-14 21:02:52 +00:00
Nilesh Agrawal e856f62dcf am b5b7fd3c: am fbed86e6: am 579c8433: Merge "Allow scrolling folders in when all apps is disabled." into jb-ub-now-kermit 
* commit 'b5b7fd3c3a2d5bdc540e1c508f2416155f85de18':
  Allow scrolling folders in when all apps is disabled.
 2014-02-14 21:02:51 +00:00
Sandeep Siddhartha 95e465f1fd am 8bea84e3: am eb870e15: am 8d36ffe5: Merge "Allow changing search bar hint in the cling on-the-fly" into jb-ub-now-kermit 
* commit '8bea84e396ac6feb54d8009165f428b87157e084':
  Allow changing search bar hint in the cling on-the-fly
 2014-02-14 21:02:50 +00:00
Baligh Uddin 2e6ad33d4a 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 'c7cdc43ef3f3fb7799dbf2fc68be96c70cdc422c':
  Import translations. DO NOT MERGE
 2014-02-14 21:02:50 +00:00
Baligh Uddin f0257dd566 am 476e0045: (-s ours) am 7c4a9e55: (-s ours) am 37749ea3: (-s ours) Import translations. DO NOT MERGE 
* commit '476e00451968fe0388e943e83d3895298031cd09':
  Import translations. DO NOT MERGE
 2014-02-14 21:02:49 +00:00
Chris Wren d17b38d026 am c2e2363b: am ef6b1b5c: am 5f85bb49: Merge "support multiple files and fix logcat smippets for launcher_protoutil" into jb-ub-now-kermit 
* commit 'c2e2363bb3021f640c873c4071859f561db224c6':
  support multiple files and fix logcat smippets for launcher_protoutil
 2014-02-14 21:02:48 +00:00
Nilesh Agrawal 3ff20ad022 am d76403d6: am cdf8fe86: am 20e45a8e: Merge "Do not allow duplicate shortcuts when ALL_APPS is disabled." into jb-ub-now-kermit 
* commit 'd76403d698751cd2505812ab7230c1e4fa5163e9':
  Do not allow duplicate shortcuts when ALL_APPS is disabled.
 2014-02-14 21:02:48 +00:00