Commit Graph

78507 Commits

Author SHA1 Message Date
Adam Cohen 38ed22eb29 am 9710ec9d: am 060a4837: Merge "Fix NPE in case where workspace is null because Launcher has been destroyed " into jb-ub-now-jolly-elf
* commit '9710ec9d85566ea1edf973f3d51dda24f64bdaaf':
  Fix NPE in case where workspace is null because Launcher has been destroyed
2014-02-14 20:38:13 +00:00
Dan Sandler fce34b2ff2 am 314aaeca: am a6a296ba: Revert "Enable Launcher2 workspace import."
* commit '314aaeca0ca84583fd637ff398a08d7c31d9b0a5':
  Revert "Enable Launcher2 workspace import."
2014-02-14 20:38:12 +00:00
Michael Jurka 4cb7d294e1 am e5db9b9d: am 04a231bb: Merge "Making workspace->overview transition smoother" into jb-ub-now-jolly-elf
* commit 'e5db9b9db1734659784c2296eaad22f8c579d2ec':
  Making workspace->overview transition smoother
2014-02-14 20:38:11 +00:00
Adam Cohen c1fedf5407 am 616af06a: am cccfe95b: Merge "Allowing ability to pick up items / enter overview before full page settle" into jb-ub-now-jolly-elf
* commit '616af06ac5dc7df878086a4f66422e0c9ebbfe29':
  Allowing ability to pick up items / enter overview before full page settle
2014-02-14 20:38:09 +00:00
Dan Sandler 1fbe9d192e am 658e56fc: am 5b3bdd39: Enable Launcher2 workspace import.
* commit '658e56fccae72413b8cb1a3f3a1a425f4d4dd57f':
  Enable Launcher2 workspace import.
2014-02-14 20:38:08 +00:00
Mathew Inwood 0c28076844 am 3705bb1b: Merge "Add support for initiating a drag from an overlay." into jb-ub-now-kermit
* commit '3705bb1b794ecb660e1ac57c4a3e99909d71a05e':
  Add support for initiating a drag from an overlay.
2014-02-14 20:38:06 +00:00
Winson Chung aea55e0565 am 954966bc: am 2c130e1f: Reducing workspace grid for dogfooding.
* commit '954966bc2702b19151ab9d13c4983c2ecfb2150a':
  Reducing workspace grid for dogfooding.
2014-02-14 20:38:05 +00:00
Winson Chung c0ed8edf29 am 2e06b6da: am 6dc8f7c8: Merge "Update the database when converting the final screen. (Bug 11683562, Bug 11034205)" into jb-ub-now-jolly-elf
* commit '2e06b6dac2f88307e7e3a3e25031949f14a9fc51':
  Update the database when converting the final screen. (Bug 11683562, Bug 11034205)
2014-02-14 20:38:04 +00:00
Dan Sandler d3701d4223 am 91d30b76: am f0b8dacf: Disable importing workspaces from Launcher2.
* commit '91d30b76779a7911e4252a68c0b70a154b3295c5':
  Disable importing workspaces from Launcher2.
2014-02-14 20:38:02 +00:00
Winson Chung 4168dc497d am 97436804: am 540efef7: Merge changes Ida9603e3,I3dfa45cc into jb-ub-now-jolly-elf
* commit '97436804cd50e292757674c06d5d205d281cb716':
  Initialize FastBitmapDrawable bounds with default bitmap dimensions.
  Updating LauncherModel filtering to use screen ids. (Bug 11685286)
2014-02-14 20:38:01 +00:00
Adam Cohen 3f95006528 am 2aeb1778: am f9618856: Syncing up state transition with paging transition
* commit '2aeb177876602169eb3e360a92ded77a6601ba9b':
  Syncing up state transition with paging transition
2014-02-14 20:37:59 +00:00
Winson Chung 2c93bf6417 am 2c73d923: am 603d19a3: Merge "Additional logs to track down missing workspace screen. (Bug 11683562)" into jb-ub-now-jolly-elf
* commit '2c73d9238dcbb13a000b0c037026161b82e28503':
  Additional logs to track down missing workspace screen. (Bug 11683562)
