Commit Graph

8474 Commits

Author SHA1 Message Date
Michael Jurka 24ecbf6d3c am 4cd9a102: am 744cbf46: am 8e88cb84: Move wallpaper picker code to a separate directory
* commit '4cd9a102a7dd471dc022183d023d18124aa251e9':
  Move wallpaper picker code to a separate directory
2014-02-14 21:02:27 +00:00
Winson Chung 3c182d33ce am 157e789f: am 07c9ade5: am 33231f58: Fixing crash in empty folders. (Bug 11627191)
* commit '157e789fded47e22d93a550658c51ea304ec3b76':
  Fixing crash in empty folders. (Bug 11627191)
2014-02-14 21:02:26 +00:00
Winson Chung 356b47defd am a0a8305a: am ffba2dfd: am fe2fb826: am d65fb393: Merge "Revert "Fixing crash in empty folders. (Bug 11627191)"" into jb-ub-now-jolly-elf
* commit 'a0a8305a53ff52ad0222b113d084a86bd2bd6a12':
  Revert "Fixing crash in empty folders. (Bug 11627191)"
2014-02-14 21:02:26 +00:00
Winson Chung 6bce875df1 am e7e47266: am 6160c394: am cace67f7: am 6de1ba33: Merge "Fixing crash in empty folders. (Bug 11627191)" into jb-ub-now-jolly-elf
* commit 'e7e472662a924b7f23b1be19594b9daf601ff43e':
  Fixing crash in empty folders. (Bug 11627191)
2014-02-14 21:02:25 +00:00
Nilesh Agrawal 7908978109 am 2ef2511f: am 0d43ba8c: am da41ea66: Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
* commit '2ef2511f03563f8ddd7d2f6e38fc215f14bbbc87':
  Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
2014-02-14 21:02:25 +00:00
Nilesh Agrawal a24de42294 am d1ce093c: am 03ec57d3: am 93b6ee6d: Merge "Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."" into jb-ub-now-kermit
* commit 'd1ce093cf026ca3ee3072adeca13e28c97d34b68':
  Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."
2014-02-14 21:02:24 +00:00
Nilesh Agrawal dfa1993e65 am e4ccb341: am ac2ddbb4: am 23c165a9: Merge "Allow 5 hotseat icons in DISABLE_ALL_APPS mode." into jb-ub-now-kermit
* commit 'e4ccb341d890e01e1f365c1ed8880a581985c034':
  Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
2014-02-14 21:02:23 +00:00
Chris Wren f3d1cc1bf5 am b8336373: am 3eaaf7d1: am 06a0ac2f: Merge "backup launcher preferences" into jb-ub-now-kermit
* commit 'b8336373ffe1c39532e4645cbcc938c7676f3943':
  backup launcher preferences
2014-02-14 21:02:23 +00:00
Adam Cohen c5890e8ce2 am 4b0b4bce: am 8aebe36d: am 5d518fa7: Decrease delay for closing folder on removal of an item (issue 11028310)
* commit '4b0b4bceefef4573fbb913fd49f105f2d76dcff2':
  Decrease delay for closing folder on removal of an item (issue 11028310)
2014-02-14 21:02:22 +00:00
Michael Jurka 3606ae0a48 am 06440fb8: am 29de7557: am 566bdc37: Merge "Update suggested wallpaper dimensions in onResume" into jb-ub-now-kermit
* commit '06440fb8ecd085a4e383552232001f2bc1291f91':
  Update suggested wallpaper dimensions in onResume
2014-02-14 21:02:21 +00:00
Winson Chung eb81222633 am 86ee1473: am 9026ce17: am 58705534: am a67d1ea0: Merge "Fixing regression in drop target bar height. (Bug 11980757)" into jb-ub-now-jolly-elf
* commit '86ee1473fbb53e4fa75b284711ae08cc798c73c9':
  Fixing regression in drop target bar height. (Bug 11980757)
2014-02-14 21:02:20 +00:00
Adam Cohen ad7e86fbc3 am 94abcb98: am b2d3890d: am f9cd258b: am 59b5c79b: Fix page jumping regression in overview mode (issue 12003672)
* commit '94abcb984719c8a3f6a3cff14aad3d95a8c9df26':
  Fix page jumping regression in overview mode (issue 12003672)
2014-02-14 21:02:19 +00:00
Winson Chung 42e3066840 am 4051b53e: am 6b165fa8: am 0ea74f13: Merge "Limit AllApps insets to certain device configurations. (Bug 11451335)" into jb-ub-now-kermit
* commit '4051b53ee65d5f3e07f87fcd901601f58c817400':
  Limit AllApps insets to certain device configurations. (Bug 11451335)
