Commit Graph

78507 Commits

Author SHA1 Message Date
Dan Sandler 69c4dedd86 am fce34b2f: am 314aaeca: am a6a296ba: Revert "Enable Launcher2 workspace import."
* commit 'fce34b2ff20961642657f9b6914620dd45007d18':
  Revert "Enable Launcher2 workspace import."
2014-02-14 20:54:05 +00:00
Michael Jurka 8e15ab76d4 am 4cb7d294: am e5db9b9d: am 04a231bb: Merge "Making workspace->overview transition smoother" into jb-ub-now-jolly-elf
* commit '4cb7d294e1a5b97a734e2bbf30303eb0b5cd27fb':
  Making workspace->overview transition smoother
2014-02-14 20:54:04 +00:00
Adam Cohen e0516f539e 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 'c1fedf540713fbeec3901b9c2d25a776188b57ee':
  Allowing ability to pick up items / enter overview before full page settle
2014-02-14 20:54:03 +00:00
Dan Sandler 412870f5f1 am 1fbe9d19: am 658e56fc: am 5b3bdd39: Enable Launcher2 workspace import.
* commit '1fbe9d192e03eeadbddad79f6287f151f0e911ec':
  Enable Launcher2 workspace import.
2014-02-14 20:54:02 +00:00
Mathew Inwood 1308e53d74 am 0c280768: am 3705bb1b: Merge "Add support for initiating a drag from an overlay." into jb-ub-now-kermit
* commit '0c280768446f8de0afc4d1b94aeb6dda7a879bce':
  Add support for initiating a drag from an overlay.
2014-02-14 20:54:01 +00:00
Winson Chung 83e9b6a885 am aea55e05: am 954966bc: am 2c130e1f: Reducing workspace grid for dogfooding.
* commit 'aea55e0565ee7af79f0b96860212737e261423f8':
  Reducing workspace grid for dogfooding.
2014-02-14 20:54:01 +00:00
Winson Chung 45ad2b07c3 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 'c0ed8edf296725dfbff8cc95d9cb4803f6301390':
  Update the database when converting the final screen. (Bug 11683562, Bug 11034205)
2014-02-14 20:54:00 +00:00
Dan Sandler 737776b274 am d3701d42: am 91d30b76: am f0b8dacf: Disable importing workspaces from Launcher2.
* commit 'd3701d422329791f6758649249e6db3e538a0c4e':
  Disable importing workspaces from Launcher2.
2014-02-14 20:53:59 +00:00
Winson Chung 96df62ef12 am 4168dc49: am 97436804: am 540efef7: Merge changes Ida9603e3,I3dfa45cc into jb-ub-now-jolly-elf
* commit '4168dc497ded7c697d972283db7c8579788c23d5':
  Initialize FastBitmapDrawable bounds with default bitmap dimensions.
  Updating LauncherModel filtering to use screen ids. (Bug 11685286)
2014-02-14 20:53:59 +00:00
Adam Cohen ae2207a894 am 3f950065: am 2aeb1778: am f9618856: Syncing up state transition with paging transition
* commit '3f95006528b780c941f683c73339ab53c70a6880':
  Syncing up state transition with paging transition
2014-02-14 20:53:58 +00:00
Winson Chung 29ec2fc538 am 2c93bf64: am 2c73d923: am 603d19a3: Merge "Additional logs to track down missing workspace screen. (Bug 11683562)" into jb-ub-now-jolly-elf
* commit '2c93bf64172656e1f9501c06d133934f69ce07e8':
  Additional logs to track down missing workspace screen. (Bug 11683562)
2014-02-14 20:53:57 +00:00
Winson Chung 0c3171a557 am d21f1284: am 0788360c: am 28b690ab: Merge "Adding logs to track down missing workspace screen. (Bug 11683562)" into jb-ub-now-jolly-elf
* commit 'd21f128490f69adcddafb67d096c73e9acff17e1':
  Adding logs to track down missing workspace screen. (Bug 11683562)
2014-02-14 20:53:56 +00:00
Adam Cohen ff130dc323 am 06418978: am fe6376c2: am 582a3694: Merge "Adding method to get the search bar bounds." into jb-ub-now-jolly-elf
* commit '064189780fa729082e321b3d9f65e13d3f4d71b7':
  Adding method to get the search bar bounds.
