Commit Graph
58436 Commits
Author SHA1 Message Date
Ryan Savitski ad9addd590 [automerger skipped] Revert "Revert "Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. <snip> am: b1b76c34f5 -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 6a7a7f6bad is already in history

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

Change-Id: Ia0c3dee0bbab4383825e91fffd4b24acc0cb166d
2021-06-10 15:59:36 +00:00
Steven Ng bc5099e9a6 Fix height estimation of the widgets recommendation table
There are two vertical paddings
1. Table padding
2. Widget cell padding

We haven't taken account the widget cells padding

Test: Manual
Bug: 189814077
Change-Id: I9b1dc9e880d4402b9c461d0024a0748c0afc408a
2021-06-10 16:57:40 +01:00
Tony Wickham 51edca003c Merge "Reorganize taskbar controllers" into sc-v2-dev 2021-06-10 15:38:00 +00:00
Stevie Kideckel 1059c30f3a Account for header margin depending on which header is selected
This removes jitter from incorrectly counting or not the margins for the
headers near the top of the widget picker list.

Bug: 189956230
Test: verified locally
Change-Id: I3eeddbf8a1fb7cca31fe2a12c28b0eb444de631b
2021-06-10 15:29:46 +00:00
Ryan Savitski 5af0edefdb Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent.
Fixing build by getting rid of the erroneously merged conflict markers,
and applying the end state of ag/14651125.

Bug: 183927137
Merged-In: I881a2b79462e8d420b3dcb6a6b98adbe9e8e0394
Change-Id: I70acd4ce48853be728be1fb80b4b885d00a059a9
2021-06-10 15:51:50 +01:00
Ryan Savitski b1b76c34f5 Revert "Revert "Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. <snip>
This reverts commit 1aa95b8400.

Reason for revert: automerger got confused by the revert of a merge, and
skipped it downstream.

NB: resending this as a standalone patch, NOT generated via Gerrit's
"revert" functionality, to avoid confusing AM further (I'm told there
are hidden tags involved).

IGNORE_MERGE_CONFLICT_CHECK=="trying to fix the build, see the rest of the topic"

Since the revert was skipped downstream, using a merged-in tag to also
stop this change from propagating.

Bug: 183927137
Merged-In: I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2
Change-Id: I541eeb1cc1b589dc0134a5e2e4c16be9f658fbbb
2021-06-10 15:50:37 +01:00
Alina Zaidi dca47432fc Flip ArrowTipView when it goes beyond screen height.
Bug: 185354491
Test: Manually tested tips in widget picker, all apps, and
reconfigurable widgets tip.

Change-Id: I5d1c9e4b8bc3ae89834bc198016ffa409a2b28ad
2021-06-10 15:43:30 +01:00
Jeff Sharkey 8953469fca Update baseline to declare REL.
Bug: 186121492
Change-Id: Ifaab8dd4c852d3e5f85278ea92158a0d49f769c9
Test: treehugger
2021-06-10 14:23:54 +00:00
Alina Zaidi ecdf6575ec Add more education tips for widgets. (3/3)
Show tip on reconfigurable widget in launcher.

Bug: 185354491
Test: Manually tested tips in widget picker, all apps, and
reconfigurable widgets tip.

