summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Create separate project for Wallpaper PickerMichael Jurka2013-12-135-65/+48
| | | Change-Id: Id9e855780b9fb68c63eb6e9f6c19bcbce28a6fd5
* Merge "Fix NPE from feedback (issue 12106858)" into jb-ub-now-kermitAdam Cohen2013-12-132-14/+14
|\
| * Fix NPE from feedback (issue 12106858)Adam Cohen2013-12-122-14/+14
| | | | | | | | Change-Id: I63f7f73b85d4c1652d1e722f94c51b567a83cc6b
* | Show widgets when ALL_APPS is disabled.Nilesh Agrawal2013-12-121-4/+8
| | | | | | | | Change-Id: I367448df69a63ffd3412fe4c99137a21426d285c
* | Move additional wallpaper picker files to special dirMichael Jurka2013-12-125-726/+0
| | | | | | Change-Id: I3dd6f0ce4db72f9f30ed02e8c27039f68ab9a728
* | Merge "Don't load items which exceed the grid bounds" into jb-ub-now-kermitAdam Cohen2013-12-121-42/+32
|\|
| * Don't load items which exceed the grid boundsAdam Cohen2013-12-111-42/+32
| | | | | | | | | | | | | | -> Unified location where this is managed (with other placement verification) -> For now, not deleting out of bounds items, but can turn it on in one line Change-Id: I5e1a5cd357d80475ae40af7b89a0cd372d5c241b
* | Merge "Adjusting grid for tablets and fixing incorrect resources for large ↵Winson Chung2013-12-124-34/+32
|\ \ | | | | | | | | | tablets." into jb-ub-now-kermit
| * | Adjusting grid for tablets and fixing incorrect resources for large tablets.Winson Chung2013-12-104-34/+32
| | | | | | | | | | | | Change-Id: I4c2a058da934bef14f5be3c53ebda940aeb990ca
* | | Merge "Fixing issue with Widget sizes being icorrectly reported." into ↵Winson Chung2013-12-111-6/+4
|\ \ \ | |_|/ |/| | | | | jb-ub-now-kermit
| * | Fixing issue with Widget sizes being icorrectly reported.Winson Chung2013-12-111-6/+4
| |/ | | | | | | Change-Id: I8474514cc3722d8450c707b7fd1ccea2ea344a59
* | Fix new NPE relating to reorder hintsAdam Cohen2013-12-111-2/+2
| | | | | | | | Change-Id: I80ff327ee549caef5802eb7194d48b1e8424ce47
* | Merge "Revert "Revert "Move wallpaper picker code to a separate directory""" ↵Michael Jurka2013-12-1136-13241/+0
|\ \ | | | | | | | | | into jb-ub-now-kermit
| * | Revert "Revert "Move wallpaper picker code to a separate directory""Michael Jurka2013-12-1136-13241/+0
| | | | | | | | | | | | This reverts commit 39de459a8621abfc91382ce7b4cdd37d09aaac12.
* | | Merge "Size hotseat data structure appropriately." into jb-ub-now-kermitDan Sandler2013-12-112-10/+27
|\ \ \ | |/ / |/| |
| * | Size hotseat data structure appropriately.Dan Sandler2013-12-102-10/+27
| |/ | | | | | | | | Bug: 12070213 Change-Id: I4df2f4bcc71bb4077c62cae91ed844ea8c43d421
* | Merge "Adding reorder hinting, hopefully will help with (issue 10654628)" ↵Adam Cohen2013-12-112-64/+109
|\ \ | | | | | | | | | into jb-ub-now-kermit
| * | Adding reorder hinting, hopefully will help with (issue 10654628)Adam Cohen2013-12-092-64/+109
| | | | | | | | | | | | | | | | | | | | | -> Adds instant feedback that reorder _will_ happen, so hopefully will improve perceived disambiguation Change-Id: Icd99e7beeb87e79627a6b9fc78a9132781410379
* | | Merge "Revert "Move wallpaper picker code to a separate directory"" into ↵Michael Jurka2013-12-1036-0/+13241
|\ \ \ | | | | | | | | | | | | jb-ub-now-kermit
| * | | Revert "Move wallpaper picker code to a separate directory"Michael Jurka2013-12-1036-0/+13241
| | | | | | | | | | | | | | | | This reverts commit 8e88cb84781907afb7cca80581fea2277264fd2c.
* | | | Merge "Bind the workspace synchronously if started on -1 screen." into ↵Derek Prothro2013-12-102-10/+13
|\ \ \ \ | |/ / / |/| | | | | | | jb-ub-now-kermit
| * | | Bind the workspace synchronously if started on -1 screen.Derek Prothro2013-12-102-10/+13
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Previously, LoaderTask would be run asynchronously to bind the workspace when started on -1 which would cause the user's wallpaper to briefly flash when rotating the device on -1. Bug: 11802691 Change-Id: I3a1a7a32fa28a81e041a283a93d808d5a8884133
* / | Move wallpaper picker code to a separate directoryMichael Jurka2013-12-1036-13241/+0
|/ / | | | | 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-092-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-054-39/+94
|\ \ \ \
| * | | | Update suggested wallpaper dimensions in onResumeMichael Jurka2013-12-034-39/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If another launcher runs in between, it might change the suggested dimensions. This fixes that case. Bug: 11667475
* | | | | 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.""