Commit Graph

16456 Commits

Author SHA1 Message Date
Tony a8ccf09597 Use deep shortcuts' icons as a fallback when updating
We already do this when loading, but now we also do it when
getting callbacks that potentially change the shortcut icon.
These callbacks first check the pinned shortcut info, but if
there is no icon there we now fall back to the current icon
instead of the default icon.

Bug: 62814533
Change-Id: I777adedf4b7f93dbaddb98a993eda34d59dcc173
2017-07-28 18:11:06 -07:00
Jonathan Miranda 0116e47182 [automerger] More launcher grid updates. am: 3f9bab2fe4 am: 0aa02ecc4b
Change-Id: I0a5657f8df760d19d06bec03e2f8ff9ea16d24cd
2017-07-28 21:57:30 +00:00
Jonathan Miranda 0aa02ecc4b [automerger] More launcher grid updates. am: 3f9bab2fe4
Change-Id: I1f2507401fb8a0ea961fa1b2280d2d5f15a0b085
2017-07-28 21:57:27 +00:00
Jon Miranda 3f9bab2fe4 More launcher grid updates.
* Increase padding when in All Apps landscape.
* Calculate aspectRatio using width/height instead of
  availableWidth/Height.
* Instead of increasing page indicator size, we add the extra height to
  the Hotseat.

Bug: 63996463
Bug: 63149981
Change-Id: I1ee3549b4089b277704d5d72e1b7cb5a2abdbd5a
2017-07-28 14:50:17 -07:00
TreeHugger Robot 4752686389 Merge "Remove extra call to AllAppsContainerView#reset." into ub-launcher3-dorval-polish 2017-07-27 18:28:36 +00:00
TreeHugger Robot b48691fc37 Merge changes from topic 'am-6d9d0859-70d0-4f47-805c-9d347aa427d6' into ub-launcher3-master
* changes:
  Remove extra call to AllAppsContainerView#reset. am: 14709c6eea am: ba99c5c1fe
  Remove extra call to AllAppsContainerView#reset. am: 14709c6eea
  Remove extra call to AllAppsContainerView#reset.
2017-07-27 18:28:36 +00:00
TreeHugger Robot d771c6930f Merge changes from topic 'am-6d9d0859-70d0-4f47-805c-9d347aa427d6' into ub-launcher3-dorval-polish2
* changes:
  Remove extra call to AllAppsContainerView#reset. am: 14709c6eea
  Remove extra call to AllAppsContainerView#reset.
2017-07-27 18:28:36 +00:00
Sunny Goyal b52e82d32e [automerger] Moving GradientView background alpha to resources am: 6d1e9a1012
Change-Id: I6ef6c8a73158a1f03396f6d06cdb4297cb1714b5
2017-07-27 17:27:22 +00:00
Sunny Goyal 6d1e9a1012 Moving GradientView background alpha to resources
Bug: 63072570
Change-Id: Ie982a5a33ece72942ebee79e4eb81f83da7b31c4
2017-07-27 10:26:37 -07:00
TreeHugger Robot b35bb6021c Merge "Launcher grid changes." into ub-launcher3-dorval-polish 2017-07-26 23:59:59 +00:00
TreeHugger Robot 9365438664 Merge changes from topic 'am-7585e4a8-2edc-4122-a7e4-3366e2146d4b' into ub-launcher3-master
* changes:
  [automerger] Launcher grid changes. am: 30d0aa2605 am: 3aa645b7e6
  [automerger] Launcher grid changes. am: 30d0aa2605
  Launcher grid changes.
2017-07-26 23:59:59 +00:00
TreeHugger Robot 20d27e513c Merge changes from topic 'am-7585e4a8-2edc-4122-a7e4-3366e2146d4b' into ub-launcher3-dorval-polish2
* changes:
  [automerger] Launcher grid changes. am: 30d0aa2605
  Launcher grid changes.
2017-07-26 23:59:59 +00:00
Tony Wickham da342e092a Merge changes from topic 'am-62871b14-7da8-4b31-b420-c5c87d1477d2' into ub-launcher3-master
* changes:
  [automerger] Handle null background or foreground when dragging adaptive icons am: 746c6c36b6
  Handle null background or foreground when dragging adaptive icons
2017-07-26 22:07:11 +00:00
Tony Wickham 89c467d289 Merge "Handle null background or foreground when dragging adaptive icons" into ub-launcher3-dorval-polish2 2017-07-26 22:07:11 +00:00
Mario Bertschler 2e70cb081f Merge changes from topic 'am-fdbc4fab-6283-4635-be1f-75b7a999e4d6' into ub-launcher3-master
* changes:
  [automerger] Merging ScrimView into GradientView am: a0465afe8d
  Merging ScrimView into GradientView
