PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,380 Commits 1 Branch 0 Tags
1c59d5db7a722ae7449028861e4cd34fec58f49c
Commit Graph

102380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
3cdb4ba090 Merge "Fix keyboard settings crash in multi-user case" into tm-dev am: 897b72eb1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539524

Change-Id: Id5fc60af601333e647c6450025aac9421760351c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 08:26:57 +00:00
Bonian Chen
5839607867 Merge "[Settings] Add null pointer protection for Subscription API" into tm-dev 2022-04-08 08:16:34 +00:00
TreeHugger Robot
485bfa10b7 Merge changes from topic "presubmit-am-69008cfea6c94780a0c9a9e956ead727" into tm-mainline-prod 
* changes:
  [automerge] Fix keyboard settings crash in multi-user case 2p: 237a06e0c1
  Fix keyboard settings crash in multi-user case
 2022-04-08 08:03:36 +00:00
TreeHugger Robot
897b72eb1b Merge "Fix keyboard settings crash in multi-user case" into tm-dev 2022-04-08 08:03:36 +00:00
Mill Chen
0a4bbff802 Merge "Add cache mechanism for secondary users in Storage" into tm-dev am: 34eecaad79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182074

Change-Id: I1e7c78ff4d5e139fc7ee152a24265836ead34059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 06:12:06 +00:00
Mill Chen
34eecaad79 Merge "Add cache mechanism for secondary users in Storage" into tm-dev 2022-04-08 05:48:45 +00:00
Arc Wang
b9ecb6cadf [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours am: 3fc5b81efe -s ours am: 6b70d3b6ec -s ours am: 88f4d41a82 -s ours am: 58402f2e9f -s ours am: 106834efae -s ours am: b621abc5b1 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Ic004264fcc0af420016b0f2fb080d781db57412f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 04:57:54 +00:00
Arc Wang
0213e207c5 [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours am: 4bf19c2271 -s ours am: cf3835db35 -s ours am: e80a3dda3c -s ours am: 13a95907d8 -s ours am: 18e01b28e1 -s ours am: 247c98ae0f -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I0f1e1cf1982812c482afe1e841363a388b29f4e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 04:57:53 +00:00
Arc Wang
b621abc5b1 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours am: 3fc5b81efe -s ours am: 6b70d3b6ec -s ours am: 88f4d41a82 -s ours am: 58402f2e9f -s ours am: 106834efae -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I93423294e0c2148da8774c07785bb86dda55f957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 04:24:12 +00:00
Arc Wang
247c98ae0f [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours am: 4bf19c2271 -s ours am: cf3835db35 -s ours am: e80a3dda3c -s ours am: 13a95907d8 -s ours am: 18e01b28e1 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I4724268c0822817c05797fa3a70e0afc168a5352
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 04:24:09 +00:00
Arc Wang
433dc28026 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours am: 3fc5b81efe -s ours am: 6b70d3b6ec -s ours am: db9a89249b -s ours am: 7eacf06971 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Iad43f0633ed323addf032f938215a9439c756080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 04:06:43 +00:00
Arc Wang
f91a33d38e [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours am: 4bf19c2271 -s ours am: cf3835db35 -s ours am: 925bcd19dc -s ours am: 14e8c2961d -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I20d652741924c103cee5a76917b6334dda7eb915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 04:06:42 +00:00
Arc Wang
106834efae [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours am: 3fc5b81efe -s ours am: 6b70d3b6ec -s ours am: 88f4d41a82 -s ours am: 58402f2e9f -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Iade58839f7c094a43b5386190c44f8f2e4056165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 04:06:06 +00:00
Arc Wang
18e01b28e1 [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours am: 4bf19c2271 -s ours am: cf3835db35 -s ours am: e80a3dda3c -s ours am: 13a95907d8 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Id13203fcbe712651e2dc98aff35bc2776ec416df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 04:06:03 +00:00
Arc Wang
7eacf06971 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours am: 3fc5b81efe -s ours am: 6b70d3b6ec -s ours am: db9a89249b -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I49b510353164219952c634c077850f985620714d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 03:28:28 +00:00
Arc Wang
14e8c2961d [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours am: 4bf19c2271 -s ours am: cf3835db35 -s ours am: 925bcd19dc -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I26605f8072de37c101a2345ff55f9972d7af155e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 03:28:24 +00:00
Arc Wang
58402f2e9f [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours am: 3fc5b81efe -s ours am: 6b70d3b6ec -s ours am: 88f4d41a82 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Iaf390a8742ca82ab9f5eb4023ce35f2b0bf598b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 03:28:21 +00:00
Arc Wang
13a95907d8 [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours am: 4bf19c2271 -s ours am: cf3835db35 -s ours am: e80a3dda3c -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I46a08791fda8dc955f2980effefa48fbe731b542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 03:28:20 +00:00
Presubmit Automerger Backend
41704f98b1 [automerge] Fix keyboard settings crash in multi-user case 2p: 237a06e0c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539524

Bug: 216395439
Change-Id: Iac76ec56961b18816d750591654668b95d38e536
 2022-04-08 03:05:40 +00:00
Wilson Wu
237a06e0c1 Fix keyboard settings crash in multi-user case 
We have CL[1] to fix the NPE when keyboard settings
is launched by work app. CL[1] overlooked the work
profile with multi-user case.

Work profile user ID is not available(return null)
when calling Utils#getManagedProfile by work identity.

For work case, distinguish it's running on managed
profile user(launched by work app) or not. And use
corresponding userId as:

-. If it's a managed profile user, use currentUserId.
-. For a owner user, get managed profile userId.

[1]: Iea573922ee789d9932c0de05bf71179c4f005eeb

Bug: 216395439
Test: Manual test with bugs steps
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableVirtualKeyboardFragmentTest
Change-Id: If018d2fddbbcf932927d2235bb8e99393df1e67c
 2022-04-08 11:04:52 +08:00
Arc Wang
88f4d41a82 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours am: 3fc5b81efe -s ours am: 6b70d3b6ec -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I4929ded7641c64da2331ef184e08a90d7e31df6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:53:16 +00:00
Arc Wang
e80a3dda3c [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours am: 4bf19c2271 -s ours am: cf3835db35 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I4ce3bc069c05b36c61dcb97204ec3eadb9a0a541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:53:15 +00:00
Arc Wang
11e9985b55 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-dev am: f2b1582e0a -s ours am: 1d7d6ec5b8 -s ours am: bb5620a06d -s ours am: ed46f3e357 -s ours am: cdb6525194 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: Iff15ee6752482e5d67d3b176fefc6da7a8d390da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:53:09 +00:00
Arc Wang
b5acf3dac1 [automerger skipped] Merge changes from topic "presubmit-am-3cc3de9f6a154c869e57eba3d059bade-sc-dev" into sc-qpr1-dev am: c2c5b15855 -s ours am: 017fe0895f -s ours am: b55e56b5a9 -s ours am: c10946371c -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Iaaa99a9fbb1ad66203170e046a6be4ec72d5eaa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:52:23 +00:00
Arc Wang
0921ec5180 [automerger skipped] [automerge] Hide non-system overlay window on ActivityPicker 2p: d0a23dc840 am: 3357f3071a -s ours am: 31c51f18fc -s ours am: e29e6ba72e -s ours am: 2e5cd6b72a -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I00576b35b3b6d309d8ea241293c3a4fab53d26dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:52:22 +00:00
Arc Wang
db9a89249b [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours am: 3fc5b81efe -s ours am: 6b70d3b6ec -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I89ff3c5700ccd2ab1c96152cd135e5389a330420
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:52:21 +00:00
Arc Wang
925bcd19dc [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours am: 4bf19c2271 -s ours am: cf3835db35 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I83893011ad3948a674e713d3f22da8c872da50c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:52:20 +00:00
Arc Wang
cdb6525194 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-dev am: f2b1582e0a -s ours am: 1d7d6ec5b8 -s ours am: bb5620a06d -s ours am: ed46f3e357 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: I81e0b106281c0431a862614d3639e7c959a58ae5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:26:58 +00:00
Arc Wang
c10946371c [automerger skipped] Merge changes from topic "presubmit-am-3cc3de9f6a154c869e57eba3d059bade-sc-dev" into sc-qpr1-dev am: c2c5b15855 -s ours am: 017fe0895f -s ours am: b55e56b5a9 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I64c8da9b0d0a77925edc0aef9e2acfc5448be283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:26:42 +00:00
Arc Wang
2e5cd6b72a [automerger skipped] [automerge] Hide non-system overlay window on ActivityPicker 2p: d0a23dc840 am: 3357f3071a -s ours am: 31c51f18fc -s ours am: e29e6ba72e -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I5ba37e98c4bcc0684b2a1c1f4c9b017666155663
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:26:40 +00:00
Arc Wang
6b70d3b6ec [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours am: 3fc5b81efe -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I2f92dcd0ce9c7e0075b2bb0147547e65ef5802c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:19:30 +00:00
Arc Wang
cf3835db35 [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours am: 4bf19c2271 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Ieb785f34e2f09e855d511a22994d6869589d77f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:19:28 +00:00
Arc Wang
ed46f3e357 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-dev am: f2b1582e0a -s ours am: 1d7d6ec5b8 -s ours am: bb5620a06d -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: I60df12535cd4a15c60973b384a9a56d2990e47bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:11:03 +00:00
Arc Wang
b55e56b5a9 [automerger skipped] Merge changes from topic "presubmit-am-3cc3de9f6a154c869e57eba3d059bade-sc-dev" into sc-qpr1-dev am: c2c5b15855 -s ours am: 017fe0895f -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I4511c5642bc67356e3414a4ca723094ef45f2282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:10:51 +00:00
Arc Wang
e29e6ba72e [automerger skipped] [automerge] Hide non-system overlay window on ActivityPicker 2p: d0a23dc840 am: 3357f3071a -s ours am: 31c51f18fc -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Iff0b47ee51292c1b7f408691c8cbb63543b1b093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:10:46 +00:00
Arc Wang
3fc5b81efe [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Ied0f1e36a2d67fa9681f60c89ce0748af48148b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:50:59 +00:00
Arc Wang
4bf19c2271 [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Ib0ff605c1ed18d9053248dace8087fab90c3234c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:50:58 +00:00
Bill Yi
35525a5617 Merge SP2A.220405.004 to aosp-master - DO NOT MERGE 
Merged-In: I2a97159d0de32a6262bbace7bb82b09897447bdb
Merged-In: I58aad30729443e148da154a0d1125a6e8cb8c9d3
Change-Id: I593218f8417ab99d88c16705eef2cef705e0fcf7
 2022-04-07 18:41:02 -07:00
Arc Wang
b80633b800 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-dev am: f2b1582e0a -s ours am: 282f65828a -s ours am: 21777ae98b -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: Ia1299225d27e43636cc4d89c0d5057e2d10d80ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:37:03 +00:00
Arc Wang
bb70b82825 [automerger skipped] Merge changes from topic "presubmit-am-3cc3de9f6a154c869e57eba3d059bade-sc-dev" into sc-mainline-prod am: 9877f69b2f -s ours am: 1945ed2e82 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I8a92b92b44fa79905979d186c5459157162f58ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:36:50 +00:00
Arc Wang
7ecb9b0caa [automerger skipped] [automerge] Hide non-system overlay window on ActivityPicker 2p: d0a23dc840 am: abf3369340 -s ours am: 5e1603eee8 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Ife44cdf417a70d1d8a68b8e73992ee3fa849a77c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:36:49 +00:00
Arc Wang
21777ae98b [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-dev am: f2b1582e0a -s ours am: 282f65828a -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: I7ec4500b1ef2c2d0cc7e2218fc58a5ef5e1d6466
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:36:13 +00:00
Arc Wang
bb5620a06d [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-dev am: f2b1582e0a -s ours am: 1d7d6ec5b8 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: I7ef9834c36d7aed6196e408d917b35fb700e6f58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:36:09 +00:00
Arc Wang
017fe0895f [automerger skipped] Merge changes from topic "presubmit-am-3cc3de9f6a154c869e57eba3d059bade-sc-dev" into sc-qpr1-dev am: c2c5b15855 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Ie8771d1f169bb4299b0aafce6ced2dae9e8cf270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:36:02 +00:00
Arc Wang
31c51f18fc [automerger skipped] [automerge] Hide non-system overlay window on ActivityPicker 2p: d0a23dc840 am: 3357f3071a -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I856e903afba4e53c2a527886f7fab8527e427349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:36:01 +00:00
Arc Wang
1945ed2e82 [automerger skipped] Merge changes from topic "presubmit-am-3cc3de9f6a154c869e57eba3d059bade-sc-dev" into sc-mainline-prod am: 9877f69b2f -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I608d0333e4ca328796aea03f984a50dd843b5ae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:36:01 +00:00
Arc Wang
5e1603eee8 [automerger skipped] [automerge] Hide non-system overlay window on ActivityPicker 2p: d0a23dc840 am: abf3369340 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I1e9ea50c931d62a717838f4f415b0fceb816157a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:35:57 +00:00
Arc Wang
1d7d6ec5b8 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-dev am: f2b1582e0a -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: I20a17544720140fd1fc62b91f538c89d06184a5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:35:56 +00:00
Arc Wang
282f65828a [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-dev am: f2b1582e0a -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: I169e9c7252f6d43b3ce3bac36940b61a21d382ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:35:26 +00:00
TreeHugger Robot
b549f3a6cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 2e98d2e165 -s ours am: bf8f416119 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3edb7c7c94ff1bc2246de78e12e35a886d52d15a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:35:07 +00:00