Change-Id: I08154c944285cac6a21c3ef4aafd878bbbccf44b
2021-06-10 14:23:47 +01:00
Takeshi Hagikura 43d53432aa Update the colors of the tabs of work profile pagination
Update the tab colors based on the discussion in the bug and the
design mock.
Rename the color/all_apps_tab_bg to
color/all_apps_tab_background_selected to make the usage of the color
explicit.
(Confirmed it's only used for the color of the selected tab)

Bug: 189488670
Test: Visual inspection
Change-Id: I6ac38f71a8dd8852e1ab2e70f2f8434e9101daa1
2021-06-10 18:55:59 +09:00
Vinit Nayak 7c9e8c2ed7 Merge "Check for null shortcut before adding new split select options" into sc-v2-dev am: 1e846622c7 am: 0054869649
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14921091

Change-Id: Ia0d1e25b57da4715850b8b49ca4f34c9aa671f69
2021-06-10 06:04:01 +00:00
Vinit Nayak 0054869649 Merge "Check for null shortcut before adding new split select options" into sc-v2-dev am: 1e846622c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14921091

Change-Id: I22d707d699927913bc1c12faf8f58fc8f50a4761
2021-06-10 05:53:18 +00:00
Vinit Nayak 1e846622c7 Merge "Check for null shortcut before adding new split select options" into sc-v2-dev 2021-06-10 05:38:34 +00:00
Hyunyoung Song 9f710f137d Merge "Revert the squish translate from all apps" into sc-dev am: 8f3d9eba02 am: 394271fa9b am: f02f0305d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14921510

Change-Id: I390bad8403ce03581caaa31e8aca2e83e7b9338a
2021-06-10 04:41:20 +00:00
Hyunyoung Song eb7cb29a85 Merge "Revert the squish translate from all apps" into sc-dev am: 8f3d9eba02 am: 93652af586 am: 9f0e8ab856
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14921510

Change-Id: I97df0b754c25d8ee93893b0e072e3d0e07a36030
2021-06-10 04:40:55 +00:00
Hyunyoung Song f02f0305d3 Merge "Revert the squish translate from all apps" into sc-dev am: 8f3d9eba02 am: 394271fa9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14921510

Change-Id: I6799b1d4c4e759513d0ab166441f3ea03e6e7969
2021-06-10 04:24:21 +00:00
Hyunyoung Song 9f0e8ab856 Merge "Revert the squish translate from all apps" into sc-dev am: 8f3d9eba02 am: 93652af586
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14921510

Change-Id: Ibbd02c7d8895c042aaf613f30cbc107e6fe62dd4
2021-06-10 04:23:28 +00:00
Hyunyoung Song ce5fe18ed2 Merge "Revert the squish translate from all apps" into sc-dev am: 8f3d9eba02 am: 294ba19bb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14921510

Change-Id: I68af5a5911898ed364b4813a2b7f0e8ffc820d8d
2021-06-10 04:23:02 +00:00
Hyunyoung Song 93652af586 Merge "Revert the squish translate from all apps" into sc-dev am: 8f3d9eba02
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14921510

Change-Id: I334d8dce46078223f7302e4dfdcafa9727e57230
2021-06-10 04:07:27 +00:00
Hyunyoung Song 294ba19bb2 Merge "Revert the squish translate from all apps" into sc-dev am: 8f3d9eba02
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14921510

Change-Id: I5b70f8f044626d9f23fe7996104c72789492a087
2021-06-10 04:06:08 +00:00
Hyunyoung Song 394271fa9b Merge "Revert the squish translate from all apps" into sc-dev am: 8f3d9eba02
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14921510

Change-Id: I75a152cc770708ce1a7599adaab7a2eaf05306da
2021-06-10 04:06:05 +00:00
Hyunyoung Song 8f3d9eba02 Merge "Revert the squish translate from all apps" into sc-dev 2021-06-10 03:53:33 +00:00
android-build-team Robot b5c6f83fc3 Snap for 7442338 from 87a68b895b to tm-release
Change-Id: I2ec979eb05411a814fb2084a84d90d0048c4fae7
2021-06-10 03:09:25 +00:00
android-build-team Robot 52e6d0031d Snap for 7444394 from fc89cdfce4 to sc-release
Change-Id: I9457fa5068dbd5a5a423a1c88c0ca6d6824a2700
2021-06-10 01:12:04 +00:00
android-build-team Robot 163786b964 Snap for 7442307 from bf9b2ca0bd to sc-v2-release
Change-Id: If6aef600d9e382656fc5e9f597c8941033047413
2021-06-10 01:09:59 +00:00
Yogisha Dixit c0f29c6f95 Add a content description for the widget reconfigure button.
Bug: 186761890
Test: manual
Change-Id: Ia36972b606a524827ade8bd1c191f8b972bbb382
2021-06-09 22:47:40 +01:00
Vinit Nayak be00d16934 Check for null shortcut before adding new split select options
Bug: 190494300
Test: Manual
Change-Id: I8fe2b2fa0b1d9d4300b0bc306aa2e0667e5faa1c
2021-06-09 14:21:24 -07:00
Alex Spradlin 75e46e3313 [automerger skipped] Revert "Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3" am: 1aa95b8400 -s ours am: dfb73707c4 -s ours am: fc89cdfce4 -s ours am: a6b92660d8 -s ours am: d99e36d95e -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 6a7a7f6bad is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I49c398deedca2938434f7f86838b3c006090e0cd
2021-06-09 21:05:10 +00:00
Jon Miranda a1a54c0258 [automerger skipped] Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3 am: 1d41f93c37 am: d997f9957d -s ours am: b581582a9c -s ours am: 532ddaeb85 -s ours am: 23a1df6c20 -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 6a7a7f6bad is already in history

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

Change-Id: Ic5a6c3105eb93729246d8c3e9aea9468974028d8
2021-06-09 21:05:03 +00:00
Alex Spradlin 50ca76df11 [automerger skipped] Revert "Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3" am: 1aa95b8400 -s ours am: 4d6b4665b1 -s ours am: 6c7752625e -s ours am: 9d4d5f75e9 -s ours am: b67b375879 -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 6a7a7f6bad is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I03f1dd0b2ea766cdb90c0218479729a9cccd3de6
2021-06-09 21:04:55 +00:00
Alex Spradlin 7bdc77fa86 [automerger skipped] Revert "Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3" am: 1aa95b8400 -s ours am: dfb73707c4 -s ours am: fc89cdfce4 -s ours am: 18595b3f04 -s ours am: 6107be1ed0 -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 6a7a7f6bad is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Ie3b0023f267195dea756ce35846fd2fe55bbba32
2021-06-09 21:04:48 +00:00
Jon Miranda dabb4976c2 [automerger skipped] Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3 am: 1d41f93c37 am: d997f9957d -s ours am: b581582a9c -s ours am: c17d61c228 -s ours am: 3662f6cedb -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 6a7a7f6bad is already in history

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

Change-Id: I68bc4945ce72ef857f2736bd526682e593eb1692
2021-06-09 21:04:41 +00:00
Alex Spradlin 758239871e [automerger skipped] Revert "Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3" am: 1aa95b8400 -s ours am: 4d6b4665b1 -s ours am: 6c7752625e -s ours am: 364c3dbad9 -s ours am: edc98cf3e8 -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 6a7a7f6bad is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Ied05256d7c413b26924fd823efd93771044d8d25
2021-06-09 21:04:33 +00:00
Jon Miranda 572d790e9e [automerger skipped] Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3 am: 1d41f93c37 am: 7f721c7fda -s ours am: 8b38024f05 -s ours am: 0797ea1ae6 -s ours am: 42e1207c6b -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 6a7a7f6bad is already in history

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

Change-Id: I96aa10901183b4723f4fd88c271347ff77bf7082
2021-06-09 21:04:15 +00:00
Jon Miranda ebbd578624 [automerger skipped] Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3 am: 1d41f93c37 am: 7f721c7fda -s ours am: 8b38024f05 -s ours am: c0efd4535d -s ours am: 26595ec29b -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 6a7a7f6bad is already in history

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

Change-Id: Iea0ab8aacb9640941ecc38a639ee95561817ee0e
2021-06-09 21:03:48 +00:00
Alex Spradlin d99e36d95e [automerger skipped] Revert "Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3" am: 1aa95b8400 -s ours am: dfb73707c4 -s ours am: fc89cdfce4 -s ours am: a6b92660d8 -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 6a7a7f6bad is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Id38e03d832032e85ff2e4d42f831b1b89f0b3e0c
2021-06-09 20:54:53 +00:00
Jon Miranda 23a1df6c20 [automerger skipped] Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3 am: 1d41f93c37 am: d997f9957d -s ours am: b581582a9c -s ours am: 532ddaeb85 -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 6a7a7f6bad is already in history

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

Change-Id: I048bfc1e01d9701943f7303e67e7c3680de317f1
2021-06-09 20:54:46 +00:00
Alex Spradlin b67b375879 [automerger skipped] Revert "Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3" am: 1aa95b8400 -s ours am: 4d6b4665b1 -s ours am: 6c7752625e -s ours am: 9d4d5f75e9 -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 6a7a7f6bad is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I7398e633a5f26cb050b32aec87e6b9ef87f915f8
2021-06-09 20:54:39 +00:00
Alex Spradlin e06ffa6846 [automerger skipped] Revert "Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3" am: 1aa95b8400 -s ours am: dfb73707c4 -s ours am: fc89cdfce4 -s ours am: 4c80a47c76 -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 6a7a7f6bad is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I339f3cca1dcff89bf1e02de357816b41ab0f9844
2021-06-09 20:54:18 +00:00
Jon Miranda bfec0dc7d9 [automerger skipped] Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3 am: 1d41f93c37 am: d997f9957d -s ours am: b581582a9c -s ours am: 8eb7e5aeb3 -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 6a7a7f6bad is already in history

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

Change-Id: If4f4cb8cac94c607a3ccf775967db02dabed7162
2021-06-09 20:54:10 +00:00
Alex Spradlin e1b1f10b36 [automerger skipped] Revert "Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3" am: 1aa95b8400 -s ours am: 4d6b4665b1 -s ours am: 6c7752625e -s ours am: 16ec50c582 -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 6a7a7f6bad is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I428e86d49b7f2c80e7a0fde85d6c2c0bdfbff978
2021-06-09 20:53:47 +00:00
Alex Spradlin 6107be1ed0 [automerger skipped] Revert "Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3" am: 1aa95b8400 -s ours am: dfb73707c4 -s ours am: fc89cdfce4 -s ours am: 18595b3f04 -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 6a7a7f6bad is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I13fb0d0ce34f66bf03a8d72f6e5adc7ca619109d
2021-06-09 20:53:27 +00:00
Jon Miranda 3662f6cedb [automerger skipped] Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3 am: 1d41f93c37 am: d997f9957d -s ours am: b581582a9c -s ours am: c17d61c228 -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 6a7a7f6bad is already in history

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

Change-Id: I4adac808712b54f2707a7c74d22883e37a21ff79
2021-06-09 20:53:21 +00:00
Alex Spradlin edc98cf3e8 [automerger skipped] Revert "Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3" am: 1aa95b8400 -s ours am: 4d6b4665b1 -s ours am: 6c7752625e -s ours am: 364c3dbad9 -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 6a7a7f6bad is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Ifccd6818cdf1b99eded013f6f80b07d4847132fc
2021-06-09 20:53:10 +00:00
Jon Miranda 42e1207c6b [automerger skipped] Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3 am: 1d41f93c37 am: 7f721c7fda -s ours am: 8b38024f05 -s ours am: 0797ea1ae6 -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 6a7a7f6bad is already in history

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

Change-Id: I3ab0e94239400fa9c769de9480efe3a9915ff18d
2021-06-09 20:52:42 +00:00
Jon Miranda 26595ec29b [automerger skipped] Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3 am: 1d41f93c37 am: 7f721c7fda -s ours am: 8b38024f05 -s ours am: c0efd4535d -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 b62fba0d01 is already in history

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

Change-Id: I8117c2fff3de393458dd9421b260d2792bb0d950
2021-06-09 20:52:13 +00:00
Jon Miranda 702952f5f9 [automerger skipped] Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3 am: 1d41f93c37 am: 7f721c7fda -s ours am: 8b38024f05 -s ours am: b9ab3e470e -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 b62fba0d01 is already in history

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

Change-Id: I740edf6c08b97be0baba7db4cc889a4ef6b46273
2021-06-09 20:51:40 +00:00
Alex Spradlin a6b92660d8 [automerger skipped] Revert "Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3" am: 1aa95b8400 -s ours am: dfb73707c4 -s ours am: fc89cdfce4 -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 6a7a7f6bad is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Ief85c66d1c1104cfac8081f5beb9f8388b08c3a3
2021-06-09 20:34:01 +00:00
Jon Miranda 532ddaeb85 [automerger skipped] Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3 am: 1d41f93c37 am: d997f9957d -s ours am: b581582a9c -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 6a7a7f6bad is already in history

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

Change-Id: I332133457545efd0675fac38373165599b0dec70
2021-06-09 20:33:57 +00:00
Alex Spradlin 9d4d5f75e9 [automerger skipped] Revert "Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3" am: 1aa95b8400 -s ours am: 4d6b4665b1 -s ours am: 6c7752625e -s ours
am skip reason: Merged-In I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2 with SHA-1 6a7a7f6bad is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Ia79355a6cc11fe14ee1f89db3728b3b5dec39eb0
2021-06-09 20:33:50 +00:00