Commit Graph

52076 Commits

Author SHA1 Message Date
TreeHugger Robot fef71d99a5 Merge "Don't allow swiping to HintState if we're already in HintState" into tm-dev am: c012085c6c am: 774c53f919 am: 5b765189e2 am: 71311797b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18521352

Change-Id: I79743f53b86b83928a3115decf0a354204b81a3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:58:17 +00:00
TreeHugger Robot 71311797b6 Merge "Don't allow swiping to HintState if we're already in HintState" into tm-dev am: c012085c6c am: 774c53f919 am: 5b765189e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18521352

Change-Id: I3a54c582097c75b9d643b2c2063f02186ad4837a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:42:28 +00:00
TreeHugger Robot 5b765189e2 Merge "Don't allow swiping to HintState if we're already in HintState" into tm-dev am: c012085c6c am: 774c53f919
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18521352

Change-Id: If494d52f37fd556dca2fd6960bb69490c812e5fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:26:26 +00:00
TreeHugger Robot 3d662872c2 Merge "Don't allow swiping to HintState if we're already in HintState" into tm-dev am: c012085c6c am: abbb482160
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18521352

Change-Id: I61e3083d3d6a348dcd09d33fb43d1a592147e3fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:25:45 +00:00
TreeHugger Robot 774c53f919 Merge "Don't allow swiping to HintState if we're already in HintState" into tm-dev am: c012085c6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18521352

Change-Id: I35340674db72bc9a640653b9bba787e06b86ff23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:01:22 +00:00
TreeHugger Robot abbb482160 Merge "Don't allow swiping to HintState if we're already in HintState" into tm-dev am: c012085c6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18521352

Change-Id: I7abe815c7ca7801d7172663ff8370a84ff8cc973
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:00:37 +00:00
TreeHugger Robot 439d0def19 Merge "Adds helper methods in SearchUiManager and OnboardingPrefs." into tm-dev am: dd053e79e2 am: 9f3a9b6f35 am: f2db082b89 am: 1a8e258a74
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18631233

Change-Id: I0a36955eb8904e52fa75053389bf3a18f84e8ff9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:39:33 +00:00
TreeHugger Robot c012085c6c Merge "Don't allow swiping to HintState if we're already in HintState" into tm-dev 2022-06-04 01:38:29 +00:00
TreeHugger Robot b9e163352b Merge "Adds helper methods in SearchUiManager and OnboardingPrefs." into tm-dev am: dd053e79e2 am: 6b390b8c16 am: 13df7c439c am: b13c076c75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18631233

Change-Id: I9c1482c0829b50b765619d2328ab1123243002c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:38:15 +00:00
TreeHugger Robot f51f75ce26 Merge "Adds helper methods in SearchUiManager and OnboardingPrefs." into tm-dev am: dd053e79e2 am: 6b390b8c16 am: 7e2cac2b7d am: 347e073063
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18631233

Change-Id: I4125eb729fd2f1de69ae025e2615300a0821bc18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:37:52 +00:00
TreeHugger Robot 1a8e258a74 Merge "Adds helper methods in SearchUiManager and OnboardingPrefs." into tm-dev am: dd053e79e2 am: 9f3a9b6f35 am: f2db082b89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18631233

Change-Id: I7fd9b1cd22e8c99dc7cc2414105b75149a17d1e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:13:19 +00:00
TreeHugger Robot b13c076c75 Merge "Adds helper methods in SearchUiManager and OnboardingPrefs." into tm-dev am: dd053e79e2 am: 6b390b8c16 am: 13df7c439c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18631233

Change-Id: I9cea1d83c07511e7b82c175ae83a0d2652e6cf26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:11:49 +00:00
TreeHugger Robot 347e073063 Merge "Adds helper methods in SearchUiManager and OnboardingPrefs." into tm-dev am: dd053e79e2 am: 6b390b8c16 am: 7e2cac2b7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18631233

Change-Id: Idfe2cd8b1205388d057513bba7c1f7e888c5232d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:11:32 +00:00
TreeHugger Robot f2db082b89 Merge "Adds helper methods in SearchUiManager and OnboardingPrefs." into tm-dev am: dd053e79e2 am: 9f3a9b6f35
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18631233

Change-Id: Ib9d8398bdae8287b9e662c651cc5e75f1f70ecb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:48:34 +00:00
TreeHugger Robot 13df7c439c Merge "Adds helper methods in SearchUiManager and OnboardingPrefs." into tm-dev am: dd053e79e2 am: 6b390b8c16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18631233

