Commit Graph
7904 Commits
Author SHA1 Message Date
Huy Nguyen 8dc2ca68c1 Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release 2014-03-07 13:49:10 -08:00
Dan Sandler eac828e0fe Merge "Don't lose icons when migrating from different-sized hotseats." into ub-now-lunchbox 2014-03-07 20:15:17 +00:00
Mark Ashdown a2bc37722e Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release 2014-03-07 15:33:44 +00:00
Dan Sandler ab5fa3a06a 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
2014-03-06 23:54:24 -05:00
Adam Cohen ac8180ac78 Merge "Revert "Fix issue of extra blank screen after uninstall (issue 12372657)"" into ub-now-lunchbox 2014-03-07 00:39:23 +00:00
Huy Nguyen 6cb8ae4c16 Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release 2014-03-06 15:29:42 -08:00
Adam Cohen 8a4a731b0f Revert "Fix issue of extra blank screen after uninstall (issue 12372657)"
This reverts commit b2603e3d3a.

Change-Id: I81f8c5a4e3861b936ef9e1fbdb339c12d5aefc70
2014-03-06 22:30:35 +00:00
Winson Chung c6c0367111 Disabling cling when the user moves the folder before launching it. (Bug 12963868)
Change-Id: Iddcdf655c78b7240be123bd549f3d45794d02c83
2014-03-06 10:33:41 -08:00
Mark Ashdown 7c9f33481f Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release 2014-03-04 10:25:42 +00:00
Selim Cinek 0c255a9467 Merge "Changed behaviour of the wallpaper picker." into ub-now-lunchbox 2014-03-04 09:48:32 +00:00
Adam Cohen 7da05a506c Merge "Fix issue of extra blank screen after uninstall (issue 12372657)" into ub-now-lunchbox 2014-03-04 00:14:38 +00:00
Adam Cohen b2603e3d3a Fix issue of extra blank screen after uninstall (issue 12372657)
Change-Id: I0326914821f68d789cb26767518ead1292d87db0
2014-03-03 16:12:35 -08:00
Adam Cohen 65e43032c8 Fix build
Change-Id: I17944c557970ed35e1bc67f6f3e3372ff88651ad
2014-03-03 11:37:27 -08:00
Adam Cohen 474a35735a Merge "Avoid stripping empty screens if the workspace is still loading (issue 12523285)" into ub-now-lunchbox 2014-03-03 19:07:23 +00:00
Selim Cinek ffed65886e 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
2014-03-03 18:09:06 +01:00
Christoph Studer 8657bac9b5 Merge "Guard against null default wallpaper" into ub-now-lunchbox 2014-03-03 16:00:06 +00:00
Christoph Studer 7084c606eb Guard against null default wallpaper
Deal with WallpaperManager.getBuiltInDrawable() returning null.

Bug: 13109487
Change-Id: Ib5665a0eb947e9784cdcd0e8dfab1a01b4deca82
2014-03-03 15:35:25 +01:00
Adam Cohen 517a7f5fd0 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
2014-03-01 12:17:44 -08:00
Selim Cinek 3aa28319ce Changed inconsistency when selecting default wallpaper, where it did not go back to home.
Bug: 13219313
Change-Id: I4961c6724a1550dbae126f97e45dc166cbe9a565
2014-02-28 18:03:15 +01:00
Jorim Jaggi 4f462f4a8b Merge "Revert "Disabled the wallpaper when completely in -1 Now space."" into ub-now-lunchbox 2014-02-28 14:52:44 +00:00
Chris Wren 7114426665 skip backup if launcher is in a bad state
Bug: 13153542
Change-Id: I4312ebd200e8e652ef841f54301981c2a486b726
2014-02-27 15:49:39 -05:00
Jorim Jaggi b45b65e1e5 Revert "Disabled the wallpaper when completely in -1 Now space."
This reverts commit f3a8e8c0bd.