2014-02-14 21:02:19 +00:00
Winson Chung 5d0172726f am fe712898: am 89524f48: am 17bde09a: Merge "Retain current AllApps page if we never leave Launcher. (Bug 11468582)" into jb-ub-now-kermit
* commit 'fe71289896386326de86c225e9b7aec51f15c4cc':
  Retain current AllApps page if we never leave Launcher. (Bug 11468582)
2014-02-14 21:02:18 +00:00
Winson Chung d12c70238a am c24021e3: am 88818ab2: am 42b3c068: Restoring Hotseat to the left-aligned in RTL. (Bug 11451335)
* commit 'c24021e3de84506fd7feb5c521d27283b50f6aab':
  Restoring Hotseat to the left-aligned in RTL. (Bug 11451335)
2014-02-14 21:02:18 +00:00
Adam Cohen 4152dadfe2 am 1b6b42e3: am ec6b71a0: am 531a5c32: am b0ee0810: Add guards for restoreInstanceState (issue 11982812)
* commit '1b6b42e356f1365f23e2553a8718d4dfa9f52358':
  Add guards for restoreInstanceState (issue 11982812)
2014-02-14 21:02:17 +00:00
Dan Sandler 8cb26100ed am 351453a1: am 0572c310: am b4ee5792: am b3084e87: Merge "Revert "Revert "Enable Launcher2 workspace import.""" into jb-ub-now-jolly-elf
* commit '351453a18755e24abf1906e6fec469e8691baba1':
  Revert "Revert "Enable Launcher2 workspace import.""
