Commit Graph
12878 Commits
Author SHA1 Message Date
Presubmit Automerger Backend 233f9fc731 [automerge] Init FloatingIconView properties before fetching drawable. 2p: 35d294387c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16908749

Bug: 207389002
Change-Id: I3815ebc0a26f61950d03b63a011dce9e42adb036
Merged-In: Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c
2022-02-16 23:23:54 +00:00
Jon Miranda 35d294387c Init FloatingIconView properties before fetching drawable.
& Make sure properties are reset when recycled.

This fixes the bug that causes BubbleTextView drawable not to get set.

Bug: 207389002
Test: locally disable loading AdaptiveIcons, ensure BubbleTextView
      drawable always gets drawn for closing animation

Change-Id: Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c
(cherry picked from commit b2670d2051)
Merged-In: Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c
2022-02-16 23:23:44 +00:00
TreeHugger Robot 0702c25340 Merge "Fix taskbar icon dragging issues" into sc-v2-dev am: 9f0d54ebe3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16738495

Change-Id: If129ddc48e5432bdb5c26280bc7ea20926518fac
2022-02-01 20:08:59 +00:00
TreeHugger Robot 9f0d54ebe3 Merge "Fix taskbar icon dragging issues" into sc-v2-dev 2022-02-01 19:53:13 +00:00
Schneider Victor-tulias a8dae26d39 Fix taskbar icon dragging issues
- Fixed icons disappearing when initiating dragging
- Fixed incorrect icon location when initiating dragging after rotating the screen to an orientation other than what launcher started in

Fixes: 215418478
Fixes: 214025075
Fixes: 210460544
Test: dragged icons from the workspace and taskbar
Change-Id: I848138af28802f7d806708c77c25b8de307c70d8
(cherry picked from commit 312b68fde4)
Merged-In: I848138af28802f7d806708c77c25b8de307c70d8
2022-02-01 18:27:59 +00:00
Andy Wickham 38257ad086 [automerge] Utilities.trim never returns null. 2p: 5f0a5eb877
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16741586

Bug: 213931730
Change-Id: If167edb9f9d56ffdb6e94eee2f660c47dc331d94
2022-01-28 00:56:13 +00:00
Andy Wickham 5f0a5eb877 Utilities.trim never returns null.
This fixes a crash loop I was seeing on my device and also
preemptively fixes similar NullPointerExceptions.

Bug: 213931730
Test: Manually verified crash loop stopped with this change.
Change-Id: I8d2fc8475d42ac60b7fdc9219421a8c9733c7b9f
(cherry picked from commit 56be73be80)
2022-01-28 00:56:08 +00:00
Tony Wickham 5e9a8503b6 Merge "Update hotseat alpha in TaskbarLauncherStateController#init()" into sc-v2-dev am: e064f51642
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16492578