Change-Id: Ib62c619c43e54b11d794a2222e31aeca2ac9f722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:47:11 +00:00
TreeHugger Robot 7e2cac2b7d Merge "Adds helper methods in SearchUiManager and OnboardingPrefs." into tm-dev am: dd053e79e2 am: 6b390b8c16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18631233

Change-Id: I5ca1d6bab8401fa52ab74856e98c6219b69819ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:46:49 +00:00
TreeHugger Robot dae444b827 Merge "Adds helper methods in SearchUiManager and OnboardingPrefs." into tm-dev am: dd053e79e2 am: ddf7dfff31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18631233

Change-Id: I033fc551db30a45910900b3c544b065293c2fd3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:46:04 +00:00
TreeHugger Robot 6b390b8c16 Merge "Adds helper methods in SearchUiManager and OnboardingPrefs." into tm-dev am: dd053e79e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18631233

Change-Id: Ib141d29a96ab83bb8bc2cd9e9fcc436c2401c148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:20:18 +00:00
TreeHugger Robot 9f3a9b6f35 Merge "Adds helper methods in SearchUiManager and OnboardingPrefs." into tm-dev am: dd053e79e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18631233

Change-Id: I4c332f3922a2a71bee2217620b880f610d5f0796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:19:33 +00:00
TreeHugger Robot ddf7dfff31 Merge "Adds helper methods in SearchUiManager and OnboardingPrefs." into tm-dev am: dd053e79e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18631233

Change-Id: Idc6425c6d68f85828caa5ebb7dad7b950db4b45f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:19:29 +00:00
Ats Jenk f5098d95c4 Merge "Enable bubbles home gesture by default" into tm-qpr-dev am: e048af300b am: d2082c8c65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18720602

Change-Id: Ie1704232532c9f6700ebf18f709d290da174efb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:16:28 +00:00
Tony Wickham 8d72018a87 Don't allow swiping to HintState if we're already in HintState
Context: there was a bug where you could get stuck in HintState if you
did the following (timing is critical):
1. Short swipe from nav region towards HintState, but not far enough or
   fast enough to commit before letting go; this cancels the state
   animation, returning towards Normal (but, crucially, StateManager
   still has state set as Hint)
2. While previous animation is animating back to Normal, swipe up again,
   but this time faster/farther to actually reach Hint; this time, the
   animation does go towards Hint, but gets stuck there. The reason it
   gets stuck is because StateManager thinks we're already in Hint from
   step 1, so doesn't call onStateTransitionEnd(Hint) in step 2. Thus,
   we never get QuickstepLauncher#onStateSetEnd(Hint), which is what we
   rely on to return to Normal.

The simple fix is to prevent the second swipe in the first place.

Test: short swipe followed immediately by fast fling from nav region on home successfully stays in Normal state intead of getting stuck in HintState
Test:
NexusLauncherOutOfProcTests: com.google.android.apps.nexuslauncher.TaplTestsNexus
Fixes: 228276181
Change-Id: I54c371c8518a9a220e75c98003331b552d8bf8af
2022-06-03 14:56:04 -07:00
TreeHugger Robot dd053e79e2 Merge "Adds helper methods in SearchUiManager and OnboardingPrefs." into tm-dev 2022-06-03 20:10:27 +00:00
Ats Jenk d2082c8c65 Merge "Enable bubbles home gesture by default" into tm-qpr-dev am: e048af300b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18720602

Change-Id: I902285c63d03346e4edbdfc8863357fc4acc939b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 19:38:37 +00:00
Ats Jenk e048af300b Merge "Enable bubbles home gesture by default" into tm-qpr-dev 2022-06-03 18:46:20 +00:00
Vinit Nayak 107f79a4a2 Merge "Refactor TaskShortcutFactory to return List of SystemShortcuts" into tm-qpr-dev am: dde2536a52 am: 54cdc33ca1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18624822

Change-Id: Ia9e062b2e7ab1a86cdc703614fdbc44f01afb2df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 17:33:22 +00:00
Vinit Nayak 54cdc33ca1 Merge "Refactor TaskShortcutFactory to return List of SystemShortcuts" into tm-qpr-dev am: dde2536a52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18624822

Change-Id: I6248b81a30447c2634a325cd5543e74129630d36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 17:02:01 +00:00
Vinit Nayak dde2536a52 Merge "Refactor TaskShortcutFactory to return List of SystemShortcuts" into tm-qpr-dev 2022-06-03 16:39:11 +00:00
Ats Jenk daccf18be1 Enable bubbles home gesture by default
Update feature flag for bubbles home gesture handling to be on by
default.

