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
Michael Jurka 849aff7553 Disable Set Wallpaper button while loading image 
Bug: 12472111

Change-Id: I2a0cba47f31af2416b0dd062929f277fcbf80481
 2014-01-17 13:30:11 +01:00
Mark Ashdown 8ffe7b76ac Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release 
Conflicts:
	src/com/android/launcher3/LauncherClings.java

Change-Id: Idd2e6d54180315854216cfc868cd36297dcb95d9
 2014-01-17 12:17:52 +00:00
Selim Cinek 025a5eec5a am f3a8e8c0: Disabled the wallpaper when completely in -1 Now space. 
* commit 'f3a8e8c0bd8b0dbe3991e5ad9d315e6e253e92eb':
  Disabled the wallpaper when completely in -1 Now space.
 2014-01-16 16:19:16 -08:00
Adam Cohen efb31e399d Fix overlapping pages (issue 12551580) 
Change-Id: I03c29c36828b6c4baadb33b13b0e852b07b2d40f
 2014-01-16 16:09:05 -08:00
Selim Cinek f3a8e8c0bd Disabled the wallpaper when completely in -1 Now space. 
Bug: 11186234
Change-Id: I6ffb66f12298bd9df7e228a8589d63780b70a396
 2014-01-16 23:57:27 +00:00
Winson Chung 6b14dd5e8e am cdd82ef1: am f8584042: Merge "Updating Tablet clings. (Bug 11973614)" into jb-ub-now-kermit 
* commit 'cdd82ef1bbe32ba3d83810e5d2e95ed4e9002204':
  Updating Tablet clings. (Bug 11973614)
 2014-01-16 15:13:14 -08:00
Winson Chung cdd82ef1bb am f8584042: Merge "Updating Tablet clings. (Bug 11973614)" into jb-ub-now-kermit 
* commit 'f8584042713aad82f9d057ecaace8a9ad1aad0bc':
  Updating Tablet clings. (Bug 11973614)
 2014-01-16 15:10:51 -08:00
Winson Chung 80cc87ca63 am ce46ad2a: am 1ba0a30e: Merge "Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)" into jb-ub-now-kermit 
* commit 'ce46ad2add6a3bbcacc27b5ff0ccc4589d848e64':
  Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)
 2014-01-16 15:09:59 -08:00
Adam Cohen fb86919503 am 5a02d4c3: am 08101b1f: Merge "Lazy load the widget preview loader class" into jb-ub-now-kermit 
* commit '5a02d4c325e51617cab319d3e104f6e1c24b8f36':
  Lazy load the widget preview loader class
 2014-01-16 15:09:59 -08:00
Winson Chung ce46ad2add am 1ba0a30e: Merge "Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)" into jb-ub-now-kermit 
* commit '1ba0a30e6545a8c313d0ef355a101f661bbf778c':
  Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)
 2014-01-16 15:07:35 -08:00
Adam Cohen 5a02d4c325 am 08101b1f: Merge "Lazy load the widget preview loader class" into jb-ub-now-kermit 
* commit '08101b1f52b2b6aa8ddb82f09a18b91482b99f58':
  Lazy load the widget preview loader class
 2014-01-16 15:07:34 -08:00
Winson Chung f858404271 Merge "Updating Tablet clings. (Bug 11973614)" into jb-ub-now-kermit 2014-01-16 23:07:02 +00:00
Winson Chung 1ba0a30e65 Merge "Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)" into jb-ub-now-kermit 2014-01-16 23:06:29 +00:00
Adam Cohen 08101b1f52 Merge "Lazy load the widget preview loader class" into jb-ub-now-kermit 2014-01-16 23:05:00 +00:00
Winson Chung 795ada2fb3 am 88eefe43: am e1b0682a: Merge "Updating screen background assets. (Bug 12136457)" into jb-ub-now-kermit 
* commit '88eefe43bfbce822372ac430dcd119b9c0c7518c':
  Updating screen background assets. (Bug 12136457)
 2014-01-16 14:51:47 -08:00
Winson Chung 88eefe43bf am e1b0682a: Merge "Updating screen background assets. (Bug 12136457)" into jb-ub-now-kermit 
* commit 'e1b0682af062bc85b7328f5c635a21d9ce420d8e':
  Updating screen background assets. (Bug 12136457)
 2014-01-16 14:50:25 -08:00
