Commit Graph

60459 Commits

Author SHA1 Message Date
TreeHugger Robot 5dcb88cb71 Merge changes from topic "presubmit-am-2f8e16fe33c44e5196ee3ee1963fafb2" into sc-qpr1-dev am: 04162f05d7 am: e2e3340998
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030

Change-Id: Ic7fcfc4f59ec430b2d8126dc72239f9c8f232682
2021-12-16 16:14:55 +00:00
Bill Yi 4b2275537a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 384c30fa4c am: 439705b5a3 -s ours am: 2d4d5863b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I79133aa37949d7f78930cfb848a64bf9ec373b13
2021-12-16 16:14:52 +00:00
Bill Yi df18d0f7a2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8942bc90bf -s ours am: 0a77ac2558 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I49d9fa06480cfbdafb358c95c04d09a0ebf116c2
2021-12-16 16:13:54 +00:00
TreeHugger Robot 3ffaf3c71f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 649325ad1a -s ours am: 4d6831e2b9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie8afdf5787284f711960ea7edb124641edbaceb5
2021-12-16 16:11:57 +00:00
TreeHugger Robot 74713bf7fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 649325ad1a -s ours am: 4d6831e2b9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4baef64d51053fa2d7a6f12bf3137d34de4bdb52
2021-12-16 16:11:50 +00:00
TreeHugger Robot 85064cbe20 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: d1841de078 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9aa58829f42179c3c4106b3636d0b3f16c04e078
2021-12-16 16:11:34 +00:00
TreeHugger Robot 011e9314e6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: d1841de078 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I70958dc746e53154b9d9c58ee72c59a995ca7439
2021-12-16 16:11:32 +00:00
TreeHugger Robot 122f22518b Merge changes from topic "presubmit-am-299ca4020ed94d05b0ac27bbf6752f7a" into sc-qpr1-dev am: cd30824c99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027

Change-Id: I9c60650a3fceb5ee1ec7d073d640b82e01a6b455
2021-12-16 16:11:15 +00:00
TreeHugger Robot 63d5fd85e6 Merge changes from topic "presubmit-am-299ca4020ed94d05b0ac27bbf6752f7a" into sc-qpr1-dev am: cd30824c99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027

Change-Id: I1e7e38f0fbaac4c1ac90ff2f040c2eadfc362f42
2021-12-16 16:11:14 +00:00
Bill Yi 81d7f5cfa1 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 189f1ce908 am: a0cf7967db -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4e739ae331e86662dff1bdddb7f0567a520a6831
2021-12-16 16:11:10 +00:00
Bill Yi 964665a000 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 189f1ce908 am: a0cf7967db -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic4fac6992b03a6d95684e48d2c4c5233085d47f1
2021-12-16 16:11:09 +00:00
TreeHugger Robot e2e3340998 Merge changes from topic "presubmit-am-2f8e16fe33c44e5196ee3ee1963fafb2" into sc-qpr1-dev am: 04162f05d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030

Change-Id: Ia18da606589470e86ed75583ba30250f04237750
2021-12-16 16:10:07 +00:00
Bill Yi 2d4d5863b7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 384c30fa4c am: 439705b5a3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iab2bf266a7d1626fec28b44727d42500285a9fa7
2021-12-16 16:10:07 +00:00
TreeHugger Robot 62f10cad58 Merge changes from topic "presubmit-am-2f8e16fe33c44e5196ee3ee1963fafb2" into sc-qpr1-dev am: 04162f05d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030

