Commit Graph

49925 Commits

Author SHA1 Message Date
Jonathan Miranda 79412e481d [automerger skipped] Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 89299047d7 am: 4401663f4a am: 209035afce -s ours am: d11638739c -s ours am: 89e9723fcb -s ours am: 20a582167a -s ours am: 7b3816cdeb -s ours am: 30133051d7 -s ours
am skip reason: Merged-In I70acd4ce48853be728be1fb80b4b885d00a059a9 with SHA-1 5af0edefdb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14936503

Change-Id: I2e0269f847b7795b1a62fcb1b5f3ff189dd2f703
2021-06-10 21:30:08 +00:00
Jonathan Miranda dbdf5cc077 [automerger skipped] Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 89299047d7 am: 4401663f4a am: 209035afce -s ours am: d11638739c -s ours am: 8d398a8892 -s ours am: babf48c636 -s ours am: 43cf4563ed -s ours am: d2b065e221 -s ours
am skip reason: Merged-In I70acd4ce48853be728be1fb80b4b885d00a059a9 with SHA-1 5af0edefdb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14936503

Change-Id: Ib13cecb5360da66d5e1c32701cb9c29224040736
2021-06-10 21:29:54 +00:00
Alina Zaidi 001543fdce Merge changes I5d1c9e4b,I08154c94 into sc-dev am: 1fbf9200f1 am: 18d07beef4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14899453

Change-Id: I721d24e08f6ddf2d9be73392d66f25daa3346d5b
2021-06-10 21:17:26 +00:00
Jonathan Miranda c11d9e8cff [automerger skipped] Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 89299047d7 am: 4401663f4a am: 209035afce -s ours am: d11638739c -s ours am: 89e9723fcb -s ours am: 20a582167a -s ours am: 2425b24747 -s ours
am skip reason: Merged-In I70acd4ce48853be728be1fb80b4b885d00a059a9 with SHA-1 5af0edefdb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14936503

Change-Id: If481b27cf87633f7921a8d7276cb99d7c09c652b
2021-06-10 21:17:20 +00:00
Jonathan Miranda f9c38db316 [automerger skipped] Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 89299047d7 am: 4401663f4a am: 209035afce -s ours am: d11638739c -s ours am: 8d398a8892 -s ours am: babf48c636 -s ours am: dccbc3d20c -s ours
am skip reason: Merged-In I70acd4ce48853be728be1fb80b4b885d00a059a9 with SHA-1 5af0edefdb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14936503

Change-Id: I4dbdde972f4b05a7968b505415845c07abff0791
2021-06-10 21:16:56 +00:00
Alina Zaidi 784d08da4e Merge changes I5d1c9e4b,I08154c94 into sc-dev am: 1fbf9200f1 am: e908dbba29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14899453

Change-Id: Icc45b99bc5daac07ab781ec794748218b3ab9087
2021-06-10 21:16:35 +00:00
Jonathan Miranda 30133051d7 [automerger skipped] Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 89299047d7 am: 4401663f4a am: 209035afce -s ours am: d11638739c -s ours am: 89e9723fcb -s ours am: 20a582167a -s ours am: 7b3816cdeb -s ours
am skip reason: Merged-In I70acd4ce48853be728be1fb80b4b885d00a059a9 with SHA-1 5af0edefdb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14936503

Change-Id: I8d597ab9ab758d648b903a31785cf31889285bc9
2021-06-10 21:16:31 +00:00
Alina Zaidi c81e7cea5f Merge changes I5d1c9e4b,I08154c94 into sc-dev am: 1fbf9200f1 am: 153c81df42
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14899453

Change-Id: I7f2840229a8ff5bad5c9acaa143b5e6c139c1689
2021-06-10 21:16:15 +00:00
Jonathan Miranda 9f45b4b829 [automerger skipped] Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 89299047d7 am: 4401663f4a am: 209035afce -s ours am: d11638739c -s ours am: 89e9723fcb -s ours am: 20a582167a -s ours am: 3cb4055a09 -s ours
am skip reason: Merged-In I70acd4ce48853be728be1fb80b4b885d00a059a9 with SHA-1 5af0edefdb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14936503

Change-Id: Icd0d028a1294017a021f1b91ded84097fcc874c8
2021-06-10 21:16:10 +00:00
Jonathan Miranda d2b065e221 [automerger skipped] Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 89299047d7 am: 4401663f4a am: 209035afce -s ours am: d11638739c -s ours am: 8d398a8892 -s ours am: babf48c636 -s ours am: 43cf4563ed -s ours
am skip reason: Merged-In I70acd4ce48853be728be1fb80b4b885d00a059a9 with SHA-1 5af0edefdb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14936503

