summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* expose the protoutil for launcher as an executable scriptChris Wren2013-12-104-2/+111
| | | | Change-Id: Ie990262534d85b118c165589ecee55d64f3a58cc
* Move wallpaper picker code to a separate directoryMichael Jurka2013-12-1091-65/+194
| | | Change-Id: Id79d11ed08085c4fe356739498a8b77952e30392
* Fixing crash in empty folders. (Bug 11627191)Winson Chung2013-12-093-6/+18
| | | | | | Change-Id: I7a0e23e16a7546a9612d3406257e15be758d4c52 Signed-off-by: Winson Chung <winsonc@google.com>
* am d65fb393: Merge "Revert "Fixing crash in empty folders. (Bug 11627191)"" ↵Winson Chung2013-12-093-18/+6
|\ | | | | | | | | | | | | into jb-ub-now-jolly-elf * commit 'd65fb393595cb093936c7d5d0d54b0511430aa9d': Revert "Fixing crash in empty folders. (Bug 11627191)"
| * Merge "Revert "Fixing crash in empty folders. (Bug 11627191)"" into ↵Winson Chung2013-12-103-18/+6
| |\ | | | | | | | | | jb-ub-now-jolly-elf
| | * Revert "Fixing crash in empty folders. (Bug 11627191)"Winson Chung2013-12-103-18/+6
| | | | | | | | | | | | | | | | | | This reverts commit 68b667848ef7c6f69b24a40d780e4088a5f2a1fb. Change-Id: I51da495d6f8ef98b268c23cce02cce5ef1c7ea00
* | | am 6de1ba33: Merge "Fixing crash in empty folders. (Bug 11627191)" into ↵Winson Chung2013-12-093-6/+18
|\| | | | | | | | | | | | | | | | | | | | jb-ub-now-jolly-elf * commit '6de1ba3377dd407e83f682edf9ae742416302772': Fixing crash in empty folders. (Bug 11627191)
| * | Merge "Fixing crash in empty folders. (Bug 11627191)" into jb-ub-now-jolly-elfWinson Chung2013-12-103-6/+18
| |\|
| | * Fixing crash in empty folders. (Bug 11627191)Winson Chung2013-12-093-6/+18
| | | | | | | | | | | | Change-Id: I7a0e23e16a7546a9612d3406257e15be758d4c52
* | | Allow 5 hotseat icons in DISABLE_ALL_APPS mode.Nilesh Agrawal2013-12-093-7/+72
| | | | | | | | | | | | | | | | | | | | | | | | Added the xml resource in Launcher3 package as well. This is a dummy resource with just hotseat icons. Previously reviewed on: http://ag/396580 Change-Id: I31b0d7d4796d028f44f746260c381f2d8226605a
* | | Merge "Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."" into ↵Nilesh Agrawal2013-12-092-16/+7
|\ \ \ | | | | | | | | | | | | jb-ub-now-kermit
| * | | Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."Nilesh Agrawal2013-12-092-16/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f4ed1be4ef22c87b002c3bca90d130eb77fe5535. This broke the build: packages/apps/Launcher3/src/com/android/launcher3/LauncherProvider.java:292: cannot find symbol symbol : variable default_workspace_no_all_apps location: class com.android.launcher3.R.xml return R.xml.default_workspace_no_all_apps; Change-Id: I40e80494f06f08de3d827c6816075ac4d269ea6a
* | | | Merge "Allow 5 hotseat icons in DISABLE_ALL_APPS mode." into jb-ub-now-kermitNilesh Agrawal2013-12-092-7/+16
|\| | |
| * | | Allow 5 hotseat icons in DISABLE_ALL_APPS mode.Nilesh Agrawal2013-12-062-7/+16
| | | | | | | | | | | | | | | | Change-Id: I71510cf079e211bd53e411e6e43f1bc6475f6d35
* | | | Merge "backup launcher preferences" into jb-ub-now-kermitChris Wren2013-12-092-0/+18
|\ \ \ \ | |/ / / |/| | |
| * | | backup launcher preferencesChris Wren2013-12-032-0/+18
| | | | | | | | | | | | | | | | | | | | Bug: 11267816 Change-Id: I12a32477164fe2205bc8cb02e0a23c561a7f9189
* | | | Decrease delay for closing folder on removal of an item (issue 11028310)Adam Cohen2013-12-051-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ie5c094af8b0293e56bf016be5b4f4db05e7a9a05
* | | | Merge "Update suggested wallpaper dimensions in onResume" into jb-ub-now-kermitMichael Jurka2013-12-055-39/+101
|\ \ \ \
| * | | | Update suggested wallpaper dimensions in onResumeMichael Jurka2013-12-035-39/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If another launcher runs in between, it might change the suggested dimensions. This fixes that case. Bug: 11667475
* | | | | am a67d1ea0: Merge "Fixing regression in drop target bar height. (Bug ↵Winson Chung2013-12-041-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | 11980757)" into jb-ub-now-jolly-elf * commit 'a67d1ea0db5f536ca4a954a5f958211ec6c99992': Fixing regression in drop target bar height. (Bug 11980757)
| * | | | Merge "Fixing regression in drop target bar height. (Bug 11980757)" into ↵Winson Chung2013-12-051-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | jb-ub-now-jolly-elf
| | * | | | Fixing regression in drop target bar height. (Bug 11980757)Winson Chung2013-12-041-1/+1
| | | |_|/ | | |/| | | | | | | | | | | | Change-Id: I67ccc575b5c15a47ab7f41ceebfc86d9a212ddf3
* | | | | am 59b5c79b: Fix page jumping regression in overview mode (issue 12003672)Adam Cohen2013-12-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '59b5c79b6ff2de83209cf1425b8924d541e97266': Fix page jumping regression in overview mode (issue 12003672)
| * | | | Fix page jumping regression in overview mode (issue 12003672)Adam Cohen2013-12-041-1/+1
| |/ / / | | | | | | | | | | | | Change-Id: I4315d4e97c8df4db25e2d70be759b94a0348d644
* | | | Merge "Limit AllApps insets to certain device configurations. (Bug ↵Winson Chung2013-12-041-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | 11451335)" into jb-ub-now-kermit
| * | | | Limit AllApps insets to certain device configurations. (Bug 11451335)Winson Chung2013-12-041-1/+2
| | | | | | | | | | | | | | | Change-Id: I0b7172bb8c2e8cfb06ef4ff097bdc632d6be0548
* | | | | Merge "Retain current AllApps page if we never leave Launcher. (Bug ↵Winson Chung2013-12-041-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 11468582)" into jb-ub-now-kermit
| * | | | | Retain current AllApps page if we never leave Launcher. (Bug 11468582)Winson Chung2013-12-041-2/+2
| |/ / / / | | | | | | | | | | Change-Id: Id18b14f6fbb2598a8c1f4c714f79d1a4332a7868
* / / / / Restoring Hotseat to the left-aligned in RTL. (Bug 11451335)Winson Chung2013-12-041-6/+19
|/ / / / | | | | | | | | Change-Id: I5451b1281e3f346f51677040775ae7bf76e303d1
* | | | am b0ee0810: Add guards for restoreInstanceState (issue 11982812)Adam Cohen2013-12-032-2/+4
|\| | | | | | | | | | | | | | | | | | | * commit 'b0ee08109ec89959d9bbd526c6e5f7ab96c8c3ea': Add guards for restoreInstanceState (issue 11982812)
| * | | Add guards for restoreInstanceState (issue 11982812)Adam Cohen2013-12-032-2/+4
| | | | | | | | | | | | | | | | Change-Id: Ic4c632a956130ab28843085490dc1badb39b0e8c
* | | | am b3084e87: Merge "Revert "Revert "Enable Launcher2 workspace import.""" ↵Dan Sandler2013-12-031-1/+1
|\| | | | |/ / |/| | | | | | | | | | | | | | into jb-ub-now-jolly-elf * commit 'b3084e87fcf7b617899b3c858d5372d079e0fe36': Revert "Revert "Enable Launcher2 workspace import.""
| * | Merge "Revert "Revert "Enable Launcher2 workspace import.""" into ↵Dan Sandler2013-12-031-1/+1
| |\ \ | | | | | | | | | | | | jb-ub-now-jolly-elf
| | * | Revert "Revert "Enable Launcher2 workspace import.""Dan Sandler2013-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a6a296ba1ffba6c5b98e92f05254f0317f28290b. https://memegen.googleplex.com/5476445807706112 Bug: 9832552
* | | | am c924cacf: Merge "Only import workspaces for non-tablets (where grid ↵Adam Cohen2013-12-031-1/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | hasn\'t changed)" into jb-ub-now-jolly-elf * commit 'c924cacfab4144eefdf8e46dfc82d79cb15e9c96': Only import workspaces for non-tablets (where grid hasn't changed)
| * | | Merge "Only import workspaces for non-tablets (where grid hasn't changed)" ↵Adam Cohen2013-12-031-1/+8
| |\ \ \ | | | | | | | | | | | | | | | into jb-ub-now-jolly-elf
| | * | | Only import workspaces for non-tablets (where grid hasn't changed)Adam Cohen2013-12-021-1/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: I832b6259477d6325c141fddfe9b50cb05aeff8d2
* | | | | am 1c00fd0b: Fix NPE when going to All Apps in landscapeMichael Jurka2013-12-031-4/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '1c00fd0b045179c9e6cc2dfc344cddc1a8d5b383': Fix NPE when going to All Apps in landscape
| * | | | Fix NPE when going to All Apps in landscapeMichael Jurka2013-12-021-4/+6
| | | | |
* | | | | am 2cb2471e: Ensure we pass search bar bounds to GoogleSearch. (Bug 11968598)Winson Chung2013-12-031-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '2cb2471e7fbade9a785c523df5941f2855e99041': Ensure we pass search bar bounds to GoogleSearch. (Bug 11968598)
| * | | | Ensure we pass search bar bounds to GoogleSearch. (Bug 11968598)Winson Chung2013-12-021-2/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I10027c2c10bbc5b2f2e63276dc91ceca0bf59a08
* | | | | am 1a5adf4f: Merge "Modifying Workspace padding to account for Search Bar ↵Winson Chung2013-12-031-4/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offsets. (Bug 11968598)" into jb-ub-now-jolly-elf * commit '1a5adf4f4cb30114fc0e508651b2833dd15674d0': Modifying Workspace padding to account for Search Bar offsets. (Bug 11968598)
| * | | | Merge "Modifying Workspace padding to account for Search Bar offsets. (Bug ↵Winson Chung2013-12-021-4/+13
| |\ \ \ \ | | |/ / / | |/| | | | | | | | 11968598)" into jb-ub-now-jolly-elf
| | * | | Modifying Workspace padding to account for Search Bar offsets. (Bug 11968598)Winson Chung2013-12-021-4/+13
| | |/ / | | | | | | | | | | | | Change-Id: I26b8488afd6d75777e1d881f1105b5c1a89021d7
* | | | am 10a8935e: Merge "Use AsyncTasks instead of creating new threads" into ↵Michael Jurka2013-12-034-24/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | jb-ub-now-jolly-elf * commit '10a8935ef1fc8f073e276fddc85bf66513050c81': Use AsyncTasks instead of creating new threads
| * | | Merge "Use AsyncTasks instead of creating new threads" into jb-ub-now-jolly-elfMichael Jurka2013-12-024-24/+30
| |\ \ \ | | |/ / | |/| |
| | * | Use AsyncTasks instead of creating new threadsMichael Jurka2013-11-144-24/+30
| | | | | | | | | | | | Change-Id: If166869dfbeb84d4dee2203f5b98a22b9d20719d
* | | | am a50d3430: Merge "Add method to retrieve search box bounds." into ↵Mac Duy Hai2013-12-021-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | jb-ub-now-jolly-elf * commit 'a50d34306c5fe6748392b493b5fbd4c54bf5f39f': Add method to retrieve search box bounds.
| * | | Merge "Add method to retrieve search box bounds." into jb-ub-now-jolly-elfMac Duy Hai2013-12-021-0/+5
| |\ \ \
| | * | | Add method to retrieve search box bounds.Mac Duy Hai2013-11-281-0/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I67893f00990053415453490034ea7066d9f0f3b6