Commit Graph

58436 Commits

Author SHA1 Message Date
TreeHugger Robot f145aa39b3 Merge "Diagnose when lab device sends fake touch screen events to test" into sc-v2-dev am: 0a39f6daec am: da4e9793bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15482523

Change-Id: I345353d5b08e8e9a9fd4eaaafd27d79b0125b485
2021-08-09 11:40:08 +00:00
TreeHugger Robot da4e9793bb Merge "Diagnose when lab device sends fake touch screen events to test" into sc-v2-dev am: 0a39f6daec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15482523

Change-Id: I47b4031201e3156868a485bff0ceca5506a2e788
2021-08-09 11:31:04 +00:00
TreeHugger Robot 0a39f6daec Merge "Diagnose when lab device sends fake touch screen events to test" into sc-v2-dev 2021-08-09 11:00:45 +00:00
Android Build Coastguard Worker 7c36831696 Snap for 7620097 from 41d913a90f to tm-release
Change-Id: I5b60809959f458d7f688af86366b2fce24ed389f
2021-08-07 05:08:31 +00:00
Android Build Coastguard Worker df37ea3b41 Snap for 7618979 from 55861dc50b to sc-v2-release
Change-Id: I6f10c5ad33779fa9ad3e26e3bcda06c957cea926
2021-08-07 03:08:43 +00:00
vadimt 6b534ee54f Diagnose when lab device sends fake touch screen events to test
Bug: 189874683
Test: local
Change-Id: I8ac569ab049bafaa0a6263598f2b43a99386e6d9
2021-08-06 15:49:02 -07:00
Alex Chau 41d913a90f Merge "Only refresh DISABLED_NO_THUMBNAIL when thumbnail changes" into sc-v2-dev am: 55861dc50b am: 23af5955e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15455164

Change-Id: I9d7b00eb56bdb1760443f7805569dcb219fdbc57
2021-08-06 18:08:48 +00:00
Alex Chau 23af5955e8 Merge "Only refresh DISABLED_NO_THUMBNAIL when thumbnail changes" into sc-v2-dev am: 55861dc50b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15455164

Change-Id: I79c9685bfdf9cec713c06cd3a62cf9388867432d
2021-08-06 17:56:31 +00:00
Alex Chau 55861dc50b Merge "Only refresh DISABLED_NO_THUMBNAIL when thumbnail changes" into sc-v2-dev 2021-08-06 17:41:11 +00:00
Alex Chau efd01b530a Merge "Revert "Revert "Removing workaround for battery defender""" into sc-v2-dev am: b3e8d11b9f am: 4f64a7fcfa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15476265

Change-Id: Ifd6c72541b0888d5173d9237eeb2cf5c576f2299
2021-08-06 10:35:13 +00:00
Alex Chau 4f64a7fcfa Merge "Revert "Revert "Removing workaround for battery defender""" into sc-v2-dev am: b3e8d11b9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15476265

Change-Id: If676f2d6c42beb45407961740df93ed98554b779
2021-08-06 10:25:06 +00:00
Alex Chau b3e8d11b9f Merge "Revert "Revert "Removing workaround for battery defender""" into sc-v2-dev 2021-08-06 09:58:53 +00:00
TreeHugger Robot af42b54626 Merge "Prevent NPE when resetting divider bar visibility" into sc-v2-dev am: 5a25696bfd am: 541a1a6da5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15472699

Change-Id: I62a970d75b5be3c9a48605e8b343305d2b0fe4ec
2021-08-06 05:34:43 +00:00
TreeHugger Robot 541a1a6da5 Merge "Prevent NPE when resetting divider bar visibility" into sc-v2-dev am: 5a25696bfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15472699

Change-Id: Id99dd83824f2ebcbf80428f7877d9713a757d3a1
2021-08-06 05:22:58 +00:00
TreeHugger Robot 5a25696bfd Merge "Prevent NPE when resetting divider bar visibility" into sc-v2-dev 2021-08-06 05:06:54 +00:00
Android Build Coastguard Worker e2c81fea57 Snap for 7615884 from 772d782f9f to tm-release
Change-Id: If266b0f548fedc1bbd24007e8e8ee25b24174edd
2021-08-06 03:08:36 +00:00
Jerry Chang 6368746a3c Prevent NPE when resetting divider bar visibility
Fix: 195325902
Test: atest
com.android.launcher3.memory.MemoryTests#testActivityRecreation
--rerun-until-failure

Change-Id: I12c48fe2834a225c5f7d042be632ddd29135b7c5
2021-08-06 09:59:31 +08:00
Android Build Coastguard Worker 0e83cb1c6b Snap for 7615608 from 1ac67e4314 to sc-v2-release
Change-Id: I8bd1dad79c5409447f3e83271e8313dd701cf2d8
2021-08-06 01:08:54 +00:00
Android Build Coastguard Worker 0637c023d5 Snap for 7616100 from dd16ecbc61 to sc-release
Change-Id: I3b74b6098286cde566e555716855f33a349c8fea
2021-08-06 01:08:31 +00:00
TreeHugger Robot b30a2798f9 Merge "Invoke home via recents for fallback recents" into sc-v2-dev am: 9b762e9778 am: e10975e88e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15430812

