PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,511 Commits 1 Branch 0 Tags
4a7394041c3ee070ab3a763bdc91ef6870d8a192
Commit Graph

101511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yuri Ufimtsev
4a7394041c Merge "Fix typo in Preference definition for Security Advanced Settings" into tm-dev am: addc9c06bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17474923

Change-Id: I5389c1897386eac6f23fc33e4f56ff71286cb392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 08:06:13 +00:00
Yuri Ufimtsev
addc9c06bc Merge "Fix typo in Preference definition for Security Advanced Settings" into tm-dev 2022-03-30 07:48:16 +00:00
Weng Su
76a3954c18 [automerger skipped] Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1 am: a30d123e12 am: 7abffe0057 am: 4026f4134f -s ours am: 1c60264236 -s ours 
am skip reason: Merged-In Ic434f0583cba557228c72508a501347ffa3141e1 with SHA-1 4c4a1f58c1 is already in history

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

Change-Id: Ie90a01f637e5b88aa7ad882443c329591d1baff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 07:11:13 +00:00
Weng Su
1c60264236 [automerger skipped] Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1 am: a30d123e12 am: 7abffe0057 am: 4026f4134f -s ours 
am skip reason: Merged-In Ic434f0583cba557228c72508a501347ffa3141e1 with SHA-1 4c4a1f58c1 is already in history

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

Change-Id: Ia69461e39acae0c5a685b9901e1fc2b265ec1eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 06:56:02 +00:00
Weng Su
33138dfc48 [automerger skipped] Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1 am: 95ff0f1453 -s ours am: a2e5b7b7cb -s ours 
am skip reason: Merged-In Ic434f0583cba557228c72508a501347ffa3141e1 with SHA-1 876f691377 is already in history

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

Change-Id: I2de07abbbdb4de1ff49a5ac497ab4d7b67db4080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 06:41:26 +00:00
Weng Su
4026f4134f Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1 am: a30d123e12 am: 7abffe0057 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180

Change-Id: I17625880bf59eb632cc0dcdbc222c60a516d119e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 06:40:51 +00:00
Weng Su
7abffe0057 Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1 am: a30d123e12 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180

Change-Id: If2619c93286363f268bb7021af1037195fcba4be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 06:26:59 +00:00
Weng Su
a2e5b7b7cb [automerger skipped] Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1 am: 95ff0f1453 -s ours 
am skip reason: Merged-In Ic434f0583cba557228c72508a501347ffa3141e1 with SHA-1 876f691377 is already in history

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

Change-Id: Ic37d4df464b13fdc23737b1fec9ec9894718a693
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 06:26:53 +00:00
Jason Hsu
3f88b72bea Merge "Set title to the hearing aid pair instruction dialog" into tm-dev am: abd4fd54b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17291806

Change-Id: I5b2ee4e522c86d0494ef3587b9c551d790fd1098
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 06:19:31 +00:00
Weng Su
a30d123e12 Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180

Change-Id: I4d1bf49f4eab2ce72148cd308b5c217d814ab75c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 06:11:32 +00:00
Weng Su
95ff0f1453 Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180

Change-Id: I28a8e979130dc61c3cfdbe5b90bfc8ad905d1d35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 06:10:23 +00:00
Jason Hsu
abd4fd54b1 Merge "Set title to the hearing aid pair instruction dialog" into tm-dev 2022-03-30 06:03:00 +00:00
Kevin Han
1f21417702 Merge "Update hibernation toggle title to have "if unused"" into tm-dev am: c4c923d1eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17450694

Change-Id: Ic478dc38f408b02762afbac4539d9b7e5ee61e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 19:30:03 +00:00
Kevin Han
c4c923d1eb Merge "Update hibernation toggle title to have "if unused"" into tm-dev 2022-03-29 18:55:35 +00:00
Kevin Han
03a87f460b [automerge] Update hibernation toggle title to have "if unused" 2p: 3cfc87cc05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17450694

Bug: 227235454
Change-Id: I61350d752c0324b3672193dcbbf364f4696ec786
 2022-03-29 18:38:18 +00:00
