Commit Graph

3278 Commits

Author SHA1 Message Date
Dan Sandler 947ef4e7ab am 7a9cda18: Merge "Defend against missing DB during migration." into jb-ub-now-kermit
* commit '7a9cda18eb31b5ab47d7eca064374eaa6efdc268':
  Defend against missing DB during migration.
2014-01-24 21:02:03 -08:00
Dan Sandler 7a9cda18eb Merge "Defend against missing DB during migration." into jb-ub-now-kermit 2014-01-25 05:00:33 +00:00
Winson Chung d6467b98e8 am 2aaf6e33: Merge "Adding tighter first run checks for migration clings. (Bug 12626290)" into jb-ub-now-kermit
* commit '2aaf6e339000646501bc3d73e497a365174fad26':
  Adding tighter first run checks for migration clings. (Bug 12626290)
2014-01-23 12:23:35 -08:00
Winson Chung 2aaf6e3390 Merge "Adding tighter first run checks for migration clings. (Bug 12626290)" into jb-ub-now-kermit 2014-01-23 20:21:12 +00:00
Ian Parkinson 4195da42b7 am 94449158: Avoid NPE from delayed Runnable
* commit '944491587e8a8f77233a1916cc16cd07edd97f2e':
  Avoid NPE from delayed Runnable
2014-01-22 11:32:47 -08:00
Winson Chung 0b560dda27 Adding tighter first run checks for migration clings. (Bug 12626290)
Change-Id: I09fc95c9a3d50ce57f9140e89da2ff4856807f92
2014-01-21 13:00:26 -08:00
Dan Sandler 2b4717447e Defend against missing DB during migration.
Bug: 12600784
Change-Id: Ie295d2ac970eab798b9826748d400cd30a04662d
2014-01-21 14:14:41 -05:00
Ian Parkinson 944491587e Avoid NPE from delayed Runnable
Naive fix to b/12656485. Other Runnables in Launcher similarly check
that mWorkspace hasn't become null between being posted and being
executed, so I think this is probably appropriate.

Bug: 12656485
Change-Id: Ib4f3d0e8686c6249fe838144b1e8120c85f66f01
2014-01-21 13:09:59 +00:00
Adam Cohen f488644c2c am a4db090b: Merge "Adding specific buckets for N5 in dynamic grid. (Bug 12604220)" into jb-ub-now-kermit
* commit 'a4db090b1345038a89a38ba8af6ac74f71e2ed7c':
  Adding specific buckets for N5 in dynamic grid. (Bug 12604220)
2014-01-17 16:23:19 -08:00
Adam Cohen a4db090b13 Merge "Adding specific buckets for N5 in dynamic grid. (Bug 12604220)" into jb-ub-now-kermit 2014-01-18 00:21:57 +00:00
Winson Chung 3abfd16e5d Adding specific buckets for N5 in dynamic grid. (Bug 12604220)
Change-Id: I1fa62b7d16f557c7191fb1666d687b8784a88857
2014-01-17 14:43:02 -08:00
Adam Cohen 0d5de13425 am 5ac62d69: Merge "Fix overlapping pages (issue 12551580)" into jb-ub-now-kermit
* commit '5ac62d6914067c48e1fcdb3f6f149532017c5803':
  Fix overlapping pages (issue 12551580)
2014-01-17 14:34:19 -08:00
Adam Cohen 5ac62d6914 Merge "Fix overlapping pages (issue 12551580)" into jb-ub-now-kermit 2014-01-17 22:32:22 +00:00
Adam Cohen c07347961e am e6e0af03: Merge "Dismissing search and other overlays when the menu button is pressed. (Bug 12524591)" into jb-ub-now-kermit
* commit 'e6e0af03ee39b3e800c8f7e86eefffae432ee7c8':
  Dismissing search and other overlays when the menu button is pressed. (Bug 12524591)