Change-Id: I9cae8ac93942acec610a40be18deac1e88c29580
2021-06-10 21:16:08 +00:00
Jonathan Miranda d3b942c65c [automerger skipped] Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 89299047d7 am: 4401663f4a am: 209035afce -s ours am: d11638739c -s ours am: 8d398a8892 -s ours am: babf48c636 -s ours am: c1d019de69 -s ours
am skip reason: Merged-In I70acd4ce48853be728be1fb80b4b885d00a059a9 with SHA-1 5af0edefdb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14936503

Change-Id: Ifeaf03f0eacb955876e3db23c8d579f7500b13c2
2021-06-10 21:16:00 +00:00
Zak Cohen f160fda5ad Merge "Suppress failing view inflation tests until investigation" into sc-dev am: 20832e64a4 am: 86924b3812 am: 914d62a625
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14938006

Change-Id: I60155569303d42b76bb8102eb5a65d69dff2a341
2021-06-10 21:05:42 +00:00
Zak Cohen dd06886103 Merge "Suppress failing view inflation tests until investigation" into sc-dev am: 20832e64a4 am: e3ae74943c am: 5b805ebb17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14938006

Change-Id: I727f936063f21db713dbc0a808d0b526bb51595e
2021-06-10 21:04:30 +00:00
Cyrus Boadway 9f06168692 Use the splash screen background color as the fallback background color
For the widget transition animation fallback background color, use either
the splash screen background color if a task is starting or the task
description-attached background color.

With a background in place, allow the window to fully fade out before
fading in the widget, by moving the window alpha math into an animation
factory-specific implementation.

Bug: 187706750
Test: Manual
Change-Id: I2b5a7783b0585d447ad60534bc48d2e2176877ed
2021-06-10 21:03:24 +00:00
Alina Zaidi e908dbba29 Merge changes I5d1c9e4b,I08154c94 into sc-dev am: 1fbf9200f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14899453

Change-Id: I2ad1c6fd6c70d06f3aea57b465cddb107f4aba2e
2021-06-10 20:59:43 +00:00
Jonathan Miranda 7b3816cdeb [automerger skipped] Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 89299047d7 am: 4401663f4a am: 209035afce -s ours am: d11638739c -s ours am: 89e9723fcb -s ours am: 20a582167a -s ours
am skip reason: Merged-In I70acd4ce48853be728be1fb80b4b885d00a059a9 with SHA-1 5af0edefdb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14936503

Change-Id: Id96cbb627cca6ee7254887f68607e607d97c6c6a
2021-06-10 20:59:36 +00:00
Jonathan Miranda 43cf4563ed [automerger skipped] Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 89299047d7 am: 4401663f4a am: 209035afce -s ours am: d11638739c -s ours am: 8d398a8892 -s ours am: babf48c636 -s ours
am skip reason: Merged-In I70acd4ce48853be728be1fb80b4b885d00a059a9 with SHA-1 5af0edefdb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14936503

Change-Id: I460320305b6a0b822bd642fc0c93de91a798af8e
2021-06-10 20:59:28 +00:00
Alina Zaidi 153c81df42 Merge changes I5d1c9e4b,I08154c94 into sc-dev am: 1fbf9200f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14899453

Change-Id: I13bcd5ad69deeed3ce8915bd53e72c0640662c2f
2021-06-10 20:58:34 +00:00
Jonathan Miranda 3cb4055a09 [automerger skipped] Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 89299047d7 am: 4401663f4a am: 209035afce -s ours am: d11638739c -s ours am: 89e9723fcb -s ours am: 20a582167a -s ours
am skip reason: Merged-In I70acd4ce48853be728be1fb80b4b885d00a059a9 with SHA-1 5af0edefdb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14936503

Change-Id: I890916266e3b0a50588621babab598ae9c342df6
2021-06-10 20:58:29 +00:00
Alina Zaidi 18d07beef4 Merge changes I5d1c9e4b,I08154c94 into sc-dev am: 1fbf9200f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14899453

Change-Id: I695053553d122e0eb0bae1f569d0b747dd612c8a
2021-06-10 20:58:28 +00:00
Jonathan Miranda 2425b24747 [automerger skipped] Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 89299047d7 am: 4401663f4a am: 209035afce -s ours am: d11638739c -s ours am: 89e9723fcb -s ours am: 20a582167a -s ours
am skip reason: Merged-In I70acd4ce48853be728be1fb80b4b885d00a059a9 with SHA-1 5af0edefdb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14936503

