summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add auto-detection of payload typeChris Wren2013-12-161-35/+113
| | | | | | | | | update docs and error messages use png extension of files, since they are don't create image files by default use input filename for image files Change-Id: I3e9c31a1de02976432d3f39cf82b5403055d620a
* Merge "Don't notifyPageSwitchListener until page settles (issue 12069757)" ↵Adam Cohen2013-12-132-3/+16
|\ | | | | | | into jb-ub-now-kermit
| * Don't notifyPageSwitchListener until page settles (issue 12069757)Adam Cohen2013-12-132-3/+16
| | | | | | | | | | | | -> Should address the dismiss timer not working quite right Change-Id: I63ad32d8f7c37f1a090ff1dd6024eeb7c0c6ce65
* | Update script to pull latest files from GalleryMichael Jurka2013-12-131-1/+1
| |
* | Clean up importsMichael Jurka2013-12-1328-69/+20
| |
* | Create separate project for Wallpaper PickerMichael Jurka2013-12-13100-27/+122
| | | | | | 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
* | Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermitBaligh Uddin2013-12-1257-812/+0
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2013-12-1157-812/+0
| | | | | | | | | | | | | | | Change-Id: I82b885284a196a6e466640d7790dc3c977f247a5 Auto-generated-cl: translation import
* | | Move additional wallpaper picker files to special dirMichael Jurka2013-12-126-34/+37
| | | | | | | | | 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-1212-43/+32
|\ \ \ | | | | | | | | | | | | tablets." into jb-ub-now-kermit
| * | | Adjusting grid for tablets and fixing incorrect resources for large tablets.Winson Chung2013-12-1012-43/+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 "expose the protoutil for launcher as an executable script" into ↵Chris Wren2013-12-114-2/+111
|\ \ \ | |_|/ |/| | | | | jb-ub-now-kermit
| * | expose the protoutil for launcher as an executable scriptChris Wren2013-12-104-2/+111
| | | | | | | | | | | | Change-Id: Ie990262534d85b118c165589ecee55d64f3a58cc
* | | Merge "Revert "Revert "Move wallpaper picker code to a separate directory""" ↵Michael Jurka2013-12-1191-65/+194
|\ \ \ | | | | | | | | | | | | into jb-ub-now-kermit
| * | | Revert "Revert "Move wallpaper picker code to a separate directory""Michael Jurka2013-12-1191-65/+194
| | | | | | | | | | | | | | | | 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-1091-194/+65
|\ \ \ \ | | | | | | | | | | | | | | | jb-ub-now-kermit
| * | | | Revert "Move wallpaper picker code to a separate directory"Michael Jurka2013-12-1091-194/+65
| | |_|/ | |/| | | | | | | | | | 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-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)