Bill Yi
e2d121740c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 2a04bb24d2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23971853
Change-Id: Ib4943c5ec0d2203e31a6e08cdedb9caa19534201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 18:22:00 +00:00
Bill Yi
50e55c26cf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8851a2634f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23971853
Change-Id: I8fabbb8194651923e69ff5a86585f7eba0564c0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 18:21:47 +00:00
Bill Yi
2a04bb24d2
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-07-08 17:47:47 +00:00
Andrew Cole
974c183668
Merge "Updating materialColorSurfaceContainerHighest color access" into udc-dev am: 81ab7aa4a9 am: a6654af458
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23920481
Change-Id: Icd700f114b00297c258731e2af845c8cc71514c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 22:28:42 +00:00
Andrew Cole
67200bef8a
Merge "Updating materialColorSurfaceContainerHighest color access" into udc-dev am: 81ab7aa4a9 am: cc5b2f4106
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23920481
Change-Id: Id452d315af2efd6017f5bd55a21497adf2972a5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 22:26:10 +00:00
Andrew Cole
a6654af458
Merge "Updating materialColorSurfaceContainerHighest color access" into udc-dev am: 81ab7aa4a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23920481
Change-Id: I2ee60648b554b9746d47f40cf7ea945c901c2dda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 21:46:45 +00:00
Andrew Cole
cc5b2f4106
Merge "Updating materialColorSurfaceContainerHighest color access" into udc-dev am: 81ab7aa4a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23920481
Change-Id: Ie01138e97d1302eb1df18572ff1d6599345b7ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 21:46:25 +00:00
Andrew Cole
81ab7aa4a9
Merge "Updating materialColorSurfaceContainerHighest color access" into udc-dev
2023-07-07 21:14:26 +00:00
Winson Chung
19d3aa2d1a
Merge "Fix an issue with nav bar translations not being updated" into udc-dev am: a53261b9cd am: e4b98ea44d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23923806
Change-Id: Iaf694b46d54762ed8e6d7cbf5d0d1470853d06c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 20:01:50 +00:00
Winson Chung
200e56770a
Ignore recents transition if there are no closing tasks am: 6f7e15ff64 am: 38e763613b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23909000
Change-Id: Ibfc18b251bde238121cbf62e71c61836cbec1a87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 20:01:25 +00:00
Winson Chung
1108507fcb
Merge "Fix an issue with nav bar translations not being updated" into udc-dev am: a53261b9cd am: a8e08175ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23923806
Change-Id: Ie3fb097de6ced28d239dc129b10335e0b10448bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 19:59:08 +00:00
Winson Chung
3537a91808
Ignore recents transition if there are no closing tasks am: 6f7e15ff64 am: b06c5f7a2b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23909000
Change-Id: If676c1f88a4bab7299fca8d97a0d33090accb269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 19:58:56 +00:00
Winson Chung
e4b98ea44d
Merge "Fix an issue with nav bar translations not being updated" into udc-dev am: a53261b9cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23923806
Change-Id: Ifc99248dda1a45f3034a80ddca47e8dcc506cd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 19:20:03 +00:00
Winson Chung
38e763613b
Ignore recents transition if there are no closing tasks am: 6f7e15ff64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23909000
Change-Id: I25d6e8f6b1cadf1a102980258dd5842f4e7277b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 19:19:53 +00:00
Winson Chung
a8e08175ad
Merge "Fix an issue with nav bar translations not being updated" into udc-dev am: a53261b9cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23923806
Change-Id: I5b5de5b767d1f743b7dd66d178b9ccb0d9a2c33f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 19:19:42 +00:00
Winson Chung
b06c5f7a2b
Ignore recents transition if there are no closing tasks am: 6f7e15ff64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23909000
Change-Id: I8077d28abcee554ef793df5eefc7ceab94ec0149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 19:19:31 +00:00
Winson Chung
a53261b9cd
Merge "Fix an issue with nav bar translations not being updated" into udc-dev
2023-07-07 18:33:16 +00:00
Bill Yi
8851a2634f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I239d8c74223ab3fce1d6cb902aa08d4bd34272da
2023-07-06 22:41:22 -07:00
Winson Chung
ccd359d76c
Fix an issue with nav bar translations not being updated
...
- There are flows where the shared taskbar state is updated prior
to being destroyed, and not updated to the latest values when
the taskbar is recreated.
ie.
unfolded -> lock screen -> LauncherTaskbarUiController's
mTaskbarInAppDisplayProgress[SYSUI_SURFACE_PROGRESS_INDEX]
is set to 1 due to the notif shade (lockscreen) showing.
This is written into TaskbarSharedState's sysuiStateFlags
and inAppDisplayProgressMultiPropValues.
fold -> TaskbarActivityContext is destroyed
unlock -> TaskbarManager and TaskbarSharedState's
sysuiStateFlags are updated while the device is folded
unfold -> TaskbarActivityContext is recreated and initialized
which restores from the shared state's
inAppDisplayProgressMultiPropValues. It also tries to reapply
the shared state's sysuiStateFlags, but this doesn't update
inAppDisplayProgressMultiPropValues because the state's
"enabled" state is not updated (default is no flag set, and
lockscreen sysui state is not set anymore).
-> The restored inAppDisplayProgressMultiPropValues value
results in the wrong translation.
- Note that after the above, the NavbarButtonsViewController state
is actually correct and reflects the SysUI state, but the
LauncherTaskbarUiController state is wrong. This CL tries to
manually update the ui controller to the correct state when it
is recreated.
- CL also fixes a separate issue where LauncherTaskbarUIController
could potentially overwrite the saved state progresses while
restoring them due to the state callback being called
Bug: 283346744
Test: Unfold -> Lockscreen -> Fold -> Unlock -> Unfold and ensure
the buttons are translated correctly
Change-Id: I43e473faf4fa2a493b9705506e3755df8f6264e7
Signed-off-by: Winson Chung <winsonc@google.com >
2023-07-06 22:01:49 +00:00
Andrew Cole
a9af3bd03d
Updating materialColorSurfaceContainerHighest color access
...
For any view files applying the WidgetConatinerTheme via widgetsTheme they were incorrectly inheriting themes and skipping the AppTheme provided but only in light mode. In dark mode the WidgetContainerTheme.Dark was correctly inheriting the theme.
To avoid a risky theme update for all widgetsThemes we just modify the color accessor to use @color instead of ?attr as these colors should not be attributes AFAIKT
Bug: b/289305591
Test: Follow repro steps on the bug for smartspace
Change-Id: I26cc3239763f8eac3dfe5f094c6757692f46d1bc
2023-07-06 19:29:30 +00:00
Winson Chung
6f7e15ff64
Ignore recents transition if there are no closing tasks
...
- In the case where Launcher calls startRecentsTransition while there
are no other visible tasks, we should not be continuing with the
transition as there are no tasks for Launcher to control. This was
previously handled in RecentsAnimationController in legacy
transitions, but the safer fix is to ignore it on the Launcher
side for this release.
Bug: 289175232
Test: Manually trigger empty targets and verify no issues
Change-Id: I3657c000cbc8c14c9ac989c2a57715515c96edb6
2023-07-06 18:09:52 +00:00
Jagrut Desai
4fc44d56a9
Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev am: fa2a81844f am: 982dacc7ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23845422
Change-Id: I686be2553533fbec2b6c45af460fa482580bb500
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 23:47:47 +00:00
Jagrut Desai
62dd220b69
Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev am: fa2a81844f am: d4b4e95bea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23845422
Change-Id: I2c06c2637c4d7fefab71ea87af677b210cd2829c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 23:45:46 +00:00
Jagrut Desai
982dacc7ef
Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev am: fa2a81844f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23845422
Change-Id: I5c4b401023efb9cd5fcdbff50819dc95ad6cc4c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 23:06:12 +00:00
Jagrut Desai
d4b4e95bea
Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev am: fa2a81844f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23845422
Change-Id: I33a1ec0e54a662878f981bd599abb3f1d5c6f105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 23:05:06 +00:00
Jagrut Desai
fa2a81844f
Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev
2023-06-30 22:29:20 +00:00
Treehugger Robot
c44ae73e4f
Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev am: 2c3c1e46c0 am: 4264a7d135
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23852178
Change-Id: I8cbe4f47fc876d1a90fdf97b0b110ee9b10b7c37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 19:05:50 +00:00
Treehugger Robot
120c78d24f
Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev am: 2c3c1e46c0 am: 4de15620c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23852178
Change-Id: I1302f2aeaeb17fa95a1a64cb2e095febadcacba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 19:03:05 +00:00
Treehugger Robot
4264a7d135
Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev am: 2c3c1e46c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23852178
Change-Id: I9db459debe4075642f868ca1f46c05ee14d7bd2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 18:22:57 +00:00
Treehugger Robot
4de15620c2
Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev am: 2c3c1e46c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23852178
Change-Id: I31bb8d94d473716e148140372e61fc71fc024deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 18:22:28 +00:00
Treehugger Robot
2c3c1e46c0
Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev
2023-06-30 17:45:50 +00:00
Brandon Dayauon
8469cfab71
Merge "Fix custom buttons with translated string" into udc-d1-dev am: 206821cee6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23849389
Change-Id: Ic819b40f9bd901de4823d36c2693b2bf96436581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 22:56:08 +00:00
Brandon Dayauon
206821cee6
Merge "Fix custom buttons with translated string" into udc-d1-dev
2023-06-29 22:15:38 +00:00
Mateusz Cicheński
a118efdd61
Merge "Remove the keep clear areas XML tag from Hotseat" into udc-dev am: 665524cc37 am: 8bc482c25e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23823197
Change-Id: I1a2036123af24af25f1cfb2662ad1b73e9410a1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 19:05:14 +00:00
Mateusz Cicheński
ea4fb36690
Merge "Remove the keep clear areas XML tag from Hotseat" into udc-dev am: 665524cc37 am: 1f113855f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23823197
Change-Id: I50b0b0ca9e82dd33d5c64dec1352fc4b86db1665
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 19:02:51 +00:00
Mateusz Cicheński
1f113855f4
Merge "Remove the keep clear areas XML tag from Hotseat" into udc-dev am: 665524cc37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23823197
Change-Id: I64cf41db2c47a69dd941a889f726604f669dd515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 18:20:14 +00:00
Mateusz Cicheński
8bc482c25e
Merge "Remove the keep clear areas XML tag from Hotseat" into udc-dev am: 665524cc37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23823197
Change-Id: I820931e5b5ccc0487dc9d8046c26579d762185e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 18:20:12 +00:00
Hongwei Wang
c1749851f2
Merge "Polish home-key from split to pip transition" into udc-dev am: ca08d75e4a am: 858a3c1659
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23833485
Change-Id: Ib800e1e635df5146c380816970d2c01850c76baa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 17:58:25 +00:00
Hongwei Wang
263aceeeea
Merge "Polish home-key from split to pip transition" into udc-dev am: ca08d75e4a am: 93551e9496
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23833485
Change-Id: I6d23eca98f12691d3f87af8fedf8049f27125194
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 17:56:29 +00:00
Mateusz Cicheński
665524cc37
Merge "Remove the keep clear areas XML tag from Hotseat" into udc-dev
2023-06-29 17:55:57 +00:00
Hongwei Wang
93551e9496
Merge "Polish home-key from split to pip transition" into udc-dev am: ca08d75e4a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23833485
Change-Id: I4074f76d60524d37c28408ea5744bde8bb790cbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 17:36:12 +00:00
Hongwei Wang
858a3c1659
Merge "Polish home-key from split to pip transition" into udc-dev am: ca08d75e4a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23833485
Change-Id: I4e379dab3bfd5096bb2550a226e1d2b5b84c7bcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 17:35:55 +00:00
Hongwei Wang
ca08d75e4a
Merge "Polish home-key from split to pip transition" into udc-dev
2023-06-29 17:17:03 +00:00
Jon Miranda
3bad3ebaad
Cleans up bad state when transient taskbar shows on home.
...
Bug: 279514548
Test: open transparent activity on top of launcher
unstash taskbar
go home
Change-Id: I13ab79b334e1f8feda441a82cc4d035c0142f513
2023-06-29 02:51:38 +00:00
Brandon Dayauon
dba7359d23
Fix custom buttons with translated string
...
The reason why the buttons aren't being updated with the translated string is because the cache the views get the string from is not updated/loaded with the new language.
Rather, the update happens after the view has been inflated. With this change, when the string cache updates in bindStringCache(), we update the UI right then.
bug: 280958663
bug: 288442609
test: Manual
Change-Id: I7a49ee401d5a5f3268cfaef1abee8153e913a8ce
(cherry picked from commit 076dcdfd54 )
2023-06-28 21:49:25 +00:00
Jagrut Desai
53d953ccd2
Taskbar All Apps Shortcut Menu Acccessibility Focus
...
Bug: 280657266
Test: manual
Flag: not needed
Change-Id: I2426636067ce3635b8b24b9f5d093dad7d9ddf4c
2023-06-28 14:48:54 -07:00
Winson Chung
4c287515b1
Merge "Workaround for handling the restart of an already visible task" into udc-dev am: 0da5208bb3 am: 974375b996
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23785437
Change-Id: I82816159605aaeca16fa8d0b0f9b6fd126a1930e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 07:52:44 +00:00
Winson Chung
b019f371fd
Merge "Workaround for handling the restart of an already visible task" into udc-dev am: 0da5208bb3 am: c8a2f9111b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23785437
Change-Id: Ib095560a1ba305ec4150037852caa2d0d58f9121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 07:48:03 +00:00
Winson Chung
c8a2f9111b
Merge "Workaround for handling the restart of an already visible task" into udc-dev am: 0da5208bb3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23785437
Change-Id: Icd31107e3d5f3e8496bf4ac974a23d49396ee695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 07:07:49 +00:00
Winson Chung
974375b996
Merge "Workaround for handling the restart of an already visible task" into udc-dev am: 0da5208bb3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23785437
Change-Id: I2c53ed7cc9125a8076899932f5c8908206f6d1e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 07:04:17 +00:00