Commit Graph

78507 Commits

Author SHA1 Message Date
Winson Chung f8e0f2d419 am 447d9c3b: am ca00240f: am cd1092ce: am b6147f85: Merge "Adjusting grid for tablets and fixing incorrect resources for large tablets." into jb-ub-now-kermit
* commit '447d9c3b56b0f688f675096a687015007055f265':
2014-10-29 07:07:12 +00:00
Winson Chung 544c09625a am f2e7e334: am 6772fd99: am d6b50a48: am 1239b9da: Merge "Fixing issue with Widget sizes being icorrectly reported." into jb-ub-now-kermit
* commit 'f2e7e3347d291fe2af34feb59092781842ab3d38':
2014-10-29 07:07:10 +00:00
Adam Cohen f4b63d5082 am e6d2305f: am 7aa4ac9f: am d039b6e2: am fe69287b: Fix new NPE relating to reorder hints
* commit 'e6d2305f6240c9b63a2d9aec80a59676778e3712':
2014-10-29 07:07:09 +00:00
Chris Wren e472e54e9b am ee812299: am f810f75f: am bf597a68: am 52a935a2: Merge "expose the protoutil for launcher as an executable script" into jb-ub-now-kermit
* commit 'ee81229929c454ad9e48a6fb3cf459f091e941d5':
2014-10-29 07:07:07 +00:00
Michael Jurka 37e0782361 am e74f0905: am 54dffa11: am d2f15728: am 772bbcc7: Merge "Revert "Revert "Move wallpaper picker code to a separate directory""" into jb-ub-now-kermit
* commit 'e74f0905d4a7de2aa278a7ae3ad5d68eaa8eb6b1':
2014-10-29 07:07:05 +00:00
Dan Sandler 11bcfaa164 am a0fa07a0: am 5aff893a: am 5ab7187d: am a40916d5: Merge "Size hotseat data structure appropriately." into jb-ub-now-kermit
* commit 'a0fa07a05fcb0ba4914a376abb717fabed3c80b8':
2014-10-29 07:07:04 +00:00
Adam Cohen 83eaf660ba am a0a4870e: am 6effa1e3: am f2551ffc: am 1f60653a: Merge "Adding reorder hinting, hopefully will help with (issue 10654628)" into jb-ub-now-kermit
* commit 'a0a4870ec0fe6fa6df70fe85472f586a07584537':
2014-10-29 07:07:02 +00:00
Michael Jurka 8d0ba2abd2 am 1ebef2df: am 8e47355a: am 0a667dd4: am 8824eadc: Merge "Revert "Move wallpaper picker code to a separate directory"" into jb-ub-now-kermit
* commit '1ebef2df9bb0331e16a1b29dd010e654657e95aa':
2014-10-29 07:07:00 +00:00
Derek Prothro 3c44a9209f am cb3d4a61: am 465606c2: am 98245209: am fa071f93: Merge "Bind the workspace synchronously if started on -1 screen." into jb-ub-now-kermit
* commit 'cb3d4a61f2af40e7fa8d143b4e2bc4889ca40711':
2014-10-29 07:06:58 +00:00
Michael Jurka a4b1dc9e06 am 47f75d94: am 4cd9a102: am 744cbf46: am 8e88cb84: Move wallpaper picker code to a separate directory
* commit '47f75d940e314a6eb15cf40b92bc06a29665b9e4':
2014-10-29 07:06:56 +00:00
Winson Chung a3fe87fb03 am 4ee45e93: am 157e789f: am 07c9ade5: am 33231f58: Fixing crash in empty folders. (Bug 11627191)
* commit '4ee45e93775da9f786b3c394eb6aed901c3a2bff':
2014-10-29 07:06:55 +00:00
Winson Chung a0436691dd am e623e902: am a0a8305a: am ffba2dfd: am fe2fb826: am d65fb393: Merge "Revert "Fixing crash in empty folders. (Bug 11627191)"" into jb-ub-now-jolly-elf
* commit 'e623e9023f02456146ddb6228419521c473cedb5':
2014-10-29 07:06:53 +00:00
Winson Chung 7d1d4e40d6 am 564cfbde: am e7e47266: am 6160c394: am cace67f7: am 6de1ba33: Merge "Fixing crash in empty folders. (Bug 11627191)" into jb-ub-now-jolly-elf
* commit '564cfbdef48fccb6e26b164aa670f73aeffa05d9':
2014-10-29 07:06:51 +00:00
Nilesh Agrawal cebb580f2a am 33cddd18: am 2ef2511f: am 0d43ba8c: am da41ea66: Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
* commit '33cddd186afe9134f241295a960ac5384166ae3e':
2014-10-29 07:06:49 +00:00
Nilesh Agrawal 62cad76921 am f448e23f: am d1ce093c: am 03ec57d3: am 93b6ee6d: Merge "Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."" into jb-ub-now-kermit
* commit 'f448e23f12379ca43e9ca930977cf4185ca8af92':
2014-10-29 07:06:47 +00:00
Nilesh Agrawal edcf9e6ba9 am e5e395e4: am e4ccb341: am ac2ddbb4: am 23c165a9: Merge "Allow 5 hotseat icons in DISABLE_ALL_APPS mode." into jb-ub-now-kermit
* commit 'e5e395e4e01f82ba96031ab93fe30d9c8e214470':
2014-10-29 07:06:46 +00:00
Chris Wren 97371eda3a am 142c274b: am b8336373: am 3eaaf7d1: am 06a0ac2f: Merge "backup launcher preferences" into jb-ub-now-kermit
* commit '142c274b1d25bb46bc97ffc3acc0b2cb4f7de3b6':
2014-10-29 07:06:44 +00:00
Adam Cohen a41c0f2774 am 7b1828f1: am 4b0b4bce: am 8aebe36d: am 5d518fa7: Decrease delay for closing folder on removal of an item (issue 11028310)
* commit '7b1828f166bd3ff94bc6cf9f514353c3b4f27641':
2014-10-29 07:06:42 +00:00
Michael Jurka 57e6800339 am 73a90f7e: am 06440fb8: am 29de7557: am 566bdc37: Merge "Update suggested wallpaper dimensions in onResume" into jb-ub-now-kermit
* commit '73a90f7e0807cba086296cf1b195e429aee09eb3':
2014-10-29 07:06:40 +00:00
Winson Chung 9d729f2134 am 3826d2b4: 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 '3826d2b460d86ffcd99855b82a37b20f06071ec7':
2014-10-29 07:06:38 +00:00
Adam Cohen eed36eba68 am c686d62c: am 94abcb98: am b2d3890d: am f9cd258b: am 59b5c79b: Fix page jumping regression in overview mode (issue 12003672)
* commit 'c686d62cf64a4eb9c51b7145a83d6543442c93dd':
2014-10-29 07:06:36 +00:00
Winson Chung 9a501b22f9 am b53f6146: am 4051b53e: am 6b165fa8: am 0ea74f13: Merge "Limit AllApps insets to certain device configurations. (Bug 11451335)" into jb-ub-now-kermit
* commit 'b53f61463dc6b850be374da724b5d76221cd2ce6':
2014-10-29 07:06:35 +00:00
Winson Chung b3684ca729 am d85a790f: am fe712898: am 89524f48: am 17bde09a: Merge "Retain current AllApps page if we never leave Launcher. (Bug 11468582)" into jb-ub-now-kermit
* commit 'd85a790fe4f828eed03eb6fe02343624657c8c28':
2014-10-29 07:06:33 +00:00
Winson Chung f4cfade1fa am 807748a9: am c24021e3: am 88818ab2: am 42b3c068: Restoring Hotseat to the left-aligned in RTL. (Bug 11451335)
* commit '807748a96c70744ba796afaf68d103dc36e406c5':
2014-10-29 07:06:32 +00:00
Adam Cohen a2498d1033 am 07fd6bd2: am 1b6b42e3: am ec6b71a0: am 531a5c32: am b0ee0810: Add guards for restoreInstanceState (issue 11982812)
* commit '07fd6bd2709468cce968e852bc0c354cb4e11065':
2014-10-29 07:06:30 +00:00
Dan Sandler 02aa00d00d am 7e23ffeb: am 351453a1: am 0572c310: am b4ee5792: am b3084e87: Merge "Revert "Revert "Enable Launcher2 workspace import.""" into jb-ub-now-jolly-elf
* commit '7e23ffebe926a1818e6fae9a4cf4bb047309c099':
2014-10-29 07:06:29 +00:00
Adam Cohen f0fe8bb2b3 am 77540341: 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 '77540341dc893157e01a64e4063c21a19309dec7':
2014-10-29 07:06:27 +00:00
Michael Jurka 1f6960a0f4 am cae21c25: am dbd4b06d: am 512093f3: am 16fa074d: am 1c00fd0b: Fix NPE when going to All Apps in landscape
* commit 'cae21c250be3b5a7c04b9360c9955cd628374ede':
2014-10-29 07:06:26 +00:00
Winson Chung f351ca04f5 am 7927a642: am 0f39034b: am f342c5b4: am 0c1b33db: am 2cb2471e: Ensure we pass search bar bounds to GoogleSearch. (Bug 11968598)
* commit '7927a642ed5788efb55b2a33200de36539f2dfd8':
2014-10-29 07:06:24 +00:00
Winson Chung 9a409e85ac am 3be79574: 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 '3be79574b8d0312a12fe5cb36303fac5d692723b':
2014-10-29 07:06:23 +00:00
Michael Jurka 2d8207db2e am 5b278a72: am 93ebd399: am 082893ff: am 3ed4a4dd: am 10a8935e: Merge "Use AsyncTasks instead of creating new threads" into jb-ub-now-jolly-elf
* commit '5b278a722612541c84684607b6658b063dd793af':
2014-10-29 07:06:22 +00:00
Mac Duy Hai c4ff989dfe am 5d8da377: am ecf352fb: am 745413c1: am 60779458: am a50d3430: Merge "Add method to retrieve search box bounds." into jb-ub-now-jolly-elf
* commit '5d8da377c1932a274130173a140e62ebc15eec33':
2014-10-29 07:06:21 +00:00
Adam Cohen 6e21adafed am c5b499a2: am 546dc3d9: am a9aeb127: am bfb2ed2f: am 76980e33: Merge "Fix binding problem with no screens (issue 11768766)" into jb-ub-now-jolly-elf
* commit 'c5b499a2d05ac6e94e6ee8b4e2a380c9e59f856f':
2014-10-29 07:06:20 +00:00
Adam Cohen 9472e68a48 am 4c11f026: am d84e8a46: am 6bc01d4a: am 6229a0d5: am 6400b84d: Update custom content insets when Workspace insets are set
* commit '4c11f02620c1c8cb303d72087ed2917b7988b960':
2014-10-29 07:06:19 +00:00
Mathew Inwood 3d636b2a6d am 4d0c9c14: am 573b7f06: am 071b346e: am 1eeb3fc9: Generalize support for \'App Info\', \'Uninstall\' and \'Delete\'
* commit '4d0c9c14ceeb3d2995dc1e96b19bd8e96b66deeb':
2014-10-29 07:06:18 +00:00
Adam Cohen e50ec0854f am be20490b: am 0008ff9b: am d7351228: am 0a23daac: am 166ebd4d: De-parent custom content view before adding to custom content screen
* commit 'be20490b25011fe730824412ab674c447d26ffbe':
2014-10-29 07:06:17 +00:00
Adam Cohen 65a0442010 am d11abc71: am 53b995f0: am c82aa4cd: am 52aa0636: am d552dd90: Fix NPE in Launcher onDestroy
* commit 'd11abc71e9be940db2169eac581e85d913a6c598':
2014-10-29 07:06:16 +00:00
Adam Cohen fa88746f0a am 52c8860c: 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 '52c8860c979ed8da3efd1bc5215e3ab0ffa39f11':
2014-10-29 07:06:15 +00:00
Dan Sandler 1957816ec6 am 694a34ad: am 69c4dedd: am fce34b2f: am 314aaeca: am a6a296ba: Revert "Enable Launcher2 workspace import."
* commit '694a34adb815a54d418e4b481d0b9d47385d09d6':
2014-10-29 07:06:14 +00:00
Michael Jurka 2574b4efd1 am ba7fe381: am 8e15ab76: am 4cb7d294: am e5db9b9d: am 04a231bb: Merge "Making workspace->overview transition smoother" into jb-ub-now-jolly-elf
* commit 'ba7fe381ed2c348f6caed1f02b421889baf265a6':
2014-10-29 07:06:13 +00:00
Adam Cohen 64e463b465 am 28260772: 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 '28260772ce843e5f0e5b31806232f470d68fb070':
2014-10-29 07:06:13 +00:00
Dan Sandler a3f1566c35 am 35f3d1f7: am 412870f5: am 1fbe9d19: am 658e56fc: am 5b3bdd39: Enable Launcher2 workspace import.
* commit '35f3d1f74cdacb29f8732c45e8bcc686f024433e':
2014-10-29 07:06:12 +00:00
Mathew Inwood d84e105738 am c4b9f7f8: am 1308e53d: am 0c280768: am 3705bb1b: Merge "Add support for initiating a drag from an overlay." into jb-ub-now-kermit
* commit 'c4b9f7f8a475e42492cf3e1f58e22cf66732d3e1':
2014-10-29 07:06:11 +00:00
Winson Chung d6fae2639b am 18d47400: am 83e9b6a8: am aea55e05: am 954966bc: am 2c130e1f: Reducing workspace grid for dogfooding.
* commit '18d4740083eefd4dfd07f28bc1380ef079d1f112':
2014-10-29 07:06:10 +00:00
Winson Chung 7e4ca4845c am 56879a3d: 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 '56879a3dbbcac39cab2d823afd67abe67ec1f49d':
2014-10-29 07:06:09 +00:00
Dan Sandler 0931c799d9 am 3734461f: am 737776b2: am d3701d42: am 91d30b76: am f0b8dacf: Disable importing workspaces from Launcher2.
* commit '3734461fa74d27b5e7f3edcd5ae5033841f56679':
2014-10-29 07:06:08 +00:00
Winson Chung 785203b22a am 7ed74d2c: am 96df62ef: am 4168dc49: am 97436804: am 540efef7: Merge changes Ida9603e3,I3dfa45cc into jb-ub-now-jolly-elf
* commit '7ed74d2cc2deb59e32d72a0950e7beb179d73d46':
2014-10-29 07:06:07 +00:00
Adam Cohen b693886f81 am 22808603: am ae2207a8: am 3f950065: am 2aeb1778: am f9618856: Syncing up state transition with paging transition
* commit '22808603a92a75356d4419036644ff745b66afd2':
2014-10-29 07:06:06 +00:00
Winson Chung fe1ec2cec6 am 663254d1: 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 '663254d1f396590ca39387c643f4c2f9cf24c3e9':
2014-10-29 07:06:05 +00:00
Winson Chung 5b1dcb1377 am 1f02b410: 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 '1f02b410063d3aedd61ae9e798b40b6b2d51735c':
2014-10-29 07:06:04 +00:00