Change-Id: Ie31a2acc903fc0f95e43f110a3233cd3648096ef
2021-12-21 00:46:12 +00:00
Tony Wickham e064f51642 Merge "Update hotseat alpha in TaskbarLauncherStateController#init()" into sc-v2-dev 2021-12-21 00:30:12 +00:00
Tony Wickham bf07660f9e Update hotseat alpha in TaskbarLauncherStateController#init()
Technically the consumer should do that already, but the consumer isn't called if the value isn't changed (in this case, it's going from 1 to 1). So explicitly call the consumer once in init().

Test: Open an app, toggle dark theme from quick settings, go home and ensure hotseat isn't visible during the transition
Fixes: 211002647
Change-Id: I5a9680282b3982d9b6f982833cd671b224767518
2021-12-16 18:29:41 +00:00
TreeHugger Robot 510d9060a7 Merge "Show Digital Wellbeing Banners for split tasks" into sc-v2-dev am: 8d25a0a363
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16459079

Change-Id: Ia65e7ce8eabc0a9caa5892a5a8de0e14f2b70b73
2021-12-16 11:33:17 +00:00
TreeHugger Robot 8d25a0a363 Merge "Show Digital Wellbeing Banners for split tasks" into sc-v2-dev 2021-12-16 11:13:10 +00:00
Vinit Nayak ebf2cdd0f1 Show Digital Wellbeing Banners for split tasks
Fixes: 199936292
Change-Id: I38743d58f53a65ef717b1babc21ad1df2dc840a4
2021-12-15 22:19:02 -08:00
Winson Chung 049a345cbe Merge "Wait for the Launcher activity to bind to TIS before animating" into sc-v2-dev am: 2ecf688de6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16420662

Change-Id: Ifdb1a25ea269ca38a7390c7367bb7a5876717c81
2021-12-15 20:17:59 +00:00
Winson Chung 2ecf688de6 Merge "Wait for the Launcher activity to bind to TIS before animating" into sc-v2-dev 2021-12-15 19:44:26 +00:00
Vinit Nayak 8581dfc218 Wait for the Launcher activity to bind to TIS before animating
- Mainly a test issue where we destroy the activity and immediately
  enter overview without preloading launcher.  In this case, the task
  bar does not animate due to the delayed cycled of activity create
  -> bind service -> service connected -> taskbar ui controller init.
  As a result, the bar can occlude content from Launcher preventing
  the test from finding the overview actions.

  Instead, in cases where we need to animate with launcher, we wait
  for Launcher to be created (generally already the case) and the
  service has bound before proceeding.

Bug: 189807374
Bug: 204891006
Test: atest NexusLauncherTests:com.android.quickstep.StartLauncherViaGestureTests
Change-Id: I2cfccae67ac0e5a591639c6c99df032451dae16d
2021-12-15 00:53:54 +00:00
TreeHugger Robot 67daf300e2 Merge "Set default value for rank field in launcher logs to ItemInfo.rank." into sc-v2-dev am: ed6cbbc9a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16360368

Change-Id: Ic15c841f299bd8d14d3c7c4352ad9d76fdecaa04
2021-12-13 19:07:36 +00:00
TreeHugger Robot ed6cbbc9a6 Merge "Set default value for rank field in launcher logs to ItemInfo.rank." into sc-v2-dev 2021-12-13 18:48:09 +00:00
TreeHugger Robot a370c8880f Merge "DeviceProfile.overviewRowSpacing should exclude extra top margin on grid tasks" into sc-v2-dev am: 953873dd18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16440097

Change-Id: Ifa60729ab1b7cf9031dc03698684879a202ff1f4
2021-12-11 01:51:08 +00:00
TreeHugger Robot 953873dd18 Merge "DeviceProfile.overviewRowSpacing should exclude extra top margin on grid tasks" into sc-v2-dev 2021-12-11 01:12:57 +00:00
TreeHugger Robot 7f4adf679e Merge "Allow restore across form factors" into sc-v2-dev am: 5599b02141
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16440220

Change-Id: I46024c6edf3539fa495ed491c679d1cdce8b5dd0
2021-12-11 00:36:04 +00:00
TreeHugger Robot 5599b02141 Merge "Allow restore across form factors" into sc-v2-dev 2021-12-11 00:11:56 +00:00
Jon Miranda 2539cd207e Merge "Display in-memory icon for app close while AdaptiveIcon loads." into sc-v2-dev am: b788f9f7f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16441110

Change-Id: I21e8ad9e5df8dacba63601911f08782d8c935b0d
2021-12-10 23:38:56 +00:00
Alex Chau 4c98374d99 DeviceProfile.overviewRowSpacing should exclude extra top margin on grid tasks
Bug: 207350366
Bug: 210158657
Test: manual
Change-Id: I28116407c4267259a75fd39637104cea9db73fe3
2021-12-10 23:29:08 +00:00
Jon Miranda b788f9f7f7 Merge "Display in-memory icon for app close while AdaptiveIcon loads." into sc-v2-dev 2021-12-10 23:20:42 +00:00
Alex Chau ab26c62c4a Allow restore across form factors
- Removed deviceTypeCompatible check and allow restore across for mfactors
- In AOSP default device_profile, mark 3x3, 4x4, and 5x5 as phone only. On tablets they'll reflow to 6x5.

Bug: 198575341
Bug: 210129187
Test: Only 3x3, 4x4 and 5x5 are enabled on phone
Test: Only 6x5 is enabled on tablet
Test: Phone backup of 4x4 get restored and reflow to 6x5 on tablet
Change-Id: I36a641d47fcee86ace0fea3d9194d61d12517f13
2021-12-10 22:00:49 +00:00
Jon Miranda 0c2f0faef1 Display in-memory icon for app close while AdaptiveIcon loads.
- We already display the BubbleTextView icon during app close
  since we need the shadows to ensure a clean handoff.
- Previously, we waited until the icon and the AdaptiveIcon were
  both loaded to show the FloatingIconView.
- This change immediately shows the BubbleTextView icon so that
  we can have something displayed in the cases where AdaptiveIcon
  is slow to load (ie. immediately after killing/restarting launcher).

Currently there are cases where we defer some BubbleTextView drawing to
ClipIconView. We can refactor in master so that ClipIconView is only used
when drawable is an AdaptiveIcon.

Bug: 207389002
Test: manual
Change-Id: Ie54642fef4258862a155ab0aba6e49cea9c9ead0
2021-12-10 13:25:39 -08:00
Jon Miranda 48d82e2c19 Merge "Clear all DragView in onSaveInstanceState" into sc-v2-dev am: 7ac2a71b94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16425110

Change-Id: I60f6a9e8ae87bb011f9e7f4a7b11748415f044c1
2021-12-10 18:48:18 +00:00
Jon Miranda 7ac2a71b94 Merge "Clear all DragView in onSaveInstanceState" into sc-v2-dev 2021-12-10 18:36:15 +00:00
Alex Chau 809cef23a5 Merge "Add split support for 3P launcher" into sc-v2-dev am: 42cbdee25c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16416933

Change-Id: I7fa6dc108941f935a9f1987c23b9c8f2f49dad79
2021-12-10 10:10:55 +00:00
Vinit Nayak 2a93bc5b30 Add split support for 3P launcher
* Copied logic mostly from
Base/RecentsViewStateController
* There's one KI crash specific to 3P
(b/209694087)
* Swipe to home animation is TODO, but
then again it also seems incorrect for
full-screen app. 3P has many cosmetic issues
throughout.

Bug: 195607777
Test: Tested w/ Nova launcher with grid
and non-grid, able to invoke split screen with
same animations as 1P launcher

Change-Id: I35a1bc92a51caccac4214289e614000cd47bb503
2021-12-09 12:52:04 -08:00
Jon Miranda 14d6771aae Clear all DragView in onSaveInstanceState
Multiple users reports view getting stuck on screen. This CL
clears all DragView when user leaves launcher.

Root cause still undetermined, but happens enough that it warrants
a temp fix.

Bug: 162636845
Test: manual
Change-Id: I532b5274a1308c53f67c23c5c8ca07f2b7f9802c
2021-12-08 17:47:33 -08:00
TreeHugger Robot 287d976c91 Merge "Add launcher grid spec for tablet" into sc-v2-dev am: b1ae1ca124
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16371727

Change-Id: Id456a1dfa7e7f3578aa80cc281eb6680575c4cef
2021-12-08 23:14:44 +00:00
TreeHugger Robot b1ae1ca124 Merge "Add launcher grid spec for tablet" into sc-v2-dev 2021-12-08 22:49:00 +00:00
Alex Chau 1c883d861e Add launcher grid spec for tablet
- Introduced device_category to allow grids to be only enabled for certain device types. By default grids are enabled for all device types, so old OEM device_profiles aren't affected
  - Removed device_profiles_split.xml as a result and merged with device_profiles.xml
- Added deviceType in InvariantDeviceProfile to replace isSplitDisplay and centralize the logic
- Only has 6x5 grid with new default layout that works better for tablets

Bug: 198575341
Test: manual
Change-Id: I03f6727ce837ffeee6321b6d7c53942338d0cf30
2021-12-08 18:22:34 +00:00
Tony Wickham b05ad5dcbf Merge changes I6cf84ec7,Iea599651,If3238286 into sc-v2-dev am: b5a051ca0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16407666

Change-Id: Iffb14ab9d043a5802a92a76b2f388a62423c6625
2021-12-08 17:58:35 +00:00
Tony Wickham b5a051ca0b Merge changes I6cf84ec7,Iea599651,If3238286 into sc-v2-dev
* changes:
  Improve quick switch from home to taskbar
  Cleanup some taskbar/hotseat handoff issues
  Fix taskbar stash misalignment when going from app to overview
2021-12-08 17:42:54 +00:00
Alex Chau bcf2060c5d Handle split select rotation am: 86ef5e924a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16405843

Change-Id: Ife26f26f92bd2f0a238ea19c9e9958d655e96083
2021-12-08 11:55:07 +00:00
Alex Chau 86ef5e924a Handle split select rotation
- Update floatingTaskView, apply splitsSelectTranslation and splitPrimaryScorllOffest when rotating while in split select
- Moved getSplitSelectTranslation to RecentsView
- When in portrait, treat STAGE_POSITION_BOTTOM_OR_RIGHT as STAGE_POSITION_TOP_OR_LEFT in split translation calculation
- Apply splitsSelectTranslation for portrait grid too

Fix: 201721153
Test: manual
Change-Id: I768a3b15de4d434674058b274c368798f5852917
2021-12-08 11:35:02 +00:00
Becky Qiu 9b2673cda4 [DO NOT MERGE] Remove one search flag and code from sc-v2. am: d0a9f1502b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16407148

Change-Id: I20a1bfac918e53367ab1af1203e0a94de02b1893
2021-12-08 07:25:57 +00:00
TreeHugger Robot 57b9c472dc Merge "[DO NOT MERGE] Remove one search flag and code from sc-v2." into sc-v2-dev 2021-12-08 06:57:28 +00:00
Brian Isganitis 1b5dd42e61 Merge "Adding support for logging wallpaper container info." into sc-v2-dev am: d3ebc4c692
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16335450

Change-Id: Ic26d48fe0190f8362acbd76170b649f5686a46e9
2021-12-08 06:14:10 +00:00
Brian Isganitis d3ebc4c692 Merge "Adding support for logging wallpaper container info." into sc-v2-dev 2021-12-08 05:48:30 +00:00
Brian Isganitis 79efba935f Adding support for logging wallpaper container info.
Test: https://paste.googleplex.com/5350571797118976 shows logging carousel size and index of wallpaper tapped. If the wallpaper is a live wallpaper, we also log its application info.
Bug: 188222480
Change-Id: I6dd7ac20af7afd675d8a886d5b838263680f773e
Merged-In: I6dd7ac20af7afd675d8a886d5b838263680f773e
2021-12-08 00:22:59 +00:00
Tony Wickham 24675d36b7 Improve quick switch from home to taskbar
- Add LauncherState#isTaskbarAlignedWithHotseat() which defaults to !isTaskbarStashed(), but is always false for quick switch from home
- Replaced FLAG_TRANSITION_STATE_START_STASHED and FLAG_TRANSITION_STATE_COMMITTED_STASHED with FLAG_STATE_TRANSITION_RUNNING and a reference to mLauncherState. STATE_START is equivalent to TRANSITION_RUNNING changing to true, and STATE_COMMITTED is equivalent to TRANSITION_RUNNING changing to false. Then can get details from the state such as whether taskbar is stashed and icon alignment from mLauncherState

Test: quick switch from home, both with taskbar stashed in apps and not
Fixes: 194728611
Bug: 204657916
Change-Id: I6cf84ec73a4036e14cc7268667c6f62100884c27
2021-12-07 13:13:48 -08:00
Tony Wickham 562ca940e2 Merge "Remove LauncherState.TASKBAR visible element" into sc-v2-dev am: 779879ce3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16405551

Change-Id: I876064e6ca079acf04ffdf17ee38060e270852a7
2021-12-07 20:56:27 +00:00
Tony Wickham 779879ce3d Merge "Remove LauncherState.TASKBAR visible element" into sc-v2-dev 2021-12-07 20:42:55 +00:00
Alex Chau 992db75dae Use percentage scaling for overview thumbnail size
- Limit overview to screen ratio to be at max 70%
- Tuned row spacing and page spacing
- Added 2 more test activities to testOverviewForTablet to avoid dismissing tasks at end of grid, as more grid tasks are now shown

Bug: 207350366
Test: manual
Change-Id: Id04871464bdb3ef2d6b046977b0ffd9bd51bc230
Merged-In: Id04871464bdb3ef2d6b046977b0ffd9bd51bc230
2021-12-07 14:50:40 +00:00
Alex Chau 4f7952ead4 Use percentage scaling for overview thumbnail size
- Limit overview to screen ratio to be at max 70%
- Tuned row spacing and page spacing
- Added 2 more test activities to testOverviewForTablet to avoid dismissing tasks at end of grid, as more grid tasks are now shown

Bug: 207350366
Test: manual
Change-Id: Id04871464bdb3ef2d6b046977b0ffd9bd51bc230
2021-12-07 11:00:48 +00:00
Tony Wickham 7af54403a3 Remove LauncherState.TASKBAR visible element
It's no longer used, so removing to cleanup code and reduce confusion

Test: no functional change
Fixes: 209512651
Change-Id: Ibd671bde7190df976b5365331731a55a9abdbb35
2021-12-06 15:59:39 -08:00