Adam Cohen
b5abf2a0c8
am 930514df: Fix overlapping pages (issue 12551580)
...
* commit '930514df0529ff5316bb00f3e45a4de036b7f5aa':
Fix overlapping pages (issue 12551580)
2014-02-15 00:20:31 +00:00
Jim Guggemos
1fb0035ace
am b608ae67: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kermit-release
...
* commit 'b608ae672d7ef85b85d9f45e7c36371c22ab8645':
Dismissing search and other overlays when the menu button is pressed. (Bug 12524591)
2014-02-15 00:20:30 +00:00
Mark Ashdown
8c8abe936d
am 8ffe7b76: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kermit-release
...
* commit '8ffe7b76acda07a09a9c2a9eec1eb3d0c1542763': (24 commits)
Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)
Updating screen background assets. (Bug 12136457)
Updating Tablet clings. (Bug 11973614)
Migration update: ensuring all folders go first
Lazy load the widget preview loader class
Don't migrate shortcuts for components that no longer exist
Import translations. DO NOT MERGE
rationalize launcher backup logging
Tightening migration conditions. (Bug 11973614)
Replace "hotseat" with "Favorites tray" in user visible strings.
Remove settings in overview mode for Launcher3.
Fixing drop targets in phone / small tablet landscape (issue 12192781)
Ensure that hasFirstRunActivity is only called when necessary
Keep selected wallpaper on configuration change.
search for a valid journal
Fix NPE in Workspace.onDropCompleted
Properly saving migration cling keys.
restore app favorites and screens
Fix longpress crash.
Add ability to center the crop (disabled)
...
2014-02-15 00:20:29 +00:00
Adam Cohen
4227263c21
am 71c92b35: Merge "Properly saving migration cling keys." into jb-ub-now-kermit-release
...
* commit '71c92b356099c90d52a848981855be3fef5c895f':
Properly saving migration cling keys.
2014-02-15 00:20:29 +00:00
Qiwen Zhao
ec3aad2e30
Merge commit 'd5c6745b' into klp-dev-plus-aosp
...
Conflicts:
res/values-ar/strings.xml
res/values-de/strings.xml
res/values-fa/strings.xml
res/values-iw/strings.xml
2014-02-14 16:04:37 -08:00
Adam Cohen
51ac5ce545
am cf09fa12: am b54a5989: Adding optional first run activity to Launcher
...
* commit 'cf09fa1263edfb9b951e5b728b54156db3e40c6b':
Adding optional first run activity to Launcher
2014-02-14 20:54:54 +00:00
Adam Cohen
537ecd451b
am 8df1285d: am 0259c629: Merge "Fix issue where deleting item from folder leaves extra page" into jb-ub-now-kermit
...
* commit '8df1285d0d1291adb3eeab66f9a1b1b77c5cbb73':
Fix issue where deleting item from folder leaves extra page
2014-02-14 20:54:53 +00:00
Chris Wren
84ae085dc7
am 1cf23e10: am 8661761c: better support for multiple files
...
* commit '1cf23e10c67539447c5f687b73f5d15bd7f7e351':
better support for multiple files
2014-02-14 20:54:53 +00:00
Chris Wren
de0fc51acf
am 32911d21: am 33f4c2df: first backup should save things from the beginning of time
...
* commit '32911d2124f68747f08460455fab623dcb048f72':
first backup should save things from the beginning of time
2014-02-14 20:54:52 +00:00
Yura
7dae6109db
am 946334b3: am 0bae5b22: Merge "Moved paddingStart to -v17 folder." into jb-ub-now-kermit
...
* commit '946334b3d3f5cd0390f35022217cec95338dd01f':
Moved paddingStart to -v17 folder.
2014-02-14 20:54:51 +00:00
Winson Chung
01880c02f5
am 29a86c26: am 872e70e0: Merge "Accounting for new Package event extras when updating forward-locked apps. (Bug 11855584)" into jb-ub-now-kermit
...
* commit '29a86c267b890a506c12d1ffadb8db2baaa2e20e':
Accounting for new Package event extras when updating forward-locked apps. (Bug 11855584)
2014-02-14 20:54:51 +00:00
Dan Sandler
425941d0c2
am 1d7cf660: am 155f3bc6: Merge "KEYCODE_MENU: hide all apps when entering overview mode" into jb-ub-now-kermit
...
* commit '1d7cf660ce57d0e11718a0f82ff596477063bb45':
KEYCODE_MENU: hide all apps when entering overview mode
2014-02-14 20:54:50 +00:00
Mihail Dumitrescu
bd8d3e665a
am e4c398d3: am 29e619c8: Merge "Remove a non-obvious fall through in a switch statement." into jb-ub-now-kermit
...
* commit 'e4c398d36907da10ac0239f53c43763f91f15790':
Remove a non-obvious fall through in a switch statement.
2014-02-14 20:54:49 +00:00
Yura
ad72d13f43
am 792ed52a: am 83b0da1a: Removed paddingStart and paddingEnd when they are the same.
...
* commit '792ed52a22e0fa61692c505596b4a3a2f5a4fa26':
Removed paddingStart and paddingEnd when they are the same.
2014-02-14 20:54:49 +00:00
Nilesh Agrawal
b5b7fd3c3a
am fbed86e6: am 579c8433: Merge "Allow scrolling folders in when all apps is disabled." into jb-ub-now-kermit
...
* commit 'fbed86e6da1865c38a43e646ea05cc1e6def67e3':
Allow scrolling folders in when all apps is disabled.
2014-02-14 20:54:48 +00:00
Sandeep Siddhartha
8bea84e396
am eb870e15: am 8d36ffe5: Merge "Allow changing search bar hint in the cling on-the-fly" into jb-ub-now-kermit
...
* commit 'eb870e154a7e13ccc775fa6ab0c00a3fb6acd845':
Allow changing search bar hint in the cling on-the-fly
2014-02-14 20:54:47 +00:00
Baligh Uddin
c7cdc43ef3
am 72af7f8d: (-s ours) am 72b4c7c3: (-s ours) am 3e6b26da: (-s ours) am cff2d6a2: (-s ours) Import translations. DO NOT MERGE
...
* commit '72af7f8ddd2b13456c5e32b0e79390d6d5be163d':
Import translations. DO NOT MERGE
2014-02-14 20:54:47 +00:00
Baligh Uddin
476e004519
am 7c4a9e55: (-s ours) am 37749ea3: (-s ours) Import translations. DO NOT MERGE
...
* commit '7c4a9e55f0614d89c24b71811066d2b19a450efe':
Import translations. DO NOT MERGE
2014-02-14 20:54:46 +00:00
Chris Wren
c2e2363bb3
am ef6b1b5c: am 5f85bb49: Merge "support multiple files and fix logcat smippets for launcher_protoutil" into jb-ub-now-kermit
...
* commit 'ef6b1b5c7dd2cc6cdcc241de50515486012f5588':
support multiple files and fix logcat smippets for launcher_protoutil
2014-02-14 20:54:45 +00:00
Nilesh Agrawal
d76403d698
am cdf8fe86: am 20e45a8e: Merge "Do not allow duplicate shortcuts when ALL_APPS is disabled." into jb-ub-now-kermit
...
* commit 'cdf8fe869862fc0ae4d03a90c32d0ddf009d63e4':
Do not allow duplicate shortcuts when ALL_APPS is disabled.
2014-02-14 20:54:45 +00:00
Baligh Uddin
9b4d5a425b
am 65301b14: (-s ours) am 3d2fefae: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
...
* commit '65301b1443804099de1e5165d98a0506682df5cb':
Import translations. DO NOT MERGE
2014-02-14 20:54:44 +00:00
Chris Wren
76fffaeaa2
am 41307509: am f6a22ada: Add auto-detection of payload type
...
* commit '413075099d724c35781e4f6ac3f71fd0bf474ab5':
Add auto-detection of payload type
2014-02-14 20:54:43 +00:00
Adam Cohen
e4618064e8
am 5d81c91a: am 309260ee: Merge "Don\'t notifyPageSwitchListener until page settles (issue 12069757)" into jb-ub-now-kermit
...
* commit '5d81c91a11867a579d5cf07a8a8ce4ca1596a861':
Don't notifyPageSwitchListener until page settles (issue 12069757)
2014-02-14 20:54:42 +00:00
Michael Jurka
d3d591871c
am d2c865d8: am 31ff527a: Update script to pull latest files from Gallery
...
* commit 'd2c865d85e54dfc5794f1f966ad16e87b3ddb9dd':
Update script to pull latest files from Gallery
2014-02-14 20:54:41 +00:00
Michael Jurka
454f4f5b23
am 11c15ad0: am 34c2e6cf: Clean up imports
...
* commit '11c15ad06d684635c36b9dc28766c11baad13938':
Clean up imports
2014-02-14 20:54:41 +00:00
Michael Jurka
7d2e58ddb5
am 896b9cfc: am 7ad868b8: Create separate project for Wallpaper Picker
...
* commit '896b9cfc06ef9047812307d7e73a791161d09600':
Create separate project for Wallpaper Picker
2014-02-14 20:54:40 +00:00
Adam Cohen
71d0183cd9
am 19f7dcd5: am 69a10949: Merge "Fix NPE from feedback (issue 12106858)" into jb-ub-now-kermit
...
* commit '19f7dcd5624536544f53a4e53fc1d62b96fdc11b':
Fix NPE from feedback (issue 12106858)
2014-02-14 20:54:39 +00:00
Nilesh Agrawal
01e377b0b0
am 132ad329: am 306c1cf2: Show widgets when ALL_APPS is disabled.
...
* commit '132ad3291b833ecaca425ef0e4b4ff9360ccd42b':
Show widgets when ALL_APPS is disabled.
2014-02-14 20:54:39 +00:00
Baligh Uddin
cd0f6e0cd5
am 6fc0c669: (-s ours) am 33cd5b9e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
...
* commit '6fc0c6690ed00dbc7b3dd1a6a4dd0ce8b7dc8959':
Import translations. DO NOT MERGE
2014-02-14 20:54:38 +00:00
Michael Jurka
0d7ed5fc5f
am fb07a6ab: am 69413c91: Move additional wallpaper picker files to special dir
...
* commit 'fb07a6ab673ff3bbbcde27bd226c8fcb4bfe5aa7':
Move additional wallpaper picker files to special dir
2014-02-14 20:54:37 +00:00
Adam Cohen
157b263ef9
am be71ebfb: am f833fefb: Merge "Don\'t load items which exceed the grid bounds" into jb-ub-now-kermit
...
* commit 'be71ebfb28ffd7a3e6b085826d157f69c1842b00':
Don't load items which exceed the grid bounds
2014-02-14 20:54:37 +00:00
Winson Chung
ca00240fe4
am cd1092ce: am b6147f85: Merge "Adjusting grid for tablets and fixing incorrect resources for large tablets." into jb-ub-now-kermit
...
* commit 'cd1092ce7bff3d4c4372a3a93c055d24ffdbaafc':
Adjusting grid for tablets and fixing incorrect resources for large tablets.
2014-02-14 20:54:36 +00:00
Winson Chung
6772fd99c7
am d6b50a48: am 1239b9da: Merge "Fixing issue with Widget sizes being icorrectly reported." into jb-ub-now-kermit
...
* commit 'd6b50a4872fddefeb2fb24538631270af5d52b0c':
Fixing issue with Widget sizes being icorrectly reported.
2014-02-14 20:54:35 +00:00
Adam Cohen
7aa4ac9f66
am d039b6e2: am fe69287b: Fix new NPE relating to reorder hints
...
* commit 'd039b6e2546311cb197e93c01b9b2a8752225f0e':
Fix new NPE relating to reorder hints
2014-02-14 20:54:35 +00:00
Chris Wren
f810f75ffa
am bf597a68: am 52a935a2: Merge "expose the protoutil for launcher as an executable script" into jb-ub-now-kermit
...
* commit 'bf597a68e97265f7d3f5325f050f8bd844dd9266':
expose the protoutil for launcher as an executable script
2014-02-14 20:54:34 +00:00
Michael Jurka
54dffa118c
am d2f15728: am 772bbcc7: Merge "Revert "Revert "Move wallpaper picker code to a separate directory""" into jb-ub-now-kermit
...
* commit 'd2f157283c599e49083a89b5c78c64a9258fbe1a':
Revert "Revert "Move wallpaper picker code to a separate directory""
2014-02-14 20:54:33 +00:00
Dan Sandler
5aff893a23
am 5ab7187d: am a40916d5: Merge "Size hotseat data structure appropriately." into jb-ub-now-kermit
...
* commit '5ab7187d6eccd41680314d0a830f5cafe6fe4a3f':
Size hotseat data structure appropriately.
2014-02-14 20:54:32 +00:00
Adam Cohen
6effa1e357
am f2551ffc: am 1f60653a: Merge "Adding reorder hinting, hopefully will help with (issue 10654628)" into jb-ub-now-kermit
...
* commit 'f2551ffcd440b990cf49b1a3e2b0f6b8c70c6d45':
Adding reorder hinting, hopefully will help with (issue 10654628)
2014-02-14 20:54:32 +00:00
Michael Jurka
8e47355a8f
am 0a667dd4: am 8824eadc: Merge "Revert "Move wallpaper picker code to a separate directory"" into jb-ub-now-kermit
...
* commit '0a667dd4efa69e0f817e8a126df23c1e1f9aab6f':
Revert "Move wallpaper picker code to a separate directory"
2014-02-14 20:54:31 +00:00
Derek Prothro
465606c29c
am 98245209: am fa071f93: Merge "Bind the workspace synchronously if started on -1 screen." into jb-ub-now-kermit
...
* commit '98245209f6d97d4f74bfe55cd2ff7e0756ed120b':
Bind the workspace synchronously if started on -1 screen.
2014-02-14 20:54:30 +00:00
Michael Jurka
4cd9a102a7
am 744cbf46: am 8e88cb84: Move wallpaper picker code to a separate directory
...
* commit '744cbf4623c5af05495781197423095914988ae2':
Move wallpaper picker code to a separate directory
2014-02-14 20:54:30 +00:00
Winson Chung
157e789fde
am 07c9ade5: am 33231f58: Fixing crash in empty folders. (Bug 11627191)
...
* commit '07c9ade5be5cc3476dc64d5830568d2a4958129d':
Fixing crash in empty folders. (Bug 11627191)
2014-02-14 20:54:29 +00:00
Winson Chung
a0a8305a53
am ffba2dfd: am fe2fb826: am d65fb393: Merge "Revert "Fixing crash in empty folders. (Bug 11627191)"" into jb-ub-now-jolly-elf
...
* commit 'ffba2dfd7a5a6e60ce45453bde9fc8eb6f2fe4c8':
Revert "Fixing crash in empty folders. (Bug 11627191)"
2014-02-14 20:54:28 +00:00
Winson Chung
e7e472662a
am 6160c394: am cace67f7: am 6de1ba33: Merge "Fixing crash in empty folders. (Bug 11627191)" into jb-ub-now-jolly-elf
...
* commit '6160c3947ae2aa1080a269279d04862eb7108a8a':
Fixing crash in empty folders. (Bug 11627191)
2014-02-14 20:54:28 +00:00
Nilesh Agrawal
2ef2511f03
am 0d43ba8c: am da41ea66: Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
...
* commit '0d43ba8c91b4e6cc678cb5cd762f7a38c4406a51':
Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
2014-02-14 20:54:27 +00:00
Nilesh Agrawal
d1ce093cf0
am 03ec57d3: am 93b6ee6d: Merge "Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."" into jb-ub-now-kermit
...
* commit '03ec57d313f3f72b76f3df0cc4a297d3788847e5':
Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."
2014-02-14 20:54:26 +00:00
Nilesh Agrawal
e4ccb341d8
am ac2ddbb4: am 23c165a9: Merge "Allow 5 hotseat icons in DISABLE_ALL_APPS mode." into jb-ub-now-kermit
...
* commit 'ac2ddbb4277fd3be025acfdfa930b9f71c9b5ce4':
Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
2014-02-14 20:54:26 +00:00
Chris Wren
b8336373ff
am 3eaaf7d1: am 06a0ac2f: Merge "backup launcher preferences" into jb-ub-now-kermit
...
* commit '3eaaf7d1c4d7fbd9eaf66cb8548b91a40e8fb308':
backup launcher preferences
2014-02-14 20:54:25 +00:00
Adam Cohen
4b0b4bceef
am 8aebe36d: am 5d518fa7: Decrease delay for closing folder on removal of an item (issue 11028310)
...
* commit '8aebe36dd9f1f039dc8bca78cf4d3271e3525334':
Decrease delay for closing folder on removal of an item (issue 11028310)
2014-02-14 20:54:24 +00:00
Michael Jurka
06440fb8ec
am 29de7557: am 566bdc37: Merge "Update suggested wallpaper dimensions in onResume" into jb-ub-now-kermit
...
* commit '29de7557c5f47e9b3e1fb6a5b9afcd95d5b5b4c0':
Update suggested wallpaper dimensions in onResume
2014-02-14 20:54:24 +00:00