summaryrefslogtreecommitdiffstats
path: root/src/com
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Don't lose icons when migrating from different-sized hotseats." into ↵Dan Sandler2014-03-072-6/+42
|\ | | | | | | ub-now-lunchbox
| * Don't lose icons when migrating from different-sized hotseats.Dan Sandler2014-03-062-6/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Revert "Fix issue of extra blank screen after uninstall (issue ↵Adam Cohen2014-03-071-1/+0
|\ \ | | | | | | | | | 12372657)"" into ub-now-lunchbox
| * | Revert "Fix issue of extra blank screen after uninstall (issue 12372657)"Adam Cohen2014-03-061-1/+0
| | | | | | | | | | | | | | | | | | This reverts commit b2603e3d3a32c90ca13458409561d025afdce399. Change-Id: I81f8c5a4e3861b936ef9e1fbdb339c12d5aefc70
* | | Disabling cling when the user moves the folder before launching it. (Bug ↵Winson Chung2014-03-062-1/+10
| |/ |/| | | | | | | | | 12963868) Change-Id: Iddcdf655c78b7240be123bd549f3d45794d02c83
* | Merge "Fix issue of extra blank screen after uninstall (issue 12372657)" ↵Adam Cohen2014-03-041-0/+1
|\| | | | | | | into ub-now-lunchbox
| * Fix issue of extra blank screen after uninstall (issue 12372657)Adam Cohen2014-03-031-0/+1
| | | | | | | | Change-Id: I0326914821f68d789cb26767518ead1292d87db0
* | Fix buildAdam Cohen2014-03-031-1/+1
|/ | | | Change-Id: I17944c557970ed35e1bc67f6f3e3372ff88651ad
* Merge "Avoid stripping empty screens if the workspace is still loading ↵Adam Cohen2014-03-032-0/+12
|\ | | | | | | (issue 12523285)" into ub-now-lunchbox
| * Avoid stripping empty screens if the workspace is still loading (issue 12523285)Adam Cohen2014-03-012-0/+12
| | | | | | | | | | | | | | | | -> 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
* | Merge "Revert "Disabled the wallpaper when completely in -1 Now space."" ↵Jorim Jaggi2014-02-281-1/+1
|\ \ | |/ |/| | | into ub-now-lunchbox
| * Revert "Disabled the wallpaper when completely in -1 Now space."Jorim Jaggi2014-02-271-1/+1
| | | | | | | | | | | | | | This reverts commit f3a8e8c0bd8b0dbe3991e5ad9d315e6e253e92eb. Bug: 12978354 Change-Id: I11f1eeaab4fad9a2e4acf835144f0b0dc6fac54b
* | skip backup if launcher is in a bad stateChris Wren2014-02-271-10/+32
|/ | | | | Bug: 13153542 Change-Id: I4312ebd200e8e652ef841f54301981c2a486b726
* Merge "use restored icon for restored app shortcuts" into ub-now-lunchboxChris Wren2014-02-244-40/+255
|\
| * use restored icon for restored app shortcutsChris Wren2014-02-144-40/+255
| | | | | | | | | | Bug: 10778992 Change-Id: Ie430a6587d49dc0d78b87b81582c0cef7c281017
* | Fix issue where clings didn't appear after set up wizard (issue 13077829)Adam Cohen2014-02-212-23/+22
|/ | | | | | | | | | | -> 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
* Implement spring-loading of folders when dragging over.Jorim Jaggi2014-02-125-61/+147
| | | | | Bug: 8912132 Change-Id: Id81889a133e56461df2e20599c4b40020818ba18
* Do updateWorkspaceScreenOrder inside a single transaction.Yura2014-02-112-4/+26
| | | | | | | | | | | 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
* Fix NPE in when dropping from all apps (issue 12917451)Adam Cohen2014-02-071-4/+5
| | | | | | | | | 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
* update placeholder on package install or restoreChris Wren2014-02-065-4/+88
| | | | | Bug: 10778992 Change-Id: I3293d8bab8ae0ef49fc5554531bba5bd6f70932c
* Merge "Small refactor to separate adding workspace / all apps items" into ↵Adam Cohen2014-02-053-22/+46
|\ | | | | | | ub-now-lunchbox
| * Small refactor to separate adding workspace / all apps itemsAdam Cohen2014-02-053-22/+46
| | | | | | | | Change-Id: I06b7bc7f7f0e01696cb9670b8385e5148593e3e0
* | am 6033ceb4: Ensure we don\'t call getLayoutDirection() for devices not ↵Winson Chung2014-02-051-1/+5
|\ \ | | | | | | | | | | | | | | | | | | running JB MR1+. (Bug 12906355) * commit '6033ceb438d2d8e6c8406e2b61ae515e6156965c': Ensure we don't call getLayoutDirection() for devices not running JB MR1+. (Bug 12906355)
| * | Ensure we don't call getLayoutDirection() for devices not running JB MR1+. ↵Winson Chung2014-02-051-1/+5
| | | | | | | | | | | | | | | (Bug 12906355) Change-Id: I25115b9529c21d3079f50bc26bad8f846a6fcd3e
* | | Fix deprecated EMPTY_ARRAY usage (nanoprotos).Mac Duy Hai2014-02-051-2/+2
| | | | | | | | | | | | | | | | | | Newer nanoproto compiler discourages the use of this. Change-Id: Ic27a6d15f2892bb49df3100147c086a2bce20fd4
* | | Do not show overview when menu pressed on CustomContent screen.Yura2014-02-041-9/+15
| | | | | | | | | | | | | | | Bug: 12524591 Change-Id: I2bc0c4d206214d994c9a9e1bd13b42f2e53dba9f
* | | Merge "Fix black flash during rotation of -1 screen with GEL." into ↵Derek Prothro2014-01-302-22/+9
|\ \ \ | | | | | | | | | | | | ub-now-lunchbox
| * | | Fix black flash during rotation of -1 screen with GEL.Derek Prothro2014-01-302-22/+9
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Fix bug: Scroll position reported incorrectly to live wallpapersMichael Jurka2014-01-301-2/+21
| | | | | | | | | | | | | | | Bug: 11189265 Change-Id: I410f318df4e43ed13d33889a8158a03438a6174f
* | | Add callback for "Widgets" button click in launcherSandeep Siddhartha2014-01-281-1/+9
| | | | | | | | | | | | | | | Bug: 12553852 Change-Id: I8befd046242b32e86dbc6c98e6d97f0307380dd0
* | | handle shortcut restore for missing packagesChris Wren2014-01-274-14/+123
|/ / | | | | | | | | Bug: 10778992 Change-Id: I8766b8d4dd9c0269d52a7ec3da58dd408bc5f09f
* | am 7a9cda18: Merge "Defend against missing DB during migration." into ↵Dan Sandler2014-01-241-2/+4
|\| | | | | | | | | | | | | jb-ub-now-kermit * commit '7a9cda18eb31b5ab47d7eca064374eaa6efdc268': Defend against missing DB during migration.
| * Merge "Defend against missing DB during migration." into jb-ub-now-kermitDan Sandler2014-01-251-2/+4
| |\
| | * Defend against missing DB during migration.Dan Sandler2014-01-211-2/+4
| | | | | | | | | | | | | | | Bug: 12600784 Change-Id: Ie295d2ac970eab798b9826748d400cd30a04662d
* | | am 2aaf6e33: Merge "Adding tighter first run checks for migration clings. ↵Winson Chung2014-01-232-1/+13
|\| | | | | | | | | | | | | | | | | | | | (Bug 12626290)" into jb-ub-now-kermit * commit '2aaf6e339000646501bc3d73e497a365174fad26': Adding tighter first run checks for migration clings. (Bug 12626290)
| * | Merge "Adding tighter first run checks for migration clings. (Bug 12626290)" ↵Winson Chung2014-01-232-1/+13
| |\ \ | | | | | | | | | | | | into jb-ub-now-kermit
| | * | Adding tighter first run checks for migration clings. (Bug 12626290)Winson Chung2014-01-212-1/+13
| | | | | | | | | | | | | | | | Change-Id: I09fc95c9a3d50ce57f9140e89da2ff4856807f92
* | | | am 94449158: Avoid NPE from delayed RunnableIan Parkinson2014-01-221-3/+5
|\| | | | | | | | | | | | | | | | | | | * commit '944491587e8a8f77233a1916cc16cd07edd97f2e': Avoid NPE from delayed Runnable
| * | | Avoid NPE from delayed RunnableIan Parkinson2014-01-211-3/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 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
* | | am a4db090b: Merge "Adding specific buckets for N5 in dynamic grid. (Bug ↵Adam Cohen2014-01-171-2/+4
|\| | | | | | | | | | | | | | | | | | | | 12604220)" into jb-ub-now-kermit * commit 'a4db090b1345038a89a38ba8af6ac74f71e2ed7c': Adding specific buckets for N5 in dynamic grid. (Bug 12604220)
| * | Merge "Adding specific buckets for N5 in dynamic grid. (Bug 12604220)" into ↵Adam Cohen2014-01-181-2/+4
| |\ \ | | | | | | | | | | | | jb-ub-now-kermit
| | * | Adding specific buckets for N5 in dynamic grid. (Bug 12604220)Winson Chung2014-01-171-2/+4
| | |/ | | | | | | | | | Change-Id: I1fa62b7d16f557c7191fb1666d687b8784a88857
* | | am 5ac62d69: Merge "Fix overlapping pages (issue 12551580)" into ↵Adam Cohen2014-01-171-1/+1
|\| | | | | | | | | | | | | | | | | | | | jb-ub-now-kermit * commit '5ac62d6914067c48e1fcdb3f6f149532017c5803': Fix overlapping pages (issue 12551580)
| * | Merge "Fix overlapping pages (issue 12551580)" into jb-ub-now-kermitAdam Cohen2014-01-171-1/+1
| |\ \ | | |/ | |/|
| | * Fix overlapping pages (issue 12551580)Adam Cohen2014-01-161-1/+1
| | | | | | | | | | | | Change-Id: I03c29c36828b6c4baadb33b13b0e852b07b2d40f
* | | am e6e0af03: Merge "Dismissing search and other overlays when the menu ↵Adam Cohen2014-01-171-1/+10
|\| | | | | | | | | | | | | | | | | | | | 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)
| * | Merge "Dismissing search and other overlays when the menu button is pressed. ↵Adam Cohen2014-01-171-1/+10
| |\ \ | | |/ | |/| | | | (Bug 12524591)" into jb-ub-now-kermit
| | * Dismissing search and other overlays when the menu button is pressed. (Bug ↵Winson Chung2014-01-171-1/+10
| | | | | | | | | | | | 12524591)
* | | Disabled the wallpaper when completely in -1 Now space.Selim Cinek2014-01-161-1/+1
| | | | | | | | | | | | Bug: 11186234 Change-Id: I6ffb66f12298bd9df7e228a8589d63780b70a396
* | | am f8584042: Merge "Updating Tablet clings. (Bug 11973614)" into ↵Winson Chung2014-01-164-41/+123
|\| | | | | | | | | | | | | | | | | | | | jb-ub-now-kermit * commit 'f8584042713aad82f9d057ecaace8a9ad1aad0bc': Updating Tablet clings. (Bug 11973614)