summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge changes from topic 'am-6d9d0859-70d0-4f47-805c-9d347aa427d6' into ↵TreeHugger Robot2017-07-271-3/+1
|\ | | | | | | | | | | | | | | ub-launcher3-dorval-polish2 * changes: Remove extra call to AllAppsContainerView#reset. am: 14709c6eea Remove extra call to AllAppsContainerView#reset.
| * Remove extra call to AllAppsContainerView#reset. am: 14709c6eeaJonathan Miranda2017-07-241-3/+1
| |\ | | | | | | | | | Change-Id: I3c2b33376f3051b4775b7079ac138048d1acda29
| | * Remove extra call to AllAppsContainerView#reset.Jon Miranda2017-07-241-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | We were calling reset twice: * LauncherStateTransitionAnimation#startAnimationToWorkspaceFromAllApps * AllAppsTransitionController#finishPullDown Bug: 63711551 Change-Id: Ib695332f537c270ecd3a67c4369fe90b8761032a
* | | Merge changes from topic 'am-7585e4a8-2edc-4122-a7e4-3366e2146d4b' into ↵TreeHugger Robot2017-07-261-9/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ub-launcher3-dorval-polish2 * changes: [automerger] Launcher grid changes. am: 30d0aa2605 Launcher grid changes.
| * \ \ [automerger] Launcher grid changes. am: 30d0aa2605Jonathan Miranda2017-07-251-9/+13
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I2acf9e9086534266b97846fbf3d9ea4181839f6f
| | * | | Launcher grid changes.Jon Miranda2017-07-251-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Tighten up space on Workspace/All Apps for tall devices. * Decrease the cell layout padding. Bug: 63996463 Change-Id: Ifc89e4786b7033e2af77d3742006d8c9ee719081
* | | | | Merge "Handle null background or foreground when dragging adaptive icons" ↵Tony Wickham2017-07-261-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into ub-launcher3-dorval-polish2
| * | | | | Handle null background or foreground when dragging adaptive iconsTony Wickham2017-07-261-0/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 64080513 Change-Id: I5e80e8a4b4a80ebd3bc052592283eee72d59c0e2
* | | | | Merge "Merging ScrimView into GradientView" into ub-launcher3-dorval-polish2Mario Bertschler2017-07-265-173/+66
|\ \ \ \ \
| * | | | | Merging ScrimView into GradientViewMario Bertschler2017-07-265-173/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Less banding, less drawing for All Apps Transition. Bug: 63873246 Change-Id: I6c7c856e2939a10db7e44b266c1d6d51334fd152
* | | | | | Merge "All Apps physics polish." into ub-launcher3-dorval-polish2Jonathan Miranda2017-07-262-32/+23
|\ \ \ \ \ \
| * | | | | | All Apps physics polish.Jon Miranda2017-07-262-32/+23
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change, the springs will now animate if your finger is on the RecyclerView while you hit the top/bottom. This covers the case when the user has few apps (ie. the RecyclerView does not scroll very much). Bug: 64041310 Change-Id: Ia72aea05d62a6fb896fdb7df379d6c7abd188d6d
* | | | | | Merge "Adding spring effect for folder icons when dragging similar to ↵Sunny Goyal2017-07-266-38/+256
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | adaptive icons" into ub-launcher3-dorval-polish2
| * | | | | Adding spring effect for folder icons when dragging similar to adaptive iconsSunny Goyal2017-07-256-38/+256
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 63889144 Change-Id: Idd1fd13c6343bf3e0a3a0e5ff0be730d41996575
* | | | | [automerger] Revert "Update Folders to match spec." am: 9ad87463a8Jonathan Miranda2017-07-262-13/+6
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | Change-Id: I75ad19eba41a0bab0461a0255954092a4790c617
| * | | | Revert "Update Folders to match spec."Jonathan Miranda2017-07-262-13/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | This reverts commit fd8fa136f5cec15302bf48bdd60761e057f960c4. Change-Id: Ifb8ce81e23f38df2eb2c26f93376eca19caae5b1
| * | | Merge "Fix bug when dragging FolderIcon between Workspace/Hotseat." into ↵TreeHugger Robot2017-07-242-4/+7
| |\ \ \ | | | | | | | | | | | | | | | ub-launcher3-dorval-polish
| * \ \ \ Merge "separate enforceContainerWithinScreen logic to a private method" into ↵Hyunyoung Song2017-07-241-2/+7
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | ub-launcher3-dorval-polish
* | | | | Fix bug when dragging FolderIcon between Workspace/Hotseat. am: 0c172151c3Jonathan Miranda2017-07-242-4/+7
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | Change-Id: I07704d09c7005d9b4df25f21ac0c062aaea9a507
| * | | | Fix bug when dragging FolderIcon between Workspace/Hotseat.Jon Miranda2017-07-242-4/+7
| |/ / / | | | | | | | | | | | | | | | | Bug: 63902464 Change-Id: I7995295d5c350720030abc6651af681c880464f8
* | | | Merge changes from topic 'am-866a059a-f7fc-4082-9b78-f35b177cf256' into ↵Hyunyoung Song2017-07-241-2/+7
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | ub-launcher3-dorval-polish2 * changes: separate enforceContainerWithinScreen logic to a private method am: 27790352a3 separate enforceContainerWithinScreen logic to a private method
| * | | separate enforceContainerWithinScreen logic to a private method am: 27790352a3Hyunyoung Song2017-07-201-2/+7
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I965c403341a9bca872a0d14c455e25aa254cf41e
| | * | separate enforceContainerWithinScreen logic to a private methodHyunyoung Song2017-07-201-2/+7
| | | | | | | | | | | | | | | | Change-Id: Ifcf8c6a79286269646a845b5be6cfa92b64fcbcc
* | | | Merge "Simplifying FeatureFlags by moving common flags to a base class. Only ↵Sunny Goyal2017-07-241-0/+73
|\ \ \ \ | | | | | | | | | | | | | | | the modified flags need to be redefined." into ub-launcher3-dorval-polish2
| * | | | Simplifying FeatureFlags by moving common flags to a base class.Sunny Goyal2017-07-241-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only the modified flags need to be redefined. Bug: 63967896 Change-Id: I521018a45a4c6b3280a4fbcf97cac698f8470a03
* | | | | Manually compute all apps cell height in multi-window mode. am: 1091e538b4Jonathan Miranda2017-07-241-11/+20
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | Change-Id: I1421b4b05e2b38e1fac47310466154df1be8788b
| * | | Manually compute all apps cell height in multi-window mode.Jon Miranda2017-07-241-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The All Apps cell height is set to match the Workspace. This causes a problem in multi-window mode because only the Workspace items do not have labels. Bug: 63933609 Change-Id: I13be6e50c12d50465be0555721f273abfc0d836a
| * | | Merge "Adding ability to set a custom blur mask filter and alphas in shadow ↵Mario Bertschler2017-07-211-5/+10
| |\ \ \ | | | | | | | | | | | | | | | generator." into ub-launcher3-dorval-polish
* | \ \ \ Merge "Adding A feature flag to disable widgets and a corresponding build ↵TreeHugger Robot2017-07-2414-89/+172
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | target Launcher3Go without widgets support" into ub-launcher3-dorval-polish2
| * | | | | Adding A feature flag to disable widgets and a corresponding buildSunny Goyal2017-07-2114-89/+172
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | target Launcher3Go without widgets support Bug: 62353159 Change-Id: Ia03d2235a9bcf75f9ef191924f81630e63a2c684
* | | | | Merge changes from topic 'shadowweather' into ub-launcher3-dorval-polish2Mario Bertschler2017-07-211-5/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Adding ability to set a custom blur mask filter and alphas in shadow generator. am: 665971c007 Adding ability to set a custom blur mask filter and alphas in shadow generator.
| * \ \ \ \ Adding ability to set a custom blur mask filter and alphas in shadow ↵Mario Bertschler2017-07-201-5/+10
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| | | | | | | generator. am: 665971c007 Change-Id: I38abf88bae019b334de0176fba8d732155bb3d2a
| | * | | Adding ability to set a custom blur mask filter and alphas in shadowMario Bertschler2017-07-201-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generator. Bug: 63151770 Change-Id: I7d79b700b64ccb949816b7bf31d98cc76fa443ba
* | | | | Merge "Using common fling detection logic for notification and all-apps" ↵Sunny Goyal2017-07-2111-1248/+249
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into ub-launcher3-dorval-polish2
| * | | | | Using common fling detection logic for notification and all-appsSunny Goyal2017-07-2011-1248/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > Refactoring SwipeDetector to both allow vertical and horizontal swipes > Using SwipeDetector and common overscroll effect for notification swipes instead of a separate logic Change-Id: Ib706ee179811ade59ddb68184e1c202365d147c4
* | | | | | Update Folders to match spec. am: fd8fa136f5Jonathan Miranda2017-07-202-6/+13
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | | Change-Id: If10efb5a72bbe261f6e7af2b66e741b7a9ee350b
| * | | | Update Folders to match spec.Jon Miranda2017-07-202-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 63825895 Change-Id: Ia1a139f1afd944eefcd370645142227317e2bf20
| * | | | Merge "Update when Launcher's scrim should fade." into ↵TreeHugger Robot2017-07-201-3/+14
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | ub-launcher3-dorval-polish
| * | | | Merge "PopupContainerWithArrow should align correctly in RTL mode Test: see ↵Hyunyoung Song2017-07-191-15/+20
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | attached screenshot in the bug" into ub-launcher3-dorval-polish
| * | | | Merge "Updating UserEventDispatcher to make some methods accessible." into ↵TreeHugger Robot2017-07-194-49/+38
| |\ \ \ \ | | | | | | | | | | | | | | | | | | ub-launcher3-dorval-polish
| * \ \ \ \ Merge "Factor in CellLayout padding in cell size calculation." into ↵TreeHugger Robot2017-07-191-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | ub-launcher3-dorval-polish
* | \ \ \ \ \ Merge "Adding support for derivative apps to safely extend LauncherLog ↵TreeHugger Robot2017-07-201-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | proto" into ub-launcher3-dorval-polish2
| * | | | | | | Adding support for derivative apps to safely extend LauncherLog protoSunny Goyal2017-07-201-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 37676962 Change-Id: I24716070841b41418ac57b8dc367278e3ebdd046
* | | | | | | | Update when Launcher's scrim should fade. am: 7fda285cf0Jonathan Miranda2017-07-201-3/+14
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | Change-Id: I0761f13886f34d9f27bc50ee523a0c1de7f6a7a1
| * | | | | | | Update when Launcher's scrim should fade.Jon Miranda2017-07-201-3/+14
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Scrim will fade first time the user starts Launcher (unlocks device). * Scrim will fade if resuming from a screen off and Launcher is in the foreground. Bug: 63801668 Change-Id: I4465765fe5a0f81c2f4dec715f9f5a24a309fc1b
* | | | | | | Fixing tint not getting applied when an item is dragged over a drop targetSunny Goyal2017-07-191-135/+131
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > Changing spring animation to use drawable instead of views. This allows us to reuse the size calculations from AdaptiveIconDrawable, instead of reimplementing the logic. > Updating tint logic to concat any existing filter and reapply it to the drawable Bug: 63873434 Change-Id: I30e97d181bd3439e5b10272d4964bad1c70ceb3c
* | | | | | Merge changes from topic 'am-47bc3657-4ec5-48ea-a081-c94faa8bfc8c' into ↵Hyunyoung Song2017-07-191-15/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ub-launcher3-dorval-polish2 * changes: PopupContainerWithArrow should align correctly in RTL mode Test: see attached screenshot in the bug am: 435a35dec3 PopupContainerWithArrow should align correctly in RTL mode Test: see attached screenshot in the bug
| * \ \ \ \ \ PopupContainerWithArrow should align correctly in RTL mode Test: see ↵Hyunyoung Song2017-07-191-15/+20
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | attached screenshot in the bug am: 435a35dec3 Change-Id: I4c290f603c94955a9b85a9c4b91fa0738820d932
| | * | | | | PopupContainerWithArrow should align correctly in RTL modeHyunyoung Song2017-07-191-15/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: see attached screenshot in the bug Bug: 63721807 the horizontal gravity enforcement has to be done on (left+translateX) value and not just translateX. Hence that enforcement has been moved to onLayout. Change-Id: I9b6502dc55d59e04a406ebe71ac3b649b31d6088
* | | | | | | Merge changes from topic 'am-948a617f-f892-4399-bd5c-3dd472692cca' into ↵TreeHugger Robot2017-07-194-49/+38
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ub-launcher3-dorval-polish2 * changes: Merge commit 'refs/changes/98/2553198/2' of sso://googleplex-android/platform/packages/apps/Launcher3 into am-948a617f-f892-4399-bd5c-3dd472692cca Updating UserEventDispatcher to make some methods accessible.