2014-02-14 21:02:16 +00:00
Adam Cohen 538c449bb5 am 09d12192: am 7cb06bde: am 87f445c8: am c924cacf: Merge "Only import workspaces for non-tablets (where grid hasn\'t changed)" into jb-ub-now-jolly-elf
* commit '09d121923b0673605f95e6b178a7b8fff27551d8':
  Only import workspaces for non-tablets (where grid hasn't changed)
2014-02-14 21:02:15 +00:00
Michael Jurka 0a63fa8226 am dbd4b06d: am 512093f3: am 16fa074d: am 1c00fd0b: Fix NPE when going to All Apps in landscape
* commit 'dbd4b06db4ae5704069839183b89078e03ece2af':
  Fix NPE when going to All Apps in landscape
2014-02-14 21:02:15 +00:00
Winson Chung 21fe3e0aa3 am 0f39034b: am f342c5b4: am 0c1b33db: am 2cb2471e: Ensure we pass search bar bounds to GoogleSearch. (Bug 11968598)
* commit '0f39034b12fce23f4ae493fd2ea86ac827d4a0c7':
  Ensure we pass search bar bounds to GoogleSearch. (Bug 11968598)
2014-02-14 21:02:14 +00:00
Winson Chung cd366acd2a am 5c502d71: am 1cfabb7f: am ab84b8b4: am 1a5adf4f: Merge "Modifying Workspace padding to account for Search Bar offsets. (Bug 11968598)" into jb-ub-now-jolly-elf
* commit '5c502d71347b1b888c7e48d41b592fab1139f4ad':
  Modifying Workspace padding to account for Search Bar offsets. (Bug 11968598)
2014-02-14 21:02:13 +00:00
Michael Jurka ccfc9f7165 am 93ebd399: am 082893ff: am 3ed4a4dd: am 10a8935e: Merge "Use AsyncTasks instead of creating new threads" into jb-ub-now-jolly-elf
* commit '93ebd399da6d7537c6d6f6a2e8de9e1aa2a98b42':
  Use AsyncTasks instead of creating new threads
2014-02-14 21:02:04 +00:00
Mac Duy Hai 48e0e039ac am ecf352fb: am 745413c1: am 60779458: am a50d3430: Merge "Add method to retrieve search box bounds." into jb-ub-now-jolly-elf
* commit 'ecf352fbba6e9806a0a9149558582b85e00a9388':
  Add method to retrieve search box bounds.
2014-02-14 21:02:04 +00:00
Adam Cohen 38d2232f0e am 546dc3d9: am a9aeb127: am bfb2ed2f: am 76980e33: Merge "Fix binding problem with no screens (issue 11768766)" into jb-ub-now-jolly-elf
* commit '546dc3d977207c1ce7c128313e9a27fb9362d4c6':
  Fix binding problem with no screens (issue 11768766)
2014-02-14 21:02:03 +00:00
Adam Cohen c951b26b4c am d84e8a46: am 6bc01d4a: am 6229a0d5: am 6400b84d: Update custom content insets when Workspace insets are set
* commit 'd84e8a463d0c69036b9d75483405798cd01d025f':
  Update custom content insets when Workspace insets are set
2014-02-14 21:02:02 +00:00
Mathew Inwood de4c6ec5ab am 573b7f06: am 071b346e: am 1eeb3fc9: Generalize support for \'App Info\', \'Uninstall\' and \'Delete\'
* commit '573b7f0638e4257a0799f25019073fdb8357c518':
  Generalize support for 'App Info', 'Uninstall' and 'Delete'
2014-02-14 21:02:02 +00:00
Adam Cohen 9d549a7207 am 0008ff9b: am d7351228: am 0a23daac: am 166ebd4d: De-parent custom content view before adding to custom content screen
* commit '0008ff9b365460757776fd048e0e45690f5548af':
  De-parent custom content view before adding to custom content screen
2014-02-14 21:02:01 +00:00
Adam Cohen e7a4283415 am 53b995f0: am c82aa4cd: am 52aa0636: am d552dd90: Fix NPE in Launcher onDestroy
* commit '53b995f00c84d6ed9f10d4e8ddd0f38a33072af9':
  Fix NPE in Launcher onDestroy
2014-02-14 21:02:00 +00:00
Adam Cohen 155b262488 am d8a11572: am 38ed22eb: 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 'd8a11572d247ab4fc90d5ff28c31c183442691bf':
  Fix NPE in case where workspace is null because Launcher has been destroyed
2014-02-14 21:02:00 +00:00
Dan Sandler b45d0d0a8b am 69c4dedd: am fce34b2f: am 314aaeca: am a6a296ba: Revert "Enable Launcher2 workspace import."
* commit '69c4dedd867e034120973f44dd4342e07e33196c':
  Revert "Enable Launcher2 workspace import."
2014-02-14 21:01:59 +00:00
Michael Jurka 90d4563530 am 8e15ab76: am 4cb7d294: am e5db9b9d: am 04a231bb: Merge "Making workspace->overview transition smoother" into jb-ub-now-jolly-elf
* commit '8e15ab76d411cb6f20b8e37dd9130e4ab6d6d94c':
  Making workspace->overview transition smoother
2014-02-14 21:01:58 +00:00
Adam Cohen 6c20782efd am e0516f53: am c1fedf54: am 616af06a: am cccfe95b: Merge "Allowing ability to pick up items / enter overview before full page settle" into jb-ub-now-jolly-elf
* commit 'e0516f539ee175420b1bbf2c71d5a2603625a6e7':
  Allowing ability to pick up items / enter overview before full page settle
2014-02-14 21:01:58 +00:00
Dan Sandler 3afdd81293 am 412870f5: am 1fbe9d19: am 658e56fc: am 5b3bdd39: Enable Launcher2 workspace import.
* commit '412870f5f14b321ef1fbc7371416359d1e2a5e74':
  Enable Launcher2 workspace import.
2014-02-14 21:01:57 +00:00
Mathew Inwood 26848f18c5 am 1308e53d: am 0c280768: am 3705bb1b: Merge "Add support for initiating a drag from an overlay." into jb-ub-now-kermit
* commit '1308e53d74744e4601264c6799f364971da9e3a4':
  Add support for initiating a drag from an overlay.
2014-02-14 21:01:57 +00:00
Winson Chung dfd1d25df6 am 83e9b6a8: am aea55e05: am 954966bc: am 2c130e1f: Reducing workspace grid for dogfooding.
* commit '83e9b6a88539dc3f5c8780c1b59b4a525492cb79':
  Reducing workspace grid for dogfooding.
2014-02-14 21:01:56 +00:00
Winson Chung 257d70f234 am 45ad2b07: am c0ed8edf: am 2e06b6da: am 6dc8f7c8: Merge "Update the database when converting the final screen. (Bug 11683562, Bug 11034205)" into jb-ub-now-jolly-elf
* commit '45ad2b07c30ed48b94d11c362105909348164f09':
  Update the database when converting the final screen. (Bug 11683562, Bug 11034205)
2014-02-14 21:01:55 +00:00
Dan Sandler 0217ac8da7 am 737776b2: am d3701d42: am 91d30b76: am f0b8dacf: Disable importing workspaces from Launcher2.
* commit '737776b2749dc27e919c4324aa28efe3df8ea0ba':
  Disable importing workspaces from Launcher2.
2014-02-14 21:01:54 +00:00
Winson Chung 4f2599e50e am 96df62ef: am 4168dc49: am 97436804: am 540efef7: Merge changes Ida9603e3,I3dfa45cc into jb-ub-now-jolly-elf
* commit '96df62ef12af2b0bddbe7b18c6b40e187d2ad539':
  Initialize FastBitmapDrawable bounds with default bitmap dimensions.
  Updating LauncherModel filtering to use screen ids. (Bug 11685286)
2014-02-14 21:01:53 +00:00
Adam Cohen 1eea5cce05 am ae2207a8: am 3f950065: am 2aeb1778: am f9618856: Syncing up state transition with paging transition
* commit 'ae2207a89473c3b614d345257e6524aff2a4e1e7':
  Syncing up state transition with paging transition
2014-02-14 21:01:52 +00:00
Winson Chung 21394feee0 am 29ec2fc5: am 2c93bf64: am 2c73d923: am 603d19a3: Merge "Additional logs to track down missing workspace screen. (Bug 11683562)" into jb-ub-now-jolly-elf
* commit '29ec2fc538848f1ff7edd5f1f1c248936e84b9a3':
  Additional logs to track down missing workspace screen. (Bug 11683562)
2014-02-14 21:01:50 +00:00
Winson Chung c1209bd1d3 am 0c3171a5: am d21f1284: am 0788360c: am 28b690ab: Merge "Adding logs to track down missing workspace screen. (Bug 11683562)" into jb-ub-now-jolly-elf
* commit '0c3171a557a8dc538a99fef2826d4a2a80833917':
  Adding logs to track down missing workspace screen. (Bug 11683562)
2014-02-14 21:01:49 +00:00
Adam Cohen ec009f7139 am ff130dc3: am 06418978: am fe6376c2: am 582a3694: Merge "Adding method to get the search bar bounds." into jb-ub-now-jolly-elf
* commit 'ff130dc323cbba4e7115036efcd761ed2e7c9311':
  Adding method to get the search bar bounds.
2014-02-14 21:01:48 +00:00
Adam Cohen b3b87142fc am a5250ad3: am 422a7208: am 4b0badc9: am 3a14eeb5: Bit of code cleanup (issue 11648206)
* commit 'a5250ad3e4429c357471d19defa1ad6e424225f9':
  Bit of code cleanup (issue 11648206)
2014-02-14 21:01:46 +00:00
Adam Cohen 4b2a752f26 am 7c79e5dc: am 6521be4f: am 2dc25b18: am 202e4fda: Merge "Fix for transparent CustomContent screen (issue 11549096)" into jb-ub-now-jolly-elf
* commit '7c79e5dc819b08f544a53f7f300c033280755c7f':
  Fix for transparent CustomContent screen (issue 11549096)
2014-02-14 21:01:45 +00:00
Winson Chung 151b5f585c am 67a2db1a: am 1a3a5b0c: am 1aca70a5: am b427f30e: Merge "Require valid arrays when adding and binding new Apps. (Bug 11627095)" into jb-ub-now-jolly-elf
* commit '67a2db1a2d99a018edb74b3740065bd850b61d1a':
  Require valid arrays when adding and binding new Apps. (Bug 11627095)
2014-02-14 21:01:41 +00:00
Winson Chung 5f4c7c8d2e am 3907f60d: am b3c34125: am 3a7bea59: am 89ee93e0: Merge "Use the icon bounds for all calculations." into jb-ub-now-jolly-elf
* commit '3907f60dfae08d65a15e649ba9acf224f264192a':
  Use the icon bounds for all calculations.
2014-02-14 21:01:40 +00:00
Adam Cohen a7f80c8647 am 0765fc4d: am 0b38a944: am b6186d2b: am 4e2683a4: Merge "Fix issue where custom content would be invisible (issue 11644432)" into jb-ub-now-jolly-elf
* commit '0765fc4d8b5ed1b23f1cda10137cb3ae99e41928':
  Fix issue where custom content would be invisible (issue 11644432)
2014-02-14 21:01:39 +00:00
Adam Cohen d7eb2ecbed am 905157ef: am 3ee9a07f: am a9f8aeeb: am e9b198fd: Merge "Change the way view ids are assigned (issue 11627801)" into jb-ub-now-jolly-elf
* commit '905157ef4d56266d52496cec237e348624901de4':
  Change the way view ids are assigned (issue 11627801)
2014-02-14 21:01:38 +00:00
Adam Copp 8ed895ff98 am 0d3c6797: am 783f18da: am ee7f46cb: am 3dc3ecda: Merge "Hooks for subclasses to react to home presses." into jb-ub-now-jolly-elf
* commit '0d3c6797d4e5edcee8768d602381996018e6aefd':
  Hooks for subclasses to react to home presses.
2014-02-14 21:01:36 +00:00
Adam Cohen e50d0ac021 am 48a44c00: am b46426e3: am cb0468fa: am b79a48c2: Merge "Add logging for NPE (issue 11627249)" into jb-ub-now-jolly-elf
* commit '48a44c0041a05e5142e2a3b22cdb4d9783023c7e':
  Add logging for NPE (issue 11627249)
2014-02-14 21:01:36 +00:00