2014-02-14 20:53:56 +00:00
Adam Cohen a5250ad3e4 am 422a7208: am 4b0badc9: am 3a14eeb5: Bit of code cleanup (issue 11648206)
* commit '422a7208d186ce9af4a9a59466a9773179f844fd':
  Bit of code cleanup (issue 11648206)
2014-02-14 20:53:55 +00:00
Adam Cohen 7c79e5dc81 am 6521be4f: am 2dc25b18: am 202e4fda: Merge "Fix for transparent CustomContent screen (issue 11549096)" into jb-ub-now-jolly-elf
* commit '6521be4f9272d12f907108d871a79852ce9e6183':
  Fix for transparent CustomContent screen (issue 11549096)
2014-02-14 20:53:54 +00:00
Winson Chung 67a2db1a2d 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 '1a3a5b0c67c0ed596efe56a9df9477a983dccc39':
  Require valid arrays when adding and binding new Apps. (Bug 11627095)
2014-02-14 20:53:54 +00:00
Winson Chung 3907f60dfa am b3c34125: am 3a7bea59: am 89ee93e0: Merge "Use the icon bounds for all calculations." into jb-ub-now-jolly-elf
* commit 'b3c34125a483b321bd91025f88058c58844cde2e':
  Use the icon bounds for all calculations.
2014-02-14 20:53:53 +00:00
Adam Cohen 0765fc4d8b am 0b38a944: am b6186d2b: am 4e2683a4: Merge "Fix issue where custom content would be invisible (issue 11644432)" into jb-ub-now-jolly-elf
* commit '0b38a9447a6e146132922ab18862b96534f3e968':
  Fix issue where custom content would be invisible (issue 11644432)
2014-02-14 20:53:52 +00:00
Adam Cohen 905157ef4d am 3ee9a07f: am a9f8aeeb: am e9b198fd: Merge "Change the way view ids are assigned (issue 11627801)" into jb-ub-now-jolly-elf
* commit '3ee9a07fb14bb5c753a51d5a8c7989117f7b10db':
  Change the way view ids are assigned (issue 11627801)
2014-02-14 20:53:52 +00:00
Adam Copp 0d3c6797d4 am 783f18da: am ee7f46cb: am 3dc3ecda: Merge "Hooks for subclasses to react to home presses." into jb-ub-now-jolly-elf
* commit '783f18da245ea8fad8f8d6d6a83f407a3e3f44b9':
  Hooks for subclasses to react to home presses.
2014-02-14 20:53:51 +00:00
Adam Cohen 48a44c0041 am b46426e3: am cb0468fa: am b79a48c2: Merge "Add logging for NPE (issue 11627249)" into jb-ub-now-jolly-elf
* commit 'b46426e3de3d199429c22fb17d0d798aa78d2886':
  Add logging for NPE (issue 11627249)
2014-02-14 20:53:45 +00:00
Adam Cohen c2c629aaff am 9d170dbb: am 6641570e: am 17e1aeac: Merge "Fix CellLayout UNSPECIFIED exception (issue 11627191)" into jb-ub-now-jolly-elf
* commit '9d170dbb65924d60f5a32a37496ec9142a186005':
  Fix CellLayout UNSPECIFIED exception (issue 11627191)
2014-02-14 20:53:44 +00:00
Winson Chung f8d8c22e4d am c665bd13: 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 'c665bd136f19109f0ea7414988078330ce895dda':
  Prevent launching Widgets when cycling between Overview/Shrink state and Home. (Bug 11439120)
2014-02-14 20:53:44 +00:00
Adam Cohen 02222ba800 am 42143d73: am e99951bd: am f0f2ffae: Fix issue where extra page hangs around (issue 11634172)
* commit '42143d73ab1fe0318a2410a56634992ffc481588':
  Fix issue where extra page hangs around (issue 11634172)
2014-02-14 20:53:43 +00:00
Adam Cohen 53cb2ba421 am e4a44cc7: am 5b34b3ae: am c361b6fe: Merge "Small tweaks to custom content management" into jb-ub-now-jolly-elf
* commit 'e4a44cc7be0a49b7b3a0623751f7c59502697175':
  Small tweaks to custom content management
2014-02-14 20:53:41 +00:00
Michael Jurka 3a19c4788d am 2026a5a9: am 314b922b: am bf292a0b: Merge "Fix wallpaper cropping bugs" into jb-ub-now-jolly-elf
* commit '2026a5a91feabaa8711d9fa1272fa9dbed355bcc':
  Fix wallpaper cropping bugs
