OSDN Git Service
Dan Sandler [Tue, 14 Jan 2014 18:51:35 +0000 (18:51 +0000)]
Merge "Fix longpress crash." into jb-ub-now-kermit
Winson Chung [Tue, 14 Jan 2014 18:31:32 +0000 (18:31 +0000)]
Merge "Properly saving migration cling keys." into jb-ub-now-kermit
Winson Chung [Tue, 14 Jan 2014 18:30:27 +0000 (10:30 -0800)]
Properly saving migration cling keys.
Change-Id: Id52a12da6af0fc91463dae07bbeb355ee04873d0
Dan Sandler [Mon, 13 Jan 2014 19:30:14 +0000 (14:30 -0500)]
Fix longpress crash.
The AllApps button doesn't usually accept longpresses, but
you can trick it into trying by holding one finger on it and
another on another icon in the hotseat. This patch defends
against that and bails out if the longpressed item has the
all apps rank (position in hotseat).
Bug:
11740833
Change-Id: I99785ccbc9e6dc6be2a9e56289b3cc0275fbb65c
Chris Wren [Tue, 14 Jan 2014 15:15:04 +0000 (15:15 +0000)]
Merge "backup keys that might have slipped past" into jb-ub-now-kermit
Chris Wren [Tue, 14 Jan 2014 14:58:43 +0000 (14:58 +0000)]
Merge "hide launcher restore behind a flag." into jb-ub-now-kermit
Michael Jurka [Tue, 14 Jan 2014 12:50:53 +0000 (13:50 +0100)]
Add ability to center the crop (disabled)
Michael Jurka [Tue, 14 Jan 2014 11:10:48 +0000 (11:10 +0000)]
Merge "Move saved wallpaper images from cache directory to data directory" into jb-ub-now-kermit
Michael Jurka [Tue, 14 Jan 2014 11:10:34 +0000 (11:10 +0000)]
Merge "Recover when widget preview database is deleted" into jb-ub-now-kermit
Winson Chung [Mon, 13 Jan 2014 22:52:49 +0000 (14:52 -0800)]
Increasing string length for translation (Bug
12524122)
Change-Id: I24e053790812779ec07de99c6f763965584a1bb7
Chris Wren [Mon, 13 Jan 2014 22:39:02 +0000 (17:39 -0500)]
hide launcher restore behind a flag.
enable with 'adb shell settings put secure launcher_restore_enabled 1'
before signing into wiped device
Bug:
12532845
Change-Id: I1471c39dac2e6e1412f7720b1ba8edf46273c593
Geoff Mendal [Mon, 13 Jan 2014 22:26:12 +0000 (14:26 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib79d541dac6867d262bb02f04eda43728d7a8357
Auto-generated-cl: translation import
Winson Chung [Mon, 13 Jan 2014 18:32:22 +0000 (18:32 +0000)]
Merge "Set App context from WallpaperChanged receiver. (Bug
12525684)" into jb-ub-now-kermit
Winson Chung [Mon, 13 Jan 2014 18:05:37 +0000 (10:05 -0800)]
Set App context from WallpaperChanged receiver. (Bug
12525684)
Change-Id: Ie037d74d31e6b05b0ae5bb25ed1bf1c639a28a5f
Dan Sandler [Mon, 13 Jan 2014 15:35:40 +0000 (15:35 +0000)]
Merge "Quick patch for b/
12446428." into jb-ub-now-kermit
Chris Wren [Fri, 10 Jan 2014 23:02:06 +0000 (18:02 -0500)]
backup keys that might have slipped past
seems a little paranoid, but can't hurt.
Bug:
12455866
Change-Id: If9da4cc021ee4fac32c822a91fabda69bf3ff8aa
Winson Chung [Sat, 11 Jan 2014 00:46:15 +0000 (16:46 -0800)]
Updating assets and text for migration cling. (Bug
11973614)
Change-Id: I69ffc1581cc43511b4f42ebb2735afe4c0b44131
Winson Chung [Fri, 10 Jan 2014 23:40:40 +0000 (23:40 +0000)]
Merge "Adding migration Clings. (Bug
11973614)" into jb-ub-now-kermit
Winson Chung [Wed, 8 Jan 2014 22:04:34 +0000 (14:04 -0800)]
Adding migration Clings. (Bug
11973614)
- Refactoring Launcher cling code out to LauncherClings.
Change-Id: Iff4f84f5b8bfeb69b1be0b4802022c3eb20b6f2c
Adam Cohen [Fri, 10 Jan 2014 21:42:39 +0000 (21:42 +0000)]
Merge "New launcher2 icon migration algorithm." into jb-ub-now-kermit
Dan Sandler [Thu, 9 Jan 2014 20:01:33 +0000 (15:01 -0500)]
New launcher2 icon migration algorithm.
The user will be able to request "icon migration", which is
not a direct mapping of the old workspace, but rather
follows this heuristic for bringing the user's favorite
icons (by dint of their existence on the workspace) into
Launcher3:
Workspace shortcuts are placed in lexicographic order on the workspace
starting at screen 0 (leaving the bottom row of screen 0 empty to make
sure there's room to move things around). Folders are preserved and
their contents sorted. Duplicate icons (that is, shortcuts
with the same intent, pursuant to some cleanups) are removed.
Hotseat icons are migrated in their original place, unless their new
location is not accommodated by the hotseat (i.e. the L3 hotseat is
too small on this device), in which case they're treated like any
other shortcut and tossed into the workspace.
To test, turn on Launcher.ENABLE_DEBUG_INTENTS and then:
$ adb shell am broadcast -a com.android.launcher3.action.DELETE_DATABASE
$ adb shell am broadcast -a com.android.launcher3.action.MIGRATE_DATABASE
Bug:
12416411
Change-Id: Ia5c56f36c11455867ea20a39f70210f595020a87
Nilesh Agrawal [Fri, 10 Jan 2014 19:49:21 +0000 (19:49 +0000)]
Merge "Allow DISABLE_ALL_APPS to be set using a system property." into jb-ub-now-kermit
Dan Sandler [Fri, 10 Jan 2014 18:24:55 +0000 (13:24 -0500)]
Quick patch for b/
12446428.
Bug:
12446428
Change-Id: I5b9472e55a8919f5640c6e97fede9b5637819be0
Nilesh Agrawal [Fri, 10 Jan 2014 01:14:01 +0000 (17:14 -0800)]
Allow DISABLE_ALL_APPS to be set using a system property.
- Moving the property to LauncherAppState
- The property is only read on dogfood builds.
The property can be set using setprop or /data/local.prop
Change-Id: I14c7354efb12edb93f97e81687a6f920cc634e9a
Adam Cohen [Wed, 8 Jan 2014 23:21:04 +0000 (15:21 -0800)]
Adding optional first run activity to Launcher
Change-Id: I146927d8a065f1cf5ef5cec41c8fb4f9ad09d25c
Adam Cohen [Thu, 9 Jan 2014 19:14:52 +0000 (19:14 +0000)]
Merge "Fix issue where deleting item from folder leaves extra page" into jb-ub-now-kermit
Chris Wren [Thu, 9 Jan 2014 16:08:37 +0000 (11:08 -0500)]
better support for multiple files
don't exit on error, just log.
new verbose flag to print more information
Change-Id: I5c4895a837cb8a31901aabceade3ab976abf4af0
Chris Wren [Thu, 9 Jan 2014 16:54:15 +0000 (11:54 -0500)]
first backup should save things from the beginning of time
Bug:
12455866
Change-Id: Ie9a97ed4110e7b1ded21f609179b5d6ee7f0ead5
Yura [Thu, 9 Jan 2014 14:45:56 +0000 (14:45 +0000)]
Merge "Moved paddingStart to -v17 folder." into jb-ub-now-kermit
Michael Jurka [Tue, 10 Dec 2013 12:40:30 +0000 (13:40 +0100)]
Recover when widget preview database is deleted
Bug:
12109621
Change-Id: I8d59700d31d6856d6151b965786c87585801317b
Michael Jurka [Mon, 6 Jan 2014 22:33:50 +0000 (14:33 -0800)]
Move saved wallpaper images from cache directory to data directory
Bug:
12028275
Change-Id: Ia8fdd0ea50a4dad34e560287c50ae3fcc6d09cf9
Yura [Wed, 8 Jan 2014 11:24:34 +0000 (11:24 +0000)]
Moved paddingStart to -v17 folder.
This is to help get us paddingStart free to be able to work on Samsung
tablets, as they crash on paddingStart when it is used outside of -v17.
Bug:
8166178
Change-Id: I84879257c4e463879fd6bfc322514d30c469ca30
Winson Chung [Wed, 8 Jan 2014 22:05:47 +0000 (22:05 +0000)]
Merge "Accounting for new Package event extras when updating forward-locked apps. (Bug
11855584)" into jb-ub-now-kermit
Winson Chung [Mon, 6 Jan 2014 23:53:37 +0000 (15:53 -0800)]
Accounting for new Package event extras when updating forward-locked apps. (Bug
11855584)
Change-Id: I983c82a74690a9031d18d456ff43dc8750081871
Dan Sandler [Wed, 8 Jan 2014 21:02:50 +0000 (21:02 +0000)]
Merge "KEYCODE_MENU: hide all apps when entering overview mode" into jb-ub-now-kermit
Mihail Dumitrescu [Tue, 7 Jan 2014 19:39:17 +0000 (19:39 +0000)]
Merge "Remove a non-obvious fall through in a switch statement." into jb-ub-now-kermit
Dan Sandler [Tue, 7 Jan 2014 19:12:27 +0000 (14:12 -0500)]
KEYCODE_MENU: hide all apps when entering overview mode
Bug:
12165618
Change-Id: I7ee652012c7f7b8e6fab3d9d1f99cf22484f3182
Mihail Dumitrescu [Fri, 3 Jan 2014 12:40:22 +0000 (12:40 +0000)]
Remove a non-obvious fall through in a switch statement.
This CL does not modify the result of calling onInterceptHoverEvent()
assuming isEventOverFolder() has no side effects. The only change is
that isEventOverFolder will now be called once rather than twice when
action == MotionEvent.ACTION_HOVER_ENTER and isOverFolder == true.
Change-Id: Icc28ab880cf5094e49f51d72035891e924cb2031
Yura [Tue, 7 Jan 2014 18:15:46 +0000 (18:15 +0000)]
Removed paddingStart and paddingEnd when they are the same.
This is to help get us paddingStart free to be able to work on Samsung
tablets, as they crash on paddingStart when it is used outside of -v17.
Bug:
8166178
Change-Id: Ic0ea256aabb68b654a3942dd19dd30e67f1b2af9
Nilesh Agrawal [Fri, 3 Jan 2014 22:28:44 +0000 (22:28 +0000)]
Merge "Allow scrolling folders in when all apps is disabled." into jb-ub-now-kermit
Sandeep Siddhartha [Fri, 3 Jan 2014 20:02:19 +0000 (20:02 +0000)]
Merge "Allow changing search bar hint in the cling on-the-fly" into jb-ub-now-kermit
Nilesh Agrawal [Thu, 2 Jan 2014 23:54:57 +0000 (15:54 -0800)]
Allow scrolling folders in when all apps is disabled.
Allows for more items to be added into a folder.
Allows for scrolling by letting the content area inside the scroll view to be taller.
The height of content area was capped in https://googleplex-android-review.git.corp.google.com/#/c/387583/
Change-Id: I8d7950ac9c155e26c5a299c17ae6a2bbf829dce6
Baligh Uddin [Fri, 27 Dec 2013 03:53:09 +0000 (19:53 -0800)]
am
3e6b26da: (-s ours) am
cff2d6a2: (-s ours) Import translations. DO NOT MERGE
* commit '
3e6b26daba924fb88e20855210e0a96e2ab0ac37':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 27 Dec 2013 03:51:01 +0000 (19:51 -0800)]
am
cff2d6a2: (-s ours) Import translations. DO NOT MERGE
* commit '
cff2d6a2d904b7d88096650021aa428cfdc08632':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 27 Dec 2013 01:20:10 +0000 (17:20 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9ced3c60b831f09e8436f562d8c1fef1e2aa6156
Auto-generated-cl: translation import
Baligh Uddin [Fri, 27 Dec 2013 01:19:12 +0000 (17:19 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5cbd143e531cfe8f1d131f0d7c91008758337013
Auto-generated-cl: translation import
Sandeep Siddhartha [Thu, 26 Dec 2013 23:42:52 +0000 (15:42 -0800)]
Allow changing search bar hint in the cling on-the-fly
- This allows GEL to initially supply an empty string if hotword isn't
active, and later on update the cling if and when the hotword becomes
active.
- This isn't expensive as it'll only be called if Launcher first calls
getFirstRunClingSearchBarHint, i.e. once every fresh install/clear
data
Bug:
11116105
Change-Id: Ia963bb62d7b331afd0c34adfa6c4b6bdbac48349
Chris Wren [Wed, 18 Dec 2013 19:29:14 +0000 (19:29 +0000)]
Merge "support multiple files and fix logcat smippets for launcher_protoutil" into jb-ub-now-kermit
Chris Wren [Wed, 18 Dec 2013 19:11:40 +0000 (14:11 -0500)]
support multiple files and fix logcat smippets for launcher_protoutil
plus some code cleanup
Change-Id: I09b4a6aedbb1251a65d379464d830da694d38a38
Nilesh Agrawal [Tue, 17 Dec 2013 23:46:13 +0000 (23:46 +0000)]
Merge "Do not allow duplicate shortcuts when ALL_APPS is disabled." into jb-ub-now-kermit
Nilesh Agrawal [Tue, 17 Dec 2013 23:20:50 +0000 (15:20 -0800)]
Do not allow duplicate shortcuts when ALL_APPS is disabled.
When DISABLE_ALL_APPS is true, we want to have only one shortcut for each activityexposed via the Application's manifest.
We ignore INSTALL_SHORTCUT broadcasts which have launch intents with ACTION_MAIN and CATEGORY_LAUNCHER.
Applications can still create shortcuts pointing to an already exposed component if they provide data or extras in the intent.
Change-Id: I0b05283ea6c522d197e0262c2997f7298e08740b
Baligh Uddin [Tue, 17 Dec 2013 17:33:21 +0000 (17:33 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
Baligh Uddin [Mon, 16 Dec 2013 21:16:15 +0000 (13:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I40a264c567f7d0e599182ce68f5b844bd2856f9d
Auto-generated-cl: translation import
Chris Wren [Thu, 12 Dec 2013 16:20:09 +0000 (11:20 -0500)]
Add auto-detection of payload type
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
Adam Cohen [Sat, 14 Dec 2013 01:18:10 +0000 (17:18 -0800)]
Fix issue where deleting item from folder leaves extra page
Change-Id: Ie741dbe5341d8237c85f732b26661d084b99f6e2
Adam Cohen [Fri, 13 Dec 2013 23:59:53 +0000 (23:59 +0000)]
Merge "Don't notifyPageSwitchListener until page settles (issue
12069757)" into jb-ub-now-kermit
Adam Cohen [Fri, 13 Dec 2013 23:07:14 +0000 (15:07 -0800)]
Don't notifyPageSwitchListener until page settles (issue
12069757)
-> Should address the dismiss timer not working quite right
Change-Id: I63ad32d8f7c37f1a090ff1dd6024eeb7c0c6ce65
Michael Jurka [Fri, 13 Dec 2013 15:28:36 +0000 (16:28 +0100)]
Update script to pull latest files from Gallery
Michael Jurka [Fri, 13 Dec 2013 15:07:45 +0000 (16:07 +0100)]
Clean up imports
Michael Jurka [Thu, 12 Dec 2013 14:04:25 +0000 (15:04 +0100)]
Create separate project for Wallpaper Picker
Change-Id: Id9e855780b9fb68c63eb6e9f6c19bcbce28a6fd5
Adam Cohen [Fri, 13 Dec 2013 00:24:05 +0000 (00:24 +0000)]
Merge "Fix NPE from feedback (issue
12106858)" into jb-ub-now-kermit
Adam Cohen [Fri, 13 Dec 2013 00:16:39 +0000 (16:16 -0800)]
Fix NPE from feedback (issue
12106858)
Change-Id: I63f7f73b85d4c1652d1e722f94c51b567a83cc6b
Nilesh Agrawal [Thu, 12 Dec 2013 22:56:00 +0000 (14:56 -0800)]
Show widgets when ALL_APPS is disabled.
Change-Id: I367448df69a63ffd3412fe4c99137a21426d285c
Baligh Uddin [Thu, 12 Dec 2013 15:50:14 +0000 (15:50 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
Michael Jurka [Wed, 11 Dec 2013 16:09:53 +0000 (17:09 +0100)]
Move additional wallpaper picker files to special dir
Change-Id: I3dd6f0ce4db72f9f30ed02e8c27039f68ab9a728
Baligh Uddin [Thu, 12 Dec 2013 05:11:15 +0000 (21:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: I82b885284a196a6e466640d7790dc3c977f247a5
Auto-generated-cl: translation import
Adam Cohen [Thu, 12 Dec 2013 01:50:13 +0000 (01:50 +0000)]
Merge "Don't load items which exceed the grid bounds" into jb-ub-now-kermit
Adam Cohen [Tue, 26 Nov 2013 18:34:59 +0000 (10:34 -0800)]
Don't load items which exceed the grid bounds
-> 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
Winson Chung [Thu, 12 Dec 2013 00:35:47 +0000 (00:35 +0000)]
Merge "Adjusting grid for tablets and fixing incorrect resources for large tablets." into jb-ub-now-kermit
Winson Chung [Wed, 11 Dec 2013 23:52:06 +0000 (23:52 +0000)]
Merge "Fixing issue with Widget sizes being icorrectly reported." into jb-ub-now-kermit
Winson Chung [Wed, 11 Dec 2013 23:28:15 +0000 (15:28 -0800)]
Fixing issue with Widget sizes being icorrectly reported.
Change-Id: I8474514cc3722d8450c707b7fd1ccea2ea344a59
Adam Cohen [Wed, 11 Dec 2013 22:47:23 +0000 (14:47 -0800)]
Fix new NPE relating to reorder hints
Change-Id: I80ff327ee549caef5802eb7194d48b1e8424ce47
Chris Wren [Wed, 11 Dec 2013 20:04:39 +0000 (20:04 +0000)]
Merge "expose the protoutil for launcher as an executable script" into jb-ub-now-kermit
Michael Jurka [Wed, 11 Dec 2013 15:18:18 +0000 (15:18 +0000)]
Merge "Revert "Revert "Move wallpaper picker code to a separate directory""" into jb-ub-now-kermit
Dan Sandler [Wed, 11 Dec 2013 15:03:01 +0000 (15:03 +0000)]
Merge "Size hotseat data structure appropriately." into jb-ub-now-kermit
Michael Jurka [Wed, 11 Dec 2013 14:41:28 +0000 (15:41 +0100)]
Revert "Revert "Move wallpaper picker code to a separate directory""
This reverts commit
39de459a8621abfc91382ce7b4cdd37d09aaac12.
Winson Chung [Tue, 10 Dec 2013 20:32:14 +0000 (12:32 -0800)]
Adjusting grid for tablets and fixing incorrect resources for large tablets.
Change-Id: I4c2a058da934bef14f5be3c53ebda940aeb990ca
Adam Cohen [Wed, 11 Dec 2013 00:33:14 +0000 (00:33 +0000)]
Merge "Adding reorder hinting, hopefully will help with (issue
10654628)" into jb-ub-now-kermit
Michael Jurka [Tue, 10 Dec 2013 22:48:25 +0000 (22:48 +0000)]
Merge "Revert "Move wallpaper picker code to a separate directory"" into jb-ub-now-kermit
Michael Jurka [Tue, 10 Dec 2013 22:47:28 +0000 (23:47 +0100)]
Revert "Move wallpaper picker code to a separate directory"
This reverts commit
8e88cb84781907afb7cca80581fea2277264fd2c.
Derek Prothro [Tue, 10 Dec 2013 22:46:07 +0000 (22:46 +0000)]
Merge "Bind the workspace synchronously if started on -1 screen." into jb-ub-now-kermit
Chris Wren [Tue, 10 Dec 2013 20:48:47 +0000 (15:48 -0500)]
expose the protoutil for launcher as an executable script
Change-Id: Ie990262534d85b118c165589ecee55d64f3a58cc
Dan Sandler [Tue, 10 Dec 2013 21:05:47 +0000 (16:05 -0500)]
Size hotseat data structure appropriately.
Bug:
12070213
Change-Id: I4df2f4bcc71bb4077c62cae91ed844ea8c43d421
Derek Prothro [Tue, 10 Dec 2013 19:00:37 +0000 (14:00 -0500)]
Bind the workspace synchronously if started on -1 screen.
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
Michael Jurka [Tue, 10 Dec 2013 15:59:20 +0000 (16:59 +0100)]
Move wallpaper picker code to a separate directory
Change-Id: Id79d11ed08085c4fe356739498a8b77952e30392
Adam Cohen [Sat, 7 Dec 2013 00:10:55 +0000 (16:10 -0800)]
Adding reorder hinting, hopefully will help with (issue
10654628)
-> Adds instant feedback that reorder _will_ happen, so hopefully will
improve perceived disambiguation
Change-Id: Icd99e7beeb87e79627a6b9fc78a9132781410379
Winson Chung [Tue, 10 Dec 2013 00:57:45 +0000 (16:57 -0800)]
Fixing crash in empty folders. (Bug
11627191)
Change-Id: I7a0e23e16a7546a9612d3406257e15be758d4c52
Signed-off-by: Winson Chung <winsonc@google.com>
Winson Chung [Tue, 10 Dec 2013 01:19:02 +0000 (17:19 -0800)]
am
d65fb393: Merge "Revert "Fixing crash in empty folders. (Bug
11627191)"" into jb-ub-now-jolly-elf
* commit '
d65fb393595cb093936c7d5d0d54b0511430aa9d':
Revert "Fixing crash in empty folders. (Bug
11627191)"
Winson Chung [Tue, 10 Dec 2013 01:17:46 +0000 (01:17 +0000)]
Merge "Revert "Fixing crash in empty folders. (Bug
11627191)"" into jb-ub-now-jolly-elf
Winson Chung [Tue, 10 Dec 2013 01:17:03 +0000 (01:17 +0000)]
Revert "Fixing crash in empty folders. (Bug
11627191)"
This reverts commit
68b667848ef7c6f69b24a40d780e4088a5f2a1fb.
Change-Id: I51da495d6f8ef98b268c23cce02cce5ef1c7ea00
Winson Chung [Tue, 10 Dec 2013 01:15:54 +0000 (17:15 -0800)]
am
6de1ba33: Merge "Fixing crash in empty folders. (Bug
11627191)" into jb-ub-now-jolly-elf
* commit '
6de1ba3377dd407e83f682edf9ae742416302772':
Fixing crash in empty folders. (Bug
11627191)
Winson Chung [Tue, 10 Dec 2013 01:14:30 +0000 (01:14 +0000)]
Merge "Fixing crash in empty folders. (Bug
11627191)" into jb-ub-now-jolly-elf
Winson Chung [Tue, 10 Dec 2013 00:57:45 +0000 (16:57 -0800)]
Fixing crash in empty folders. (Bug
11627191)
Change-Id: I7a0e23e16a7546a9612d3406257e15be758d4c52
Nilesh Agrawal [Mon, 9 Dec 2013 22:17:49 +0000 (14:17 -0800)]
Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
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
Nilesh Agrawal [Mon, 9 Dec 2013 20:40:05 +0000 (20:40 +0000)]
Merge "Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."" into jb-ub-now-kermit
Nilesh Agrawal [Mon, 9 Dec 2013 20:39:28 +0000 (20:39 +0000)]
Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."
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
Nilesh Agrawal [Mon, 9 Dec 2013 20:18:56 +0000 (20:18 +0000)]
Merge "Allow 5 hotseat icons in DISABLE_ALL_APPS mode." into jb-ub-now-kermit
Chris Wren [Mon, 9 Dec 2013 18:52:36 +0000 (18:52 +0000)]
Merge "backup launcher preferences" into jb-ub-now-kermit
Nilesh Agrawal [Sat, 7 Dec 2013 01:56:07 +0000 (17:56 -0800)]
Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
Change-Id: I71510cf079e211bd53e411e6e43f1bc6475f6d35
Adam Cohen [Thu, 5 Dec 2013 22:16:23 +0000 (14:16 -0800)]
Decrease delay for closing folder on removal of an item (issue
11028310)
Change-Id: Ie5c094af8b0293e56bf016be5b4f4db05e7a9a05