Bill Yi
3939db651c
Merge changes from topic "presubmit-am-7e1940cadd2a43ad94282dd8aef456b4" into sc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c864f6c50e
Import translations. DO NOT MERGE ANYWHERE
2021-08-17 22:05:47 +00:00
Bill Yi
4d3edb5d91
Merge changes from topic "presubmit-am-dd3c36e3866a44d6b7f93a76c12cd46d" into sc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cea66b3a81
Import translations. DO NOT MERGE ANYWHERE
2021-08-17 22:04:02 +00:00
Xin Li
40df1d25c3
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: b252da0e67 -s ours
...
am skip reason: Merged-In Ic51ea9d199e6a072168365aeb7553203cd2c43c6 with SHA-1 4b3c24d0d3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15571784
Change-Id: I48bec9307c0b9a015ae63ec906995b0549339cd1
2021-08-17 18:35:32 +00:00
Bill Yi
b40b16f35c
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c864f6c50e
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15595326
Change-Id: Idc53bbfe4477e888acc4098262b31f98bacc9973
2021-08-17 09:15:33 +00:00
Bill Yi
c864f6c50e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7fb2cb94cefd0abab06ebaf0f6a54d5ef2b225aa
2021-08-17 02:15:20 -07:00
Bill Yi
049c6cb59f
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cea66b3a81
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15595229
Change-Id: Id7128e13afc746901ad8d6f4a2b0f6a9b795fc16
2021-08-17 09:11:13 +00:00
Bill Yi
cea66b3a81
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1827e8d2469c9c7993b5b15ea5a964e1fa562dbb
2021-08-17 02:11:04 -07:00
Xin Li
b252da0e67
Merge sc-dev-plus-aosp-without-vendor@7634622
...
Merged-In: Ic51ea9d199e6a072168365aeb7553203cd2c43c6
Change-Id: I73e01a9461ec61f09c776977b1ecb49ad9de991d
2021-08-14 06:31:03 +00:00
TreeHugger Robot
4b3c24d0d3
Merge "Adjust all apps zoom level" into sc-dev am: 6b10f4649c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15530106
Change-Id: Ic51ea9d199e6a072168365aeb7553203cd2c43c6
2021-08-12 00:29:10 +00:00
TreeHugger Robot
6b10f4649c
Merge "Adjust all apps zoom level" into sc-dev
2021-08-12 00:09:14 +00:00
Steven Ng
9b6951db38
Fix pending restore widget touch issue am: bdffb53843
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15517689
Change-Id: I41dd1c03f6ba6c1b9e6d477fd9809d7d37d2b133
2021-08-11 23:48:34 +00:00
Steven Ng
bdffb53843
Fix pending restore widget touch issue
...
After http://ag/14980850 , we block updateAppWidget until app widget
is restored. However, PendingAppWidgetHostView constructor relies
on updateAppWidget(null) to trigger set listener in getDefaultView().
We should call super.updateAppWidget(null) in the constructor instead.
Test: manual
Bug: 14980850
Change-Id: I30af9778a636af2ad822e7abc152b6f0bfdea1bf
2021-08-11 22:40:06 +01:00
Lucas Dupin
3f6a4e6bf5
Adjust all apps zoom level
...
The All Apps scrim fades in early, covering part of the zoom animation.
We need to adjust the max zoom in order to make All Apps consistent with
Overview, -1, and Shade.
Test: pull up the all apps drawer
Fixes: 195992422
Change-Id: Ia7bbe17fe7f227dd0a16ba7d21b402cff57176f0
(cherry picked from commit f168bb7aaf )
2021-08-11 15:55:04 +00:00
Bill Yi
fdd9d1421f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8bc9c6355a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15505516
Change-Id: I1f59d0195111e5346e9dabde61f3657c9aedf3f3
2021-08-10 19:38:23 +00:00
Bill Yi
8bc9c6355a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8a0be2eb6ceb321440efdf75d2b8f6232de201fe
2021-08-09 22:32:00 +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
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
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
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
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
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
TreeHugger Robot
eaff8ef0ab
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9d5749fd7f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15465212
Change-Id: I448b9c74672773675879da2fe8b31d5963f69bb4
2021-08-05 03:04:07 +00:00
TreeHugger Robot
8a8b410906
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a85c40ebd6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15465214
Change-Id: Ia971bb911679fceec2afa52f2e2be08cd07143a3
2021-08-05 03:04:03 +00:00
TreeHugger Robot
9d5749fd7f
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-05 03:03:29 +00:00
TreeHugger Robot
a85c40ebd6
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-05 02:53:48 +00:00
Brian Isganitis
36af576d7c
Merge "Fix crash from previewing launcher with unknown wallpaper colors." into sc-dev am: 200d7634d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15462873
Change-Id: Ied267f8cd7e6176a2f7ce00b9f1b92293deafdac
2021-08-05 01:27:13 +00:00
Brian Isganitis
200d7634d1
Merge "Fix crash from previewing launcher with unknown wallpaper colors." into sc-dev
2021-08-05 01:08:00 +00:00
Bill Yi
315b29c87e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id83c1f3b8772c671e8a8836da2435f75d21cf40e
2021-08-04 22:16:53 +00:00
Bill Yi
ff049aae0f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8da912b3e7ec23e63a5c1436773cd86b8cb8dffc
2021-08-04 22:14:26 +00:00
Steven Ng
4dd79f1bde
Merge "Don't delete widgets that violate min size requirement" into sc-dev am: 5fc53cbc22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15455163
Change-Id: I4b3304545e0d4c1418ec1140cfa2beddbd48231f
2021-08-04 20:27:46 +00:00
Steven Ng
5fc53cbc22
Merge "Don't delete widgets that violate min size requirement" into sc-dev
2021-08-04 20:15:45 +00:00
Jon Miranda
a56cb84141
Update extra space allocations for taller devices.
...
- Take less space from cells
- Distribute some of the empty space above the workspace
- Already confirmed from previous testing that these thresholds
only affect taller devices
Bug: 194688362
Test: long press on app icons,
test drag and drop bounds
test drop target bounds
test folder opening bounds
test all grids on taller devices
Change-Id: If90b7663ab4afedca1193bdd73a0ae38a1f25243
2021-08-04 12:00:36 -07:00
Brian Isganitis
dafa5040ef
Fix crash from previewing launcher with unknown wallpaper colors.
...
Test: Open wallpaper app with live wallpaper applied should not crash.
Fix: 195246865
Change-Id: Id64de32b35aa7a553daa752438060d7f6822bec8
2021-08-04 18:31:20 +00:00
Steven Ng
b269cc5150
Don't delete widgets that violate min size requirement
...
Test: Manual
Bug: 194766124
Change-Id: I4713e65e27da23d833bb60fb556ae8924a63e305
2021-08-04 11:14:09 +01:00
Tracy Zhou
80f3aa7039
Merge "[DO NOT MERGE] Disable live tile in split mode for S" into sc-dev am: 25399db1e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15331686
Change-Id: Ifa68ea829c3af28f936417871048d265e53954fa
2021-08-03 22:02:32 +00:00
Tracy Zhou
6c262c5f94
[DO NOT MERGE] Disable live tile in split mode for S am: 145bd74749
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15331686
Change-Id: I65674551091fde62193325a3f5676c5becde7334
2021-08-03 22:02:31 +00:00
vadimt
7e93cf4264
Logging to figure out why first dump didn't result in assertion am: 21091ada88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15455400
Change-Id: Ifcea39e46349e0941bc168929da300f6dc24fb5d
2021-08-03 22:02:26 +00:00
Tracy Zhou
25399db1e7
Merge "[DO NOT MERGE] Disable live tile in split mode for S" into sc-dev
2021-08-03 21:50:06 +00:00
Tracy Zhou
145bd74749
[DO NOT MERGE] Disable live tile in split mode for S
...
Recall link: https://recall.googleplex.com/projects/debb8388-5e38-42c5-99ab-20bdfb92d25e/sessions/655af962-b4bd-4dc4-93aa-178852c0d701
Bug: 193991436
Test: enter split screen and swipe up
Change-Id: I7adffcdefb12d225db207542716a436f29df0377
2021-08-03 20:50:27 +00:00
vadimt
21091ada88
Logging to figure out why first dump didn't result in assertion
...
Bug: 195319692
Test: presubmit
Change-Id: I4a80541a58eb8f630211de4b90836c435f6d41b2
2021-08-03 18:47:35 +00:00
Jonathan Miranda
87d39d6715
Merge "Add more restrictions on whether we increase the hotseat size for tall devices." into sc-dev am: 4a17e66166
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15412628
Change-Id: I1bc24e2fd76a312aa99b02a766af2405cab2f02e
2021-07-30 20:50:06 +00:00