Winson Chung e1b0682af0 Merge "Updating screen background assets. (Bug 12136457)" into jb-ub-now-kermit 2014-01-16 22:48:33 +00:00
Winson Chung 6d110117be Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166) 
Change-Id: I01fc54be8059d4cd25ff465c70595683fc8ac019
 2014-01-16 14:47:53 -08:00
Winson Chung fd0394cc6d Updating screen background assets. (Bug 12136457) 
Change-Id: I48d235d9c44a53b5fbf6c244736e86cbc9f19162
 2014-01-16 14:41:21 -08:00
Winson Chung 205cd7727f Updating Tablet clings. (Bug 11973614) 
Change-Id: I6cb10424a345691d50c4fac7969e0b97bbee4b3c
 2014-01-16 14:26:07 -08:00
Adam Cohen db146820b7 am 99cc9752: am 72960975: Migration update: ensuring all folders go first 
* commit '99cc97527169291953175288aa904a0215279c2a':
  Migration update: ensuring all folders go first
 2014-01-16 12:01:38 -08:00
Adam Cohen 99cc975271 am 72960975: Migration update: ensuring all folders go first 
* commit '72960975d8367e7ce789d8a5b6f0763fb0ec78bf':
  Migration update: ensuring all folders go first
 2014-01-16 11:59:19 -08:00
Adam Cohen 72960975d8 Migration update: ensuring all folders go first 
-> Also, leave the last row empty on every screen
-> Fix bug where shortcuts weren't getting moved (introduced in
   previous CL)
-> Only dedupe items directly on the workspace

Bug 12416411
Bug 12572727

Change-Id: Id95cc6081c57cc289c2a85b2a6872ee0bf3eb98a
 2014-01-16 11:56:41 -08:00
Adam Cohen 7f0767e4ba am 2760274d: am 556f6135: Don\'t migrate shortcuts for components that no longer exist 
* commit '2760274df32e935bc148dc63c0f0abdd2dc8ce47':
  Don't migrate shortcuts for components that no longer exist
 2014-01-16 11:23:00 -08:00
Adrian Roos 238cf2068a am aa5113a4: Merge "Fix back button behavior for "App info" when launched by Launcher3." into ub-now-lunchbox 
* commit 'aa5113a446ffc8196b45bee9c7181842c477375c':
  Fix back button behavior for "App info" when launched by Launcher3.
 2014-01-16 11:22:59 -08:00
Chris Wren a7f9fc6424 am e6f4bf64: am 230cbf83: Merge "rationalize launcher backup logging" into jb-ub-now-kermit 
* commit 'e6f4bf642f3b182efabee3567b426d6fb59867fc':
  rationalize launcher backup logging
 2014-01-16 11:22:59 -08:00
Geoff Mendal e09727057a am 3992735e: (-s ours) am 43323cc3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit 
* commit '3992735e00fe0d7df82b41123ed7afe36d50037d':
  Import translations. DO NOT MERGE
 2014-01-16 11:22:59 -08:00
Geoff Mendal a653fbb1cc am fbc17c9e: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-lunchbox 
* commit 'fbc17c9e2f39e2d15f9bef1c4ce03b1cfb4c00e1':
  Import translations. DO NOT MERGE
 2014-01-16 11:22:59 -08:00
Adam Cohen 2760274df3 am 556f6135: Don\'t migrate shortcuts for components that no longer exist 
* commit '556f6135f992dcd5bfbfffe0172627bfbf57d24e':
  Don't migrate shortcuts for components that no longer exist
 2014-01-16 11:20:19 -08:00
Michael Jurka 9c5cc5a893 Lazy load the widget preview loader class 
Bug: 12109621

Change-Id: Id99aded30195bf39ebcf2148611bc4e084f3b2c7
 2014-01-16 13:34:55 +01:00
Adam Cohen 556f6135f9 Don't migrate shortcuts for components that no longer exist 
Bug 12570791

Change-Id: Ie4b55afcee0c4d1d16acf7b830d7885800943454
 2014-01-15 23:32:46 +00:00
