Commit Graph

34620 Commits

Author SHA1 Message Date
Android Build Coastguard Worker
d544550ff0 Merge "Snap for 8144225 from 55ce0a918c to sdk-release" into sdk-release platform-tools-33.0.1 2022-02-03 02:10:52 +00:00
Android Build Coastguard Worker
99f4855f0f Snap for 8144225 from 55ce0a918c to sdk-release
Change-Id: Ie06f95ed8592d41934d24e898792de54a7dbc60f
2022-02-03 02:07:37 +00:00
Treehugger Robot
55ce0a918c Merge "Fix licenses and license texts." android-t-beta-3 android-t-preview-2 android-s-qpr3-beta-1 android-t-preview-1 android-s-v2-beta-3 2022-02-02 16:48:44 +00:00
Bob Badour
596ebbc9fb Fix licenses and license texts.
Entire project is 1p.

Bug: 210912771

Test: m nothing

Change-Id: I1d76cab983a7d1f9078c0e2f1252f5409692f300
Merged-in: Id941d93786882aca78f214ac692433a353b84ed3
Merged-in: I1d76cab983a7d1f9078c0e2f1252f5409692f300
2022-02-02 03:02:50 +00:00
Android Build Coastguard Worker
a1111beedb Merge "Snap for 8074123 from fd43233281 to sdk-release" into sdk-release platform-tools-33.0.0 2022-01-13 02:22:11 +00:00
Android Build Coastguard Worker
a5fb44cc2f Snap for 8074123 from fd43233281 to sdk-release
Change-Id: I132c1d32da3baca47b2e569e6beacb42c3468f36
2022-01-13 02:08:14 +00:00
Treehugger Robot
fd43233281 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-01-11 00:50:07 +00:00
Treehugger Robot
f28414562e Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-01-11 00:49:47 +00:00
Treehugger Robot
8ca8a317cb Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-01-11 00:49:45 +00:00
Bill Yi
487c69e0e2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I11e6b41bdca9d55dd12983151a0c68d3ff2a7422
2022-01-10 14:49:52 +00:00
Bill Yi
8ff9808c85 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I62e88b73bc557c47aebac0eb595cabcfcdc7f29f
2022-01-10 14:49:12 +00:00
Bill Yi
bb956f5d16 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I43930759be42abba1707fde580baf01938955099
2022-01-10 14:48:40 +00:00
Android Build Coastguard Worker
2d19ec5334 Merge "Snap for 8023979 from 6faed50183 to sdk-release" into sdk-release 2021-12-23 02:16:28 +00:00
Android Build Coastguard Worker
767dd55f52 Snap for 8023979 from 6faed50183 to sdk-release
Change-Id: I3bbf3fa9a87be13f907592cdcc10611daf31b5f8
2021-12-23 02:07:12 +00:00
Colin Cross
6faed50183 Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" 2021-12-16 19:26:17 +00:00
Android Build Coastguard Worker
02d146b9ac Merge "Snap for 8005954 from 3afd8cbc24 to sdk-release" into sdk-release platform-tools-32.0.0 2021-12-16 00:26:31 +00:00
Android Build Coastguard Worker
24d8192e3e Snap for 8005954 from 3afd8cbc24 to sdk-release
Change-Id: If31b5856c32837252e0e0040f87bad9167610dbc
2021-12-16 00:06:33 +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
Xin Li
3afd8cbc24 Merge "Merge Android 12 QPR1" 2021-12-14 20:25:21 +00:00
Xin Li
b07b62dbb3 Merge Android 12 QPR1
Bug: 210511427
Merged-In: Iae5e73b18d8885df51c1fca1ef27e277721a8237
Change-Id: Id334bdfd9f81b6ad5f97edd4c50d8df49efb4c9c
2021-12-14 08:39:12 -08:00
Xin Li
c4a6b5cc40 Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467
Merged-In: I40bef9eb41bfedf73ac4bd0ff0050833d2a9623c
Change-Id: Iae5e73b18d8885df51c1fca1ef27e277721a8237
2021-11-10 08:06:07 +00:00
Android Build Coastguard Worker
f018c48f5b Merge "Snap for 7881886 from 6fcd0f86c5 to sdk-release" into sdk-release 2021-11-04 01:15:14 +00:00
Android Build Coastguard Worker
7f054fb359 Snap for 7881886 from 6fcd0f86c5 to sdk-release
Change-Id: I7bf091586e8d69e881d97f71cca4831514363216
2021-11-04 01:07:55 +00:00
Bill Yi
fb65043bca [automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 6fcd0f86c5 -s ours
am skip reason: Merged-In Id6156b3469ffc23b171415d792cf48c9db9634c2 with SHA-1 526386b255 is already in history

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

Change-Id: I0326842ee7088786e0b5b267f7a9fe199f42a18b
2021-11-03 18:08:27 +00:00
Bill Yi
6fcd0f86c5 Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" 2021-11-03 17:50:39 +00:00
Bill Yi
b9ffa5b002 Merge SP1A.211105.004 to aosp-master - DO NOT MERGE
Merged-In: Id6156b3469ffc23b171415d792cf48c9db9634c2
Merged-In: I92ba4bd46f2671c0bc33a71631ce1b0290198c67
Change-Id: I58ae017dde7870b2c97e1eaca0ce12d5d887bb8b
2021-11-02 21:07:54 -07:00
The Android Open Source Project
ec304d206e Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE
Merged-In: I92ba4bd46f2671c0bc33a71631ce1b0290198c67
Change-Id: I9f61cd1e3a3feebf6fc2aaa020e65a8909662712
2021-11-02 14:11:57 -07:00
Android Build Coastguard Worker
a5f86233b3 Merge "Snap for 7843118 from c6cb960ecc to sdk-release" into sdk-release 2021-10-21 01:14:45 +00:00
Android Build Coastguard Worker
508932c4cf Snap for 7843118 from c6cb960ecc to sdk-release
Change-Id: I570cc767f0c39aa23dc9ddeef840e84b6f4fdd24
2021-10-21 01:09:20 +00:00
Trevor Radcliffe
526386b255 Merge "Migrate Aardwolf to Soong" am: c6cb960ecc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1855833

Change-Id: Id6156b3469ffc23b171415d792cf48c9db9634c2
2021-10-18 18:44:37 +00:00
Trevor Radcliffe
c6cb960ecc Merge "Migrate Aardwolf to Soong" android-s-v2-beta-2 android-s-v2-preview-2 android-s-v2-preview-1 2021-10-18 18:34:03 +00:00
Android Build Coastguard Worker
661a2c8d3a Merge "Snap for 7821744 from e84b3a6c3b to sdk-release" into sdk-release 2021-10-14 01:19:26 +00:00
Android Build Coastguard Worker
80d8a99c47 Snap for 7821744 from e84b3a6c3b to sdk-release
Change-Id: Ibf38d03043b28de2a05472b0e4ed4446205c7cc2
2021-10-14 01:06:45 +00:00
Trevor Radcliffe
caecf6393b Migrate Aardwolf to Soong
Fixes: 202886196
Test: apkanalyzer--apks are identical
Test: Treehugger
Change-Id: Iff24028632c4b6929c408db2dbae9a3d98604810
2021-10-12 23:00:23 +00:00
Bill Yi
447bd19ff4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6cb6ac8bfc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I40bef9eb41bfedf73ac4bd0ff0050833d2a9623c
2021-10-10 05:55:12 +00:00
Bill Yi
6cb6ac8bfc Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I86a7c11f2696200bc4c5f083d41e603c5f8b256e
2021-10-08 22:34:20 +00:00
Xin Li
dd241611e5 [automerger skipped] Merge "Merge Android 12" am: e84b3a6c3b -s ours am: aab33ff88b -s ours am: 0ccf3f4fd8 -s ours
am skip reason: Merged-In I3958bd9fb5521d09fa7cae642128b9f5e11b8e2e with SHA-1 183bca2dcc is already in history

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

Change-Id: I1de8274053d21518d9cb9202b53bf945f5335a44
2021-10-08 07:56:18 +00:00
Xin Li
0ccf3f4fd8 [automerger skipped] Merge "Merge Android 12" am: e84b3a6c3b -s ours am: aab33ff88b -s ours
am skip reason: Merged-In I3958bd9fb5521d09fa7cae642128b9f5e11b8e2e with SHA-1 183bca2dcc is already in history

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

Change-Id: I4e15ec3e294633fbf852fdecf1cb974cf4f579f6
2021-10-08 01:39:03 +00:00
TreeHugger Robot
8744e4d382 Merge "Add a new string for widget configuration drop target" into sc-qpr1-dev am: 52c93d17fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15992145

Change-Id: Idd0abbec06c8aa1f06a2d11500f67ceebdd801db
2021-10-08 01:29:29 +00:00
Xin Li
aab33ff88b [automerger skipped] Merge "Merge Android 12" am: e84b3a6c3b -s ours
am skip reason: Merged-In I3958bd9fb5521d09fa7cae642128b9f5e11b8e2e with SHA-1 183bca2dcc is already in history

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

Change-Id: Ib3e5de38322b643b0974840b4c2d33565eba0988
2021-10-08 01:19:37 +00:00
TreeHugger Robot
52c93d17fa Merge "Add a new string for widget configuration drop target" into sc-qpr1-dev 2021-10-08 01:09:24 +00:00
Xin Li
e84b3a6c3b Merge "Merge Android 12" 2021-10-07 23:50:25 +00:00
TreeHugger Robot
b8ac4acfac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 8b3ae2064b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I77cc79df93ad271b4fc0e9de09ce630cf650a715
2021-10-07 15:05:48 +00:00
TreeHugger Robot
8b3ae2064b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-07 14:48:19 +00:00
Bill Yi
d5527cf152 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 39122b4f30 am: 90f1a4e085 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic43b56e2e2cef7d7026b1805a4dfa1e8215fd40d
2021-10-07 13:59:11 +00:00
Bill Yi
1881145608 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 39122b4f30 am: 7f19dccedc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ida7225fd19b24bef27e239d9593e7cefc4182ee3
2021-10-07 13:58:43 +00:00
Xin Li
02dd0ed8bc Merge Android 12
Bug: 202323961
Merged-In: I3958bd9fb5521d09fa7cae642128b9f5e11b8e2e
Change-Id: I5c1ce9f07b41e45ae38dc81f553c5e64a9abe8ff
2021-10-06 22:53:56 +00:00
Bill Yi
c3b9e7cf6b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic59a97dcc0eaf13c3554d01ef4d6b094d893e7bd
2021-10-06 21:34:22 +00:00
Bill Yi
90f1a4e085 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 39122b4f30
Blank merge reason: commit message contains skip directive

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

Change-Id: If745478a901821ee58e1598bebd3d0f7fbdd7333
2021-10-06 21:33:53 +00:00
Bill Yi
7f19dccedc [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 39122b4f30
Blank merge reason: commit message contains skip directive

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

Change-Id: I6be47ca3cfb175423022626cad2d9073f50dee07
2021-10-06 21:33:52 +00:00