Change-Id: I1a92f87d03c59f53212d8edc27ddce42456f5b9c
2021-08-05 22:34:30 +00:00
TreeHugger Robot e10975e88e Merge "Invoke home via recents for fallback recents" into sc-v2-dev am: 9b762e9778
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15430812

Change-Id: Ibfadc5c4a295be844c9a193a9f9a415159f35b8d
2021-08-05 22:24:03 +00:00
TreeHugger Robot 9b762e9778 Merge "Invoke home via recents for fallback recents" into sc-v2-dev 2021-08-05 22:11:13 +00:00
Robb Glasser 772d782f9f [automerger skipped] Merge "Revert "[DO NOT MERGE]"" am: d6d67c99a7 am: 989e34f8f8 -s ours am: eee72258d9 -s ours am: c99a3ffa66 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iefd9e4d5922065d7fec195f6f943c00c7d37bee4
2021-08-05 22:08:57 +00:00
Robb Glasser e65f6ed998 [automerger skipped] Revert "[DO NOT MERGE]" am: 4eda9fc848 am: 0b934e9da4 -s ours am: 3e5b8d82e9 -s ours am: 7d9b13cbe6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibc396c8147a0cad7212ab06047033082c5f79ea8
2021-08-05 22:08:54 +00:00
Robb Glasser c99a3ffa66 [automerger skipped] Merge "Revert "[DO NOT MERGE]"" am: d6d67c99a7 am: 989e34f8f8 -s ours am: eee72258d9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I10c25116d5208f0d947318fcd6e6adb48b5b56de
2021-08-05 21:56:49 +00:00
Robb Glasser 7d9b13cbe6 [automerger skipped] Revert "[DO NOT MERGE]" am: 4eda9fc848 am: 0b934e9da4 -s ours am: 3e5b8d82e9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I736bc1acceca5aa4142a8b654fbff03300577ef0
2021-08-05 21:56:48 +00:00
Robb Glasser eee72258d9 [automerger skipped] Merge "Revert "[DO NOT MERGE]"" am: d6d67c99a7 am: 989e34f8f8 -s ours
am skip reason: Merged-In Ie476f8cbe56bf51218b15b8361a22fec2dc845e6 with SHA-1 1c01685186 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Idec217b8c941cf24246453439ee205ee6ab3c96f
2021-08-05 21:41:42 +00:00
Robb Glasser 3e5b8d82e9 [automerger skipped] Revert "[DO NOT MERGE]" am: 4eda9fc848 am: 0b934e9da4 -s ours
am skip reason: Merged-In Ie476f8cbe56bf51218b15b8361a22fec2dc845e6 with SHA-1 1c01685186 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I1e5cc339eef904851aff67fcc16d96f3cbd0f76a
2021-08-05 21:41:38 +00:00
Jon Spivack 65b105bdee Merge "NIU Actions: Handle null default assistant" 2021-08-05 21:38:49 +00:00
Robb Glasser 989e34f8f8 Merge "Revert "[DO NOT MERGE]"" am: d6d67c99a7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1788551

Change-Id: I7ed98b733806f81cf388a7a37f252a0e31c25ae0
2021-08-05 21:23:40 +00:00
Robb Glasser 0b934e9da4 Revert "[DO NOT MERGE]" am: 4eda9fc848
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1788551

Change-Id: I3609572bc3f06728aed78a72b26565527923b959
2021-08-05 21:23:39 +00:00
Robb Glasser d6d67c99a7 Merge "Revert "[DO NOT MERGE]"" 2021-08-05 21:08:09 +00:00
Robb Glasser 4eda9fc848 Revert "[DO NOT MERGE]"
This reverts commit d0823a77da.

Reason for revert: Broke the build: b/195683319

Change-Id: I931793f37df2ddcd6e179f5cc205e1bcec244de9
2021-08-05 21:03:31 +00:00
Vadim Tryshev ed53d1c21c Revert "Revert "Removing workaround for battery defender""
This reverts commit f9ccf0175d.

Reason for revert: to see whether b/151613234 is fixed

Test: pre-, post- submit
Bug: 151613234
Change-Id: Ieda2907319d796a57494318920c22f3db4527dab
2021-08-05 20:52:58 +00:00
TreeHugger Robot df9bcfada7 Merge "Allow Sv2 in launcher build version" into sc-v2-dev am: 1ac67e4314 am: 7e2254693a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15472533

