Adam Cohen
309260ee59
Merge "Don't notifyPageSwitchListener until page settles (issue 12069757)" into jb-ub-now-kermit
2013-12-13 23:59:53 +00:00
Adam Cohen
674531f261
Don't notifyPageSwitchListener until page settles (issue 12069757)
...
-> Should address the dismiss timer not working quite right
Change-Id: I63ad32d8f7c37f1a090ff1dd6024eeb7c0c6ce65
2013-12-13 15:59:01 -08:00
Michael Jurka
5f744f16a6
am 31ff527a: Update script to pull latest files from Gallery
...
* commit '31ff527a4a489019803f7b6147c95630700f4bb9':
Update script to pull latest files from Gallery
2013-12-13 07:31:48 -08:00
Michael Jurka
31ff527a4a
Update script to pull latest files from Gallery
2013-12-13 16:28:36 +01:00
Michael Jurka
5009917f57
am 34c2e6cf: Clean up imports
...
* commit '34c2e6cf7af328aba25c98158161dbad15ae986d':
Clean up imports
2013-12-13 07:24:27 -08:00
Michael Jurka
34c2e6cf7a
Clean up imports
2013-12-13 16:20:53 +01:00
Michael Jurka
3e9bc81023
am 7ad868b8: Create separate project for Wallpaper Picker
...
* commit '7ad868b86e45d6f58c186d2731ab2beb84643757':
Create separate project for Wallpaper Picker
2013-12-13 04:25:57 -08:00
Michael Jurka
7ad868b86e
Create separate project for Wallpaper Picker
...
Change-Id: Id9e855780b9fb68c63eb6e9f6c19bcbce28a6fd5
2013-12-13 12:50:32 +01:00
Adam Cohen
baa7838f4d
am 69a10949: Merge "Fix NPE from feedback (issue 12106858)" into jb-ub-now-kermit
...
* commit '69a10949d62255f6b32dff8c3a6a91cbfcf98587':
Fix NPE from feedback (issue 12106858)
2013-12-12 16:26:08 -08:00
Adam Cohen
69a10949d6
Merge "Fix NPE from feedback (issue 12106858)" into jb-ub-now-kermit
2013-12-13 00:24:06 +00:00
Adam Cohen
4de0974c46
Fix NPE from feedback (issue 12106858)
...
Change-Id: I63f7f73b85d4c1652d1e722f94c51b567a83cc6b
2013-12-12 16:16:55 -08:00
Nilesh Agrawal
5de33657cb
am 306c1cf2: Show widgets when ALL_APPS is disabled.
...
* commit '306c1cf200d4e334b19e09a5a5a2026d9f6d12b2':
Show widgets when ALL_APPS is disabled.
2013-12-12 16:07:37 -08:00
Nilesh Agrawal
306c1cf200
Show widgets when ALL_APPS is disabled.
...
Change-Id: I367448df69a63ffd3412fe4c99137a21426d285c
2013-12-12 15:00:59 -08:00
Baligh Uddin
0dbbe71890
am 33cd5b9e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
...
* commit '33cd5b9e9ecc541f4966a0d285296fb53447fdf4':
Import translations. DO NOT MERGE
2013-12-12 08:37:48 -08:00
Baligh Uddin
33cd5b9e9e
Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
2013-12-12 15:50:14 +00:00
Michael Jurka
69413c91c5
Move additional wallpaper picker files to special dir
...
Change-Id: I3dd6f0ce4db72f9f30ed02e8c27039f68ab9a728
2013-12-12 13:14:32 +01:00
Baligh Uddin
bd2243aca1
Import translations. DO NOT MERGE
...
Change-Id: I82b885284a196a6e466640d7790dc3c977f247a5
Auto-generated-cl: translation import
2013-12-11 21:11:15 -08:00
Adam Cohen
f833fefb50
Merge "Don't load items which exceed the grid bounds" into jb-ub-now-kermit
2013-12-12 01:50:14 +00:00
Adam Cohen
ae4409dea9
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
2013-12-11 17:46:39 -08:00
Winson Chung
b6147f8578
Merge "Adjusting grid for tablets and fixing incorrect resources for large tablets." into jb-ub-now-kermit
2013-12-12 00:35:47 +00:00
Winson Chung
1239b9da89
Merge "Fixing issue with Widget sizes being icorrectly reported." into jb-ub-now-kermit
2013-12-11 23:52:07 +00:00
Winson Chung
dcd27ba909
Fixing issue with Widget sizes being icorrectly reported.
...
Change-Id: I8474514cc3722d8450c707b7fd1ccea2ea344a59
2013-12-11 15:28:15 -08:00
Adam Cohen
fe69287b97
Fix new NPE relating to reorder hints
...
Change-Id: I80ff327ee549caef5802eb7194d48b1e8424ce47
2013-12-11 14:47:47 -08:00
Chris Wren
52a935a242
Merge "expose the protoutil for launcher as an executable script" into jb-ub-now-kermit
2013-12-11 20:04:39 +00:00
Michael Jurka
772bbcc764
Merge "Revert "Revert "Move wallpaper picker code to a separate directory""" into jb-ub-now-kermit
2013-12-11 15:18:19 +00:00
Dan Sandler
a40916d534
Merge "Size hotseat data structure appropriately." into jb-ub-now-kermit
2013-12-11 15:03:02 +00:00
Michael Jurka
96749c1321
Revert "Revert "Move wallpaper picker code to a separate directory""
...
This reverts commit 39de459a86 .
2013-12-11 15:41:28 +01:00
Winson Chung
59a488ac03
Adjusting grid for tablets and fixing incorrect resources for large tablets.
...
Change-Id: I4c2a058da934bef14f5be3c53ebda940aeb990ca
2013-12-10 17:52:40 -08:00
Adam Cohen
1f60653abc
Merge "Adding reorder hinting, hopefully will help with (issue 10654628)" into jb-ub-now-kermit
2013-12-11 00:33:14 +00:00
Michael Jurka
8824eadc96
Merge "Revert "Move wallpaper picker code to a separate directory"" into jb-ub-now-kermit
2013-12-10 22:48:25 +00:00
Michael Jurka
39de459a86
Revert "Move wallpaper picker code to a separate directory"
...
This reverts commit 8e88cb8478 .
2013-12-10 23:47:28 +01:00
Derek Prothro
fa071f936a
Merge "Bind the workspace synchronously if started on -1 screen." into jb-ub-now-kermit
2013-12-10 22:46:07 +00:00
Chris Wren
ba2923a391
expose the protoutil for launcher as an executable script
...
Change-Id: Ie990262534d85b118c165589ecee55d64f3a58cc
2013-12-10 17:41:18 -05:00
Narayan Kamath
a9a32b1400
am daa9dfcb: Merge "Fix build"
...
* commit 'daa9dfcbd5865bd25d729f313159f8f8adfd2fcd':
Fix build
2013-12-10 13:29:44 -08:00
Narayan Kamath
daa9dfcbd5
Merge "Fix build"
2013-12-10 21:23:59 +00:00
Dan Sandler
295ae18d0f
Size hotseat data structure appropriately.
...
Bug: 12070213
Change-Id: I4df2f4bcc71bb4077c62cae91ed844ea8c43d421
2013-12-10 16:10:53 -05:00
Max Cai
e907e35e6c
Fix build
...
Change-Id: Ifbd3584549ad3c52af460802d8625de293ddc897
2013-12-10 20:20:03 +00:00
Derek Prothro
7aff399974
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
2013-12-10 15:05:41 -05:00
Michael Jurka
8e88cb8478
Move wallpaper picker code to a separate directory
...
Change-Id: Id79d11ed08085c4fe356739498a8b77952e30392
2013-12-10 18:28:50 +01:00
Adam Cohen
fa3c58f647
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
2013-12-09 18:04:57 -08:00
Winson Chung
33231f587e
Fixing crash in empty folders. (Bug 11627191)
...
Change-Id: I7a0e23e16a7546a9612d3406257e15be758d4c52
Signed-off-by: Winson Chung <winsonc@google.com >
2013-12-09 17:24:48 -08:00
Winson Chung
fe2fb82657
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)"
2013-12-09 17:19:02 -08:00
Winson Chung
d65fb39359
Merge "Revert "Fixing crash in empty folders. (Bug 11627191)"" into jb-ub-now-jolly-elf
2013-12-10 01:17:46 +00:00
Winson Chung
72b520c956
Revert "Fixing crash in empty folders. (Bug 11627191)"
...
This reverts commit 68b667848e .
Change-Id: I51da495d6f8ef98b268c23cce02cce5ef1c7ea00
2013-12-10 01:17:03 +00:00
Winson Chung
cace67f7dd
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)
2013-12-09 17:15:54 -08:00
Winson Chung
6de1ba3377
Merge "Fixing crash in empty folders. (Bug 11627191)" into jb-ub-now-jolly-elf
2013-12-10 01:14:30 +00:00
Winson Chung
68b667848e
Fixing crash in empty folders. (Bug 11627191)
...
Change-Id: I7a0e23e16a7546a9612d3406257e15be758d4c52
2013-12-09 16:57:45 -08:00
Nilesh Agrawal
da41ea6698
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
2013-12-09 14:37:59 -08:00
Nilesh Agrawal
93b6ee6dfa
Merge "Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."" into jb-ub-now-kermit
2013-12-09 20:40:05 +00:00
Nilesh Agrawal
d85ee9b994
Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."
...
This reverts commit f4ed1be4ef .
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
2013-12-09 20:39:28 +00:00