Anton Hansson
cd76f89f12
am 6508fe1b: (-s ours) am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
* commit '6508fe1b07ec888012255e3a2438382b45a9707f':
Fix NPE in when dropping from all apps (issue 12917451)
update placeholder on package install or restore
2014-03-20 15:55:05 +00:00
Adam Skory
9c114bb76e
am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
* commit 'b346133679f409e3f4e7389c5dced451b9980a57':
Small refactor to separate adding workspace / all apps items
Fix deprecated EMPTY_ARRAY usage (nanoprotos).
2014-03-20 15:42:28 +00:00
Adam Skory
298a9c6185
am 78d8510a: am 9e3ebf3c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
* commit '78d8510a20be87fb4236e93e1a1c4163047151fc':
Do not show overview when menu pressed on CustomContent screen.
Missing paddingRight added.
2014-03-20 15:42:26 +00:00
Adam Skory
3a540fc85a
am 77ef6b2b: am 381fa3fb: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release
...
* commit '77ef6b2b5d30713eecd1509f43527f728bad08dc':
Import translations. DO NOT MERGE
Fix black flash during rotation of -1 screen with GEL.
Fix bug: Scroll position reported incorrectly to live wallpapers
Add callback for "Widgets" button click in launcher
handle shortcut restore for missing packages
Import translations. DO NOT MERGE
Catch exceptions if Exif is malformed
Disable Set Wallpaper button while loading image
Disabled the wallpaper when completely in -1 Now space.
Import translations. DO NOT MERGE
Fix back button behavior for "App info" when launched by Launcher3.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
2014-03-20 15:42:26 +00:00
Anton Hansson
6508fe1b07
am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
* commit 'd0642c4274abcbede9177d61b0f072689db889a9':
Fix NPE in when dropping from all apps (issue 12917451)
update placeholder on package install or restore
2014-03-20 01:12:54 +00:00
Adam Skory
b346133679
am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
* commit '853b55b96e4af7a4f949a22cc084bd333e528c1c':
Small refactor to separate adding workspace / all apps items
Fix deprecated EMPTY_ARRAY usage (nanoprotos).
2014-03-20 01:12:54 +00:00
Adam Skory
78d8510a20
am 9e3ebf3c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
* commit '9e3ebf3c95fbf4b7a96b6080802ca23e5098fe40':
Do not show overview when menu pressed on CustomContent screen.
Missing paddingRight added.
2014-03-20 01:12:53 +00:00
Adam Skory
77ef6b2b5d
am 381fa3fb: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release
...
* commit '381fa3fb2d990f7976a898c16f3675dbb325b848':
Import translations. DO NOT MERGE
Fix black flash during rotation of -1 screen with GEL.
Fix bug: Scroll position reported incorrectly to live wallpapers
Add callback for "Widgets" button click in launcher
handle shortcut restore for missing packages
Import translations. DO NOT MERGE
Catch exceptions if Exif is malformed
Disable Set Wallpaper button while loading image
Disabled the wallpaper when completely in -1 Now space.
Import translations. DO NOT MERGE
Fix back button behavior for "App info" when launched by Launcher3.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
2014-03-20 01:12:52 +00:00
Baligh Uddin
a003c8ede8
am 4487e0aa: (-s ours) am beb7bc60: (-s ours) Import translations. DO NOT MERGE
...
* commit '4487e0aac4270f3ab429d27f454d4eb1efb19a6b':
Import translations. DO NOT MERGE
2014-02-20 22:40:46 +00:00
Geoff Mendal
9bc59c20d0
Merge commit '457e9215df2a8353f484a268950623d714afa01c' into klp-dev-plus-aosp
...
Conflicts:
res/values-lo-rLA/strings.xml
2014-02-20 14:34:09 -08:00
Baligh Uddin
4487e0aac4
am beb7bc60: (-s ours) Import translations. DO NOT MERGE
...
* commit 'beb7bc6028eeeea160b17df800b0a886eecd1c9b':
Import translations. DO NOT MERGE
2014-02-20 21:13:05 +00:00
Baligh Uddin
beb7bc6028
Import translations. DO NOT MERGE
...
Change-Id: I6fb7884fae6cc8e09ca5fe51f28f5f80b183e9b5
Auto-generated-cl: translation import
2014-02-20 09:42:49 -08:00
Tom Stamm
a0010b81ad
am 279b0385: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kr
...
* commit '279b0385d04427d039c10bc22df2a2aaafd99a4a':
Ensure we don't call getLayoutDirection() for devices not running JB MR1+. (Bug 12906355)
2014-02-15 00:26:11 +00:00
Qiwen Zhao
76fd2e70bd
Merge branch 'klp-dev-plus-aosp' of sso://googleplex-android.git.corp.google.com/a/platform/packages/apps/Launcher3 into klp-dev-plus-aosp
2014-02-14 16:23:01 -08:00
Qiwen Zhao
0f3e20658a
Merge commit '8fa85d20' into klp-dev-plus-aosp
...
Conflicts:
res/values-lo-rLA/strings.xml
2014-02-14 16:22:50 -08:00
Ian Parkinson
6b524fe0b2
am 8944f244: Merge Launcher3 jb-ub-now-kermit to kermit-release
...
* commit '8944f244d55a5f60cfb4d69b464c5694d11d097d':
Defend against missing DB during migration.
2014-02-15 00:20:32 +00:00
Huy Nguyen
c027560893
am 6a996e7d: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kermit-release
...
* commit '6a996e7d3470a582a953032f772674b174873f32':
Import translations. DO NOT MERGE
Adding tighter first run checks for migration clings. (Bug 12626290)
Avoid NPE from delayed Runnable
2014-02-15 00:20:32 +00:00
Jim Guggemos
5c7c3c9b8d
am 608401ac: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kermit-release
...
* commit '608401ac43fa1840dd95be9c1e2fad472fa47027':
Adding specific buckets for N5 in dynamic grid. (Bug 12604220)
Fix overlapping pages (issue 12551580)
2014-02-15 00:20:31 +00:00
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
Qiwen Zhao
457e9215df
reset to klp-dev at 9a69cbb with history
2014-02-14 14:35:05 -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