Adrian Roos aa5113a446 Merge "Fix back button behavior for "App info" when launched by Launcher3." into ub-now-lunchbox 2014-01-15 23:18:24 +00:00
Chris Wren e6f4bf642f am 230cbf83: Merge "rationalize launcher backup logging" into jb-ub-now-kermit 
* commit '230cbf831cbbe8aaa6eaff976f755a8adf5e1708':
  rationalize launcher backup logging
 2014-01-15 15:03:10 -08:00
Chris Wren 230cbf831c Merge "rationalize launcher backup logging" into jb-ub-now-kermit 2014-01-15 22:09:20 +00:00
Geoff Mendal 3992735e00 am 43323cc3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit 
* commit '43323cc306adaae144457f29c0b0860d4f21f257':
  Import translations. DO NOT MERGE
 2014-01-15 14:09:10 -08:00
Geoff Mendal fbc17c9e2f Merge "Import translations. DO NOT MERGE" into ub-now-lunchbox 2014-01-15 22:05:06 +00:00
Geoff Mendal 43323cc306 Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit 2014-01-15 22:04:16 +00:00
Geoff Mendal 3b0d0a6bd3 Import translations. DO NOT MERGE 
Change-Id: I8f07cab26ae1bd70357157730b8dbe36eca34e0d
Auto-generated-cl: translation import
 2014-01-15 13:56:06 -08:00
Geoff Mendal 0c04bfae09 Import translations. DO NOT MERGE 
Change-Id: I7f6ec7de198d8fd863c1a56294609474d2e02a32
Auto-generated-cl: translation import
 2014-01-15 13:52:37 -08:00
Adam Cohen 71c92b3560 Merge "Properly saving migration cling keys." into jb-ub-now-kermit-release 2014-01-15 21:37:37 +00:00
Chris Wren 50c8f42568 rationalize launcher backup logging 
enough data to debug dogfood issues
easy switch to move to quieter production mode
common switch across all three classes

Bug: 12545310
Change-Id: Icb4ad7174f20884c6993140149db590d66f6e006
 2014-01-15 16:35:33 -05:00
Adrian Roos 850f91320c Fix back button behavior for "App info" when launched by Launcher3. 
Ensures the back stack is clean when opening the "App info" app from the launcher.

Bug: 10393223
Change-Id: Iad078ca37c4794a580f1b996f8324fef404e7462
 2014-01-15 21:18:20 +00:00
Winson Chung c3993d15d9 Properly saving migration cling keys. 
Change-Id: Id52a12da6af0fc91463dae07bbeb355ee04873d0
(cherry picked from commit 285b6e1483)
 2014-01-15 21:09:24 +00:00
Winson Chung d6c6745b2e Tightening migration conditions. (Bug 11973614) 
Change-Id: I6d7417b705227472d035f428cbec933cc6dbf2ce
(cherry picked from commit e43a1e7882)
 2014-01-15 21:08:29 +00:00
Winson Chung f120fe4112 am affe0b5f: Merge "Tightening migration conditions. (Bug 11973614)" into jb-ub-now-kermit 
* commit 'affe0b5f764274a34b2869de7c529df61c24de7b':
  Tightening migration conditions. (Bug 11973614)
 2014-01-15 11:54:45 -08:00
Winson Chung affe0b5f76 Merge "Tightening migration conditions. (Bug 11973614)" into jb-ub-now-kermit 2014-01-15 19:42:40 +00:00
Winson Chung e43a1e7882 Tightening migration conditions. (Bug 11973614) 
Change-Id: I6d7417b705227472d035f428cbec933cc6dbf2ce
 2014-01-15 11:34:54 -08:00
Jorim Jaggi 3d3303a258 am 12f583b4: Merge "Keep selected wallpaper on configuration change." into jb-ub-now-kermit 
* commit '12f583b487e445a886d7c23cd76f4cadfdc5d4e2':
  Keep selected wallpaper on configuration change.
 2014-01-15 10:36:39 -08:00
Jorim Jaggi 12f583b487 Merge "Keep selected wallpaper on configuration change." into jb-ub-now-kermit 2014-01-15 18:34:33 +00:00
Dan Sandler cc49ea186a am 44f83413: Merge "restore app favorites and screens" into jb-ub-now-kermit 
* commit '44f834133e106550a67ecf246e8bc9d4e1644c56':
  restore app favorites and screens
 2014-01-15 06:49:16 -08:00