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
Selim Cinek cd58e223d0 am d266d0fa: Merge "Fixed visibility issue of save button in case the url loading failed" into ub-now-lunchbox 
* commit 'd266d0fae04e980a57c8e67c2b238b49cc1cf497':
  Fixed visibility issue of save button in case the url loading failed
 2014-02-25 12:15:06 -08:00
Baligh Uddin 32451e1a0a am 8fb904cc: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly 
* commit '8fb904cc2f916cea52439a19a0b71d5fef7d3964':
  Import translations. DO NOT MERGE
 2014-02-25 18:25:04 +00:00
Chris Wren c054b3aeb6 am 0fe41883: am 0e4a365e: Merge "use restored icon for restored app shortcuts" into ub-now-lunchbox 
* commit '0fe418832ad2f2df4e80051076e205a5283c1424':
  use restored icon for restored app shortcuts
 2014-02-25 18:24:45 +00:00
Baligh Uddin e8cc0905e0 Merge "Import translations. DO NOT MERGE" into ub-now-lunchbox 2014-02-25 17:23:59 +00:00
Baligh Uddin 8fb904cc2f Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly 2014-02-25 17:23:55 +00:00
Chris Wren 0fe418832a am 0e4a365e: Merge "use restored icon for restored app shortcuts" into ub-now-lunchbox 
* commit '0e4a365e0d0220aff3cf60aa390fe9fcc05dbea1':
  use restored icon for restored app shortcuts
 2014-02-25 08:21:35 -08:00
Selim Cinek d266d0fae0 Merge "Fixed visibility issue of save button in case the url loading failed" into ub-now-lunchbox 2014-02-25 13:26:07 +00:00
Selim Cinek c13e0a5cf1 Fixed visibility issue of save button in case the url loading failed 
Bug: 12953091
Change-Id: Idc640532e2c2c6143d49d330bd541682eca64ac5
 2014-02-25 14:23:57 +01:00
Mathew Inwood 56ca86b7c1 Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release 2014-02-25 10:30:34 +00:00
Baligh Uddin bb6094ed3c Import translations. DO NOT MERGE 
Change-Id: I4bba74d1936a4a23bd4449e3fa699d3ad1ec36ce
Auto-generated-cl: translation import
 2014-02-24 14:00:55 -08:00
Baligh Uddin 77f40b46b2 Import translations. DO NOT MERGE 
Change-Id: I695c7a40bf0130120d380c788841cedfc7b91c34
Auto-generated-cl: translation import
 2014-02-24 14:00:27 -08:00
Baligh Uddin 10addc3e0e Import translations. DO NOT MERGE 
Change-Id: I2b7248218fe16856a9721b8b9169700977f19d00
Auto-generated-cl: translation import
 2014-02-24 13:59:57 -08:00
Chris Wren 0e4a365e0d Merge "use restored icon for restored app shortcuts" into ub-now-lunchbox 2014-02-24 21:59:34 +00:00
Adam Cohen c757e6c884 am 1c471f4c: am 71e03b99: Fix issue where clings didn\'t appear after set up wizard (issue 13077829) 
* commit '1c471f4c3bd2336baabc147f9d22fffc9a880135':
  Fix issue where clings didn't appear after set up wizard (issue 13077829)
 2014-02-21 22:42:40 +00:00
Adam Cohen 1c471f4c3b am 71e03b99: Fix issue where clings didn\'t appear after set up wizard (issue 13077829) 
* commit '71e03b9979b5ee4c30daa7eb0a704ec92b38431b':
  Fix issue where clings didn't appear after set up wizard (issue 13077829)
 2014-02-21 14:40:50 -08:00
Adam Cohen 71e03b9979 Fix issue where clings didn't appear after set up wizard (issue 13077829) 
-> Also removed the db-created as a criteria for showing the clings
   (this was a bit problematic in some cases and going forward)
-> Instead, we use database upgrade as a signal to not show the clings.
   This is used instead of the above criteria (to prevent old users from
   seeing the migration cling and losing their data.)
-> Stripped some old code related to custom clings that's no longer used.

Change-Id: Ib5e5285e5ddbc60e69eb998ee9fd092ae879150d
 2014-02-21 14:37:53 -08:00
Baligh Uddin a6c57fc5b4 am e638cdad: (-s ours) am 36c123ec: (-s ours) am 9594e887: (-s ours) am 37fe7d2b: (-s ours) am f42cf7de: (-s ours) Import translations. DO NOT MERGE 
* commit 'e638cdad1e244b787c2bcb7a1eae49854d8fcf30':
  Import translations. DO NOT MERGE
 2014-02-21 11:16:17 +00:00
Baligh Uddin e638cdad1e am 36c123ec: (-s ours) am 9594e887: (-s ours) am 37fe7d2b: (-s ours) am f42cf7de: (-s ours) Import translations. DO NOT MERGE 
* commit '36c123ec6b74be058702a37e8a01702b505da5c1':
  Import translations. DO NOT MERGE
 2014-02-21 03:15:00 -08:00
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