TreeHugger Robot
8c6668cd03 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1f881c6e86 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e50a31578e4289e72d932fc9df3edb4e8297150
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 18:17:31 +00:00
Bill Yi
346d3a8459 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac9baaee08 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I27cc7eb93246429765820f51c926f12a72a4adfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 18:17:30 +00:00
TreeHugger Robot
1f881c6e86 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-29 17:54:31 +00:00
TreeHugger Robot
3c7d6ac0e5 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-03-29 17:51:45 +00:00
Treehugger Robot
8c98f0296d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d35c876857 -s ours am: 178ba3e57d -s ours am: 0818a1c62b -s ours am: 997bdcf8f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I92eb6b101e2c4dbdf1c04579e0641cdd8380b91f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:38 +00:00
Bill Yi
98fd319aba [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38de1eab21 -s ours am: 5f55cb2ed8 -s ours am: 2b1435d300 -s ours am: cbb3ac7c9e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4720ac13081819a9c47c7c3e7e9eac1c7c626e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:37 +00:00
Treehugger Robot
243e18d857 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 65c7ff0276 -s ours am: 3ad321509f -s ours am: c5142845f8 -s ours am: cb0150bde0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I80cc502b305fe4ba1936fc2d8d0d459475f25752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:29 +00:00
Bill Yi
0166aae999 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62dc714628 -s ours am: b28c27e68e -s ours am: e68d843167 -s ours am: 5729190b77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9788d84a57eefdd8794e1af790cdc78821a40b7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:28 +00:00
TreeHugger Robot
d8ef930b69 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 97539de67e -s ours am: 0e536d93b5 -s ours am: 2e4f458627 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2bfabd4b816f1ea2891992e3aa08efc3a09b66fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:20 +00:00
Bill Yi
f3b2661db4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b50ee2d6 -s ours am: cc3a93e23b -s ours am: f0886d920c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I14c3dec853939107738e8e6cb8f1ff2687c04026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:19 +00:00
TreeHugger Robot
c28707b38e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4d9878828e -s ours am: 2703c29227 -s ours am: e5091256f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I72f30a7906c9145b8b3632ad1a00c25d8e191c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:13 +00:00
Bill Yi
fd71e4b975 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e58dde841 -s ours am: 620782b9d4 -s ours am: 78bfe2c604 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If6852a1ac855e2f46c002e902f2f4cdc4b4e8c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:11 +00:00
Peter Wang
c7e49878b8 [automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 0ab2226dff -s ours am: 4f5dbc4db4 -s ours am: 886b22a7a6 -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 6879183335 is already in history

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

Change-Id: I43a678f4b949e1c864a2b5f8e3a85e71d36e6e9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:08:54 +00:00
Treehugger Robot
997bdcf8f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d35c876857 -s ours am: 178ba3e57d -s ours am: 0818a1c62b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If33b9f681a6b7b9fd3380ff95df68dda0a80513c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:48:01 +00:00
Bill Yi
cbb3ac7c9e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38de1eab21 -s ours am: 5f55cb2ed8 -s ours am: 2b1435d300 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I080bbfcbed46db28ef9b31a72ce4236a9a625a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:47:59 +00:00
Treehugger Robot
cb0150bde0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 65c7ff0276 -s ours am: 3ad321509f -s ours am: c5142845f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I13faeea594a89e382f067a237440adf9183bd33a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:46:11 +00:00
Bill Yi
5729190b77 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62dc714628 -s ours am: b28c27e68e -s ours am: e68d843167 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1d32837fd68effe1470001964dd08c8a4463dfd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:46:07 +00:00
TreeHugger Robot
2e4f458627 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 97539de67e -s ours am: 0e536d93b5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I137bd8e32d90c1bb3691d53633fe9e86cf2562a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:38:58 +00:00
Bill Yi
f0886d920c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b50ee2d6 -s ours am: cc3a93e23b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I84bf0cdc0c3d2fef27883a04efc2944be2e6044e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:38:56 +00:00
TreeHugger Robot
e5091256f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4d9878828e -s ours am: 2703c29227 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I64ca7d3f6fc6d9e3668f0a08d3fd1f58f9a79d86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:38:30 +00:00
Bill Yi
78bfe2c604 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e58dde841 -s ours am: 620782b9d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2bae1da3c62063d6ae7544cb863a8d34952252fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:38:28 +00:00
Yuri Ufimtsev
183c3f965b Fix typo in Preference definition for Security Advanced Settings 
Test: manual

Bug: 191735388
Change-Id: I9156a5d670e12a1249504cc9eb27ed1c2ef59bfc
 2022-03-29 15:09:33 +00:00
Peter Wang
886b22a7a6 [automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 0ab2226dff -s ours am: 4f5dbc4db4 -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 6879183335 is already in history

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

Change-Id: I3555813a6c257b9a084febc50b50ebd0936df3e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:09:30 +00:00
Sarah Chin
a0ddaeb7c3 [automerger skipped] Merge "[MEP] Use switchToSub API with pending intent" am: 1abef7542a am: 9b9c5f2f93 am: 61ec9b6d70 -s ours am: a8312161c7 -s ours 
am skip reason: Merged-In I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205 with SHA-1 e28eaa725d is already in history

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

Change-Id: I861481b35d5bfba7c6052b83901a1620e3b12a98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 14:41:09 +00:00
Sarah Chin
a8312161c7 [automerger skipped] Merge "[MEP] Use switchToSub API with pending intent" am: 1abef7542a am: 9b9c5f2f93 am: 61ec9b6d70 -s ours 
am skip reason: Merged-In I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205 with SHA-1 e28eaa725d is already in history

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

Change-Id: Ic6ca95a4fb388ef93b63135e7064932406eec83a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 14:22:52 +00:00
Chaohui Wang
19e3f06952 Merge "Fix "Automatically sync app data" button state not changed" into tm-dev am: b94c0ab44e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397182

Change-Id: I70f5a1bf1039685b7602c8378d60bc3d6570e0fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 10:53:03 +00:00
Chaohui Wang
b94c0ab44e Merge "Fix "Automatically sync app data" button state not changed" into tm-dev 2022-03-29 10:36:31 +00:00
TreeHugger Robot
70155c7ebc Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" into tm-dev am: 670016a2ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17379163

Change-Id: I7d9a450f5047ce720dad26dad84fba25113da720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 07:03:57 +00:00
TreeHugger Robot
670016a2ee Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" into tm-dev 2022-03-29 06:33:46 +00:00
Bonian Chen
c676cbcaf3 Merge "[Settings] Code refactor - NetworkModePreference" into tm-dev am: 3df6924591 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286345

Change-Id: Id614300db4c1c1555bd963c0281b7ebb82b4a153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 05:06:22 +00:00
Bonian Chen
3df6924591 Merge "[Settings] Code refactor - NetworkModePreference" into tm-dev 2022-03-29 04:50:20 +00:00
Chaohui Wang
9d8603568d Fix "Automatically sync app data" button state not changed 
This issue is caused by mPreference is null.
(Not recovered when the fragment is recreated after configuration change.)

Mimic the PreferenceDialogFragmentCompat.getPreference() in AndroidX to
solve this issue.
https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:preference/preference/src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java;l=176;drc=ca9feb3b73769089afbfd36b4d4a3d91239f9cd5

Ideally in the long term, we could use PreferenceDialogFragmentCompat
instead.

Fix: 218754949
Test: robotest & manual
Change-Id: I7fc8dd3b771aa45c91f915e25c8cc6c6afdd8d63
 2022-03-29 12:32:23 +08:00
Bill Yi
b387657974 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I153402b8f77ce5d15360ede6ce234a994bcf7410
 2022-03-29 03:35:53 +00:00
Bill Yi
ac9baaee08 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8140f108bb0c0d00ba08b1fccab4b6fc9376d4dc
 2022-03-29 03:00:30 +00:00
Grace Cheng
a9318375ea Merge "Hide fingerprint setup animation from talkback users" into tm-dev am: 14ffe2a2ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17414126

Change-Id: Ia3f04dd73d8cc96ee51a492a756d020ce0761a86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 00:06:24 +00:00