OSDN Git Service
Baligh Uddin [Thu, 20 Mar 2014 01:08:07 +0000 (18:08 -0700)]
keep history after reset to ub-now-lunchbox-release@
1069658
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 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
Chris Wren [Mon, 10 Feb 2014 17:16:54 +0000 (12:16 -0500)]
use restored icon for restored app shortcuts
Bug:
10778992
Change-Id: Ie430a6587d49dc0d78b87b81582c0cef7c281017
Jim Guggemos [Thu, 13 Feb 2014 21:02:00 +0000 (14:02 -0700)]
keep history after reset to git reset to
279b0385d04427d039c10bc22df2a2aaafd99a4a
Yura [Thu, 13 Feb 2014 19:33:39 +0000 (19:33 +0000)]
Fix for Can't convert to dimension: type=0x12 Crash on JB deviecs.
Bug:
11578157
Change-Id: I116cef5f30e9028348cd028eaf46038d9d79bdd3
Jorim Jaggi [Thu, 16 Jan 2014 23:30:42 +0000 (15:30 -0800)]
Implement spring-loading of folders when dragging over.
Bug:
8912132
Change-Id: Id81889a133e56461df2e20599c4b40020818ba18
Baligh Uddin [Tue, 11 Feb 2014 21:28:18 +0000 (13:28 -0800)]
am
57251be2: (-s ours) Import translations. DO NOT MERGE
* commit '
57251be2d77ad94f05c49d42d682ec008a6e211d':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Feb 2014 21:26:31 +0000 (21:26 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-now-lunchbox
Yura [Tue, 11 Feb 2014 15:15:29 +0000 (15:15 +0000)]
Do updateWorkspaceScreenOrder inside a single transaction.
The workspacescreens table is updated in LauncherModel.updateWorkspaceScreenOrder
and that the operation to remove all screens, then reinsert the new list of
screens in not inside a single transaction, so if the app is updating or
crashes between ContentResolver.delete and ContentResolver.bulkInsert then
the data will be lost. This CL makes it all happen inside 1 transaction.
Bug:
12523285
Change-Id: I409dbc9f48fa9c8bd4bf3b1453204a4daac1689a
Anton Hansson [Tue, 11 Feb 2014 10:33:40 +0000 (10:33 +0000)]
Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release
Baligh Uddin [Mon, 10 Feb 2014 23:40:51 +0000 (15:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icb76bf81b4253215543f7e384efac9eb23e0c432
Auto-generated-cl: translation import
Baligh Uddin [Mon, 10 Feb 2014 23:39:10 +0000 (15:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icfe6248a812a2aa103c830a9fabe22de9ff228bb
Auto-generated-cl: translation import
Adam Cohen [Sat, 8 Feb 2014 00:34:51 +0000 (16:34 -0800)]
Fix NPE in when dropping from all apps (issue
12917451)
When dropping from all apps, accept drop was returning true if the item
was above a folder, however, when it came time to complete the drop,
the folder wouldn't accept the item. This can be prevented by increasing
the criteria in acceptDrop.
Change-Id: Ib644ec45984e8366c33bb674f3d3a76e22ed5160
Chris Wren [Mon, 27 Jan 2014 19:17:08 +0000 (14:17 -0500)]
update placeholder on package install or restore
Bug:
10778992
Change-Id: I3293d8bab8ae0ef49fc5554531bba5bd6f70932c
Adam Skory [Thu, 6 Feb 2014 10:03:03 +0000 (10:03 +0000)]
Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release
Tom Stamm [Wed, 5 Feb 2014 23:04:27 +0000 (16:04 -0700)]
Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kr
Adam Cohen [Wed, 5 Feb 2014 22:25:41 +0000 (22:25 +0000)]
Merge "Small refactor to separate adding workspace / all apps items" into ub-now-lunchbox
Winson Chung [Wed, 5 Feb 2014 21:59:48 +0000 (13:59 -0800)]
am
6033ceb4: Ensure we don\'t call getLayoutDirection() for devices not running JB MR1+. (Bug
12906355)
* commit '
6033ceb438d2d8e6c8406e2b61ae515e6156965c':
Ensure we don't call getLayoutDirection() for devices not running JB MR1+. (Bug
12906355)
Adam Cohen [Wed, 5 Feb 2014 19:47:43 +0000 (11:47 -0800)]
Small refactor to separate adding workspace / all apps items
Change-Id: I06b7bc7f7f0e01696cb9670b8385e5148593e3e0
Winson Chung [Wed, 5 Feb 2014 20:37:42 +0000 (12:37 -0800)]
Ensure we don't call getLayoutDirection() for devices not running JB MR1+. (Bug
12906355)
Change-Id: I25115b9529c21d3079f50bc26bad8f846a6fcd3e
Mac Duy Hai [Wed, 5 Feb 2014 10:52:07 +0000 (10:52 +0000)]
Fix deprecated EMPTY_ARRAY usage (nanoprotos).
Newer nanoproto compiler discourages the use of this.
Change-Id: Ic27a6d15f2892bb49df3100147c086a2bce20fd4
Adam Skory [Tue, 4 Feb 2014 19:32:38 +0000 (19:32 +0000)]
Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release
Yura [Tue, 4 Feb 2014 14:15:21 +0000 (14:15 +0000)]
Do not show overview when menu pressed on CustomContent screen.
Bug:
12524591
Change-Id: I2bc0c4d206214d994c9a9e1bd13b42f2e53dba9f
Yura [Tue, 4 Feb 2014 16:00:31 +0000 (16:00 +0000)]
Merge "Missing paddingRight added." into ub-now-lunchbox
Adam Skory [Tue, 4 Feb 2014 15:53:42 +0000 (15:53 +0000)]
Merge remote-tracking branch 'goog/ub-now-lunchbox' into release
Yura [Tue, 4 Feb 2014 15:36:35 +0000 (15:36 +0000)]
Missing paddingRight added.
Bug:
8166178
Change-Id: Ie2ba02a1ad85d29f1028fe021ade37975b453305
Geoff Mendal [Tue, 4 Feb 2014 00:50:19 +0000 (16:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ieaf2484f1b08841a5fecd5050c4df75125e1cecf
Auto-generated-cl: translation import
Adam Skory [Mon, 3 Feb 2014 15:24:53 +0000 (15:24 +0000)]
Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release
Baligh Uddin [Sat, 1 Feb 2014 00:25:44 +0000 (16:25 -0800)]
am
f47cc890: (-s ours) Import translations. DO NOT MERGE
* commit '
f47cc890e9475b31acd1416de57d32062d395e9e':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 31 Jan 2014 23:57:58 +0000 (15:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I630533bcc5d004fc677f54233f8d0578e119ab4e
Auto-generated-cl: translation import
Derek Prothro [Thu, 30 Jan 2014 22:03:55 +0000 (22:03 +0000)]
Merge "Fix black flash during rotation of -1 screen with GEL." into ub-now-lunchbox
Derek Prothro [Fri, 17 Jan 2014 18:43:50 +0000 (13:43 -0500)]
Fix black flash during rotation of -1 screen with GEL.
We need to make sure the custom content is adding synchronously
while the rest of the workspace is being created. If we wait
for it to be added in a separate run task, we see a black
flash during rotation.
Also rename a few methods and remove obsolete methods.
Bug:
11802691
Change-Id: I3f6500aa1fabe68cef59ad8c764877f954986a99
Michael Jurka [Wed, 29 Jan 2014 15:32:39 +0000 (16:32 +0100)]
Fix bug: Scroll position reported incorrectly to live wallpapers
Bug:
11189265
Change-Id: I410f318df4e43ed13d33889a8158a03438a6174f
Sandeep Siddhartha [Tue, 28 Jan 2014 18:41:15 +0000 (10:41 -0800)]
Add callback for "Widgets" button click in launcher
Bug:
12553852
Change-Id: I8befd046242b32e86dbc6c98e6d97f0307380dd0
Chris Wren [Thu, 16 Jan 2014 23:13:56 +0000 (18:13 -0500)]
handle shortcut restore for missing packages
Bug:
10778992
Change-Id: I8766b8d4dd9c0269d52a7ec3da58dd408bc5f09f
Ian Parkinson [Mon, 27 Jan 2014 17:38:11 +0000 (17:38 +0000)]
Merge Launcher3 jb-ub-now-kermit to kermit-release
Dan Sandler [Sat, 25 Jan 2014 05:02:03 +0000 (21:02 -0800)]
am
7a9cda18: Merge "Defend against missing DB during migration." into jb-ub-now-kermit
* commit '
7a9cda18eb31b5ab47d7eca064374eaa6efdc268':
Defend against missing DB during migration.
Dan Sandler [Sat, 25 Jan 2014 05:00:32 +0000 (05:00 +0000)]
Merge "Defend against missing DB during migration." into jb-ub-now-kermit
Michael Jurka [Fri, 24 Jan 2014 12:04:45 +0000 (12:04 +0000)]
Merge "Catch exceptions if Exif is malformed" into ub-now-lunchbox
Huy Nguyen [Thu, 23 Jan 2014 22:36:56 +0000 (14:36 -0800)]
Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release
Winson Chung [Thu, 23 Jan 2014 20:23:35 +0000 (12:23 -0800)]
am
2aaf6e33: Merge "Adding tighter first run checks for migration clings. (Bug
12626290)" into jb-ub-now-kermit
* commit '
2aaf6e339000646501bc3d73e497a365174fad26':
Adding tighter first run checks for migration clings. (Bug
12626290)
Winson Chung [Thu, 23 Jan 2014 20:21:12 +0000 (20:21 +0000)]
Merge "Adding tighter first run checks for migration clings. (Bug
12626290)" into jb-ub-now-kermit
Baligh Uddin [Thu, 23 Jan 2014 18:41:40 +0000 (10:41 -0800)]
am
c2abb6b4: (-s ours) Import translations. DO NOT MERGE
* commit '
c2abb6b443592cd1d070e2fa196511e2f6957077':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 23 Jan 2014 18:28:57 +0000 (10:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2e2a6f98fd63d04c55e08e0c11d256105701457a
Auto-generated-cl: translation import
Baligh Uddin [Thu, 23 Jan 2014 18:26:35 +0000 (10:26 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9a8480fdd1e29c679711c256f4e2a0d2d0687c36
Auto-generated-cl: translation import
Michael Jurka [Thu, 23 Jan 2014 13:37:59 +0000 (14:37 +0100)]
Catch exceptions if Exif is malformed
Bug:
11650650
Change-Id: Iee8f1675850c692fe54dc619f3e969ba180e4206
Michael Jurka [Thu, 23 Jan 2014 13:22:28 +0000 (13:22 +0000)]
Merge "Disable Set Wallpaper button while loading image" into ub-now-lunchbox
Ian Parkinson [Wed, 22 Jan 2014 19:32:47 +0000 (11:32 -0800)]
am
94449158: Avoid NPE from delayed Runnable
* commit '
944491587e8a8f77233a1916cc16cd07edd97f2e':
Avoid NPE from delayed Runnable
Winson Chung [Tue, 21 Jan 2014 21:00:26 +0000 (13:00 -0800)]
Adding tighter first run checks for migration clings. (Bug
12626290)
Change-Id: I09fc95c9a3d50ce57f9140e89da2ff4856807f92
Dan Sandler [Tue, 21 Jan 2014 19:14:41 +0000 (14:14 -0500)]
Defend against missing DB during migration.
Bug:
12600784
Change-Id: Ie295d2ac970eab798b9826748d400cd30a04662d
Ian Parkinson [Tue, 21 Jan 2014 13:09:59 +0000 (13:09 +0000)]
Avoid NPE from delayed Runnable
Naive fix to b/
12656485. Other Runnables in Launcher similarly check
that mWorkspace hasn't become null between being posted and being
executed, so I think this is probably appropriate.
Bug:
12656485
Change-Id: Ib4f3d0e8686c6249fe838144b1e8120c85f66f01
Jim Guggemos [Sat, 18 Jan 2014 00:24:31 +0000 (17:24 -0700)]
Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release
at
a4db090b1345038a89a38ba8af6ac74f71e2ed7c
Adam Cohen [Sat, 18 Jan 2014 00:23:19 +0000 (16:23 -0800)]
am
a4db090b: Merge "Adding specific buckets for N5 in dynamic grid. (Bug
12604220)" into jb-ub-now-kermit
* commit '
a4db090b1345038a89a38ba8af6ac74f71e2ed7c':
Adding specific buckets for N5 in dynamic grid. (Bug
12604220)
Adam Cohen [Sat, 18 Jan 2014 00:21:56 +0000 (00:21 +0000)]
Merge "Adding specific buckets for N5 in dynamic grid. (Bug
12604220)" into jb-ub-now-kermit
Adam Cohen [Fri, 17 Jan 2014 00:07:50 +0000 (16:07 -0800)]
Fix overlapping pages (issue
12551580)
Change-Id: I03c29c36828b6c4baadb33b13b0e852b07b2d40f
(cherry picked from commit
efb31e399d335351a8db3de54ed66fabd30606ba)
Winson Chung [Fri, 17 Jan 2014 22:43:02 +0000 (14:43 -0800)]
Adding specific buckets for N5 in dynamic grid. (Bug
12604220)
Change-Id: I1fa62b7d16f557c7191fb1666d687b8784a88857
Adam Cohen [Fri, 17 Jan 2014 22:34:19 +0000 (14:34 -0800)]
am
5ac62d69: Merge "Fix overlapping pages (issue
12551580)" into jb-ub-now-kermit
* commit '
5ac62d6914067c48e1fcdb3f6f149532017c5803':
Fix overlapping pages (issue
12551580)
Adam Cohen [Fri, 17 Jan 2014 22:32:21 +0000 (22:32 +0000)]
Merge "Fix overlapping pages (issue
12551580)" into jb-ub-now-kermit
Adam Cohen [Fri, 17 Jan 2014 21:28:54 +0000 (13:28 -0800)]
am
e6e0af03: Merge "Dismissing search and other overlays when the menu button is pressed. (Bug
12524591)" into jb-ub-now-kermit
* commit '
e6e0af03ee39b3e800c8f7e86eefffae432ee7c8':
Dismissing search and other overlays when the menu button is pressed. (Bug
12524591)
Jim Guggemos [Fri, 17 Jan 2014 20:58:40 +0000 (13:58 -0700)]
Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release
at
e6e0af03ee39b3e800c8f7e86eefffae432ee7c8
Adam Cohen [Fri, 17 Jan 2014 20:25:14 +0000 (20:25 +0000)]
Merge "Dismissing search and other overlays when the menu button is pressed. (Bug
12524591)" into jb-ub-now-kermit
Winson Chung [Fri, 17 Jan 2014 20:03:00 +0000 (12:03 -0800)]
Dismissing search and other overlays when the menu button is pressed. (Bug
12524591)
Michael Jurka [Thu, 16 Jan 2014 13:58:00 +0000 (14:58 +0100)]
Disable Set Wallpaper button while loading image
Bug:
12472111
Change-Id: I2a0cba47f31af2416b0dd062929f277fcbf80481
Mark Ashdown [Fri, 17 Jan 2014 12:15:16 +0000 (12:15 +0000)]
Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release
Conflicts:
src/com/android/launcher3/LauncherClings.java
Change-Id: Idd2e6d54180315854216cfc868cd36297dcb95d9