Bug: 12978354
Change-Id: I11f1eeaab4fad9a2e4acf835144f0b0dc6fac54b
2014-02-27 20:33:46 +01:00
Winson Chung 3de6ea8647 Merge "Updating Read/Write settings permission protectionLevels. (Bug 11372484)" into ub-now-lunchbox 2014-02-26 19:58:19 +00:00
Winson Chung c66109caf6 Updating Read/Write settings permission protectionLevels. (Bug 11372484) 2014-02-26 11:50:46 -08:00
Baligh Uddin e8cc0905e0 Merge "Import translations. DO NOT MERGE" into ub-now-lunchbox 2014-02-25 17:23:59 +00:00
Selim Cinek d266d0fae0 Merge "Fixed visibility issue of save button in case the url loading failed" into ub-now-lunchbox 2014-02-25 13:26:07 +00:00
Selim Cinek c13e0a5cf1 Fixed visibility issue of save button in case the url loading failed
Bug: 12953091
Change-Id: Idc640532e2c2c6143d49d330bd541682eca64ac5
2014-02-25 14:23:57 +01:00
Mathew Inwood 56ca86b7c1 Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release 2014-02-25 10:30:34 +00:00
Baligh Uddin 10addc3e0e Import translations. DO NOT MERGE
Change-Id: I2b7248218fe16856a9721b8b9169700977f19d00
Auto-generated-cl: translation import
2014-02-24 13:59:57 -08:00
Chris Wren 0e4a365e0d Merge "use restored icon for restored app shortcuts" into ub-now-lunchbox 2014-02-24 21:59:34 +00:00
Adam Cohen 71e03b9979 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
2014-02-21 14:37:53 -08:00
Baligh Uddin 36c123ec6b am 9594e887: (-s ours) am 37fe7d2b: (-s ours) am f42cf7de: (-s ours) Import translations. DO NOT MERGE
* commit '9594e887712d8dfca47c0f160a24cfb7a8262cb8':
  Import translations. DO NOT MERGE
2014-02-20 13:12:42 -08:00
Baligh Uddin 9594e88771 am 37fe7d2b: (-s ours) am f42cf7de: (-s ours) Import translations. DO NOT MERGE
* commit '37fe7d2b99dc514f567b31e5931d054bacefe377':
  Import translations. DO NOT MERGE
2014-02-20 13:10:18 -08:00
Baligh Uddin 37fe7d2b99 am f42cf7de: (-s ours) Import translations. DO NOT MERGE
* commit 'f42cf7de53f9f500ae06b62b9097b9edc7884a2b':
  Import translations. DO NOT MERGE
2014-02-20 13:08:48 -08:00
Baligh Uddin f42cf7de53 Import translations. DO NOT MERGE
Change-Id: I4fb41af97a881f6669af15ddd6db1af4f3429765
Auto-generated-cl: translation import
2014-02-20 09:39:20 -08:00
Juan Silveira 07130d400c Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release 2014-02-18 10:33:27 +00:00
Chris Wren 6d0dde01f3 use restored icon for restored app shortcuts
Bug: 10778992
Change-Id: Ie430a6587d49dc0d78b87b81582c0cef7c281017
2014-02-14 11:49:30 -05:00
Yura c0bb4a19bb Fix for Can't convert to dimension: type=0x12 Crash on JB deviecs.
Bug: 11578157
Change-Id: I116cef5f30e9028348cd028eaf46038d9d79bdd3
2014-02-13 19:37:32 +00:00
Jorim Jaggi 55bd9725d5 Implement spring-loading of folders when dragging over.
Bug: 8912132
Change-Id: Id81889a133e56461df2e20599c4b40020818ba18
2014-02-12 22:16:51 +01:00
Baligh Uddin f180497bc3 am 57251be2: (-s ours) Import translations. DO NOT MERGE
* commit '57251be2d77ad94f05c49d42d682ec008a6e211d':
  Import translations. DO NOT MERGE
2014-02-11 13:28:18 -08:00
Baligh Uddin 17d9bf66dc Merge "Import translations. DO NOT MERGE" into ub-now-lunchbox 2014-02-11 21:26:32 +00:00
Yura 085c853a57 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
2014-02-11 15:15:29 +00:00
Anton Hansson d0642c4274 Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release 2014-02-11 10:33:40 +00:00
Baligh Uddin 30e43d723d Import translations. DO NOT MERGE
Change-Id: Icb76bf81b4253215543f7e384efac9eb23e0c432
Auto-generated-cl: translation import
2014-02-10 15:40:51 -08:00
Baligh Uddin 57251be2d7 Import translations. DO NOT MERGE
Change-Id: Icfe6248a812a2aa103c830a9fabe22de9ff228bb
Auto-generated-cl: translation import
2014-02-10 15:39:10 -08:00
Adam Cohen ec0d61d79e 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
2014-02-07 16:34:51 -08:00
Chris Wren b6d4c2827a update placeholder on package install or restore
Bug: 10778992
Change-Id: I3293d8bab8ae0ef49fc5554531bba5bd6f70932c
2014-02-06 15:05:16 -05:00
Adam Skory 853b55b96e Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release 2014-02-06 10:03:03 +00:00
Adam Cohen c87c21a0cd Merge "Small refactor to separate adding workspace / all apps items" into ub-now-lunchbox 2014-02-05 22:25:41 +00:00
Winson Chung cb2de6f8a0 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)
2014-02-05 13:59:48 -08:00