summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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)
| * | Merge "Updating Tablet clings. (Bug 11973614)" into jb-ub-now-kermitWinson Chung2014-01-164-41/+123
| |\ \
| | * | Updating Tablet clings. (Bug 11973614)Winson Chung2014-01-164-41/+123
| | | | | | | | | | | | | | | | Change-Id: I6cb10424a345691d50c4fac7969e0b97bbee4b3c
* | | | am 1ba0a30e: Merge "Adding new bucket for inbetween phone-tablet layouts. ↵Winson Chung2014-01-161-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | (Bug 11993166)" into jb-ub-now-kermit * commit '1ba0a30e6545a8c313d0ef355a101f661bbf778c': Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)
| * | | Merge "Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)" ↵Winson Chung2014-01-161-0/+2
| |\ \ \ | | | | | | | | | | | | | | | into jb-ub-now-kermit
| | * | | Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)Winson Chung2014-01-161-0/+2
| | |/ / | | | | | | | | | | | | Change-Id: I01fc54be8059d4cd25ff465c70595683fc8ac019
* | | | am 08101b1f: Merge "Lazy load the widget preview loader class" into ↵Adam Cohen2014-01-161-13/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | jb-ub-now-kermit * commit '08101b1f52b2b6aa8ddb82f09a18b91482b99f58': Lazy load the widget preview loader class
| * | | Merge "Lazy load the widget preview loader class" into jb-ub-now-kermitAdam Cohen2014-01-161-13/+16
| |\ \ \ | | |_|/ | |/| |
| | * | Lazy load the widget preview loader classMichael Jurka2014-01-161-12/+15
| | | | | | | | | | | | | | | | | | | | Bug: 12109621 Change-Id: Id99aded30195bf39ebcf2148611bc4e084f3b2c7
* | | | am 72960975: Migration update: ensuring all folders go firstAdam Cohen2014-01-161-26/+51
|\| | | | | | | | | | | | | | | | | | | * commit '72960975d8367e7ce789d8a5b6f0763fb0ec78bf': Migration update: ensuring all folders go first
| * | | Migration update: ensuring all folders go firstAdam Cohen2014-01-161-26/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> Also, leave the last row empty on every screen -> Fix bug where shortcuts weren't getting moved (introduced in previous CL) -> Only dedupe items directly on the workspace Bug 12416411 Bug 12572727 Change-Id: Id95cc6081c57cc289c2a85b2a6872ee0bf3eb98a
* | | | am 556f6135: Don\'t migrate shortcuts for components that no longer existAdam Cohen2014-01-162-20/+33
|\| | | | | | | | | | | | | | | | | | | * commit '556f6135f992dcd5bfbfffe0172627bfbf57d24e': Don't migrate shortcuts for components that no longer exist
| * | | Don't migrate shortcuts for components that no longer existAdam Cohen2014-01-152-20/+33
| | |/ | |/| | | | | | | | | | | | | Bug 12570791 Change-Id: Ie4b55afcee0c4d1d16acf7b830d7885800943454
* | | Merge "Fix back button behavior for "App info" when launched by Launcher3." ↵Adrian Roos2014-01-151-1/+2
|\ \ \ | |/ / |/| | | | | into ub-now-lunchbox