Change-Id: I8d45c9164d7ca97b1c800a914ffa577f2adb3c43
2021-06-10 20:58:23 +00:00
Jonathan Miranda dccbc3d20c [automerger skipped] Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 89299047d7 am: 4401663f4a am: 209035afce -s ours am: d11638739c -s ours am: 8d398a8892 -s ours am: babf48c636 -s ours
am skip reason: Merged-In I70acd4ce48853be728be1fb80b4b885d00a059a9 with SHA-1 5af0edefdb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14936503

Change-Id: I69053ad22aa162220f07eef758312cc463ea84c0
2021-06-10 20:58:16 +00:00
Jonathan Miranda c1d019de69 [automerger skipped] Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 89299047d7 am: 4401663f4a am: 209035afce -s ours am: d11638739c -s ours am: 8d398a8892 -s ours am: babf48c636 -s ours
am skip reason: Merged-In I70acd4ce48853be728be1fb80b4b885d00a059a9 with SHA-1 5af0edefdb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14936503

Change-Id: Ieed3517e2758c9fe217602e83d720cbe6bfc11e9
2021-06-10 20:57:52 +00:00
Zak Cohen 914d62a625 Merge "Suppress failing view inflation tests until investigation" into sc-dev am: 20832e64a4 am: 86924b3812
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14938006

Change-Id: Ia3b5d6d31caa44303fda9f0267752af855c6d1c0
2021-06-10 20:48:41 +00:00
Zak Cohen 5b805ebb17 Merge "Suppress failing view inflation tests until investigation" into sc-dev am: 20832e64a4 am: e3ae74943c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14938006

Change-Id: Ice0dce10f9efc3998ff10ad86c0ae10c853a94be
2021-06-10 20:47:56 +00:00
Zak Cohen db491ea11c Merge "Suppress failing view inflation tests until investigation" into sc-dev am: 20832e64a4 am: d6e77bced4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14938006

Change-Id: I334605687bd533c88242bf85483fadd58e767195
2021-06-10 20:47:22 +00:00
Alina Zaidi 1fbf9200f1 Merge changes I5d1c9e4b,I08154c94 into sc-dev
* changes:
  Flip ArrowTipView when it goes beyond screen height.
  Add more education tips for widgets. (3/3)
2021-06-10 20:46:20 +00:00
Santhosh Thangaraj 192924459b Fix the page number based Seen impression.
Test: On device.
Bug: 183117427
Change-Id: Ic1b11fb7630f60f11387951749420653aa3f0c8a
2021-06-10 20:44:09 +00:00
Jonathan Miranda 20a582167a [automerger skipped] Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 89299047d7 am: 4401663f4a am: 209035afce -s ours am: d11638739c -s ours am: 89e9723fcb -s ours
am skip reason: Merged-In I70acd4ce48853be728be1fb80b4b885d00a059a9 with SHA-1 5af0edefdb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14936503

Change-Id: I8364b723afd3e249e6eb1a4df26f6ec8072ba310
2021-06-10 20:42:28 +00:00
Jonathan Miranda babf48c636 [automerger skipped] Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 89299047d7 am: 4401663f4a am: 209035afce -s ours am: d11638739c -s ours am: 8d398a8892 -s ours
am skip reason: Merged-In I70acd4ce48853be728be1fb80b4b885d00a059a9 with SHA-1 5af0edefdb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14936503

Change-Id: Ib3ea4f1bc6f1ab3a01614a8b19922781c0f2b8f6
2021-06-10 20:42:09 +00:00
Zak Cohen e3ae74943c Merge "Suppress failing view inflation tests until investigation" into sc-dev am: 20832e64a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14938006

Change-Id: I0aacc8114111bc792a98129f0c8455d41b123b5c
2021-06-10 20:37:19 +00:00
Zak Cohen 86924b3812 Merge "Suppress failing view inflation tests until investigation" into sc-dev am: 20832e64a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14938006

Change-Id: I6e316eb9d60904175a3487b3fc5379bc14c26e2e
2021-06-10 20:31:01 +00:00
Zak Cohen d6e77bced4 Merge "Suppress failing view inflation tests until investigation" into sc-dev am: 20832e64a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14938006

Change-Id: Id86e625b54314cec82c4f69dde92b237d09ad7b2
2021-06-10 20:30:47 +00:00
Jonathan Miranda 89e9723fcb [automerger skipped] Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 89299047d7 am: 4401663f4a am: 209035afce -s ours am: d11638739c -s ours
am skip reason: Merged-In I70acd4ce48853be728be1fb80b4b885d00a059a9 with SHA-1 5af0edefdb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14936503

Change-Id: I80264e65cc5f5aff4bed3136bab84b12e445a968
2021-06-10 20:26:27 +00:00
Jonathan Miranda 8d398a8892 [automerger skipped] Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 89299047d7 am: 4401663f4a am: 209035afce -s ours am: d11638739c -s ours
am skip reason: Merged-In I70acd4ce48853be728be1fb80b4b885d00a059a9 with SHA-1 5af0edefdb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14936503

