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
Jonathan Miranda
d369ee4abe
Merge "Update extra space allocations for taller devices." into sc-dev am: dd16ecbc61 am: d851f92b4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15457550
Change-Id: I47e3f48ffcfa28dd059f3b9f9355fa2cce35bd0b
2021-08-05 18:52:48 +00:00
Damian Patel
6162d562d0
API level 30 upgrade: AOSP/Launcher3 am: 1c01685186
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15472946
Change-Id: I24865fccf28bf9bee6c0292a8ca5d547dcc01f3d
2021-08-05 18:52:45 +00:00
Vinit Nayak
8d51468426
Invoke home via recents for fallback recents
...
Fixes: 194286702
Test: Go home from app and overview for
3P and normal launcher (test via separate recents activity
in debug menu)
Change-Id: Ifac4afbfa549265a80448ee460a780bf0984f9e1
2021-08-05 11:52:25 -07:00
Jonathan Miranda
4d344bcf5d
Merge "Update extra space allocations for taller devices." into sc-dev am: dd16ecbc61 am: 86d80936ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15457550
Change-Id: I16f20e6e36ae524ceba8f1545d18605fe43770f7
2021-08-05 18:52:24 +00:00
Jonathan Miranda
b7bacd4de0
Merge "Update extra space allocations for taller devices." into sc-dev am: dd16ecbc61 am: 2bf9863aa4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15457550
Change-Id: I9711b3b6e7e239eb7fc6e271bd46d45d83bea19f
2021-08-05 18:51:58 +00:00
Damian Patel
d0823a77da
[DO NOT MERGE]
...
API level 30 upgrade: AOSP/Launcher3
The AndroidManifest.xml file of the AOSP Launcher3 app
has been upgraded so that its targetSdkVersion is 30.
Test: manual - after the change, the app built, intialized,
and ran successfully with the UI features functioning
properly. One unit test failed although this same test failed
before the upgrade so this can be addressed later. It may be
an error with the test itself. CTS provider tests were also
run and the output can be seen below:
================= Results ==================
=============== Consumed Time ==============
arm64-v8a CtsProviderTestCases: 18m 34s
Total aggregated tests run time: 18m 34s
============== TOP 1 Slow Modules ==============
arm64-v8a CtsProviderTestCases: 0.34 tests/sec [376 tests / 1114253 msec]
============== Modules Preparation Times ==============
arm64-v8a CtsProviderTestCases => prep = 9748 ms || clean = 3385 ms
Total preparation time: 9s || Total tear down time: 3s
=======================================================
=============== Summary ===============
Total Run time: 20m 17s
1/1 modules completed
Total Tests : 376
PASSED : 362
FAILED : 0
IGNORED : 6
ASSUMPTION_FAILURE: 8
============== End of Results ==============
Change-Id: I1121ded221fbbb90534fae706e12d007bce2bb5a
Merged-In: Ie476f8cbe56bf51218b15b8361a22fec2dc845e6
2021-08-05 18:43:33 +00:00
Jonathan Miranda
86d80936ac
Merge "Update extra space allocations for taller devices." into sc-dev am: dd16ecbc61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15457550
Change-Id: I8fe398bacbdc11a3ba6d43829c1be75248249740
2021-08-05 18:42:44 +00:00
Jonathan Miranda
2bf9863aa4
Merge "Update extra space allocations for taller devices." into sc-dev am: dd16ecbc61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15457550
Change-Id: Ie6c7f0b80eaef11d315ffe3cef9ddb6964a7eb93
2021-08-05 18:41:57 +00:00
Jonathan Miranda
d851f92b4c
Merge "Update extra space allocations for taller devices." into sc-dev am: dd16ecbc61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15457550
Change-Id: Idd5fc0d30f74ddecb70818a829c7160a6612bc36
2021-08-05 18:40:46 +00:00
Jonathan Miranda
dd16ecbc61
Merge "Update extra space allocations for taller devices." into sc-dev
2021-08-05 18:33:56 +00:00
Alex Chau
2994df043a
Allow Sv2 in launcher build version
...
Bug: 195632795
Test: atest NexusLauncherTests:com.google.android.apps.nexuslauncher.wellbeing.WellbeingTests#testPauseAppFromOverview
Change-Id: If0c047bfc64e17de71e9861e27c3a1373577e398
2021-08-05 19:10:17 +01:00
Alex Chau
036b63d7ba
Merge "Further increase FORCE_PAUSE_TIMEOUT in tests" into sc-v2-dev am: 2d96b8b10e am: 947816f9ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15472532
Change-Id: I3cab29b6035f3e670ea9a495aaa159a7106047f9
2021-08-05 17:50:55 +00:00
Alex Chau
947816f9ea
Merge "Further increase FORCE_PAUSE_TIMEOUT in tests" into sc-v2-dev am: 2d96b8b10e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15472532
Change-Id: Icba682465dd34a79fc5cd5c240338a2bdd6020fb
2021-08-05 17:33:05 +00:00
Alex Chau
2d96b8b10e
Merge "Further increase FORCE_PAUSE_TIMEOUT in tests" into sc-v2-dev
2021-08-05 17:21:21 +00:00
Damian Patel
1c01685186
API level 30 upgrade: AOSP/Launcher3
...
The AndroidManifest.xml and build.gradle file of the AOSP
Launcher app has been upgraded so that its targetSdkVersion
is 30. This change has been made on git_master so that
we can avoid presubmit conflicts when making this change
on the aosp-master branch.
Change-Id: Ie476f8cbe56bf51218b15b8361a22fec2dc845e6
(cherry picked from commit 499ffce2e7 )
2021-08-05 16:53:39 +00:00
Steven Ng
cea65b75d8
Fix wallpaper parallax calculation for large screen devices
...
Test: manual
Bug: 193403434
Change-Id: Ifaed71f8c3645b012def02a9ea36fc3fb29bac00
2021-08-05 16:05:50 +01:00
Prabir Pradhan
3c8c3d5a40
Merge "Revert "Enable input window rotation flag"" into sc-v2-dev am: be8d4adf00 am: 7bc2901973
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15468513
Change-Id: Iddf1172e34d1ca8e79f60f3ae91d462c21be5691
2021-08-05 13:41:01 +00:00
Prabir Pradhan
7bc2901973
Merge "Revert "Enable input window rotation flag"" into sc-v2-dev am: be8d4adf00
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15468513
Change-Id: I4548432b027e4729d02f8b1bbdac9ce585aa6298
2021-08-05 13:23:44 +00:00
Prabir Pradhan
be8d4adf00
Merge "Revert "Enable input window rotation flag"" into sc-v2-dev
2021-08-05 13:07:59 +00:00