2017-07-26 21:39:28 +00:00
Mario Bertschler 9fac09d852 Merge "Merging ScrimView into GradientView" into ub-launcher3-dorval-polish2 2017-07-26 21:39:28 +00:00
Tony Wickham b46aa4a39f [automerger] Handle null background or foreground when dragging adaptive icons am: 746c6c36b6
Change-Id: I3e254a7109e114072cf003ef5c2a4798604d1d1f
2017-07-26 21:36:04 +00:00
Mario Bertschler 254bd42729 Merging ScrimView into GradientView
Less banding, less drawing for All Apps Transition.

Bug: 63873246

Change-Id: I6c7c856e2939a10db7e44b266c1d6d51334fd152
2017-07-26 14:33:22 -07:00
Tony Wickham 746c6c36b6 Handle null background or foreground when dragging adaptive icons
Bug: 64080513
Change-Id: I5e80e8a4b4a80ebd3bc052592283eee72d59c0e2
2017-07-26 14:32:25 -07:00
Jonathan Miranda 8a1702ce28 Merge changes from topic 'am-32692c16-cc76-47e2-8a58-f0e5a75fdc7a' into ub-launcher3-master
* changes:
  [automerger] All Apps physics polish. am: 813c626f92
  All Apps physics polish.
2017-07-26 21:28:34 +00:00
Jonathan Miranda dc286f30f8 Merge "All Apps physics polish." into ub-launcher3-dorval-polish2 2017-07-26 21:28:34 +00:00
Jonathan Miranda 8806475b8e Merge "All Apps physics polish." into ub-launcher3-dorval-polish 2017-07-26 21:28:34 +00:00
Sunny Goyal 3aa3e55763 Merge changes from topic 'am-fd2e1243-0e42-4b1e-ac82-e4f4460e1932' into ub-launcher3-master
* changes:
  [automerger] Adding spring effect for folder icons when dragging similar to adaptive icons am: e29897f503
  Adding spring effect for folder icons when dragging similar to adaptive icons
2017-07-26 21:05:01 +00:00
Sunny Goyal f9a9c3f69c Merge "Adding spring effect for folder icons when dragging similar to adaptive icons" into ub-launcher3-dorval-polish2 2017-07-26 21:05:01 +00:00
Mario Bertschler 8604f36208 [automerger] Merging ScrimView into GradientView am: a0465afe8d
Change-Id: Idb42428806ae6c26326cb98071bc2ecb5585e025
2017-07-26 20:24:31 +00:00
Mario Bertschler a0465afe8d Merging ScrimView into GradientView
Less banding, less drawing for All Apps Transition.

Bug: 63873246

Change-Id: I6c7c856e2939a10db7e44b266c1d6d51334fd152
2017-07-26 13:23:34 -07:00
Jonathan Miranda 8df320ea5c [automerger] All Apps physics polish. am: 813c626f92
Change-Id: Ic91e209f6f0f759c01978d7c383b83d059e9c95c
2017-07-26 20:23:32 +00:00
Jon Miranda 813c626f92 All Apps physics polish.
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
2017-07-26 20:23:23 +00:00
Jon Miranda 2d5e0e067c All Apps physics polish.
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
2017-07-26 20:21:07 +00:00
Jonathan Miranda 72ff1f249a [automerger] Revert "Update Folders to match spec." am: 9ad87463a8 am: f2974a5c2a
Change-Id: I17e82e916a2ab8a5cfe4c86208c47909160a4f4b
2017-07-26 18:16:03 +00:00
Jonathan Miranda f2974a5c2a [automerger] Revert "Update Folders to match spec." am: 9ad87463a8
Change-Id: I75ad19eba41a0bab0461a0255954092a4790c617
2017-07-26 18:16:01 +00:00
Jonathan Miranda 9ad87463a8 Revert "Update Folders to match spec."
This reverts commit fd8fa136f5.

Change-Id: Ifb8ce81e23f38df2eb2c26f93376eca19caae5b1
2017-07-26 11:05:29 -07:00
Sunny Goyal 44deaac9a3 [automerger] Updating fade-effect parameters: > Shifting the effect at the edge in the presence of padding > Removing fade effect at the bottom > Fixing wrong call for translating children am: 5d80c28161
Change-Id: I5f0083b29d79dbd60c1a5b41e42a1b59e6599a65
2017-07-26 13:44:22 +00:00
Sunny Goyal 5d80c28161 Updating fade-effect parameters:
> Shifting the effect at the edge in the presence of padding
> Removing fade effect at the bottom
> Fixing wrong call for translating children