2014-01-17 13:28:54 -08:00
Adam Cohen e6e0af03ee Merge "Dismissing search and other overlays when the menu button is pressed. (Bug 12524591)" into jb-ub-now-kermit 2014-01-17 20:25:14 +00:00
Winson Chung e029874bcf Dismissing search and other overlays when the menu button is pressed. (Bug 12524591) 2014-01-17 12:03:00 -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 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 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 6d110117be Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)
Change-Id: I01fc54be8059d4cd25ff465c70595683fc8ac019
2014-01-16 14:47:53 -08:00
Winson Chung 205cd7727f Updating Tablet clings. (Bug 11973614)
Change-Id: I6cb10424a345691d50c4fac7969e0b97bbee4b3c
2014-01-16 14:26:07 -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 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 230cbf831c Merge "rationalize launcher backup logging" into jb-ub-now-kermit 2014-01-15 22:09:20 +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 e43a1e7882 Tightening migration conditions. (Bug 11973614)
Change-Id: I6d7417b705227472d035f428cbec933cc6dbf2ce
2014-01-15 11:34:54 -08:00
Dan Sandler 44f834133e Merge "restore app favorites and screens" into jb-ub-now-kermit 2014-01-15 14:46:34 +00:00
Jorim Jaggi c27a051320 Merge "Remove settings in overview mode for Launcher3." into jb-ub-now-kermit 2014-01-15 01:31:13 +00:00
Jorim Jaggi d017f882eb Remove settings in overview mode for Launcher3.
The appereance of the settings button in overview mode is now dependent on
a overridable method, such that we can have it in GEL, but not in Launcher3.
This change also adjusts the logic of how wide the overview panel is, depending
on how many items we have.

Bug: 12441429
Change-Id: Ibf537c26602785f565292cbfa213eb123469ebcd
2014-01-14 17:08:48 -08:00
Adam Cohen 24ce0b3708 Fixing drop targets in phone / small tablet landscape (issue 12192781)
Change-Id: I4dc8a82c8cd5ef279506e7868e33a455fba5a3be
2014-01-14 16:33:50 -08:00
Adam Cohen 13b563bcae Merge "Ensure that hasFirstRunActivity is only called when necessary" into jb-ub-now-kermit 2014-01-15 00:26:07 +00:00
Adam Cohen bc4539df6f Ensure that hasFirstRunActivity is only called when necessary
Change-Id: I834abcd82f46c6f096f5c92452b34c668a4a3d86
2014-01-14 16:24:16 -08:00
Jorim Jaggi 00c3184fa6 Merge "Fix NPE in Workspace.onDropCompleted" into jb-ub-now-kermit 2014-01-14 23:01:48 +00:00
Chris Wren 65b6a603fa search for a valid journal
there are too many bytes, so we need to find the valid subset,
without stepping past the end!

Bug: 12489602
Change-Id: Ic9d7c804c199740ff50d0864f99632ae68619369
2014-01-14 17:46:27 -05:00
Jorim Jaggi eedb00a674 Fix NPE in Workspace.onDropCompleted
Bug: 11627757
Change-Id: I9dc86856d4bc00253d6350d157be541a8c46888d
2014-01-14 13:02:43 -08:00
Dan Sandler c4fa7a9c4a Merge "Fix longpress crash." into jb-ub-now-kermit 2014-01-14 18:51:36 +00:00
Winson Chung d731594863 Merge "Properly saving migration cling keys." into jb-ub-now-kermit 2014-01-14 18:31:32 +00:00
Winson Chung 285b6e1483 Properly saving migration cling keys.
Change-Id: Id52a12da6af0fc91463dae07bbeb355ee04873d0
2014-01-14 10:30:27 -08:00
Chris Wren 5dee7aff5f restore app favorites and screens
version 0: restore assuming apps are already installed.

Bug: 10779035
Change-Id: I7f9aa418a7d3d5460a79a229c0fbc80305b5eb5c
2014-01-14 11:23:07 -05:00
Dan Sandler e26d094845 Fix longpress crash.
The AllApps button doesn't usually accept longpresses, but
you can trick it into trying by holding one finger on it and
another on another icon in the hotseat. This patch defends
against that and bails out if the longpressed item has the
all apps rank (position in hotseat).

Bug: 11740833
Change-Id: I99785ccbc9e6dc6be2a9e56289b3cc0275fbb65c
2014-01-14 11:12:38 -05:00