Baligh Uddin
aaf83974b9
Merge "Import translations. DO NOT MERGE" into ub-now-lunchbox
2013-12-19 15:27:18 +00:00
Baligh Uddin
deade303d1
Import translations. DO NOT MERGE
...
Change-Id: I3e93fc7096badc195c25f3456c13217ab2786b6f
Auto-generated-cl: translation import
2013-12-18 23:09:31 -08:00
Baligh Uddin
415c34b93c
Import translations. DO NOT MERGE
...
Change-Id: I6d843f955e2058b71d0f83956a805370c24a5eef
Auto-generated-cl: translation import
2013-12-18 23:07:25 -08:00
Chris Wren
9d89fb1ebf
am 5f85bb49: Merge "support multiple files and fix logcat smippets for launcher_protoutil" into jb-ub-now-kermit
...
* commit '5f85bb4977d95a1a8148ce28d534586fb1dff45d':
support multiple files and fix logcat smippets for launcher_protoutil
2013-12-18 11:30:37 -08:00
Chris Wren
5f85bb4977
Merge "support multiple files and fix logcat smippets for launcher_protoutil" into jb-ub-now-kermit
2013-12-18 19:29:14 +00:00
Chris Wren
2fd318246f
support multiple files and fix logcat smippets for launcher_protoutil
...
plus some code cleanup
Change-Id: I09b4a6aedbb1251a65d379464d830da694d38a38
2013-12-18 14:28:35 -05:00
Nilesh Agrawal
059c84e608
am 20e45a8e: Merge "Do not allow duplicate shortcuts when ALL_APPS is disabled." into jb-ub-now-kermit
...
* commit '20e45a8ef819bbb9d628176803268bb3c8aba09a':
Do not allow duplicate shortcuts when ALL_APPS is disabled.
2013-12-17 15:47:52 -08:00
Nilesh Agrawal
20e45a8ef8
Merge "Do not allow duplicate shortcuts when ALL_APPS is disabled." into jb-ub-now-kermit
2013-12-17 23:46:13 +00:00
Nilesh Agrawal
dff0bfeb90
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
2013-12-17 15:26:00 -08:00
Baligh Uddin
797d18895b
am 3d2fefae: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
...
* commit '3d2fefae6de81055952b815b872ff5d7d5c34c0a':
Import translations. DO NOT MERGE
2013-12-17 09:37:17 -08:00
Baligh Uddin
2b9323993d
Merge "Import translations. DO NOT MERGE" into ub-now-lunchbox
2013-12-17 17:33:26 +00:00
Baligh Uddin
3d2fefae6d
Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
2013-12-17 17:33:22 +00:00
Chris Wren
816fdafdff
am f6a22ada: Add auto-detection of payload type
...
* commit 'f6a22ada816ae4f63576679f03472b0a984e82be':
Add auto-detection of payload type
2013-12-16 13:26:11 -08:00
Baligh Uddin
99af01ae3a
Import translations. DO NOT MERGE
...
Change-Id: If4f1706611c12995db7f3ff9349aaa08609848a1
Auto-generated-cl: translation import
2013-12-16 13:18:55 -08:00
Baligh Uddin
10c29d30f9
Import translations. DO NOT MERGE
...
Change-Id: I40a264c567f7d0e599182ce68f5b844bd2856f9d
Auto-generated-cl: translation import
2013-12-16 13:16:15 -08:00
Chris Wren
f6a22ada81
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
2013-12-16 13:56:25 -05:00
Adam Cohen
9c58d8269b
Fix issue where deleting item from folder leaves extra page
...
Change-Id: Ie741dbe5341d8237c85f732b26661d084b99f6e2
2013-12-13 17:18:25 -08:00
Adam Cohen
f03960f7a6
am 309260ee: Merge "Don\'t notifyPageSwitchListener until page settles (issue 12069757)" into jb-ub-now-kermit
...
* commit '309260ee593aa3f209510ae6bf137f9b75e2498b':
Don't notifyPageSwitchListener until page settles (issue 12069757)
2013-12-13 16:01:11 -08:00
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