2014-02-14 20:53:40 +00:00
Adam Cohen fffd424068 am 4002465f: am 7be5f565: am ab087b9f: Fix NPE we\'re seeing in feedback (issue 11626428)
* commit '4002465f5824b7f1b8bdf9927c71b2585ad2bdde':
  Fix NPE we're seeing in feedback (issue 11626428)
2014-02-14 20:53:39 +00:00
Adam Cohen 42fafc28f4 am 51cc5316: am ed1ead7a: am 2777273a: Add method to determine if Launcher is using vertical bars
* commit '51cc53160db29cdd2a69968a292961c9e2ed2204':
  Add method to determine if Launcher is using vertical bars
2014-02-14 20:53:38 +00:00
Michael Jurka a03dab4e6f am c23fc049: am 5339119b: am 62dacd67: Merge "Uncommenting throw when item not contained in sBgItemsIdMap" into jb-ub-now-jolly-elf
* commit 'c23fc0498e398649768b8dc124f9f755a3c9bd13':
  Uncommenting throw when item not contained in sBgItemsIdMap
2014-02-14 20:53:37 +00:00
Michael Jurka 25acac7c44 am aa07fd63: am 6f372bb7: am 5fa148a1: am 5bfab60f: Fix NPE in Live Wallpaper loader
* commit 'aa07fd636e46d1be902e37519b529fbbe11dfa41':
  Fix NPE in Live Wallpaper loader
2014-02-14 20:53:36 +00:00
Adam Cohen 0b33d00d0d am b040fcf5: am a05060c9: am 18238d90: am 3428b5e9: Merge "Fix default wallpaper thumbnail" into jb-ub-now-jetsonic
* commit 'b040fcf52b4ccf6896e62a315abc447ea52db107':
  Fix default wallpaper thumbnail
2014-02-14 20:53:35 +00:00
Adam Cohen 28b32cbd9a am 39ea5106: am b767166b: am 46830418: am 2da0a053: Fix small scrolling regression
* commit '39ea51061c6b5fc66b15aa20abdcbadcb4ca5aba':
  Fix small scrolling regression
2014-02-14 20:53:35 +00:00
Dave Hawkey 97d17d4a0f am 585e1ea5: am 98e011b4: Merge "Set insets on newly added views." into jb-ub-now-kermit
* commit '585e1ea5f97b2a4036c075d312b070671214fe73':
  Set insets on newly added views.
2014-02-14 20:53:29 +00:00
Winson Chung e6ce2405a5 am aedae798: am be8ff1f4: am d7adbab6: Merge "Save and restore the correct content type when rotating while in AllApps." into jb-ub-now-jolly-elf
* commit 'aedae798333b4042d3741426b6bdfb60344b942e':
  Save and restore the correct content type when rotating while in AllApps.
2014-02-14 20:53:28 +00:00
Winson Chung 195dd27c8f am c7cfb790: am bc7d88ea: am 88416027: Merge "Fixing crash while reordering pages in OverviewMode." into jb-ub-now-jolly-elf
* commit 'c7cfb79037986c261855d875d0f14c5cc9d38399':
  Fixing crash while reordering pages in OverviewMode.
2014-02-14 20:53:28 +00:00
Winson Chung 58df0aae8a am c48aaa75: am 98168ec7: am c82d2622: Dyanmically lay out overview mode across all orientations and form factors.
* commit 'c48aaa75b3e6a90e053f0e1cc8c161b8080fa04b':
  Dyanmically lay out overview mode across all orientations and form factors.
2014-02-14 20:53:27 +00:00
Adam Cohen f6636c1eb9 am b7d56308: am c2cf2d9c: am ebb9ebed: am a1648449: Fixing tiny regression in PagedView spacing
* commit 'b7d563085fc49bccfc287f172bea7b42050e0421':
  Fixing tiny regression in PagedView spacing
2014-02-14 20:53:26 +00:00
Michael Jurka ee0ff06145 am fcb9033a: am c85a63c5: am 1beeb0aa: Merge "Revert "Workaround for remove stuck (issue 11080792)"" into jb-ub-now-jolly-elf
* commit 'fcb9033a44dd89bff39eb8fd05c5e837f63a65db':
  Revert "Workaround for remove stuck (issue 11080792)"
