summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Use promisedIntent instead of intent when deep shortcuts are restored.Tony Wickham2016-08-305-11/+21
| | | | | | | | | | | This ensures that the intent has the package corresponding to the shortcut publisher, rather than a market intent. It also ensures that the intent has the EXTRA_SHORTCUT_ID attached. Bug: 31123204 Change-Id: I05d56396b629880322e915f52bfc0605b921b0b1 (cherry picked from commit fc02c1b446ee54561ac7351fb6ff0f8294785f0e)
* Fixing the hotseat import logicSunny Goyal2016-08-242-10/+41
| | | | | | | | | | | | | | | | | The import logic following the behavior: Improt everything and force run GridMigrationTask to automatically remove broken icons. This logic would fail for hotseat as the replacement happens before the GridMigrationTask, which will not replace the broken targets appropriately The cl changes some logic only for hotseat import > After import remove any broken icons/empty folders > When adding default icons, only add as much icons as required. Since GridMigrationTask uses weights, it sometimes removes imported icon, if the hotseat size becomes too large. Bug: 30909630 Change-Id: I6ca1f25dac81649794d81aaf82c3c38d1c918d91
* Checking for duplicate intent with proper source bounds.Sunny Goyal2016-08-241-1/+3
| | | | | | | | | | Since we are doing a equality check on the intent, items which already have the bounds attached to the intent will not get matched, causing duplicate icons Bug: 27176189 Change-Id: Ia9ed9120b04e9c234304995aed13777a5773119e (cherry picked from commit cbfe71dba38af1d1cd2d2372b649537d7d94610b)
* Cancel hotseat color animator before setting a new color.Tony Wickham2016-08-221-4/+16
| | | | | | | | | | | | | | | | | There was a race condition that caused the new color to not be applied. For example, here's how the hotseat would become transparent: 1 Launcher is loaded for the first time; as such, there is not yet a color defined for the hotseat, so we start animating to the provided default (Color.TRANSPARENT). Meanwhile we start the color extraction. 2 When the color extraction finishes, we set the hotseat to the new color. However, if launcher is paused at the time (perhaps some retail mode content is showing), then we don't animate the change. 3 If 2 happens before the animation in 1 is complete, the color from 2 will be overriden by subsequent animation frames and thus the hotseat remains transparent until the wallpaper changes. Bug: 30956221 Change-Id: Iddf72379b0162f1b32883ad26ce267473e172849
* Merge "Updating version check to use SDK_INT" into ub-launcher3-calgarySunny Goyal2016-08-161-6/+1
|\
| * Updating version check to use SDK_INTSunny Goyal2016-08-151-6/+1
| | | | | | | | Change-Id: Idb46053e7304bc8d0cab03a17a6fe73013e4f092
* | [DO NOT MERGE] Set launch source target correctly for user event loggingHyunyoung Song2016-08-165-27/+75
| | | | | | | | | | | | | | | | Before, everything is set to APP_ICON With this changed, pinned shortcuts are set to DEEPSHORTCUT Change-Id: I3e17de63f58693525236290ef5cb1f909f1d6098 (cherry picked from commit 8ce6063c4a5bd90810f0a21c946e5bbad3ce9de4)
* | Merge "Ignore clicks on shortcuts' drag handles." into ub-launcher3-calgaryTony Wickham2016-08-151-0/+37
|\ \
| * | Ignore clicks on shortcuts' drag handles.Tony Wickham2016-08-151-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When touching down within the drag handle's bounds, we remove the onClickListener temporarily (restored when touching down outside of the drag handle's bounds). Long clicks still start the drag. Also increased drag threshold from 12dp to 16dp. Bug: 30816665 Change-Id: I0b33dc34bf95c0532376f2f7cf50865fa50093de
* | | Merge "Log shortcuts open on ACTION_UP instead of in showForIcon()." into ↵Hyunyoung Song2016-08-123-36/+10
|\ \ \ | |_|/ |/| | | | | ub-launcher3-calgary
| * | Log shortcuts open on ACTION_UP instead of in showForIcon().Tony Wickham2016-08-103-36/+10
| |/ | | | | | | | | | | | | | | | | | | | | - We only want to log when the container is opened and potentially used, not when a long press is followed by a drag-and-drop. - Also cleaned up code that was determining the container of the app icon, since LaunchSourceProvider.fillInLaunchSourceData() can do that instead (it's more robust and consistent). Bug: 30791570 Change-Id: I05b6750f26182fda8a9940ac66f1371c2d228ca9
* | Merge "Reloading workspace when the shortcuts permission changes" into ↵Sunny Goyal2016-08-113-5/+51
|\ \ | | | | | | | | | ub-launcher3-calgary
| * | Reloading workspace when the shortcuts permission changesSunny Goyal2016-08-103-5/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | > Check for permission on every onResume > If the permission is different than last known permission, reload and rebind workspace. Bug: 30789422 Change-Id: Idfa445815e29e2336505779545507d106b33a253
* | | Merge "Change drag from shortcuts to say "Cancel" instead of "Remove"" into ↵Tony Wickham2016-08-091-1/+1
|\ \ \ | |/ / |/| | | | | ub-launcher3-calgary
| * | Change drag from shortcuts to say "Cancel" instead of "Remove"Tony Wickham2016-08-091-1/+1
| |/ | | | | | | | | Bug: 30757836 Change-Id: I7d2d97898bd1feac3cd7ba15614c29a1e1b33841
* | Merge "Make padding consistent between shortcuts and the app icon." into ↵Tony Wickham2016-08-081-13/+17
|\ \ | | | | | | | | | ub-launcher3-calgary
| * | Make padding consistent between shortcuts and the app icon.Tony Wickham2016-08-051-13/+17
| |/ | | | | | | | | | | | | | | | | | | | | | | | | This change makes the padding consistent regardless of where the app is (e.g. folder vs workspace vs all apps) by ignoring the app's padding and adding our own to the shortcuts container. Also note that this padding is relative to the icon, excluding the text beneath it. So we also hide the text when the container opens downwards, and re-show it when the container closes. Bug: 30604007 Change-Id: I6e51c4983a8b5d495833f86e483ebaa229ed2099
* | Fixing potential ConcurrentModificationExceptionSunny Goyal2016-08-082-2/+33
| | | | | | | | | | | | | | | | mBgDeepShortcutMap is only accessed on the background thread. But the same instance of list of values was getting passed to the UI thread, instead of being cloned. Change-Id: Ie7d0442d895304489ce9323ea872b9091d668ae5
* | Merge "Pull down should work on search box, even if all apps scroll is not ↵Hyunyoung Song2016-08-053-6/+12
|\ \ | | | | | | | | | at top. b/30295305" into ub-launcher3-calgary
| * | Pull down should work on search box, even if all apps scroll is not at top.Hyunyoung Song2016-08-053-6/+12
| | | | | | | | | | | | | | | | | | b/30295305 Change-Id: I38bbe47d6e33929c550930c9f157c58fbea203ef
* | | Merge "Fix hotseat flicker when opened all apps in landscape, rotate screen, ↵Hyunyoung Song2016-08-052-3/+2
|\ \ \ | | | | | | | | | | | | pull down" into ub-launcher3-calgary
| * | | Fix hotseat flicker when opened all apps in landscape, rotate screen, pull downHyunyoung Song2016-08-042-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | b/30595452 Change-Id: Ib634ffbc509c6b16ac58c184ccbca15ae936be14
* | | | Merge "Change NavBar to transparent black b/30615471" into ub-launcher3-calgaryHyunyoung Song2016-08-055-8/+19
|\ \ \ \ | |_|_|/ |/| | |
| * | | Change NavBar to transparent blackHyunyoung Song2016-08-055-8/+19
| | |/ | |/| | | | | | | | | | | | | b/30615471 Change-Id: I7885e8a7fd63ee10c9b0107087046730e8acfde9
* / | Use shortcut disabled message if available.Tony Wickham2016-08-053-0/+17
|/ / | | | | | | | | Bug: 30681210 Change-Id: Ibb5fd58e5fc9557b63730bc1e3c3977133769466
* | Merge "Reset mActiveController to null in ↵Tony Wickham2016-08-041-0/+2
|\ \ | | | | | | | | | DragLayer.onInterceptTouchEvent()." into ub-launcher3-calgary
| * | Reset mActiveController to null in DragLayer.onInterceptTouchEvent().Tony Wickham2016-08-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the previous active controller will continue to handle touch events even if it doesn't re-intercept future touches. For instance, All Apps was handling the swipe gesture after DragLayer intercepted to close a shortcuts container, which led to the weird behavior described in the bug. Bug: 30590854 Change-Id: I247b39b03d336a04659f6ce644380bf3cef8de3f
* | | Adding support for updating the pinned shortcuts without updatingSunny Goyal2016-08-041-8/+17
| | | | | | | | | | | | | | | | | | | | | the ID map Bug: 30654182 Change-Id: I30082bd87466a29b7bafe1e8cbf1446e1d1e4f3e
* | | Prevent refreshing app search results with empty query.Winson2016-08-031-2/+2
|/ / | | | | | | | | | | | | | | | | - Any change to the TextView text will cause mQuery to be set, which will cause a new search next time refreshSearchResult is called. We should also be checking there if it is a valid search query before starting a new search. Bug: 30606307 Change-Id: I08640c56199211f2aeea2386fcf699810853ab58
* | Merge "Change interpolation logic to all apps transitioning on fling ↵Hyunyoung Song2016-08-032-49/+87
|\ \ | | | | | | | | | b/30486958" into ub-launcher3-calgary
| * | Change interpolation logic to all apps transitioning on flingHyunyoung Song2016-08-032-49/+87
| |/ | | | | | | | | | | | | | | b/30486958 Cleaning up/refactoring this CL will be done in polish branch. Change-Id: Ib51633a1e1cb79f58b505f835053ef238ae1bdec
* | Merge "Disabling accessibility focus on all children when shortcuts is open" ↵Sunny Goyal2016-08-031-11/+21
|\ \ | | | | | | | | | into ub-launcher3-calgary
| * | Disabling accessibility focus on all children when shortcuts is openSunny Goyal2016-08-031-11/+21
| | | | | | | | | | | | | | | Bug: 30611791 Change-Id: Ibb1dec13b62add3799c215fea98e87e3fa89638d
* | | Merge "Start shortcuts close animation where open left off." into ↵Tony Wickham2016-08-033-25/+89
|\ \ \ | | | | | | | | | | | | ub-launcher3-calgary
| * | | Start shortcuts close animation where open left off.Tony Wickham2016-08-023-26/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Before we always started the close animation at 0 instead of the previous open progress, which looked janky. - Shortened the animations' durations and start delays to account for the fact that the open animation was only partially finished when the close animation started. Bug: 30465231 Change-Id: I958ee5f4543dbf1185f3d0229c55fc1b51929655
* | | | Merge "Fix disco bounce crash b/30413641" into ub-launcher3-calgaryHyunyoung Song2016-08-031-0/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix disco bounce crashHyunyoung Song2016-08-031-0/+3
| | |/ | |/| | | | | | | | | | | | | b/30413641 Change-Id: Icb2f3f11024daa78c3f59cab8c773091b9481feb
* | | Simpler caretPeter Schiller2016-08-022-63/+129
| | | | | | | | | | | | | | | Bug: 30527159 Change-Id: I674de149e613c7adb567a13a288baa9877d36112
* | | Updating content description for the shortcuts menu and announcingSunny Goyal2016-08-021-0/+5
|/ / | | | | | | | | | | | | it when the container is opened Bug: 30587453 Change-Id: I6f2d3ba05593f3e2a1a8f05c66a0f80e76932c38
* | Merge "Add container velocity for all apps to be used by the caret" into ↵Hyunyoung Song2016-08-022-25/+30
|\ \ | | | | | | | | | ub-launcher3-calgary
| * | Add container velocity for all apps to be used by the caretHyunyoung Song2016-08-022-25/+30
| |/ | | | | | | Change-Id: I03479d53eb7203ab4a0515e2bf68b917dfb81f23
* | Merge "Adding workaround to jump in wallpaper offsets." into ↵Winson Chung2016-08-021-2/+3
|\ \ | | | | | | | | | ub-launcher3-calgary
| * | Adding workaround to jump in wallpaper offsets.Winson2016-08-021-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | - Just skip the animation if we are animating to the same wallpaper offset (which is the case when we are adding from all apps) Bug: 28587903 Change-Id: Ib7b1828c1b099a665d68c22cb33ee62693f33f35
* | | Merge "Always cancel forwarding on ACTION_UP or ACTION_CANCEL." into ↵Tony Wickham2016-08-021-6/+5
|\ \ \ | | | | | | | | | | | | ub-launcher3-calgary
| * | | Always cancel forwarding on ACTION_UP or ACTION_CANCEL.Tony Wickham2016-08-011-6/+5
| | |/ | |/| | | | | | | | | | Bug: 30563284 Change-Id: I6285eda6d9f7a775f8ae896baebc420a0cf84e21
* | | Merge "Handling IllegalStateException which can be thrown by the system when ↵Sunny Goyal2016-08-022-14/+29
|\ \ \ | | | | | | | | | | | | the user is locked" into ub-launcher3-calgary
| * | | Handling IllegalStateException which can be thrown by the system when the ↵Sunny Goyal2016-08-012-14/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | user is locked Bug: 30411561 Change-Id: I0d7fc0aaecba01b1aaac95b98654f6e3ee090ce8
* | | | Merge "Add logging for shortcuts opening." into ub-launcher3-calgaryTony Wickham2016-08-025-8/+52
|\ \ \ \ | |/ / / |/| | |
| * | | Add logging for shortcuts opening.Tony Wickham2016-08-015-8/+52
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | - Log as long press with child type DEEPSHORTCUTS container - Parent type can be one of WORKSPACE, HOTSEAT, FOLDER, ALLAPPS, PREDICTION, or SEARCHRESULT. Bug: 30537079 Change-Id: Ie62e4889ee06c845f959ca998781787a7fdaf00e
* | | Merge "Adding quiet mode support for shortcuts" into ub-launcher3-calgarySunny Goyal2016-08-0114-238/+372
|\ \ \ | |/ / |/| |