OSDN Git Service
Mark Ashdown [Thu, 20 Mar 2014 02:47:00 +0000 (02:47 +0000)]
am
32e4344a: am
a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit '
32e4344a20c4f9c9323061aaef96678c098d6200':
Huy Nguyen [Thu, 20 Mar 2014 02:46:59 +0000 (02:46 +0000)]
am
49635c71: am
6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit '
49635c7147d1e71d052b80d89c69785baaee99b3':
Mark Ashdown [Thu, 20 Mar 2014 02:46:58 +0000 (02:46 +0000)]
am
a4d0ef3c: am
7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit '
a4d0ef3c84cb5a9951d7d967c2c99d54d573f927':
Mathew Inwood [Thu, 20 Mar 2014 02:46:57 +0000 (02:46 +0000)]
am
48e725bd: am
56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit '
48e725bdf4c92d3faf82c1788b56aa0491b566be':
Juan Silveira [Thu, 20 Mar 2014 02:46:57 +0000 (02:46 +0000)]
am
9ee14249: am
07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit '
9ee142497e1272697393867be0bccddd758aef35':
Anton Hansson [Thu, 20 Mar 2014 02:46:56 +0000 (02:46 +0000)]
am
6508fe1b: am
d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit '
6508fe1b07ec888012255e3a2438382b45a9707f':
Adam Skory [Thu, 20 Mar 2014 02:46:56 +0000 (02:46 +0000)]
am
b3461336: (-s ours) am
853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit '
b346133679f409e3f4e7389c5dced451b9980a57':
Baligh Uddin [Thu, 20 Mar 2014 01:26:04 +0000 (18:26 -0700)]
keep history after reset to ub-now-lunchbox-release@
1069658
Adam Skory [Thu, 20 Mar 2014 01:18:37 +0000 (01:18 +0000)]
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.
Adam Skory [Thu, 20 Mar 2014 01:18:36 +0000 (01:18 +0000)]
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
Mark Ashdown [Thu, 20 Mar 2014 01:12:57 +0000 (01:12 +0000)]
am
a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit '
a2bc37722e9fa0af9d67986038aec58af5308771':
Revert "Fix issue of extra blank screen after uninstall (issue
12372657)"
Huy Nguyen [Thu, 20 Mar 2014 01:12:56 +0000 (01:12 +0000)]
am
6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit '
6cb8ae4c16cb3b0105ebfbb23be23e0fb1131496':
Disabling cling when the user moves the folder before launching it. (Bug
12963868)
Mark Ashdown [Thu, 20 Mar 2014 01:12:56 +0000 (01:12 +0000)]
am
7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit '
7c9f33481fd3c063495813b2772e198ed696e3ce':
Fix issue of extra blank screen after uninstall (issue
12372657)
Fix build
Changed behaviour of the wallpaper picker.
Guard against null default wallpaper
Avoid stripping empty screens if the workspace is still loading (issue
12523285)
Changed inconsistency when selecting default wallpaper, where it did not go back to home.
skip backup if launcher is in a bad state
Revert "Disabled the wallpaper when completely in -1 Now space."
Updating Read/Write settings permission protectionLevels. (Bug
11372484)
Fixed visibility issue of save button in case the url loading failed
Import translations. DO NOT MERGE
Mathew Inwood [Thu, 20 Mar 2014 01:12:55 +0000 (01:12 +0000)]
am
56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit '
56ca86b7c177fd6fb330d6cb3631070e8689cd87':
Fix issue where clings didn't appear after set up wizard (issue
13077829)
Import translations. DO NOT MERGE
use restored icon for restored app shortcuts
Fix for Can't convert to dimension: type=0x12 Crash on JB deviecs.
Juan Silveira [Thu, 20 Mar 2014 01:12:55 +0000 (01:12 +0000)]
am
07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit '
07130d400c52518e413e58334525f1598c3b8f1a':
Implement spring-loading of folders when dragging over.
Do updateWorkspaceScreenOrder inside a single transaction.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Anton Hansson [Thu, 20 Mar 2014 01:12:54 +0000 (01:12 +0000)]
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
Adam Skory [Thu, 20 Mar 2014 01:12:54 +0000 (01:12 +0000)]
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).
Adam Skory [Thu, 20 Mar 2014 01:12:53 +0000 (01:12 +0000)]
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.
Adam Skory [Thu, 20 Mar 2014 01:12:52 +0000 (01:12 +0000)]
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
Huy Nguyen [Fri, 7 Mar 2014 21:49:10 +0000 (13:49 -0800)]
Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release
Dan Sandler [Fri, 7 Mar 2014 20:15:17 +0000 (20:15 +0000)]
Merge "Don't lose icons when migrating from different-sized hotseats." into ub-now-lunchbox
Mark Ashdown [Fri, 7 Mar 2014 15:33:44 +0000 (15:33 +0000)]
Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release
Dan Sandler [Fri, 7 Mar 2014 04:48:04 +0000 (23:48 -0500)]
Don't lose icons when migrating from different-sized hotseats.
Launcher2 on sw720dp devices had 8 hotseat slots; Launcher3
has only 6 on those same devices. When importing the old
hotseat, the empty slot (so technically there were 9)
occupied by the all apps button didn't line up with the new
all apps button, causing a hole on the hotseat. Furthermore,
the icon in old position 3 was clobbered by the new all apps
icon:
0 1 2 3 (#) 4 5 6 7 ==> 0 1 2 (:) _ 4 5
In this CL we introduce a separate sort-and-place step for
hotseat icons so that any icon colliding with the new
all-apps slot can be moved to the right to find the next
nearest open slot. This works well for the 8->6 case; it
will probably do something reasonable, if not ideal, for
other grid migration scenarios.
But those are not covered by this bug.
Bug:
13015468
Change-Id: I7edb3f27addc78ad02bbfcd1c39175ca56220007
Adam Cohen [Fri, 7 Mar 2014 00:39:22 +0000 (00:39 +0000)]
Merge "Revert "Fix issue of extra blank screen after uninstall (issue
12372657)"" into ub-now-lunchbox
Huy Nguyen [Thu, 6 Mar 2014 23:29:42 +0000 (15:29 -0800)]
Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release
Adam Cohen [Thu, 6 Mar 2014 22:30:35 +0000 (22:30 +0000)]
Revert "Fix issue of extra blank screen after uninstall (issue
12372657)"
This reverts commit
b2603e3d3a32c90ca13458409561d025afdce399.
Change-Id: I81f8c5a4e3861b936ef9e1fbdb339c12d5aefc70
Winson Chung [Thu, 6 Mar 2014 18:12:02 +0000 (10:12 -0800)]
Disabling cling when the user moves the folder before launching it. (Bug
12963868)
Change-Id: Iddcdf655c78b7240be123bd549f3d45794d02c83
Mark Ashdown [Tue, 4 Mar 2014 10:25:42 +0000 (10:25 +0000)]
Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release
Selim Cinek [Tue, 4 Mar 2014 09:48:31 +0000 (09:48 +0000)]
Merge "Changed behaviour of the wallpaper picker." into ub-now-lunchbox
Adam Cohen [Tue, 4 Mar 2014 00:14:38 +0000 (00:14 +0000)]
Merge "Fix issue of extra blank screen after uninstall (issue
12372657)" into ub-now-lunchbox
Adam Cohen [Tue, 4 Mar 2014 00:11:20 +0000 (16:11 -0800)]
Fix issue of extra blank screen after uninstall (issue
12372657)
Change-Id: I0326914821f68d789cb26767518ead1292d87db0
Adam Cohen [Mon, 3 Mar 2014 19:37:21 +0000 (11:37 -0800)]
Fix build
Change-Id: I17944c557970ed35e1bc67f6f3e3372ff88651ad
Adam Cohen [Mon, 3 Mar 2014 19:07:23 +0000 (19:07 +0000)]
Merge "Avoid stripping empty screens if the workspace is still loading (issue
12523285)" into ub-now-lunchbox
Selim Cinek [Fri, 28 Feb 2014 16:18:59 +0000 (17:18 +0100)]
Changed behaviour of the wallpaper picker.
When opening the picker, the currently chosen wallpaper is
shown in the background.
In this change also the nullpointer was fixed when deleting
the currently selected wallpaper and setting it, because we
revert to the old wallpaper in that case.
When going into the same live wallpaper than the currently
selected we are going back to home if the user sets it or
goes back now, in order for the user not to loose state.
The real fix for this will be done later when the following
bug will be fixed: b/
13241760
Bug:
12063773
Bug:
13219612
Change-Id: I7c6abb25755eca99c3255278e0884d1ff4749b55
Christoph Studer [Mon, 3 Mar 2014 16:00:05 +0000 (16:00 +0000)]
Merge "Guard against null default wallpaper" into ub-now-lunchbox
Christoph Studer [Fri, 28 Feb 2014 14:57:18 +0000 (15:57 +0100)]
Guard against null default wallpaper
Deal with WallpaperManager.getBuiltInDrawable() returning null.
Bug:
13109487
Change-Id: Ib5665a0eb947e9784cdcd0e8dfab1a01b4deca82
Adam Cohen [Sat, 1 Mar 2014 20:12:59 +0000 (12:12 -0800)]
Avoid stripping empty screens if the workspace is still loading (issue
12523285)
-> This appears to be what may be causing data loss in some users during update.
A certain (seemingly) rare combination of life-cycle events and package events
seems to be the culprit (potentially why it's seen at update time).
Change-Id: Iea4f8aef012ba80b7ba568e0df264edb9284efbe
Selim Cinek [Fri, 28 Feb 2014 17:00:42 +0000 (18:00 +0100)]
Changed inconsistency when selecting default wallpaper, where it did not go back to home.
Bug:
13219313
Change-Id: I4961c6724a1550dbae126f97e45dc166cbe9a565
Jorim Jaggi [Fri, 28 Feb 2014 14:52:43 +0000 (14:52 +0000)]
Merge "Revert "Disabled the wallpaper when completely in -1 Now space."" into ub-now-lunchbox
Chris Wren [Thu, 27 Feb 2014 20:49:39 +0000 (15:49 -0500)]
skip backup if launcher is in a bad state
Bug:
13153542
Change-Id: I4312ebd200e8e652ef841f54301981c2a486b726
Jorim Jaggi [Thu, 27 Feb 2014 19:33:20 +0000 (20:33 +0100)]
Revert "Disabled the wallpaper when completely in -1 Now space."
This reverts commit
f3a8e8c0bd8b0dbe3991e5ad9d315e6e253e92eb.
Bug:
12978354
Change-Id: I11f1eeaab4fad9a2e4acf835144f0b0dc6fac54b
Winson Chung [Wed, 26 Feb 2014 19:58:18 +0000 (19:58 +0000)]
Merge "Updating Read/Write settings permission protectionLevels. (Bug
11372484)" into ub-now-lunchbox
Winson Chung [Wed, 26 Feb 2014 19:50:46 +0000 (11:50 -0800)]
Updating Read/Write settings permission protectionLevels. (Bug
11372484)
Baligh Uddin [Tue, 25 Feb 2014 17:23:58 +0000 (17:23 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-now-lunchbox
Selim Cinek [Tue, 25 Feb 2014 13:26:06 +0000 (13:26 +0000)]
Merge "Fixed visibility issue of save button in case the url loading failed" into ub-now-lunchbox
Selim Cinek [Tue, 25 Feb 2014 13:12:07 +0000 (14:12 +0100)]
Fixed visibility issue of save button in case the url loading failed
Bug:
12953091
Change-Id: Idc640532e2c2c6143d49d330bd541682eca64ac5
Mathew Inwood [Tue, 25 Feb 2014 10:30:34 +0000 (10:30 +0000)]
Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release
Baligh Uddin [Mon, 24 Feb 2014 21:59:57 +0000 (13:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2b7248218fe16856a9721b8b9169700977f19d00
Auto-generated-cl: translation import
Chris Wren [Mon, 24 Feb 2014 21:59:34 +0000 (21:59 +0000)]
Merge "use restored icon for restored app shortcuts" into ub-now-lunchbox
Adam Cohen [Fri, 21 Feb 2014 22:09:53 +0000 (14:09 -0800)]
Fix issue where clings didn't appear after set up wizard (issue
13077829)
-> Also removed the db-created as a criteria for showing the clings
(this was a bit problematic in some cases and going forward)
-> Instead, we use database upgrade as a signal to not show the clings.
This is used instead of the above criteria (to prevent old users from
seeing the migration cling and losing their data.)
-> Stripped some old code related to custom clings that's no longer used.
Change-Id: Ib5e5285e5ddbc60e69eb998ee9fd092ae879150d
Baligh Uddin [Thu, 20 Feb 2014 22:46:02 +0000 (22:46 +0000)]
am
a003c8ed: (-s ours) am
4487e0aa: (-s ours) am
beb7bc60: (-s ours) Import translations. DO NOT MERGE
* commit '
a003c8ede8026fac754c059c90fde5bc9ba6e309':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 22:40:46 +0000 (22:40 +0000)]
am
4487e0aa: (-s ours) am
beb7bc60: (-s ours) Import translations. DO NOT MERGE
* commit '
4487e0aac4270f3ab429d27f454d4eb1efb19a6b':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 20 Feb 2014 22:37:24 +0000 (22:37 +0000)]
Geoff Mendal [Thu, 20 Feb 2014 22:34:09 +0000 (14:34 -0800)]
Merge commit '
457e9215df2a8353f484a268950623d714afa01c' into klp-dev-plus-aosp
Conflicts:
res/values-lo-rLA/strings.xml
Baligh Uddin [Thu, 20 Feb 2014 21:13:05 +0000 (21:13 +0000)]
am
beb7bc60: (-s ours) Import translations. DO NOT MERGE
* commit '
beb7bc6028eeeea160b17df800b0a886eecd1c9b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 21:12:42 +0000 (13:12 -0800)]
am
9594e887: (-s ours) am
37fe7d2b: (-s ours) am
f42cf7de: (-s ours) Import translations. DO NOT MERGE
* commit '
9594e887712d8dfca47c0f160a24cfb7a8262cb8':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 21:10:18 +0000 (13:10 -0800)]
am
37fe7d2b: (-s ours) am
f42cf7de: (-s ours) Import translations. DO NOT MERGE
* commit '
37fe7d2b99dc514f567b31e5931d054bacefe377':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 21:08:48 +0000 (13:08 -0800)]
am
f42cf7de: (-s ours) Import translations. DO NOT MERGE
* commit '
f42cf7de53f9f500ae06b62b9097b9edc7884a2b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 17:42:49 +0000 (09:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6fb7884fae6cc8e09ca5fe51f28f5f80b183e9b5
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Feb 2014 17:39:20 +0000 (09:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4fb41af97a881f6669af15ddd6db1af4f3429765
Auto-generated-cl: translation import
Juan Silveira [Tue, 18 Feb 2014 10:33:27 +0000 (10:33 +0000)]
Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release
Tom Stamm [Sat, 15 Feb 2014 00:31:07 +0000 (00:31 +0000)]
am
a0010b81: am
279b0385: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kr
* commit '
a0010b81ad0e179a8336f84da84f7aed3dd54cb5':
Ensure we don't call getLayoutDirection() for devices not running JB MR1+. (Bug
12906355)
Qiwen Zhao [Sat, 15 Feb 2014 00:27:31 +0000 (00:27 +0000)]
am
76fd2e70: Merge branch \'klp-dev-plus-aosp\' of sso://googleplex-android.git.corp.google.com/a/platform/packages/apps/Launcher3 into klp-dev-plus-aosp
* commit '
76fd2e70bd28668a09edd1e7bb30348b6536b5ad':
Qiwen Zhao [Sat, 15 Feb 2014 00:27:31 +0000 (00:27 +0000)]
am
0f3e2065: Merge commit \'
8fa85d20\' into klp-dev-plus-aosp
* commit '
0f3e20658a2386b68f23c71a83e18b9423e939e9':
Import translations. DO NOT MERGE
Tom Stamm [Sat, 15 Feb 2014 00:26:11 +0000 (00:26 +0000)]
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)
Ian Parkinson [Sat, 15 Feb 2014 00:24:02 +0000 (00:24 +0000)]
am
6b524fe0: am
8944f244: Merge Launcher3 jb-ub-now-kermit to kermit-release
* commit '
6b524fe0b23cb698154896415290eef94f4b7ae5':
Defend against missing DB during migration.
Huy Nguyen [Sat, 15 Feb 2014 00:24:02 +0000 (00:24 +0000)]
am
c0275608: am
6a996e7d: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kermit-release
* commit '
c027560893d994d675d55bb79e60cb2c47189f3c':
Import translations. DO NOT MERGE
Adding tighter first run checks for migration clings. (Bug
12626290)
Avoid NPE from delayed Runnable
Jim Guggemos [Sat, 15 Feb 2014 00:24:01 +0000 (00:24 +0000)]
am
5c7c3c9b: am
608401ac: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kermit-release
* commit '
5c7c3c9b8d9d2bc91b40e4d0cfe12dc31787720b':
Adding specific buckets for N5 in dynamic grid. (Bug
12604220)
Fix overlapping pages (issue
12551580)
Adam Cohen [Sat, 15 Feb 2014 00:24:00 +0000 (00:24 +0000)]
am
b5abf2a0: am
930514df: Fix overlapping pages (issue
12551580)
* commit '
b5abf2a0c8b61ba4e78da62c9ef34ec159e3ead5':
Fix overlapping pages (issue
12551580)
Jim Guggemos [Sat, 15 Feb 2014 00:24:00 +0000 (00:24 +0000)]
am
1fb0035a: am
b608ae67: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kermit-release
* commit '
1fb0035acef67b99b197808158e0ac19f74d57af':
Dismissing search and other overlays when the menu button is pressed. (Bug
12524591)
Mark Ashdown [Sat, 15 Feb 2014 00:23:59 +0000 (00:23 +0000)]
am
8c8abe93: am
8ffe7b76: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kermit-release
* commit '
8c8abe936d21e95cf8f68689e750d56b6b98c04c': (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:23:58 +0000 (00:23 +0000)]
am
4227263c: am
71c92b35: Merge "Properly saving migration cling keys." into jb-ub-now-kermit-release
* commit '
4227263c212e3264003dd0c7fcc619bdc751cc04':
Properly saving migration cling keys.
Qiwen Zhao [Sat, 15 Feb 2014 00:23:01 +0000 (16:23 -0800)]
Merge branch 'klp-dev-plus-aosp' of sso://googleplex-android.git.corp.google.com/a/platform/packages/apps/Launcher3 into klp-dev-plus-aosp
Qiwen Zhao [Sat, 15 Feb 2014 00:22:50 +0000 (16:22 -0800)]
Merge commit '
8fa85d20' into klp-dev-plus-aosp
Conflicts:
res/values-lo-rLA/strings.xml
Ian Parkinson [Sat, 15 Feb 2014 00:20:32 +0000 (00:20 +0000)]
am
8944f244: Merge Launcher3 jb-ub-now-kermit to kermit-release
* commit '
8944f244d55a5f60cfb4d69b464c5694d11d097d':
Defend against missing DB during migration.
Huy Nguyen [Sat, 15 Feb 2014 00:20:32 +0000 (00:20 +0000)]
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
Jim Guggemos [Sat, 15 Feb 2014 00:20:31 +0000 (00:20 +0000)]
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)
Adam Cohen [Sat, 15 Feb 2014 00:20:31 +0000 (00:20 +0000)]
am
930514df: Fix overlapping pages (issue
12551580)
* commit '
930514df0529ff5316bb00f3e45a4de036b7f5aa':
Fix overlapping pages (issue
12551580)
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:06:35 +0000 (00:06 +0000)]
am
ec3aad2e: Merge commit \'
d5c6745b\' into klp-dev-plus-aosp
* commit '
ec3aad2e30ead7923f659c197c57f843cc55c913':
Tightening migration conditions. (Bug
11973614)
Increasing string length for translation (Bug
12524122)
Import translations. DO NOT MERGE
Set App context from WallpaperChanged receiver. (Bug
12525684)
Updating assets and text for migration cling. (Bug
11973614)
Adding migration Clings. (Bug
11973614)
New launcher2 icon migration algorithm.
Quick patch for b/
12446428.
Allow DISABLE_ALL_APPS to be set using a system property.
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
Qiwen Zhao [Fri, 14 Feb 2014 22:35:05 +0000 (14:35 -0800)]
reset to klp-dev at
9a69cbb with history
Adam Cohen [Fri, 14 Feb 2014 21:02:57 +0000 (21:02 +0000)]
am
51ac5ce5: am
cf09fa12: am
b54a5989: Adding optional first run activity to Launcher
* commit '
51ac5ce545ea800ca8378767a5d7ab17bb6bc884':
Adding optional first run activity to Launcher
Adam Cohen [Fri, 14 Feb 2014 21:02:56 +0000 (21:02 +0000)]
am
537ecd45: am
8df1285d: am
0259c629: Merge "Fix issue where deleting item from folder leaves extra page" into jb-ub-now-kermit
* commit '
537ecd451b021545b8d9c4009879fe961bff3de6':
Fix issue where deleting item from folder leaves extra page
Chris Wren [Fri, 14 Feb 2014 21:02:55 +0000 (21:02 +0000)]
am
84ae085d: am
1cf23e10: am
8661761c: better support for multiple files
* commit '
84ae085dc7f37e03d4fe50fc7747f675df32fbb3':
better support for multiple files
Chris Wren [Fri, 14 Feb 2014 21:02:55 +0000 (21:02 +0000)]
am
de0fc51a: am
32911d21: am
33f4c2df: first backup should save things from the beginning of time
* commit '
de0fc51acf071b42a5a337291af9467307917651':
first backup should save things from the beginning of time
Yura [Fri, 14 Feb 2014 21:02:54 +0000 (21:02 +0000)]
am
7dae6109: am
946334b3: am
0bae5b22: Merge "Moved paddingStart to -v17 folder." into jb-ub-now-kermit
* commit '
7dae6109dbae41d7d0d8278c8646023d790693bd':
Moved paddingStart to -v17 folder.
Winson Chung [Fri, 14 Feb 2014 21:02:54 +0000 (21:02 +0000)]
am
01880c02: am
29a86c26: am
872e70e0: Merge "Accounting for new Package event extras when updating forward-locked apps. (Bug
11855584)" into jb-ub-now-kermit
* commit '
01880c02f5200e2faad1459fb8531dfeb5cf38cb':
Accounting for new Package event extras when updating forward-locked apps. (Bug
11855584)
Dan Sandler [Fri, 14 Feb 2014 21:02:53 +0000 (21:02 +0000)]
am
425941d0: am
1d7cf660: am
155f3bc6: Merge "KEYCODE_MENU: hide all apps when entering overview mode" into jb-ub-now-kermit
* commit '
425941d0c20dd242dfb939407e9e95247a19946b':
KEYCODE_MENU: hide all apps when entering overview mode
Mihail Dumitrescu [Fri, 14 Feb 2014 21:02:52 +0000 (21:02 +0000)]
am
bd8d3e66: am
e4c398d3: am
29e619c8: Merge "Remove a non-obvious fall through in a switch statement." into jb-ub-now-kermit
* commit '
bd8d3e665ab84a0e65eb274d899000d16770487e':
Remove a non-obvious fall through in a switch statement.
Yura [Fri, 14 Feb 2014 21:02:52 +0000 (21:02 +0000)]
am
ad72d13f: am
792ed52a: am
83b0da1a: Removed paddingStart and paddingEnd when they are the same.
* commit '
ad72d13f431ea841d8bbf0a1ac6e5490715435b3':
Removed paddingStart and paddingEnd when they are the same.
Nilesh Agrawal [Fri, 14 Feb 2014 21:02:51 +0000 (21:02 +0000)]
am
b5b7fd3c: am
fbed86e6: am
579c8433: Merge "Allow scrolling folders in when all apps is disabled." into jb-ub-now-kermit
* commit '
b5b7fd3c3a2d5bdc540e1c508f2416155f85de18':
Allow scrolling folders in when all apps is disabled.
Sandeep Siddhartha [Fri, 14 Feb 2014 21:02:50 +0000 (21:02 +0000)]
am
8bea84e3: am
eb870e15: am
8d36ffe5: Merge "Allow changing search bar hint in the cling on-the-fly" into jb-ub-now-kermit
* commit '
8bea84e396ac6feb54d8009165f428b87157e084':
Allow changing search bar hint in the cling on-the-fly
Baligh Uddin [Fri, 14 Feb 2014 21:02:50 +0000 (21:02 +0000)]
am
c7cdc43e: (-s ours) am
72af7f8d: (-s ours) am
72b4c7c3: (-s ours) am
3e6b26da: (-s ours) am
cff2d6a2: (-s ours) Import translations. DO NOT MERGE
* commit '
c7cdc43ef3f3fb7799dbf2fc68be96c70cdc422c':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 14 Feb 2014 21:02:49 +0000 (21:02 +0000)]
am
476e0045: (-s ours) am
7c4a9e55: (-s ours) am
37749ea3: (-s ours) Import translations. DO NOT MERGE
* commit '
476e00451968fe0388e943e83d3895298031cd09':
Import translations. DO NOT MERGE
Chris Wren [Fri, 14 Feb 2014 21:02:48 +0000 (21:02 +0000)]
am
c2e2363b: am
ef6b1b5c: am
5f85bb49: Merge "support multiple files and fix logcat smippets for launcher_protoutil" into jb-ub-now-kermit
* commit '
c2e2363bb3021f640c873c4071859f561db224c6':
support multiple files and fix logcat smippets for launcher_protoutil
Nilesh Agrawal [Fri, 14 Feb 2014 21:02:48 +0000 (21:02 +0000)]
am
d76403d6: am
cdf8fe86: am
20e45a8e: Merge "Do not allow duplicate shortcuts when ALL_APPS is disabled." into jb-ub-now-kermit
* commit '
d76403d698751cd2505812ab7230c1e4fa5163e9':
Do not allow duplicate shortcuts when ALL_APPS is disabled.
Baligh Uddin [Fri, 14 Feb 2014 21:02:40 +0000 (21:02 +0000)]
am
9b4d5a42: (-s ours) am
65301b14: (-s ours) am
3d2fefae: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
* commit '
9b4d5a425be9f641076f32da863b04e009de1922':
Import translations. DO NOT MERGE