2014-02-14 20:37:58 +00:00
Winson Chung d21f128490 am 0788360c: am 28b690ab: Merge "Adding logs to track down missing workspace screen. (Bug 11683562)" into jb-ub-now-jolly-elf
* commit '0788360cd68c36ed07c4b52efba2c34cf791178d':
  Adding logs to track down missing workspace screen. (Bug 11683562)
2014-02-14 20:37:58 +00:00
Adam Cohen 064189780f am fe6376c2: am 582a3694: Merge "Adding method to get the search bar bounds." into jb-ub-now-jolly-elf
* commit 'fe6376c275b008c3b2d437491b374f36592ea40f':
  Adding method to get the search bar bounds.
2014-02-14 20:37:57 +00:00
Adam Cohen 422a7208d1 am 4b0badc9: am 3a14eeb5: Bit of code cleanup (issue 11648206)
* commit '4b0badc92d59634d1f52040e8f9d3ed3fa294a07':
  Bit of code cleanup (issue 11648206)
2014-02-14 20:37:56 +00:00
Adam Cohen 6521be4f92 am 2dc25b18: am 202e4fda: Merge "Fix for transparent CustomContent screen (issue 11549096)" into jb-ub-now-jolly-elf
* commit '2dc25b186ed0ddbcb117ed8b70409ee467ab2e9a':
  Fix for transparent CustomContent screen (issue 11549096)
2014-02-14 20:37:55 +00:00
Winson Chung 1a3a5b0c67 am 1aca70a5: am b427f30e: Merge "Require valid arrays when adding and binding new Apps. (Bug 11627095)" into jb-ub-now-jolly-elf
* commit '1aca70a5361857bb41ea1e1af0859ca60cf1dbd6':
  Require valid arrays when adding and binding new Apps. (Bug 11627095)
2014-02-14 20:37:54 +00:00
Winson Chung b3c34125a4 am 3a7bea59: am 89ee93e0: Merge "Use the icon bounds for all calculations." into jb-ub-now-jolly-elf
* commit '3a7bea59817342575cb8cba7c3307dc7b3c159e1':
  Use the icon bounds for all calculations.
2014-02-14 20:37:53 +00:00
Adam Cohen 0b38a9447a am b6186d2b: am 4e2683a4: Merge "Fix issue where custom content would be invisible (issue 11644432)" into jb-ub-now-jolly-elf
* commit 'b6186d2bbe32405dcee7bb83f0a516fa1732e84a':
  Fix issue where custom content would be invisible (issue 11644432)
2014-02-14 20:37:53 +00:00
Adam Cohen 3ee9a07fb1 am a9f8aeeb: am e9b198fd: Merge "Change the way view ids are assigned (issue 11627801)" into jb-ub-now-jolly-elf
* commit 'a9f8aeeb0706d991a2b3bff6c99941143fafaa42':
  Change the way view ids are assigned (issue 11627801)
2014-02-14 20:37:52 +00:00
Adam Copp 783f18da24 am ee7f46cb: am 3dc3ecda: Merge "Hooks for subclasses to react to home presses." into jb-ub-now-jolly-elf
* commit 'ee7f46cbd6b67ef4808da705b54b78990b6c6ffa':
  Hooks for subclasses to react to home presses.
2014-02-14 20:37:51 +00:00
Adam Cohen b46426e3de am cb0468fa: am b79a48c2: Merge "Add logging for NPE (issue 11627249)" into jb-ub-now-jolly-elf
* commit 'cb0468facb5a2a3927701b329f5f7e3309bb8fc3':
  Add logging for NPE (issue 11627249)
2014-02-14 20:37:50 +00:00
Adam Cohen 9d170dbb65 am 6641570e: am 17e1aeac: Merge "Fix CellLayout UNSPECIFIED exception (issue 11627191)" into jb-ub-now-jolly-elf
* commit '6641570ec10c95cfbaef139310c150626e035032':
  Fix CellLayout UNSPECIFIED exception (issue 11627191)
2014-02-14 20:37:50 +00:00
Winson Chung c665bd136f am a73c1fac: am e248b837: Merge "Prevent launching Widgets when cycling between Overview/Shrink state and Home. (Bug 11439120)" into jb-ub-now-jolly-elf
* commit 'a73c1fac3d2608b61c0d9d4ea4aeb5236bbe6a6a':
  Prevent launching Widgets when cycling between Overview/Shrink state and Home. (Bug 11439120)