2014-02-14 20:53:25 +00:00
Michael Jurka 35007abdc5 am af3064d8: am dd12202f: am 19d10a58: Don\'t adjust animation play time if not necessary
* commit 'af3064d8b86f8030b99a226b08dc1ac8e3e864d0':
  Don't adjust animation play time if not necessary
2014-02-14 20:53:18 +00:00
Baligh Uddin 16e56d7511 am 588975f0: (-s ours) am 8eb857fa: (-s ours) am 458a15f7: (-s ours) am 89fbe00d: (-s ours) am 0491f0f1: (-s ours) Import translations. DO NOT MERGE
* commit '588975f099320713b6b4c5dabc7f958f98058ca6':
  Import translations. DO NOT MERGE
2014-02-14 20:53:11 +00:00
Baligh Uddin 6c983895cd am fdfebdad: (-s ours) am 0493fb93: (-s ours) am 0effb652: (-s ours) am e0b9a1f7: (-s ours) Import translations. DO NOT MERGE
* commit 'fdfebdad758d9f140c89e4725ca10a265b9d81b2':
  Import translations. DO NOT MERGE
2014-02-14 20:53:10 +00:00
Baligh Uddin 7e0c421585 am bb69c0d8: (-s ours) am 572bdaa4: (-s ours) am f0d79e57: (-s ours) Import translations. DO NOT MERGE
* commit 'bb69c0d85cdfa60f7b62a35e26c361777aaedb60':
  Import translations. DO NOT MERGE
2014-02-14 20:53:08 +00:00
Baligh Uddin f3804c181b am 1b2ee8c1: (-s ours) am 286ecf1e: (-s ours) Import translations. DO NOT MERGE
* commit '1b2ee8c1b3a525f02cf2d302744cf4c868985f5c':
  Import translations. DO NOT MERGE
2014-02-14 20:53:06 +00:00
Baligh Uddin 459394de4a am 62a708f4: (-s ours) am 339e0c19: (-s ours) am 3be0912b: (-s ours) am 2a44d878: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic
* commit '62a708f4e81b3a1565d977607d870adb9c410083':
  Import translations. DO NOT MERGE
2014-02-14 20:53:04 +00:00
Baligh Uddin 7c3fe3947d am e6b93f95: (-s ours) am 0dc42a5d: (-s ours) am 349763d0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jolly-elf
* commit 'e6b93f95f792726d52518eb5f0da5ecd1c902862':
  Import translations. DO NOT MERGE
2014-02-14 20:53:03 +00:00
Baligh Uddin 88485bb5d0 am 78c7429c: (-s ours) am 0cc0c216: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
* commit '78c7429c2c272084b1753d51911c70f773d3b3e7':
  Import translations. DO NOT MERGE
2014-02-14 20:53:02 +00:00
Adam Cohen 569ae3921d am bfd3bda9: am fe860770: am 45fee32b: am b2af6076: Merge "Ensuring that widget ids are cleaned up" into jb-ub-now-jetsonic
* commit 'bfd3bda9acf6d13849e61f601d907fdef0b12df3':
  Ensuring that widget ids are cleaned up
2014-02-14 20:53:01 +00:00
Adam Cohen dc90f62fa6 am 5fb0a60d: 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 '5fb0a60d55526cf8426f81d60229af56b1a54fb3':
  Fix bug where cancelling config activity leaves user stuck in bad state
2014-02-14 20:53:01 +00:00
Adam Cohen 7bcf2eaff6 am 9a088cb8: am c0dfb140: am e33f8259: am 5c6474da: Merge "Fix problem with where PagedView could get stuck (issue 11314889)" into jb-ub-now-jetsonic
* commit '9a088cb860bd79c137f5cdffe696f7645663b654':
  Fix problem with where PagedView could get stuck (issue 11314889)
2014-02-14 20:53:00 +00:00
Adam Cohen ab3c061b92 am eee33bdb: am 5dd5f103: am ec2247fb: am 829f37f3: Merge "Workaround for remove stuck (issue 11080792)" into jb-ub-now-jetsonic
* commit 'eee33bdba87d6ced3df64ad8f2d743b7832c024c':
  Workaround for remove stuck (issue 11080792)
2014-02-14 20:52:59 +00:00