Bug: 63003761
Change-Id: Ia9d030de60e933a2e688496109d62977885c2c0d
2017-07-26 06:43:50 -07:00
Jon Miranda 30d0aa2605 Launcher grid changes.
* Tighten up space on Workspace/All Apps for tall devices.
* Decrease the cell layout padding.

Bug: 63996463
Change-Id: Ifc89e4786b7033e2af77d3742006d8c9ee719081
2017-07-25 15:55:29 -07:00
Jonathan Miranda e92e6e4eab [automerger] Launcher grid changes. am: 30d0aa2605 am: 3aa645b7e6
Change-Id: I04ac3ff58949f16a3f0de820efe5da0536fc306b
2017-07-25 22:54:56 +00:00
Jonathan Miranda 3aa645b7e6 [automerger] Launcher grid changes. am: 30d0aa2605
Change-Id: I2acf9e9086534266b97846fbf3d9ea4181839f6f
2017-07-25 22:54:53 +00:00
Sunny Goyal ccf0561da8 [automerger] Adding spring effect for folder icons when dragging similar to adaptive icons am: e29897f503
Change-Id: I60061185696ea977003bd84181b0374cbe116f1e
2017-07-25 21:31:11 +00:00
Sunny Goyal e29897f503 Adding spring effect for folder icons when dragging similar to adaptive icons
Bug: 63889144
Change-Id: Idd1fd13c6343bf3e0a3a0e5ff0be730d41996575
2017-07-25 14:30:54 -07:00
TreeHugger Robot df4aaca594 Merge "Fix bug when dragging FolderIcon between Workspace/Hotseat." into ub-launcher3-dorval-polish 2017-07-24 19:46:47 +00:00
Jon Miranda 0c172151c3 Fix bug when dragging FolderIcon between Workspace/Hotseat.
Bug: 63902464
Change-Id: I7995295d5c350720030abc6651af681c880464f8
2017-07-24 12:32:41 -07:00
Jonathan Miranda fcf962b09d Fix bug when dragging FolderIcon between Workspace/Hotseat. am: 0c172151c3 am: 4560d2f731
Change-Id: I807839155aeeada1700cf9f2471023032f94611e
2017-07-24 19:31:08 +00:00
Jonathan Miranda 4560d2f731 Fix bug when dragging FolderIcon between Workspace/Hotseat. am: 0c172151c3
Change-Id: I07704d09c7005d9b4df25f21ac0c062aaea9a507
2017-07-24 19:31:06 +00:00
Hyunyoung Song f38758de10 Merge "separate enforceContainerWithinScreen logic to a private method" into ub-launcher3-dorval-polish 2017-07-24 19:19:52 +00:00
Hyunyoung Song 47153d72b8 Merge changes from topic 'am-866a059a-f7fc-4082-9b78-f35b177cf256' into ub-launcher3-master
* changes:
  separate enforceContainerWithinScreen logic to a private method am: 27790352a3 am: 6dc62fb2d4
  separate enforceContainerWithinScreen logic to a private method am: 27790352a3
  separate enforceContainerWithinScreen logic to a private method
2017-07-24 19:19:52 +00:00
Hyunyoung Song 345e10e5e4 Merge changes from topic 'am-866a059a-f7fc-4082-9b78-f35b177cf256' into ub-launcher3-dorval-polish2
* changes:
  separate enforceContainerWithinScreen logic to a private method am: 27790352a3
  separate enforceContainerWithinScreen logic to a private method
2017-07-24 19:19:52 +00:00
Jonathan Miranda 14211ed13e Remove extra call to AllAppsContainerView#reset. am: 14709c6eea am: ba99c5c1fe
Change-Id: I87c5316d072275d3cbbbf3d48da7500f036fe1d1
2017-07-24 19:19:43 +00:00
Jonathan Miranda ba99c5c1fe Remove extra call to AllAppsContainerView#reset. am: 14709c6eea
Change-Id: I3c2b33376f3051b4775b7079ac138048d1acda29
2017-07-24 19:19:41 +00:00
Jon Miranda 14709c6eea Remove extra call to AllAppsContainerView#reset.
We were calling reset twice:
* LauncherStateTransitionAnimation#startAnimationToWorkspaceFromAllApps
* AllAppsTransitionController#finishPullDown

Bug: 63711551
Change-Id: Ib695332f537c270ecd3a67c4369fe90b8761032a
2017-07-24 12:19:21 -07:00
Sunny Goyal 507f4fb2d6 Merge "Simplifying FeatureFlags by moving common flags to a base class. Only the modified flags need to be redefined." into ub-launcher3-dorval-polish2 2017-07-24 18:43:27 +00:00