2014-02-14 20:37:49 +00:00
Adam Cohen 42143d73ab am e99951bd: am f0f2ffae: Fix issue where extra page hangs around (issue 11634172)
* commit 'e99951bd94babf5d4143dd0a94e4928e54c98c0b':
  Fix issue where extra page hangs around (issue 11634172)
2014-02-14 20:37:48 +00:00
Adam Cohen e4a44cc7be am 5b34b3ae: am c361b6fe: Merge "Small tweaks to custom content management" into jb-ub-now-jolly-elf
* commit '5b34b3ae6d330ffc0fd9996cf21fbe3b7622c526':
  Small tweaks to custom content management
2014-02-14 20:37:48 +00:00
Michael Jurka 2026a5a91f am 314b922b: am bf292a0b: Merge "Fix wallpaper cropping bugs" into jb-ub-now-jolly-elf
* commit '314b922b12e63507666026b6dd7bdac983ec75a5':
  Fix wallpaper cropping bugs
2014-02-14 20:37:47 +00:00
Adam Cohen 4002465f58 am 7be5f565: am ab087b9f: Fix NPE we\'re seeing in feedback (issue 11626428)
* commit '7be5f565e9b5a87c02db8c53e249fc4bf8dbbb02':
  Fix NPE we're seeing in feedback (issue 11626428)
2014-02-14 20:37:46 +00:00
Adam Cohen 51cc53160d am ed1ead7a: am 2777273a: Add method to determine if Launcher is using vertical bars
* commit 'ed1ead7ab5e5eec2cdf244437fbc797e314918da':
  Add method to determine if Launcher is using vertical bars
2014-02-14 20:37:46 +00:00
Michael Jurka c23fc0498e am 5339119b: am 62dacd67: Merge "Uncommenting throw when item not contained in sBgItemsIdMap" into jb-ub-now-jolly-elf
* commit '5339119b9ef4d283b868abc41283ef2671bfebc8':
  Uncommenting throw when item not contained in sBgItemsIdMap
2014-02-14 20:37:45 +00:00
Michael Jurka aa07fd636e am 6f372bb7: am 5fa148a1: am 5bfab60f: Fix NPE in Live Wallpaper loader
* commit '6f372bb723a87bb6c292067a848e1c4aa8153107':
  Fix NPE in Live Wallpaper loader
2014-02-14 20:37:44 +00:00
Adam Cohen b040fcf52b am a05060c9: am 18238d90: am 3428b5e9: Merge "Fix default wallpaper thumbnail" into jb-ub-now-jetsonic
* commit 'a05060c987529a7443d66d5117408a120beec411':
  Fix default wallpaper thumbnail
2014-02-14 20:37:44 +00:00
Adam Cohen 39ea51061c am b767166b: am 46830418: am 2da0a053: Fix small scrolling regression
* commit 'b767166b3ab8c18d277271167c390c8eb2088302':
  Fix small scrolling regression
2014-02-14 20:37:43 +00:00
Dave Hawkey 585e1ea5f9 am 98e011b4: Merge "Set insets on newly added views." into jb-ub-now-kermit
* commit '98e011b40aa886065f75398fec19bff7f0d7e5c5':
  Set insets on newly added views.
2014-02-14 20:37:42 +00:00
Winson Chung aedae79833 am be8ff1f4: am d7adbab6: Merge "Save and restore the correct content type when rotating while in AllApps." into jb-ub-now-jolly-elf
* commit 'be8ff1f4077c127933173dd292413d1b853052f8':
  Save and restore the correct content type when rotating while in AllApps.
2014-02-14 20:37:42 +00:00
Winson Chung c7cfb79037 am bc7d88ea: am 88416027: Merge "Fixing crash while reordering pages in OverviewMode." into jb-ub-now-jolly-elf
* commit 'bc7d88eacb68a28d9fc9ef2064f8d7fdea8e4a36':
  Fixing crash while reordering pages in OverviewMode.
2014-02-14 20:37:41 +00:00
Winson Chung c48aaa75b3 am 98168ec7: am c82d2622: Dyanmically lay out overview mode across all orientations and form factors.
* commit '98168ec76abddd286d2536baa0328353db0079ca':
  Dyanmically lay out overview mode across all orientations and form factors.
