9ae49dcbca
Merge "Remove redundant createAdapter override." into tm-qpr-dev am: 8a40f0557b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20240748
Change-Id: I181c471339e2bf293ec19cb5c2ce25cc59b1e4fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-20 05:26:36 +00:00
8a40f0557b
Merge "Remove redundant createAdapter override." into tm-qpr-dev
2022-10-20 04:57:15 +00:00
cc6290d81f
Merge "Revert "Revert "Using Transaction directly instead of building s..."" into tm-qpr-dev am: d79f84fffe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20215466
Change-Id: Ic6c00cea6febb0e36e147a4811e73f89fbfd4a78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-20 01:00:10 +00:00
9ca7744877
Remove redundant createAdapter override.
...
It is the same as ActivityAllAppsContainerView#createAdapter, so it can
be cleaned up.
Test: Manual
Fix: 254545341
Change-Id: Ib23369a53c8c0a1f8f05b671526eb82a07b6f0e3
2022-10-20 00:41:59 +00:00
d79f84fffe
Merge "Revert "Revert "Using Transaction directly instead of building s..."" into tm-qpr-dev
2022-10-20 00:26:13 +00:00
0967d53cf5
Merge "Add scroll up and scroll down logging." into tm-qpr-dev am: 821ef94974
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20181861
Change-Id: Ib706da61a874cfaaad7bc74f1568e110842cbfe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-19 21:15:26 +00:00
821ef94974
Merge "Add scroll up and scroll down logging." into tm-qpr-dev
2022-10-19 20:31:54 +00:00
5ff03db6a6
Merge changes I03636e28,I6cf6d52e into tm-qpr-dev am: 41235d529b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20095896
Change-Id: Ifbb8ec9b6115e0e3298406c8986e0a495af6d732
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-19 20:02:02 +00:00
41235d529b
Merge changes I03636e28,I6cf6d52e into tm-qpr-dev
...
* changes:
Fix page indicator dots height in workspace
Change delightful pagination flag and use it for workspace
2022-10-19 19:33:18 +00:00
c6117e0d60
Merge "Disable Launcher AIDL_TAG tracing special case" am: cf36563f87 am: 6b07d27bbf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2253778
Change-Id: I70a65c7e3608e27c38323ff06bb316728a9b2b62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-19 18:12:35 +00:00
0de35265c1
Add scroll up and scroll down logging.
...
Bug: 247601175
Test: Manual. https://paste.googleplex.com/5757099224072192
Change-Id: Iec1697e1580c75572c9e77ec349942301ee87694
2022-10-19 18:00:45 +00:00
f4abbadb21
Merge "More robust fix to BubbleTextViews appearing on multiple rows." into tm-qpr-dev am: a57bff8473
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20105877
Change-Id: I552f8d30d4a65e5a61a536ac47d21849fb53f1be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-19 17:55:20 +00:00
e260265fe2
Merge "Decouple taskbar background from overveiw scrim if taskbar is in overview" into tm-qpr-dev am: 913b5afb43
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20189272
Change-Id: I92eefce9361a89a99b9778384d2b749ba6dfc2ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-19 17:54:31 +00:00
6b07d27bbf
Merge "Disable Launcher AIDL_TAG tracing special case" am: cf36563f87
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2253778
Change-Id: I644c8c0431a1f5a71cc54ecf543bbfbeee824c6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-19 17:44:56 +00:00
a57bff8473
Merge "More robust fix to BubbleTextViews appearing on multiple rows." into tm-qpr-dev
2022-10-19 17:40:52 +00:00
913b5afb43
Merge "Decouple taskbar background from overveiw scrim if taskbar is in overview" into tm-qpr-dev
2022-10-19 17:18:25 +00:00
cf36563f87
Merge "Disable Launcher AIDL_TAG tracing special case"
2022-10-19 17:08:05 +00:00
0503584f8a
Merge "Remove KtR workaround" into tm-qpr-dev am: 994b181676
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20221668
Change-Id: I8a35758f0ee59abbb0e9fc055852a0f6a90362c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-19 14:32:28 +00:00
08092b2cfb
Merge "Implement overlay window for Taskbar EDU and All Apps." into tm-qpr-dev am: c9928a1ddf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20154536
Change-Id: I1fe0c0d4410b83c657047b59fc6988ede9b3b880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-19 14:31:57 +00:00
986e5dde13
Merge "Add launcher metrics for tracking kids nav mode change events." into tm-qpr-dev am: ded9a7485e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19697622
Change-Id: I6a7660b64929d4467bc4aa79e6bcc003ec73f336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-19 14:30:58 +00:00
72539ecb16
Merge "Convert make to bp" into tm-qpr-dev am: c863b90571
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19258809
Change-Id: Ibc6d33eb3056db39b5f9922ca44f2fbfca96fc04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-19 14:28:58 +00:00
994b181676
Merge "Remove KtR workaround" into tm-qpr-dev
2022-10-19 14:04:48 +00:00
c9928a1ddf
Merge "Implement overlay window for Taskbar EDU and All Apps." into tm-qpr-dev
2022-10-19 14:01:56 +00:00
ded9a7485e
Merge "Add launcher metrics for tracking kids nav mode change events." into tm-qpr-dev
2022-10-19 13:36:56 +00:00
c863b90571
Merge "Convert make to bp" into tm-qpr-dev
2022-10-19 13:35:18 +00:00
95759878e5
Merge changes from topic "widget_blur" into tm-qpr-dev am: 8dac89d235
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20225103
Change-Id: I3c87b449cbf63a4f3120c02710f746c905401574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-19 10:01:21 +00:00
7b815365ea
Fix STATE_DEPTH stuck at 1 after setting wallpaper am: 950a10738b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19967480
Change-Id: I00d40ac79fd33db656ae72fe492964cc1e46f8c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-19 10:01:18 +00:00
8dac89d235
Merge changes from topic "widget_blur" into tm-qpr-dev
...
* changes:
Enable wallpaper blur for widget picker
Fix STATE_DEPTH stuck at 1 after setting wallpaper
2022-10-19 09:37:39 +00:00
a3bd0797e6
Merge "Fix missing screenshots on rotate from recents view select state" into tm-qpr-dev am: a473ff6c23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20196922
Change-Id: I2f846705d8d248993b1323783c63fef9f3bdf365
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-19 07:02:34 +00:00
a473ff6c23
Merge "Fix missing screenshots on rotate from recents view select state" into tm-qpr-dev
2022-10-19 03:48:11 +00:00
608cca982f
Merge "Get rid of spring loaded mode for home gardening design" into tm-qpr-dev am: ee5827d96e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20191502
Change-Id: Iddfb8bff05991795dba060de3f28a7e1c291e42a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-18 22:56:09 +00:00
ee5827d96e
Merge "Get rid of spring loaded mode for home gardening design" into tm-qpr-dev
2022-10-18 22:17:51 +00:00
1028a726ef
Get rid of spring loaded mode for home gardening design
...
For the new home gardening mode, we plan on not having a spring loaded mode where the overlay shrinks, so when we have the flag for home gardening on, we won't be having the workspace have the green overlay and the icons shrink
Bug: 251259222
Test: Hold on an icon in workspace to enter edit workspace mode, notice how we no longer shrink the workspace
Change-Id: Ibf1c38eecc117a838eca20a860d47c355955b513
2022-10-18 13:49:37 -07:00
4ce144eaa7
Merge "Prevent restoring split selection state for fallback overview" into tm-qpr-dev am: 44e788a9d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20217203
Change-Id: Ic6df3639b6f34b17380980dfad46d7af5243e7ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-18 19:43:22 +00:00
44e788a9d3
Merge "Prevent restoring split selection state for fallback overview" into tm-qpr-dev
2022-10-18 18:50:19 +00:00
724963448f
Merge "Fixes ITEM_TYPE_SEARCH_ACTION to have a unique value." into tm-qpr-dev am: 7798fb6e30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20125070
Change-Id: I2211801f0614ff5339994261cc2cb308f00ecece
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-18 17:58:24 +00:00
7798fb6e30
Merge "Fixes ITEM_TYPE_SEARCH_ACTION to have a unique value." into tm-qpr-dev
2022-10-18 17:34:23 +00:00
dd11f089cc
Revert "Revert "Using Transaction directly instead of building s..."
...
Revert^2 "Removing unused surface transaction wrappers"
2460910c8c454bc2d3c9ae35bd32eeb590851788
Bug: 221961069
Test: Presubmit
Change-Id: I0028c9fe0de6fde6a77de84e4858fda14cd578dd
2022-10-18 16:30:26 +00:00
1852459977
Enable wallpaper blur for widget picker
...
Fix: 240580498
Test: Go to walppaper&style, set new wallpaper, then go to widget picker, wallpaper depth should transition smoothly
Change-Id: Iadabd0e755f861fb1e8967209dd647faed6e4916
2022-10-18 17:07:47 +01:00
950a10738b
Fix STATE_DEPTH stuck at 1 after setting wallpaper
...
- Made BaseDepthController.setDepth/mDepth private, all get/set should be done through STATE_DEPTH or WIDGET_DEPTH
- Generified ClampedDepthProperty into Utilities.ClampedProperty to apply on STATE_DEPTH
Bug: 240580498
Test: Go to walppaper&style, set new wallpaper, then go to widget picker, wallpaper depth should transition smoothly
Change-Id: I53cdedf970fd7ffba6a952c4edf4b34251b01f07
2022-10-18 17:07:17 +01:00
e9d4044483
Remove KtR workaround
...
Bug: 229947409
Test: m -j128 Launcher3QuickStep Launcher3QuickStepGo Launcher3 Launcher3Go NexusLauncherRelease NexusLauncherDebug SearchLauncherQuickStep SearchLauncher LauncherGoGoogle
Change-Id: I5792cc6b30dfa856747a1576ef3cb195952c25c7
(cherry picked from commit 51e164688e
2022-10-18 13:06:23 +00:00
2c54bbfdfc
Convert make to bp
...
Fix: 229946262
Test: build all launchers and run atest
Change-Id: Ie9b66ba0d83aa0c3c476dd30853ef52279c9619e
(cherry picked from commit 42f15f9b81
2022-10-18 10:02:43 +00:00
392f8878cd
Prevent restoring split selection state for fallback overview
...
* Add flag to explicitly not restore
OVERVIEW_SPLIT_SELECT
* FallbackRecentsView then resets state in
RecentsView if our endState is ever not split selection
Fixes: 253178217
Test: Used launcher developer option to
force use separate recents activity. Tested w/
3 button nav + gesture.
Change-Id: I26c9994bf853e9a005300a02aa143991958fc461
2022-10-17 17:52:16 -07:00
9345681737
Fixes ITEM_TYPE_SEARCH_ACTION to have a unique value.
...
It previously was the same as ITEM_TYPE_TASK.
Test: N/A
Bug: 254138853
Bug: 254140269
Change-Id: I6f09818e3c5c05cbcbb451147cf310d59c7064e0
2022-10-17 17:11:25 -07:00
c17c3171c5
More robust fix to BubbleTextViews appearing on multiple rows.
...
This is the more comprehensive version of ag/20119299.
Improvements compared to that change:
- Icons on the same row animate together (as opposed to the
first icon on the row animating separately)
- Multiple rows of predicted apps are supported (any beyond
the first row are animated like everything else)
--- Original description ---
Example BubbleTextView: WhatsApp/Gmail conversation shortcuts.
The issue was we were treating these the same as the top app
row, but we were assuming there would only be 1 such row, which
messed up the measurement logic. At the same time, the logic
specific to that app row was redundant with the new logic for
rows containing mulitple items.
This solution does 2 things:
- Removes special logic for app row (it now uses the same
logic as other rows with multiple items, i.e. uses the span
index to determine the height of the row)
- Keeps the scale/alpha at 1 for the first row of app icons.
This currently only applies to predicted apps, but if there
were multiple app rows in the future, the additional rows
would animate the same way as other rows (see demo videos
for an example with double predicted apps in 0 state). In
the conversation case, the other icons are deep shortcuts.
The result is the app row still does what it did before (stays
fixed at full size/opacity), and deep shortcuts like the ones
used for WhatsApp and Gmail animate like other rows of items,
such as screenshots.
Demo videos: https://drive.google.com/drive/folders/1GPQNIwMfuj9ZdAbRrh-K75C5xJYT4Gzo?resourcekey=0-ojO6VGetEBy5YTq4roFmlw&usp=sharing
Test: Manual with and without inject_web_top (which moves app row)
for WhatsApp and Gmail with AiAi fishfood.
Bug: 239927522
Change-Id: Ib2ca97b93798cb57eb55545eeba8be9322484f7d
2022-10-17 16:47:27 -07:00
f6f5b18777
Merge "Making Launcher TAPL check orientation only when the expected orientation is set by the test" into tm-qpr-dev am: 7c9144328a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20192106
Change-Id: Id8d17a1a412716ab409270a5e14c09621d64f0a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-17 23:07:14 +00:00
7c9144328a
Merge "Making Launcher TAPL check orientation only when the expected orientation is set by the test" into tm-qpr-dev
2022-10-17 22:58:51 +00:00
8c633ed07b
Merge "Landscape 3 button nav on taskbar phone supported" into tm-qpr-dev am: 90eff11fee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19541300
Change-Id: I79fceefa8267fc487d0dafaaebf69e94eddc07b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-17 22:52:40 +00:00
90eff11fee
Merge "Landscape 3 button nav on taskbar phone supported" into tm-qpr-dev
2022-10-17 22:30:05 +00:00
da45ddb921
Merge "Revert "Updating the scroll calculation from recyclerView to avoid view inflation"" into tm-qpr-dev am: 2a28ae8a3f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20213328
Change-Id: I872e01293709265d96b35845c8687c3517c96aaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-17 21:52:20 +00:00
TreeHugger Robot
Sunny Goyal
Brian Isganitis
Federico Baron
Zimuzo Ezeozue
Anushree Ganjam
Andy Wickham
Thales Lima
Pat Manning
Alex Chau
Vinit Nayak
Hui Kang