Change-Id: I8cf653fe23d49b8ce35231e1328ff85ad69fd526
2021-08-05 20:47:33 +00:00
Treehugger Robot 07ae3a5b45 [automerger skipped] Merge "[DO NOT MERGE] API level 30 upgrade: AOSP/Launcher3" am: ae7a7396b7 am: 179b769682 -s ours am: 53228df2ac -s ours am: 78d86beee2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic90d24c0c37dfec6fab85668962ea8ffd94cfd1f
2021-08-05 20:47:17 +00:00
Damian Patel f5f7bf9c9c [automerger skipped] [DO NOT MERGE] am: d0823a77da am: ba862b40b4 -s ours am: 9ef9c4ada0 -s ours am: 6d9f427fcf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I84eb1f523f4056818456fc3fe554194e0fd4371e
2021-08-05 20:47:15 +00:00
TreeHugger Robot 7e2254693a Merge "Allow Sv2 in launcher build version" into sc-v2-dev am: 1ac67e4314
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15472533

Change-Id: I27e4601e9a71b1a87d34d41ea1267aa71f7d78cc
2021-08-05 20:44:01 +00:00
Jon Spivack 91fdf160c5 NIU Actions: Handle null default assistant
This handles the case where Settings.Secure.ASSISTANT is null, which occurs when config_defaultAssistant is not set at build time.

Bug: 195600539
Test: Manual (built locally without config_defaultAssistant)
Test: b/195681795
Change-Id: Ie8da67be5f448847c07438a25b12e8b5b2022f05
2021-08-05 20:42:12 +00:00
Treehugger Robot 78d86beee2 [automerger skipped] Merge "[DO NOT MERGE] API level 30 upgrade: AOSP/Launcher3" am: ae7a7396b7 am: 179b769682 -s ours am: 53228df2ac -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia8ab780c1dd7788797ed8b76b52107c89854ad5b
2021-08-05 20:35:08 +00:00
Damian Patel 6d9f427fcf [automerger skipped] [DO NOT MERGE] am: d0823a77da am: ba862b40b4 -s ours am: 9ef9c4ada0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I79f9a308bedeb84bdb80788a19e172de503d03a3
2021-08-05 20:35:06 +00:00
TreeHugger Robot 1ac67e4314 Merge "Allow Sv2 in launcher build version" into sc-v2-dev 2021-08-05 20:28:05 +00:00
Treehugger Robot 53228df2ac [automerger skipped] Merge "[DO NOT MERGE] API level 30 upgrade: AOSP/Launcher3" am: ae7a7396b7 am: 179b769682 -s ours
am skip reason: Merged-In Ie476f8cbe56bf51218b15b8361a22fec2dc845e6 with SHA-1 1c01685186 is already in history

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

Change-Id: Icffa0849618ac2da9324754d7f5770614c342c71
2021-08-05 20:19:56 +00:00
Damian Patel 9ef9c4ada0 [automerger skipped] [DO NOT MERGE] am: d0823a77da am: ba862b40b4 -s ours
am skip reason: Merged-In Ie476f8cbe56bf51218b15b8361a22fec2dc845e6 with SHA-1 1c01685186 is already in history

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

Change-Id: If9e0f924dc32731cee5b3b7980770f3addecd550
2021-08-05 20:19:53 +00:00
Treehugger Robot 179b769682 Merge "[DO NOT MERGE] API level 30 upgrade: AOSP/Launcher3" am: ae7a7396b7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1778505

Change-Id: I0264012861a8a0c68714c91955b9ab395859e128
2021-08-05 20:05:18 +00:00
Damian Patel ba862b40b4 [DO NOT MERGE] am: d0823a77da
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1778505

Change-Id: If120094226ce87d6a4dd5cd9296d66817f5be687
2021-08-05 20:05:14 +00:00
Treehugger Robot ae7a7396b7 Merge "[DO NOT MERGE] API level 30 upgrade: AOSP/Launcher3" 2021-08-05 19:45:18 +00:00
Jonathan Miranda 5075e9adab Merge "Update extra space allocations for taller devices." into sc-dev am: dd16ecbc61 am: d851f92b4c am: d369ee4abe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15457550

Change-Id: I6449e73ca7e96755c82b7c66fc33cf97cd3742d2
2021-08-05 19:04:23 +00:00
Damian Patel 10bdafcf92 API level 30 upgrade: AOSP/Launcher3 am: 1c01685186 am: 6162d562d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15472946

Change-Id: If2cca5c848583950cf2d8f375d761796a52a199a
2021-08-05 19:04:18 +00:00
Jonathan Miranda 7d1b3d6c75 Merge "Update extra space allocations for taller devices." into sc-dev am: dd16ecbc61 am: 86d80936ac am: 4d344bcf5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15457550

Change-Id: Ibd21d3ddebc66599ea432024926b0f70105fbbef
2021-08-05 19:04:10 +00:00