2014-02-14 20:37:40 +00:00
Adam Cohen b7d563085f am c2cf2d9c: am ebb9ebed: am a1648449: Fixing tiny regression in PagedView spacing
* commit 'c2cf2d9cf276601a5c8be35b1376161934b9b40b':
  Fixing tiny regression in PagedView spacing
2014-02-14 20:37:40 +00:00
Michael Jurka fcb9033a44 am c85a63c5: am 1beeb0aa: Merge "Revert "Workaround for remove stuck (issue 11080792)"" into jb-ub-now-jolly-elf
* commit 'c85a63c58f7b9a63e62ad58f5e70f80adad4736d':
  Revert "Workaround for remove stuck (issue 11080792)"
2014-02-14 20:37:39 +00:00
Michael Jurka af3064d8b8 am dd12202f: am 19d10a58: Don\'t adjust animation play time if not necessary
* commit 'dd12202fdf5ec9ece508bea9fb0d0fa706bde044':
  Don't adjust animation play time if not necessary
2014-02-14 20:37:38 +00:00
Baligh Uddin 588975f099 am 8eb857fa: (-s ours) am 458a15f7: (-s ours) am 89fbe00d: (-s ours) am 0491f0f1: (-s ours) Import translations. DO NOT MERGE
* commit '8eb857fa9b3f956e428e3c1027ac37da63cfc1c1':
  Import translations. DO NOT MERGE
2014-02-14 20:37:37 +00:00
Baligh Uddin fdfebdad75 am 0493fb93: (-s ours) am 0effb652: (-s ours) am e0b9a1f7: (-s ours) Import translations. DO NOT MERGE
* commit '0493fb93f34fda61d46c5aec4ccbd08d2e1c541e':
  Import translations. DO NOT MERGE
2014-02-14 20:37:37 +00:00
Baligh Uddin bb69c0d85c am 572bdaa4: (-s ours) am f0d79e57: (-s ours) Import translations. DO NOT MERGE
* commit '572bdaa47484f38cc46a8507231cfec51b3c2e13':
  Import translations. DO NOT MERGE
2014-02-14 20:37:36 +00:00
Baligh Uddin 1b2ee8c1b3 am 286ecf1e: (-s ours) Import translations. DO NOT MERGE
* commit '286ecf1ea594059eb097b81709c0dc1ead246be7':
  Import translations. DO NOT MERGE
2014-02-14 20:37:36 +00:00
Baligh Uddin 62a708f4e8 am 339e0c19: (-s ours) am 3be0912b: (-s ours) am 2a44d878: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic
* commit '339e0c19d0ef7d0c59efd5eee391310ae096a4a2':
  Import translations. DO NOT MERGE
2014-02-14 20:37:35 +00:00
Baligh Uddin e6b93f95f7 am 0dc42a5d: (-s ours) am 349763d0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jolly-elf
* commit '0dc42a5d66a16589b6e8c8a57922f0134d3bcdc0':
  Import translations. DO NOT MERGE
2014-02-14 20:37:34 +00:00
Baligh Uddin 78c7429c2c am 0cc0c216: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
* commit '0cc0c216e1b68ac961cba92b3b639f06d10dcd50':
  Import translations. DO NOT MERGE
2014-02-14 20:37:34 +00:00
Adam Cohen bfd3bda9ac am fe860770: am 45fee32b: am b2af6076: Merge "Ensuring that widget ids are cleaned up" into jb-ub-now-jetsonic
* commit 'fe8607701af0477e5bad5e83dd92eaf55e1e31aa':
  Ensuring that widget ids are cleaned up
2014-02-14 20:37:33 +00:00
Adam Cohen 5fb0a60d55 am f52d5de9: am d120e994: am c18e4a92: Merge "Fix bug where cancelling config activity leaves user stuck in bad state" into jb-ub-now-jetsonic
* commit 'f52d5de90507bad7cf1bc35acb9862ea314f03d8':
  Fix bug where cancelling config activity leaves user stuck in bad state
2014-02-14 20:37:32 +00:00
Adam Cohen 9a088cb860 am c0dfb140: am e33f8259: am 5c6474da: Merge "Fix problem with where PagedView could get stuck (issue 11314889)" into jb-ub-now-jetsonic
* commit 'c0dfb140c3b11b67f22fd4ae28f688ccab4429b1':
  Fix problem with where PagedView could get stuck (issue 11314889)
2014-02-14 20:37:32 +00:00