Change-Id: I2db3d09a547d2633a4242f479c555c5df93a9e0e
2021-06-10 20:25:59 +00:00
TreeHugger Robot dd0665544f Merge "Add a content description for the widget reconfigure button." into sc-dev am: 0dfabe0a1e am: 030e9dcb57 am: e319b9bfb4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14690881

Change-Id: I128d0ded7752654d5b0f6798b3db8d013e2f4044
2021-06-10 20:06:48 +00:00
TreeHugger Robot 6d38c17115 Merge "Add a content description for the widget reconfigure button." into sc-dev am: 0dfabe0a1e am: c9565c2444 am: fb0eab88b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14690881

Change-Id: Ibc0ea1eee4f8568f3bb69bcea45fbf23495dde53
2021-06-10 20:06:18 +00:00
Zak Cohen 20832e64a4 Merge "Suppress failing view inflation tests until investigation" into sc-dev 2021-06-10 20:06:17 +00:00
Jonathan Miranda d11638739c [automerger skipped] Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 89299047d7 am: 4401663f4a am: 209035afce -s ours
am skip reason: Merged-In I70acd4ce48853be728be1fb80b4b885d00a059a9 with SHA-1 5af0edefdb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14936503

Change-Id: Ifa305375e8cc4eb32d9d09f6c780613727d14940
2021-06-10 20:04:21 +00:00
TreeHugger Robot e319b9bfb4 Merge "Add a content description for the widget reconfigure button." into sc-dev am: 0dfabe0a1e am: 030e9dcb57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14690881

Change-Id: Ia2bb57482761a5438b910766b6cd3534c07022fa
2021-06-10 19:42:38 +00:00
TreeHugger Robot fb0eab88b8 Merge "Add a content description for the widget reconfigure button." into sc-dev am: 0dfabe0a1e am: c9565c2444
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14690881

Change-Id: I5b791e55d110ecd4fa33652b31f5759017ce6f64
2021-06-10 19:41:06 +00:00
TreeHugger Robot 77045b77a6 Merge "Add a content description for the widget reconfigure button." into sc-dev am: 0dfabe0a1e am: a326c763eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14690881

Change-Id: Ideee5ffa8610cb676f26dada57ff8a76b6222841
2021-06-10 19:40:55 +00:00
Jonathan Miranda 209035afce Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 89299047d7 am: 4401663f4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14936503

Change-Id: I87759b61b2744db4792e46b7b0907dd3fad0e5b1
2021-06-10 19:40:30 +00:00
TreeHugger Robot c9565c2444 Merge "Add a content description for the widget reconfigure button." into sc-dev am: 0dfabe0a1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14690881

Change-Id: Iec5619e8b03da7239a5200dfa5acd45a75dea2af
2021-06-10 19:27:03 +00:00
Jonathan Miranda 4401663f4a Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 89299047d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14936503

Change-Id: I8c2e58a032fea1b556a32079aed32efe11ab2139
2021-06-10 19:23:41 +00:00
TreeHugger Robot 030e9dcb57 Merge "Add a content description for the widget reconfigure button." into sc-dev am: 0dfabe0a1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14690881

Change-Id: I7b5b85ebcada4508ea21dad96c0bfde132bf2c67
2021-06-10 19:23:29 +00:00
TreeHugger Robot a326c763eb Merge "Add a content description for the widget reconfigure button." into sc-dev am: 0dfabe0a1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14690881

Change-Id: I73ea5e65048e96ae733b1669815eec25fee725bd
2021-06-10 19:23:05 +00:00
Steven Ng 06c21ab66b Merge "Fix height estimation of the widgets recommendation table" into sc-dev am: d4bae086d3 am: 9c6b9c311d am: 6dbf263410
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14937090

Change-Id: I762bfa0f7c3daf1885761f97ff1dba24b2454eff
2021-06-10 19:22:55 +00:00
Steven Ng 271e73b908 Merge "Fix height estimation of the widgets recommendation table" into sc-dev am: d4bae086d3 am: a7eaedffe5 am: b19b2a91f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14937090

Change-Id: I34a79146c3c9c625fdee5f576e31eab584d6da8f
2021-06-10 19:22:23 +00:00
Jon Miranda 32ff76cb4e Adding color back to popup container.
For Color exctraction now occurs in groups:
- System shortcuts
- Deep shortcuts
- Notifications

For home setting popup, each DeepShortcutView will have its own
extracted color.

Bug: 188095443
Test: manual
Change-Id: I7e209f863ff180b8f017aeb2a73c6f1a51842e68
2021-06-10 19:15:24 +00:00