Change-Id: I99073edb152f165ca9340fbf54493a1062f7a6c3
2021-12-16 16:09:57 +00:00
Bill Yi 53f35980bf [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 384c30fa4c am: 439705b5a3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I001937bc8cb067689c7e2ab6719d1d9b2cedbd65
2021-12-16 16:09:55 +00:00
Bill Yi 6247c73793 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8942bc90bf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I040ca22ffbb2dc66b4bfd0bcedc488f95f20e41e
2021-12-16 16:06:49 +00:00
Bill Yi 0a77ac2558 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8942bc90bf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4bf9a47db20f8bb7c00ad18162bb3c32375f25d9
2021-12-16 16:06:48 +00:00
TreeHugger Robot 4d6831e2b9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 649325ad1a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic4119cd526e6601167751700d0107a788b25aecb
2021-12-16 16:06:23 +00:00
TreeHugger Robot 1adc711159 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9be15e2b85 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ica6d4f15d4dc117ed1223581e03c31348a75cb30
2021-12-16 16:05:41 +00:00
TreeHugger Robot b3a4a6139f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 649325ad1a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I628102a9469e07256e7fe9892e829c837fd8b0e5
2021-12-16 16:04:56 +00:00
Bill Yi 9c07d79b28 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 384c30fa4c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9e2090d7ebf983dad4bd9d963ac154b78678059a
2021-12-16 16:04:37 +00:00
TreeHugger Robot 40cf3b53cb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 2cce776dc4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9748b3087811e1196c28e5033e4f9225e22792ea
2021-12-16 16:04:08 +00:00
TreeHugger Robot d1841de078 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-12-16 15:50:25 +00:00
TreeHugger Robot 9be15e2b85 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-12-16 15:50:09 +00:00
TreeHugger Robot ac3d83d6ae Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-12-16 15:48:32 +00:00
TreeHugger Robot 2cce776dc4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-12-16 15:45:57 +00:00
TreeHugger Robot 649325ad1a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-12-16 15:44:44 +00:00
TreeHugger Robot cd30824c99 Merge changes from topic "presubmit-am-299ca4020ed94d05b0ac27bbf6752f7a" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 189f1ce908
  Import translations. DO NOT MERGE ANYWHERE
2021-12-16 15:44:44 +00:00
TreeHugger Robot 1a534e5929 Merge changes from topic "presubmit-am-299ca4020ed94d05b0ac27bbf6752f7a"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 189f1ce908 2p: 0e2873b514
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 189f1ce908
  Import translations. DO NOT MERGE ANYWHERE
2021-12-16 15:44:44 +00:00
TreeHugger Robot 04162f05d7 Merge changes from topic "presubmit-am-2f8e16fe33c44e5196ee3ee1963fafb2" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 384c30fa4c
  Import translations. DO NOT MERGE ANYWHERE
2021-12-16 15:44:27 +00:00
TreeHugger Robot 365560199f Merge "Show Digital Wellbeing Banners for split tasks" into sc-v2-dev am: 8d25a0a363 am: 510d9060a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16459079

Change-Id: If24107dc1d3e0d83557da8409a891471e25fc979
2021-12-16 11:49:47 +00:00
TreeHugger Robot 510d9060a7 Merge "Show Digital Wellbeing Banners for split tasks" into sc-v2-dev am: 8d25a0a363
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16459079

Change-Id: Ia65e7ce8eabc0a9caa5892a5a8de0e14f2b70b73
2021-12-16 11:33:17 +00:00
TreeHugger Robot 8d25a0a363 Merge "Show Digital Wellbeing Banners for split tasks" into sc-v2-dev 2021-12-16 11:13:10 +00:00
Vinit Nayak ebf2cdd0f1 Show Digital Wellbeing Banners for split tasks
Fixes: 199936292
Change-Id: I38743d58f53a65ef717b1babc21ad1df2dc840a4
2021-12-15 22:19:02 -08:00
Android Build Coastguard Worker 4cabd83139 Snap for 8006021 from 78b12de4d2 to tm-release
Change-Id: Icb489e31ff69f4864eef77599dd8bd4a0b0c8cdf
2021-12-16 02:10:17 +00:00
Colin Cross a1ca878a1c [automerger skipped] Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" into stage-aosp-master am: b4bb645304 am: 3816453ca4 -s ours am: 985633b7c7 -s ours
am skip reason: Merged-In Ia2a677f3a3987751349bad951ff136b2d55f439f with SHA-1 12609edb72 is already in history

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

Change-Id: I644b49eabf3f2f8f3d20ec3c52e54341038930b6
2021-12-16 00:57:16 +00:00
Vinit Nayak 84292da6c2 Merge "Save multiple RunningTaskInfo in GestureState" into sc-v2-dev am: 20102c3dd7 am: a51f394504
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16482597

Change-Id: If69bd5e02de59bdfe05a8f7fcc03a4ff235d4c41
2021-12-16 00:54:45 +00:00
TreeHugger Robot 368eb46da5 Merge "Set navBarDarkIntensity based on dark theme in SUW" into sc-v2-dev am: f9f90d6dc2 am: 5ebda13e05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16482607

Change-Id: I8babe4bae067d8feab9d80c41b48994a33bf19df
2021-12-16 00:50:57 +00:00
Colin Cross 985633b7c7 [automerger skipped] Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" into stage-aosp-master am: b4bb645304 am: 3816453ca4 -s ours
am skip reason: Merged-In Ia2a677f3a3987751349bad951ff136b2d55f439f with SHA-1 12609edb72 is already in history

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

Change-Id: I99339ecb4faa457a2058f839d42502a98f5d1a8b
2021-12-16 00:50:17 +00:00
Vinit Nayak a51f394504 Merge "Save multiple RunningTaskInfo in GestureState" into sc-v2-dev am: 20102c3dd7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16482597

Change-Id: I189ae54406b2a7dc6337e55fac648ed4f671f8bb
2021-12-16 00:36:17 +00:00
TreeHugger Robot 5ebda13e05 Merge "Set navBarDarkIntensity based on dark theme in SUW" into sc-v2-dev am: f9f90d6dc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16482607

Change-Id: I74b54c03261a46041407878337aadcf2dd62f8cc
2021-12-16 00:32:55 +00:00
Colin Cross 3816453ca4 Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" into stage-aosp-master am: b4bb645304
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15854779

Change-Id: I6b9efe278a1e6bb83f4a8f153a6a6da741d0e27f
2021-12-16 00:29:27 +00:00
Android Build Coastguard Worker 41b9029067 Snap for 8005451 from 80aa8da7e3 to sc-v2-release
Change-Id: Ib3f6f296403bdbbf72a3018961594145477de1db
2021-12-16 00:11:06 +00:00
Vinit Nayak 20102c3dd7 Merge "Save multiple RunningTaskInfo in GestureState" into sc-v2-dev 2021-12-16 00:03:20 +00:00
TreeHugger Robot f9f90d6dc2 Merge "Set navBarDarkIntensity based on dark theme in SUW" into sc-v2-dev 2021-12-15 23:42:06 +00:00
Vadim Tryshev 9a6a47e351 Revert "Temporarily disable Launcher3 tests affected by fling changes"
This reverts commit bc4dc49c6c.

Reason for revert: RecyclerView bug is fixed

Change-Id: Ia2a677f3a3987751349bad951ff136b2d55f439f
Merged-In: Ia2a677f3a3987751349bad951ff136b2d55f439f
Test: presubmit
Bug: 197802324
(cherry picked from commit 8b4a6ee65b)
2021-12-15 14:38:04 -08:00
Colin Cross b4bb645304 Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" into stage-aosp-master 2021-12-15 22:07:27 +00:00
Tony Wickham 70d237d8f3 Set navBarDarkIntensity based on dark theme in SUW
- Also remove old tinting based on textColorPrimary, as it's no longer necessary with dark intensity tinting.

Test: Run SetupWizardTestActivity in both dark and light theme, ensure back button visible
Fixes: 204384193
Change-Id: I2dc2e94bc0318ded62419b9ae0eed719db289d7f
2021-12-15 21:37:15 +00:00
Vinit Nayak dcd7ac4011 Save multiple RunningTaskInfo in GestureState
* With new split screen running two active tasks for
a given gesture, we need to get all running task
infos instead of the single most recent used one
* TODO(b/210903248) for proper refactoring for
GestureState

Fixes: 205675364
Test: Swiping up on overview no longer crashes
Change-Id: Iea1f193149657182311a97f46007b4d43e8ad549
2021-12-15 13:11:11 -08:00
Jon Miranda 78b12de4d2 Merge "Scale, crop, and translate window when swiping back to home." into sc-v2-dev am: 80aa8da7e3 am: e589eaded8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16470663

Change-Id: Id6d210fdcc9bda55a8666121bd5418a48da40c55
2021-12-15 20:35:18 +00:00