PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,555 Commits 1 Branch 0 Tags
0d585d86b883bc4eccd5805d044ebaa1bd556779
Commit Graph

34555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot 0d585d86b8 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-01-11 00:45:41 +00:00
Bill Yi f893704985 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iad1f2ecd52bbfac5a0885ea486fe31be77272d50
 2022-01-10 06:38:46 +00:00
Bill Yi b8b61348cc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id78073cef6bd578a54e65dbf9089662338a978a5
 2022-01-10 06:38:17 +00:00
Colin Cross 0bd628d967 [automerger skipped] Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" am: 6faed50183 -s ours 
am skip reason: Merged-In Ia2a677f3a3987751349bad951ff136b2d55f439f with SHA-1 e13ff2cb9a is already in history

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

Change-Id: I28ae0a1341f26a50a74e1f26eaefe3628504a70b
 2021-12-16 19:40:40 +00:00
Colin Cross 6faed50183 Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" 2021-12-16 19:26:17 +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
Xin Li 18c3599e0e [automerger skipped] Merge "Merge Android 12 QPR1" am: 3afd8cbc24 -s ours 
am skip reason: Merged-In Iae5e73b18d8885df51c1fca1ef27e277721a8237 with SHA-1 c4a6b5cc40 is already in history

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

Change-Id: Iadb054885cbaf0b5116234c338708d696770b82f
 2021-12-14 21:00:14 +00: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
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
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" 2021-10-18 18:34:03 +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
Bill Yi 39122b4f30 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9179a69632df6353981c85d3b7613211f4b7ab78
 2021-10-06 21:33:38 +00:00
Steven Ng 77940284eb Add a new string for widget configuration drop target 
Test: manual. See screenshot in b/201286923
Fix: 201286923
Change-Id: I5be4f723523befe359b922273d11f57fb9f0b3fd
(cherry picked from commit 29f46c9628)
 2021-10-06 17:38:03 +00:00
TreeHugger Robot 5992971500 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: ae6e81587c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ffa865b4a08fe755ea0036d9d8fce6c79baface
 2021-10-05 23:14:11 +00:00
TreeHugger Robot ae6e81587c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-05 22:58:32 +00:00
Samuel Fufa 0b4487149e [Work] Fix work apps showing in personal tab am: 42b75d43fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15971867

Change-Id: I45f74d7e5af83ef86f40ae4b8cf156b71a9c2658
 2021-10-05 15:55:03 +00:00
Bill Yi 37a5b5f5c2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I089a6d4201294d7856fa6e60b03f89dcdc888b84
 2021-10-05 03:50:22 +00:00
Samuel Fufa 42b75d43fc [Work] Fix work apps showing in personal tab 
The problem here is that we are tracking hasWorkApps and usingTabs using the same value.
 This leads to work/personal apps showing together when clearing search since mUsingTabs is overridden to false on setLastSearchQuery and later used to determine if tabs should show.
Bug: 198546279
Test: Manual

Change-Id: I7df5d65472703bedcc9dd688847d9ebd146d5f61
Merged-In: I7df5d65472703bedcc9dd688847d9ebd146d5f61
(cherry picked from commit 564e9ca223)
 2021-10-05 03:27:31 +00:00
Bill Yi 4a0ab290b5 Merge changes from topic "presubmit-am-38ca296c39a34a24b9e36e667e4f04a8" into sc-qpr1-dev am: e758de7f64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15926980

Change-Id: I8ad2b2c088089279073df38bb35f0c0deccf0ea8
 2021-09-29 17:23:34 +00:00
Bill Yi f6a52206d6 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 46a7262d30 am: 495ec1daba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I656d4d7f44fa0249bd3cf69d11d927d5a0442a24
 2021-09-29 17:23:31 +00:00
Bill Yi 5d8146e4fc [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 46a7262d30 am: 96d5ff6368 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f31e73a4bab7b15e0b47eb1cc46325dccbbee76
 2021-09-29 17:23:27 +00:00
Bill Yi e758de7f64 Merge changes from topic "presubmit-am-38ca296c39a34a24b9e36e667e4f04a8" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 46a7262d30
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-29 17:09:31 +00:00
Bill Yi 3fc2d61d25 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a0c54b6745 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9c6c382972d006b1e0f4ecbb086ad9e6b3a5da5
 2021-09-29 08:16:25 +00:00
Bill Yi a0c54b6745 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3484a02c57703953c91cbe02c787b7f633e319fc
 2021-09-28 02:32:40 +00:00
Bill Yi 96d5ff6368 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 46a7262d30 
Blank merge reason: commit message contains skip directive

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

Change-Id: I559b9b1ddc3f41e4f4232d049c03353f60dce0ce
 2021-09-28 02:32:13 +00:00
Bill Yi 495ec1daba [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 46a7262d30 
Blank merge reason: commit message contains skip directive

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

Change-Id: I4a712c0754e46b406cc23f6b31919c343e599121
 2021-09-28 02:32:12 +00:00
Bill Yi 46a7262d30 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I87c5b7c67e41d1db02ae5d08b50c7087ec1dfb3c
 2021-09-28 02:32:00 +00:00