OSDN Git Service
Jim Guggemos [Sat, 15 Feb 2014 00:20:30 +0000 (00:20 +0000)]
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)
Mark Ashdown [Sat, 15 Feb 2014 00:20:29 +0000 (00:20 +0000)]
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)
...
Adam Cohen [Sat, 15 Feb 2014 00:20:29 +0000 (00:20 +0000)]
am
71c92b35: Merge "Properly saving migration cling keys." into jb-ub-now-kermit-release
* commit '
71c92b356099c90d52a848981855be3fef5c895f':
Properly saving migration cling keys.
Qiwen Zhao [Sat, 15 Feb 2014 00:04:37 +0000 (16:04 -0800)]
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
Adam Cohen [Fri, 14 Feb 2014 20:54:54 +0000 (20:54 +0000)]
am
cf09fa12: am
b54a5989: Adding optional first run activity to Launcher
* commit '
cf09fa1263edfb9b951e5b728b54156db3e40c6b':
Adding optional first run activity to Launcher
Adam Cohen [Fri, 14 Feb 2014 20:54:53 +0000 (20:54 +0000)]
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
Chris Wren [Fri, 14 Feb 2014 20:54:53 +0000 (20:54 +0000)]
am
1cf23e10: am
8661761c: better support for multiple files
* commit '
1cf23e10c67539447c5f687b73f5d15bd7f7e351':
better support for multiple files
Chris Wren [Fri, 14 Feb 2014 20:54:52 +0000 (20:54 +0000)]
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
Yura [Fri, 14 Feb 2014 20:54:51 +0000 (20:54 +0000)]
am
946334b3: am
0bae5b22: Merge "Moved paddingStart to -v17 folder." into jb-ub-now-kermit
* commit '
946334b3d3f5cd0390f35022217cec95338dd01f':
Moved paddingStart to -v17 folder.
Winson Chung [Fri, 14 Feb 2014 20:54:51 +0000 (20:54 +0000)]
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)
Dan Sandler [Fri, 14 Feb 2014 20:54:50 +0000 (20:54 +0000)]
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
Mihail Dumitrescu [Fri, 14 Feb 2014 20:54:49 +0000 (20:54 +0000)]
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.
Yura [Fri, 14 Feb 2014 20:54:49 +0000 (20:54 +0000)]
am
792ed52a: am
83b0da1a: Removed paddingStart and paddingEnd when they are the same.
* commit '
792ed52a22e0fa61692c505596b4a3a2f5a4fa26':
Removed paddingStart and paddingEnd when they are the same.
Nilesh Agrawal [Fri, 14 Feb 2014 20:54:48 +0000 (20:54 +0000)]
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.
Sandeep Siddhartha [Fri, 14 Feb 2014 20:54:47 +0000 (20:54 +0000)]
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
Baligh Uddin [Fri, 14 Feb 2014 20:54:47 +0000 (20:54 +0000)]
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
Baligh Uddin [Fri, 14 Feb 2014 20:54:46 +0000 (20:54 +0000)]
am
7c4a9e55: (-s ours) am
37749ea3: (-s ours) Import translations. DO NOT MERGE
* commit '
7c4a9e55f0614d89c24b71811066d2b19a450efe':
Import translations. DO NOT MERGE
Chris Wren [Fri, 14 Feb 2014 20:54:45 +0000 (20:54 +0000)]
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
Nilesh Agrawal [Fri, 14 Feb 2014 20:54:45 +0000 (20:54 +0000)]
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.
Baligh Uddin [Fri, 14 Feb 2014 20:54:44 +0000 (20:54 +0000)]
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
Chris Wren [Fri, 14 Feb 2014 20:54:43 +0000 (20:54 +0000)]
am
41307509: am
f6a22ada: Add auto-detection of payload type
* commit '
413075099d724c35781e4f6ac3f71fd0bf474ab5':
Add auto-detection of payload type
Adam Cohen [Fri, 14 Feb 2014 20:54:42 +0000 (20:54 +0000)]
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)
Michael Jurka [Fri, 14 Feb 2014 20:54:41 +0000 (20:54 +0000)]
am
d2c865d8: am
31ff527a: Update script to pull latest files from Gallery
* commit '
d2c865d85e54dfc5794f1f966ad16e87b3ddb9dd':
Update script to pull latest files from Gallery
Michael Jurka [Fri, 14 Feb 2014 20:54:41 +0000 (20:54 +0000)]
am
11c15ad0: am
34c2e6cf: Clean up imports
* commit '
11c15ad06d684635c36b9dc28766c11baad13938':
Clean up imports
Michael Jurka [Fri, 14 Feb 2014 20:54:40 +0000 (20:54 +0000)]
am
896b9cfc: am
7ad868b8: Create separate project for Wallpaper Picker
* commit '
896b9cfc06ef9047812307d7e73a791161d09600':
Create separate project for Wallpaper Picker
Adam Cohen [Fri, 14 Feb 2014 20:54:39 +0000 (20:54 +0000)]
am
19f7dcd5: am
69a10949: Merge "Fix NPE from feedback (issue
12106858)" into jb-ub-now-kermit
* commit '
19f7dcd5624536544f53a4e53fc1d62b96fdc11b':
Fix NPE from feedback (issue
12106858)
Nilesh Agrawal [Fri, 14 Feb 2014 20:54:39 +0000 (20:54 +0000)]
am
132ad329: am
306c1cf2: Show widgets when ALL_APPS is disabled.
* commit '
132ad3291b833ecaca425ef0e4b4ff9360ccd42b':
Show widgets when ALL_APPS is disabled.
Baligh Uddin [Fri, 14 Feb 2014 20:54:38 +0000 (20:54 +0000)]
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
Michael Jurka [Fri, 14 Feb 2014 20:54:37 +0000 (20:54 +0000)]
am
fb07a6ab: am
69413c91: Move additional wallpaper picker files to special dir
* commit '
fb07a6ab673ff3bbbcde27bd226c8fcb4bfe5aa7':
Move additional wallpaper picker files to special dir
Adam Cohen [Fri, 14 Feb 2014 20:54:37 +0000 (20:54 +0000)]
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
Winson Chung [Fri, 14 Feb 2014 20:54:36 +0000 (20:54 +0000)]
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.
Winson Chung [Fri, 14 Feb 2014 20:54:35 +0000 (20:54 +0000)]
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.
Adam Cohen [Fri, 14 Feb 2014 20:54:35 +0000 (20:54 +0000)]
am
d039b6e2: am
fe69287b: Fix new NPE relating to reorder hints
* commit '
d039b6e2546311cb197e93c01b9b2a8752225f0e':
Fix new NPE relating to reorder hints
Chris Wren [Fri, 14 Feb 2014 20:54:34 +0000 (20:54 +0000)]
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
Michael Jurka [Fri, 14 Feb 2014 20:54:33 +0000 (20:54 +0000)]
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""
Dan Sandler [Fri, 14 Feb 2014 20:54:32 +0000 (20:54 +0000)]
am
5ab7187d: am
a40916d5: Merge "Size hotseat data structure appropriately." into jb-ub-now-kermit
* commit '
5ab7187d6eccd41680314d0a830f5cafe6fe4a3f':
Size hotseat data structure appropriately.
Adam Cohen [Fri, 14 Feb 2014 20:54:32 +0000 (20:54 +0000)]
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)
Michael Jurka [Fri, 14 Feb 2014 20:54:31 +0000 (20:54 +0000)]
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"
Derek Prothro [Fri, 14 Feb 2014 20:54:30 +0000 (20:54 +0000)]
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.
Michael Jurka [Fri, 14 Feb 2014 20:54:30 +0000 (20:54 +0000)]
am
744cbf46: am
8e88cb84: Move wallpaper picker code to a separate directory
* commit '
744cbf4623c5af05495781197423095914988ae2':
Move wallpaper picker code to a separate directory
Winson Chung [Fri, 14 Feb 2014 20:54:29 +0000 (20:54 +0000)]
am
07c9ade5: am
33231f58: Fixing crash in empty folders. (Bug
11627191)
* commit '
07c9ade5be5cc3476dc64d5830568d2a4958129d':
Fixing crash in empty folders. (Bug
11627191)
Winson Chung [Fri, 14 Feb 2014 20:54:28 +0000 (20:54 +0000)]
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)"
Winson Chung [Fri, 14 Feb 2014 20:54:28 +0000 (20:54 +0000)]
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)
Nilesh Agrawal [Fri, 14 Feb 2014 20:54:27 +0000 (20:54 +0000)]
am
0d43ba8c: am
da41ea66: Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
* commit '
0d43ba8c91b4e6cc678cb5cd762f7a38c4406a51':
Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
Nilesh Agrawal [Fri, 14 Feb 2014 20:54:26 +0000 (20:54 +0000)]
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."
Nilesh Agrawal [Fri, 14 Feb 2014 20:54:26 +0000 (20:54 +0000)]
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.
Chris Wren [Fri, 14 Feb 2014 20:54:25 +0000 (20:54 +0000)]
am
3eaaf7d1: am
06a0ac2f: Merge "backup launcher preferences" into jb-ub-now-kermit
* commit '
3eaaf7d1c4d7fbd9eaf66cb8548b91a40e8fb308':
backup launcher preferences
Adam Cohen [Fri, 14 Feb 2014 20:54:24 +0000 (20:54 +0000)]
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)
Michael Jurka [Fri, 14 Feb 2014 20:54:24 +0000 (20:54 +0000)]
am
29de7557: am
566bdc37: Merge "Update suggested wallpaper dimensions in onResume" into jb-ub-now-kermit
* commit '
29de7557c5f47e9b3e1fb6a5b9afcd95d5b5b4c0':
Update suggested wallpaper dimensions in onResume
Winson Chung [Fri, 14 Feb 2014 20:54:23 +0000 (20:54 +0000)]
am
9026ce17: am
58705534: am
a67d1ea0: Merge "Fixing regression in drop target bar height. (Bug
11980757)" into jb-ub-now-jolly-elf
* commit '
9026ce177afb710d753020931a942665a0ce7f81':
Fixing regression in drop target bar height. (Bug
11980757)
Adam Cohen [Fri, 14 Feb 2014 20:54:22 +0000 (20:54 +0000)]
am
b2d3890d: am
f9cd258b: am
59b5c79b: Fix page jumping regression in overview mode (issue
12003672)
* commit '
b2d3890df47fb9400c45226c4a3c4f4802536469':
Fix page jumping regression in overview mode (issue
12003672)
Winson Chung [Fri, 14 Feb 2014 20:54:22 +0000 (20:54 +0000)]
am
6b165fa8: am
0ea74f13: Merge "Limit AllApps insets to certain device configurations. (Bug
11451335)" into jb-ub-now-kermit
* commit '
6b165fa8d0d01a8e3db6bbc60e2ad79334546259':
Limit AllApps insets to certain device configurations. (Bug
11451335)
Winson Chung [Fri, 14 Feb 2014 20:54:21 +0000 (20:54 +0000)]
am
89524f48: am
17bde09a: Merge "Retain current AllApps page if we never leave Launcher. (Bug
11468582)" into jb-ub-now-kermit
* commit '
89524f48e52a25e18e1d918e96d43c6db9a3deec':
Retain current AllApps page if we never leave Launcher. (Bug
11468582)
Winson Chung [Fri, 14 Feb 2014 20:54:20 +0000 (20:54 +0000)]
am
88818ab2: am
42b3c068: Restoring Hotseat to the left-aligned in RTL. (Bug
11451335)
* commit '
88818ab2df2a0b2f665221d803ff49ce4682f07d':
Restoring Hotseat to the left-aligned in RTL. (Bug
11451335)
Adam Cohen [Fri, 14 Feb 2014 20:54:20 +0000 (20:54 +0000)]
am
ec6b71a0: am
531a5c32: am
b0ee0810: Add guards for restoreInstanceState (issue
11982812)
* commit '
ec6b71a008977995f3782c4781b43a360598be1c':
Add guards for restoreInstanceState (issue
11982812)
Dan Sandler [Fri, 14 Feb 2014 20:54:19 +0000 (20:54 +0000)]
am
0572c310: am
b4ee5792: am
b3084e87: Merge "Revert "Revert "Enable Launcher2 workspace import.""" into jb-ub-now-jolly-elf
* commit '
0572c31031ea2a0cc9f33afb2b2a4a41618415df':
Revert "Revert "Enable Launcher2 workspace import.""
Adam Cohen [Fri, 14 Feb 2014 20:54:18 +0000 (20:54 +0000)]
am
7cb06bde: am
87f445c8: am
c924cacf: Merge "Only import workspaces for non-tablets (where grid hasn\'t changed)" into jb-ub-now-jolly-elf
* commit '
7cb06bde4981411d8e34e6d37a798d0ea85f138b':
Only import workspaces for non-tablets (where grid hasn't changed)
Michael Jurka [Fri, 14 Feb 2014 20:54:18 +0000 (20:54 +0000)]
am
512093f3: am
16fa074d: am
1c00fd0b: Fix NPE when going to All Apps in landscape
* commit '
512093f3655a1970f1f05605deb219ef9d6ab957':
Fix NPE when going to All Apps in landscape
Winson Chung [Fri, 14 Feb 2014 20:54:17 +0000 (20:54 +0000)]
am
f342c5b4: am
0c1b33db: am
2cb2471e: Ensure we pass search bar bounds to GoogleSearch. (Bug
11968598)
* commit '
f342c5b4324b0aa052b89d4016673e1735df5e90':
Ensure we pass search bar bounds to GoogleSearch. (Bug
11968598)
Winson Chung [Fri, 14 Feb 2014 20:54:16 +0000 (20:54 +0000)]
am
1cfabb7f: am
ab84b8b4: am
1a5adf4f: Merge "Modifying Workspace padding to account for Search Bar offsets. (Bug
11968598)" into jb-ub-now-jolly-elf
* commit '
1cfabb7f144b8691279b322aaf1827339c447cbe':
Modifying Workspace padding to account for Search Bar offsets. (Bug
11968598)
Michael Jurka [Fri, 14 Feb 2014 20:54:16 +0000 (20:54 +0000)]
am
082893ff: am
3ed4a4dd: am
10a8935e: Merge "Use AsyncTasks instead of creating new threads" into jb-ub-now-jolly-elf
* commit '
082893ffbac31567360c26c1df1e5c1c61af7f5c':
Use AsyncTasks instead of creating new threads
Mac Duy Hai [Fri, 14 Feb 2014 20:54:15 +0000 (20:54 +0000)]
am
745413c1: am
60779458: am
a50d3430: Merge "Add method to retrieve search box bounds." into jb-ub-now-jolly-elf
* commit '
745413c10594c6694fedc2e3bf39d03e368a3b7c':
Add method to retrieve search box bounds.
Adam Cohen [Fri, 14 Feb 2014 20:54:14 +0000 (20:54 +0000)]
am
a9aeb127: am
bfb2ed2f: am
76980e33: Merge "Fix binding problem with no screens (issue
11768766)" into jb-ub-now-jolly-elf
* commit '
a9aeb1278a338e6235138d8bccee7d1a3a3e271b':
Fix binding problem with no screens (issue
11768766)
Adam Cohen [Fri, 14 Feb 2014 20:54:13 +0000 (20:54 +0000)]
am
6bc01d4a: am
6229a0d5: am
6400b84d: Update custom content insets when Workspace insets are set
* commit '
6bc01d4a1b337290f056947a964d604514e5207f':
Update custom content insets when Workspace insets are set
Mathew Inwood [Fri, 14 Feb 2014 20:54:13 +0000 (20:54 +0000)]
am
071b346e: am
1eeb3fc9: Generalize support for \'App Info\', \'Uninstall\' and \'Delete\'
* commit '
071b346eab89494e79c1ffa834a4083e0565bfb7':
Generalize support for 'App Info', 'Uninstall' and 'Delete'
Adam Cohen [Fri, 14 Feb 2014 20:54:07 +0000 (20:54 +0000)]
am
d7351228: am
0a23daac: am
166ebd4d: De-parent custom content view before adding to custom content screen
* commit '
d735122857231d3e6e74e516f2de5fa101b14d7e':
De-parent custom content view before adding to custom content screen
Adam Cohen [Fri, 14 Feb 2014 20:54:06 +0000 (20:54 +0000)]
am
c82aa4cd: am
52aa0636: am
d552dd90: Fix NPE in Launcher onDestroy
* commit '
c82aa4cd1ea81c5fae7901bcb147df0ca082594b':
Fix NPE in Launcher onDestroy
Adam Cohen [Fri, 14 Feb 2014 20:54:06 +0000 (20:54 +0000)]
am
38ed22eb: am
9710ec9d: am
060a4837: Merge "Fix NPE in case where workspace is null because Launcher has been destroyed " into jb-ub-now-jolly-elf
* commit '
38ed22eb292f18f139f41b3b2bb87abcdd883c2d':
Fix NPE in case where workspace is null because Launcher has been destroyed
Dan Sandler [Fri, 14 Feb 2014 20:54:05 +0000 (20:54 +0000)]
am
fce34b2f: am
314aaeca: am
a6a296ba: Revert "Enable Launcher2 workspace import."
* commit '
fce34b2ff20961642657f9b6914620dd45007d18':
Revert "Enable Launcher2 workspace import."
Michael Jurka [Fri, 14 Feb 2014 20:54:04 +0000 (20:54 +0000)]
am
4cb7d294: am
e5db9b9d: am
04a231bb: Merge "Making workspace->overview transition smoother" into jb-ub-now-jolly-elf
* commit '
4cb7d294e1a5b97a734e2bbf30303eb0b5cd27fb':
Making workspace->overview transition smoother
Adam Cohen [Fri, 14 Feb 2014 20:54:03 +0000 (20:54 +0000)]
am
c1fedf54: am
616af06a: am
cccfe95b: Merge "Allowing ability to pick up items / enter overview before full page settle" into jb-ub-now-jolly-elf
* commit '
c1fedf540713fbeec3901b9c2d25a776188b57ee':
Allowing ability to pick up items / enter overview before full page settle
Dan Sandler [Fri, 14 Feb 2014 20:54:02 +0000 (20:54 +0000)]
am
1fbe9d19: am
658e56fc: am
5b3bdd39: Enable Launcher2 workspace import.
* commit '
1fbe9d192e03eeadbddad79f6287f151f0e911ec':
Enable Launcher2 workspace import.
Mathew Inwood [Fri, 14 Feb 2014 20:54:01 +0000 (20:54 +0000)]
am
0c280768: am
3705bb1b: Merge "Add support for initiating a drag from an overlay." into jb-ub-now-kermit
* commit '
0c280768446f8de0afc4d1b94aeb6dda7a879bce':
Add support for initiating a drag from an overlay.
Winson Chung [Fri, 14 Feb 2014 20:54:01 +0000 (20:54 +0000)]
am
aea55e05: am
954966bc: am
2c130e1f: Reducing workspace grid for dogfooding.
* commit '
aea55e0565ee7af79f0b96860212737e261423f8':
Reducing workspace grid for dogfooding.
Winson Chung [Fri, 14 Feb 2014 20:54:00 +0000 (20:54 +0000)]
am
c0ed8edf: am
2e06b6da: am
6dc8f7c8: Merge "Update the database when converting the final screen. (Bug
11683562, Bug
11034205)" into jb-ub-now-jolly-elf
* commit '
c0ed8edf296725dfbff8cc95d9cb4803f6301390':
Update the database when converting the final screen. (Bug
11683562, Bug
11034205)
Dan Sandler [Fri, 14 Feb 2014 20:53:59 +0000 (20:53 +0000)]
am
d3701d42: am
91d30b76: am
f0b8dacf: Disable importing workspaces from Launcher2.
* commit '
d3701d422329791f6758649249e6db3e538a0c4e':
Disable importing workspaces from Launcher2.
Winson Chung [Fri, 14 Feb 2014 20:53:59 +0000 (20:53 +0000)]
am
4168dc49: am
97436804: am
540efef7: Merge changes Ida9603e3,I3dfa45cc into jb-ub-now-jolly-elf
* commit '
4168dc497ded7c697d972283db7c8579788c23d5':
Initialize FastBitmapDrawable bounds with default bitmap dimensions.
Updating LauncherModel filtering to use screen ids. (Bug
11685286)
Adam Cohen [Fri, 14 Feb 2014 20:53:58 +0000 (20:53 +0000)]
am
3f950065: am
2aeb1778: am
f9618856: Syncing up state transition with paging transition
* commit '
3f95006528b780c941f683c73339ab53c70a6880':
Syncing up state transition with paging transition
Winson Chung [Fri, 14 Feb 2014 20:53:57 +0000 (20:53 +0000)]
am
2c93bf64: am
2c73d923: am
603d19a3: Merge "Additional logs to track down missing workspace screen. (Bug
11683562)" into jb-ub-now-jolly-elf
* commit '
2c93bf64172656e1f9501c06d133934f69ce07e8':
Additional logs to track down missing workspace screen. (Bug
11683562)
Winson Chung [Fri, 14 Feb 2014 20:53:56 +0000 (20:53 +0000)]
am
d21f1284: am
0788360c: am
28b690ab: Merge "Adding logs to track down missing workspace screen. (Bug
11683562)" into jb-ub-now-jolly-elf
* commit '
d21f128490f69adcddafb67d096c73e9acff17e1':
Adding logs to track down missing workspace screen. (Bug
11683562)
Adam Cohen [Fri, 14 Feb 2014 20:53:56 +0000 (20:53 +0000)]
am
06418978: am
fe6376c2: am
582a3694: Merge "Adding method to get the search bar bounds." into jb-ub-now-jolly-elf
* commit '
064189780fa729082e321b3d9f65e13d3f4d71b7':
Adding method to get the search bar bounds.
Adam Cohen [Fri, 14 Feb 2014 20:53:55 +0000 (20:53 +0000)]
am
422a7208: am
4b0badc9: am
3a14eeb5: Bit of code cleanup (issue
11648206)
* commit '
422a7208d186ce9af4a9a59466a9773179f844fd':
Bit of code cleanup (issue
11648206)
Adam Cohen [Fri, 14 Feb 2014 20:53:54 +0000 (20:53 +0000)]
am
6521be4f: am
2dc25b18: am
202e4fda: Merge "Fix for transparent CustomContent screen (issue
11549096)" into jb-ub-now-jolly-elf
* commit '
6521be4f9272d12f907108d871a79852ce9e6183':
Fix for transparent CustomContent screen (issue
11549096)
Winson Chung [Fri, 14 Feb 2014 20:53:54 +0000 (20:53 +0000)]
am
1a3a5b0c: am
1aca70a5: am
b427f30e: Merge "Require valid arrays when adding and binding new Apps. (Bug
11627095)" into jb-ub-now-jolly-elf
* commit '
1a3a5b0c67c0ed596efe56a9df9477a983dccc39':
Require valid arrays when adding and binding new Apps. (Bug
11627095)
Winson Chung [Fri, 14 Feb 2014 20:53:53 +0000 (20:53 +0000)]
am
b3c34125: am
3a7bea59: am
89ee93e0: Merge "Use the icon bounds for all calculations." into jb-ub-now-jolly-elf
* commit '
b3c34125a483b321bd91025f88058c58844cde2e':
Use the icon bounds for all calculations.
Adam Cohen [Fri, 14 Feb 2014 20:53:52 +0000 (20:53 +0000)]
am
0b38a944: am
b6186d2b: am
4e2683a4: Merge "Fix issue where custom content would be invisible (issue
11644432)" into jb-ub-now-jolly-elf
* commit '
0b38a9447a6e146132922ab18862b96534f3e968':
Fix issue where custom content would be invisible (issue
11644432)
Adam Cohen [Fri, 14 Feb 2014 20:53:52 +0000 (20:53 +0000)]
am
3ee9a07f: am
a9f8aeeb: am
e9b198fd: Merge "Change the way view ids are assigned (issue
11627801)" into jb-ub-now-jolly-elf
* commit '
3ee9a07fb14bb5c753a51d5a8c7989117f7b10db':
Change the way view ids are assigned (issue
11627801)
Adam Copp [Fri, 14 Feb 2014 20:53:51 +0000 (20:53 +0000)]
am
783f18da: am
ee7f46cb: am
3dc3ecda: Merge "Hooks for subclasses to react to home presses." into jb-ub-now-jolly-elf
* commit '
783f18da245ea8fad8f8d6d6a83f407a3e3f44b9':
Hooks for subclasses to react to home presses.
Adam Cohen [Fri, 14 Feb 2014 20:53:45 +0000 (20:53 +0000)]
am
b46426e3: am
cb0468fa: am
b79a48c2: Merge "Add logging for NPE (issue
11627249)" into jb-ub-now-jolly-elf
* commit '
b46426e3de3d199429c22fb17d0d798aa78d2886':
Add logging for NPE (issue
11627249)
Adam Cohen [Fri, 14 Feb 2014 20:53:44 +0000 (20:53 +0000)]
am
9d170dbb: am
6641570e: am
17e1aeac: Merge "Fix CellLayout UNSPECIFIED exception (issue
11627191)" into jb-ub-now-jolly-elf
* commit '
9d170dbb65924d60f5a32a37496ec9142a186005':
Fix CellLayout UNSPECIFIED exception (issue
11627191)
Winson Chung [Fri, 14 Feb 2014 20:53:44 +0000 (20:53 +0000)]
am
c665bd13: am
a73c1fac: am
e248b837: Merge "Prevent launching Widgets when cycling between Overview/Shrink state and Home. (Bug
11439120)" into jb-ub-now-jolly-elf
* commit '
c665bd136f19109f0ea7414988078330ce895dda':
Prevent launching Widgets when cycling between Overview/Shrink state and Home. (Bug
11439120)
Adam Cohen [Fri, 14 Feb 2014 20:53:43 +0000 (20:53 +0000)]
am
42143d73: am
e99951bd: am
f0f2ffae: Fix issue where extra page hangs around (issue
11634172)
* commit '
42143d73ab1fe0318a2410a56634992ffc481588':
Fix issue where extra page hangs around (issue
11634172)
Adam Cohen [Fri, 14 Feb 2014 20:53:41 +0000 (20:53 +0000)]
am
e4a44cc7: am
5b34b3ae: am
c361b6fe: Merge "Small tweaks to custom content management" into jb-ub-now-jolly-elf
* commit '
e4a44cc7be0a49b7b3a0623751f7c59502697175':
Small tweaks to custom content management
Michael Jurka [Fri, 14 Feb 2014 20:53:40 +0000 (20:53 +0000)]
am
2026a5a9: am
314b922b: am
bf292a0b: Merge "Fix wallpaper cropping bugs" into jb-ub-now-jolly-elf
* commit '
2026a5a91feabaa8711d9fa1272fa9dbed355bcc':
Fix wallpaper cropping bugs
Adam Cohen [Fri, 14 Feb 2014 20:53:39 +0000 (20:53 +0000)]
am
4002465f: am
7be5f565: am
ab087b9f: Fix NPE we\'re seeing in feedback (issue
11626428)
* commit '
4002465f5824b7f1b8bdf9927c71b2585ad2bdde':
Fix NPE we're seeing in feedback (issue
11626428)
Adam Cohen [Fri, 14 Feb 2014 20:53:38 +0000 (20:53 +0000)]
am
51cc5316: am
ed1ead7a: am
2777273a: Add method to determine if Launcher is using vertical bars
* commit '
51cc53160db29cdd2a69968a292961c9e2ed2204':
Add method to determine if Launcher is using vertical bars
Michael Jurka [Fri, 14 Feb 2014 20:53:37 +0000 (20:53 +0000)]
am
c23fc049: am
5339119b: am
62dacd67: Merge "Uncommenting throw when item not contained in sBgItemsIdMap" into jb-ub-now-jolly-elf
* commit '
c23fc0498e398649768b8dc124f9f755a3c9bd13':
Uncommenting throw when item not contained in sBgItemsIdMap
Michael Jurka [Fri, 14 Feb 2014 20:53:36 +0000 (20:53 +0000)]
am
aa07fd63: am
6f372bb7: am
5fa148a1: am
5bfab60f: Fix NPE in Live Wallpaper loader
* commit '
aa07fd636e46d1be902e37519b529fbbe11dfa41':
Fix NPE in Live Wallpaper loader
Adam Cohen [Fri, 14 Feb 2014 20:53:35 +0000 (20:53 +0000)]
am
b040fcf5: am
a05060c9: am
18238d90: am
3428b5e9: Merge "Fix default wallpaper thumbnail" into jb-ub-now-jetsonic
* commit '
b040fcf52b4ccf6896e62a315abc447ea52db107':
Fix default wallpaper thumbnail
Adam Cohen [Fri, 14 Feb 2014 20:53:35 +0000 (20:53 +0000)]
am
39ea5106: am
b767166b: am
46830418: am
2da0a053: Fix small scrolling regression
* commit '
39ea51061c6b5fc66b15aa20abdcbadcb4ca5aba':
Fix small scrolling regression