Bug: 170163464
Test: manually verified that home gesture feature is enabled on a a fresh build
Test: atest PlatformScenarioTests:android.platform.test.scenario.sysui.bubble
Change-Id: Ie6bdea919dfaf6448b3c57756cd06993a6a60ce7
2022-06-02 17:05:36 -07:00
Andy Wickham e20a35c7a3 Adds helper methods in SearchUiManager and OnboardingPrefs.
Bug: 233656600
Test: With topic change.
Change-Id: I9ddb910e94d389ec682617ce874fff6a2ce703c8
2022-06-02 16:44:16 -07:00
Sunny Goyal f7c5dc7223 Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54 am: 3960374e68 am: 5132ca8f3e am: d20f6584cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: Iffa23eb17faadb40c8f4c43b7e1ff3d71235b18c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:55:24 +00:00
Sunny Goyal 13742b769e Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54 am: 0b6a764f36 am: e40d5085b7 am: d6207bfce8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: I96ee7966a108c63cbba5661b3b90f99708786790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:55:10 +00:00
Sunny Goyal 9a4f0c882b Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54 am: 3960374e68 am: 7f1b08672e am: 38e1c232e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: Ie44c9df79372752e33cb7d19d63deb0c6635bf19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:54:54 +00:00
Sunny Goyal d20f6584cb Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54 am: 3960374e68 am: 5132ca8f3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: Ifd75bdb2ee460b6bc93a75051df22a122ec3844b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:39:25 +00:00
Sunny Goyal d6207bfce8 Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54 am: 0b6a764f36 am: e40d5085b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: Id4ebbe8edb921f6cd6db86962d3e3fa749e9f2b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:39:10 +00:00
Sunny Goyal 38e1c232e9 Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54 am: 3960374e68 am: 7f1b08672e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: I1a9793a2f412cc25c483b7d12dad3d0e257f8a78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:38:43 +00:00
Sunny Goyal 7f1b08672e Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54 am: 3960374e68
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: Ie0a5fd47908ddb962fbfacd7e058c76587ba9dcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:17:52 +00:00
Sunny Goyal 5132ca8f3e Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54 am: 3960374e68
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: I20cc0497fcd6f620ceb07abb096226fb32a75cb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:17:49 +00:00
Sunny Goyal e40d5085b7 Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54 am: 0b6a764f36
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: I1a8cb72237cf31fd488406780cad12e01da96be7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:17:22 +00:00
Sunny Goyal 13b5a16350 Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54 am: 004fecba55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: I8cffb398ec85945511ce0ca67fc6ac11e3324c46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:16:37 +00:00
Sunny Goyal 3960374e68 Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: I0849e6bf81386a362b32eea43d0b13c6a3e9f1ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:02:42 +00:00
Stefan Andonian 865de32778 Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev am: 0c809bbe67 am: 9dd7aa50ab am: 710a75e424 am: 08c44d2fe1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18673699

Change-Id: I3912e84c3d426cfa084dccbfbdeb8101692c8337
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:02:36 +00:00
Stefan Andonian 23f4a3a3a3 Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev am: 0c809bbe67 am: 3801caf6cc am: cf93b70a58 am: e2c421ad38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18673699

Change-Id: If80f92b930c6b4aef1ffeb6e5a49f2cf2bb64c20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:02:15 +00:00
Stefan Andonian 395437f48b Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev am: 0c809bbe67 am: 9dd7aa50ab am: d67e47294e am: 4fe7925800
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18673699

Change-Id: Ibd126c900ceccd016adf9485267d1cba8e685b35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:02:01 +00:00
Sunny Goyal 004fecba55 Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: Ib45871e138168b7cdc35946a4b50cbede596e576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:01:09 +00:00
Sunny Goyal 0b6a764f36 Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: I3cbdc77cdb7e553cb45e742e79090563617f9951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:00:51 +00:00
Sunny Goyal c2c1fdad54 Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev 2022-06-02 16:45:31 +00:00
Stefan Andonian 08c44d2fe1 Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev am: 0c809bbe67 am: 9dd7aa50ab am: 710a75e424
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18673699

Change-Id: I3b8bc4e98a1c440f6f0d4664a66f8a0f7e341c72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 16:31:13 +00:00
Stefan Andonian e2c421ad38 Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev am: 0c809bbe67 am: 3801caf6cc am: cf93b70a58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18673699

Change-Id: I6f936a25bf82c08ec7d99ab89d7600eb976ed2c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 16:31:02 +00:00
Stefan Andonian 4fe7925800 Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev am: 0c809bbe67 am: 9dd7aa50ab am: d67e47294e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18673699

Change-Id: I635db33ee12f1075ff563ffe40150cdc997117df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 16:30:47 +00:00