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

102894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
0312b67407 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e3b581c350 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I26e318e71a59517302ae0db449f649f586766093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:39:34 +00:00
Lucas Silva
b31dbbb1cf Merge "Add hyphenation to customize button text." into tm-dev 2022-04-14 17:39:13 +00:00
Victor Truong
05e824e9e0 Set Active dream to not be clickable when active. 
Setting Active dream to not be clickable to stop Talkback from prompting
user to "Double tap to activate".

Bug: 228573813
Test: Manually tested on device.
Change-Id: I5f646bcf82d8c4172127f0739b6c0d7af890dabb
 2022-04-14 17:38:26 +00:00
Bill Yi
b67694c1cb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-14 17:17:45 +00:00
Bill Yi
89a0c5fb00 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-14 17:16:07 +00:00
Bill Yi
08549ed959 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-14 17:14:41 +00:00
TreeHugger Robot
940c2d25fb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-14 17:12:57 +00:00
TreeHugger Robot
b299745a6c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-14 17:12:54 +00:00
TreeHugger Robot
2212edb907 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-14 17:10:29 +00:00
TreeHugger Robot
2880f9c765 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-14 17:08:33 +00:00
TreeHugger Robot
55e91da24e Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-14 17:08:18 +00:00
TreeHugger Robot
e3b581c350 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-14 17:08:18 +00:00
Yuri Lin
554ab1fe3e Special handling for intent coming from "welcome" notification. 
This notification is an introduction to new notification permission changes in T and is shown to the user upon upgrade; this change records that the user has seen/interacted with the notification already so we don't have to keep showing it.

This change essentially makes a copy of the existing functionality of NotificationAppListActivity, but meant only for access internally (so that neither the activity nor the associated action is exported/publicly accessible).

Bug: 225373531
Test: manual with the change that sends the notification
Change-Id: I20c6084652ea11a8d0a002a21561fe50b9cf5de3
 2022-04-14 12:54:56 -04:00
TreeHugger Robot
de1481d68a Merge "Add 2 pixels to top of Advanced Options component" into tm-dev am: 37c2ac2c6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745804

Change-Id: I675e9e5e1100c91eb01639a020be65f0bdd47e64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 16:34:59 +00:00
Quang Luong
0bbdf3a983 Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17483256

Change-Id: I6839b69c92f10905e1386c0a4555a4c980eccebc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 16:34:52 +00:00
TreeHugger Robot
37c2ac2c6a Merge "Add 2 pixels to top of Advanced Options component" into tm-dev 2022-04-14 16:28:11 +00:00
Quang Luong
93ae7acbf4 Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev 2022-04-14 16:14:21 +00:00
Tsung-Mao Fang
de992a99f8 Merge "Use androidx.window from prebuilt." into tm-dev am: 7877c073e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17644388

Change-Id: I89af98755aef258bfa9234bcdd490ca9a43c9e94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 15:05:45 +00:00
Lucas Silva
1ccbf8b7d5 Add hyphenation to customize button text. 
In some languages, customize may be a long word which doesn't fit in a
single line and should be hyphenated.

Bug: 228329886
Test: locally on device
Change-Id: Ibf647fc4c18b3eb927f2b6f6ca018f2b38e6f7b1
 2022-04-14 14:48:14 +00:00
Tsung-Mao Fang
7877c073e5 Merge "Use androidx.window from prebuilt." into tm-dev 2022-04-14 14:40:21 +00:00
YK Hung
fe2e6b19d8 Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev am: 3a08246bd9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17751849

Change-Id: If8eba2fe329e9b4d078d2b9d25bc345480d9a64b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 14:33:31 +00:00
YK Hung
3a08246bd9 Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev 2022-04-14 14:12:33 +00:00
ykhung
39972db17d Pass the activtiy launch flags into the AdvancedPowerUsageDetail 
Bug: 227978302
Test: manual
Change-Id: I036bc90eb91fd59137b51817665378f218bbad1a
 2022-04-14 19:57:14 +08:00
SongFerng Wang
97b86392fb [automerger skipped] Merge changes I6871db6c,Ia261e3b4,I1588bd4a,I1b81faf0,I9a596440, ... am: 3e9e489c0c am: 459429c182 am: 9d10f0a9fb -s ours am: 68defd99f1 -s ours 
am skip reason: Merged-In I6871db6c2d8d7b9f3cb334bb5cd2c7978b5b3b85 with SHA-1 506c3df5b9 is already in history

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

Change-Id: Ida9b92e9fabcbdef72e5b011829c658796f7ba7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:35:23 +00:00
SongFerngWang
11213d623e [automerger skipped] In E+E, the user can't enable the PSIM am: ccd55cc5c9 am: 6282d8a5de am: 10d36c9800 -s ours am: d1ae5c3d08 -s ours 
am skip reason: Merged-In Ia261e3b41c6c4a43a5429815d93ae9f6ff16f0ec with SHA-1 68cfaafe73 is already in history

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

Change-Id: I08f71204bde6bc3ac730cf9b118de9b3af66caf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:35:22 +00:00
SongFerngWang
cc06f67db0 [automerger skipped] [MEP] psim's logical slot index is 0 am: 2479c9f7bd am: 83311b6208 am: bca382eefb -s ours am: f137d36ea7 -s ours 
am skip reason: Merged-In I1588bd4a2f552a6b41844883b6ad50f1bfec95de with SHA-1 0b948c827b is already in history

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

Change-Id: I26e1533faafa71b8bb4a068c0dee15ba62ff0cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:35:21 +00:00
SongFerngWang
bd457c3c5c [automerger skipped] [MEP] The condition of "null point check" is wrong am: 5c0df6913b am: 6a0742b2fb am: ffdf3513ec -s ours am: d625370f83 -s ours 
am skip reason: Merged-In I1b81faf082163643c1d17eae2f66d75b450288fe with SHA-1 ce8232d0a4 is already in history

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

Change-Id: I0e42a5db8d4449133810982658b8da7c242d82c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:35:19 +00:00
SongFerngWang
8c636211e4 [automerger skipped] Fix the settings crash when SimDialogActivity is null am: d786b64ff6 am: a800c05ac7 am: d65110a8ff -s ours am: 444690e5ec -s ours 
am skip reason: Merged-In I9a5964400a63053e362632944b9e7aa8ec1bbea8 with SHA-1 a3b98f5d04 is already in history

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

Change-Id: Ice4340331914db9b888587944a2bb6d9fbc9797d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:35:18 +00:00
SongFerngWang
044697cd7d [automerger skipped] [MEP] The subscriptionInfo's getSimSlotIndex is logical slotId am: 7ab547f1b8 am: bfe417ee13 am: 56f8390f6e -s ours am: 3b41ab2116 -s ours 
am skip reason: Merged-In I7fef78547f4e6283791cd15a03275eaefeb50e3c with SHA-1 e90d80cc52 is already in history

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

Change-Id: Ibb0124dc309fc5c78add6f9fd3fca30f49461ad3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:35:17 +00:00
SongFerngWang
30af06f976 [automerger skipped] [MEP] the port id is wrong am: 9ee91da8e1 am: f80bc78252 am: b8a9355134 -s ours am: 9d3385835f -s ours 
am skip reason: Merged-In I70a02299c40ada4c2a700fc035034e8db24b6f03 with SHA-1 28e8f4d65a is already in history

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

Change-Id: Ide340d06ddf0847eaa4e9b0b1355c12446007036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:35:16 +00:00
SongFerngWang
55e7c1c807 [automerger skipped] [MEP] Inserting a pSIM while user has 2 esims, showing the MEP dialog am: 650b048749 am: e0e40b1e88 am: f74ef50676 -s ours am: aa0b021163 -s ours 
am skip reason: Merged-In I48fa3d483873315d7e05b39369085c48af779522 with SHA-1 c747455196 is already in history

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

Change-Id: Ib5d47229c5b6baf3c0de8ca19d57158421d9e6c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:35:15 +00:00
SongFerngWang
1f91638bfc [automerger skipped] [MEP] Refactor SlotSidecar API for all of sim page. am: 3597302ae1 am: f54b0ca79f am: bb912216d7 -s ours am: c4c07f8b8b -s ours 
am skip reason: Merged-In I81479a0c514f2b8f58b9167b31d357f017732482 with SHA-1 4d0749febd is already in history

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

Change-Id: I988a5cb4cdd7a7ecaf3097cb77c52bacbf475c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:35:13 +00:00
SongFerngWang
e4eb489087 [automerger skipped] [MEP]The Esim's PhysicalSlotIndex is wrong am: d3f3730721 am: f795e9b6d0 am: 4d039eaefc -s ours am: 06090f9837 -s ours 
am skip reason: Merged-In Ic43d6c4a3209d24673769b71b9a148e780ee81ab with SHA-1 28bed8ec9f is already in history

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

Change-Id: I8d7316751687c3272cba45b00ea0fc318ff9b5e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:35:12 +00:00
SongFerngWang
0b4df9c03f [automerger skipped] Lost code for setting the list as visible am: 130b739ed1 am: 2b02a6f3d2 am: 094ba6c077 -s ours am: c72a358a86 -s ours 
am skip reason: Merged-In If6ad5422a820627873e58b144e7b65a8b0130def with SHA-1 04eec0382c is already in history

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

Change-Id: I88fa58bb2b18667b7f5eb91c393627c154eca8cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:35:11 +00:00
SongFerngWang
e70a226a70 [automerger skipped] The list does not follow the UX dialog design doc in alert dialog. am: f88ffb09fd am: a6794dcc8a am: 22f38eeacd -s ours am: 334a700309 -s ours 
am skip reason: Merged-In I758d60202fcf477aeb49014e60b949e7ad08c082 with SHA-1 f2a8008ae3 is already in history

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

Change-Id: I98c8ba20ab9f56550601591fa55a607ef35e7874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:35:10 +00:00
SongFerngWang
5b8ece05f8 [automerger skipped] The carrier name is wrong in the dialog am: f513452d4b am: c70bde0995 am: d4ca5a289f -s ours am: e194be8946 -s ours 
am skip reason: Merged-In I894c78fccab511f26bf779638cac1f18a07a86c4 with SHA-1 b5766e4422 is already in history

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

Change-Id: Ifabd9b315f9f0e32aea24c64e084e6222c43e3bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:35:09 +00:00
SongFerngWang
3983b43715 [automerger skipped] Refine the mobile data selection UI am: 964c7d5eaf am: d4b95990e9 am: de8a16419e -s ours am: e630379229 -s ours 
am skip reason: Merged-In I1ec587fd9d64ad67bbf3479c7931c0a901f572cf with SHA-1 43ebe68063 is already in history

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

Change-Id: I3b90c19b5756a6dc7b98c1fa81229704a46f5d26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:35:07 +00:00
SongFerng Wang
8cde4c0745 Merge "Hide the Contact sharing toggle for LE audio mode" am: 3f830cc646 am: 1e89cd323e am: 028ad8fd3d am: b1166a441c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063555

Change-Id: Ifafae2079cf881aa64285e40759f8a2946034385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:34:43 +00:00
SongFerng Wang
68defd99f1 [automerger skipped] Merge changes I6871db6c,Ia261e3b4,I1588bd4a,I1b81faf0,I9a596440, ... am: 3e9e489c0c am: 459429c182 am: 9d10f0a9fb -s ours 
am skip reason: Merged-In I6871db6c2d8d7b9f3cb334bb5cd2c7978b5b3b85 with SHA-1 506c3df5b9 is already in history

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

Change-Id: I89670238b2c3a2b8010be65e01935e6285685c9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:13:05 +00:00
SongFerngWang
d1ae5c3d08 [automerger skipped] In E+E, the user can't enable the PSIM am: ccd55cc5c9 am: 6282d8a5de am: 10d36c9800 -s ours 
am skip reason: Merged-In Ia261e3b41c6c4a43a5429815d93ae9f6ff16f0ec with SHA-1 68cfaafe73 is already in history

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

Change-Id: I1d01c1a36348277b6d124ab24c9d55dfc6abb661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:13:04 +00:00
SongFerngWang
f137d36ea7 [automerger skipped] [MEP] psim's logical slot index is 0 am: 2479c9f7bd am: 83311b6208 am: bca382eefb -s ours 
am skip reason: Merged-In I1588bd4a2f552a6b41844883b6ad50f1bfec95de with SHA-1 0b948c827b is already in history

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

Change-Id: I8c09155fff1c19fbd7b364dfb6ecce726136e8a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:13:02 +00:00
SongFerngWang
d625370f83 [automerger skipped] [MEP] The condition of "null point check" is wrong am: 5c0df6913b am: 6a0742b2fb am: ffdf3513ec -s ours 
am skip reason: Merged-In I1b81faf082163643c1d17eae2f66d75b450288fe with SHA-1 ce8232d0a4 is already in history

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

Change-Id: I7c17b66a62c4e72ec144fcad8bde4ced635d6944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:13:00 +00:00
SongFerngWang
444690e5ec [automerger skipped] Fix the settings crash when SimDialogActivity is null am: d786b64ff6 am: a800c05ac7 am: d65110a8ff -s ours 
am skip reason: Merged-In I9a5964400a63053e362632944b9e7aa8ec1bbea8 with SHA-1 a3b98f5d04 is already in history

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

Change-Id: I9ae74a72fbc0c9db915efdb50bf815a7714f39b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:12:59 +00:00
SongFerngWang
3b41ab2116 [automerger skipped] [MEP] The subscriptionInfo's getSimSlotIndex is logical slotId am: 7ab547f1b8 am: bfe417ee13 am: 56f8390f6e -s ours 
am skip reason: Merged-In I7fef78547f4e6283791cd15a03275eaefeb50e3c with SHA-1 e90d80cc52 is already in history

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

Change-Id: I47066cf1aff7fb24c554eb386718a2fb4d565efb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:12:57 +00:00
SongFerngWang
9d3385835f [automerger skipped] [MEP] the port id is wrong am: 9ee91da8e1 am: f80bc78252 am: b8a9355134 -s ours 
am skip reason: Merged-In I70a02299c40ada4c2a700fc035034e8db24b6f03 with SHA-1 28e8f4d65a is already in history

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

Change-Id: Icfb8f9dc004bcbac53bc39b78092c3bc7abd0b1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:12:55 +00:00
SongFerngWang
aa0b021163 [automerger skipped] [MEP] Inserting a pSIM while user has 2 esims, showing the MEP dialog am: 650b048749 am: e0e40b1e88 am: f74ef50676 -s ours 
am skip reason: Merged-In I48fa3d483873315d7e05b39369085c48af779522 with SHA-1 c747455196 is already in history

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

Change-Id: I00556eb13b1b2bd14f7b098a3565724739af050b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:12:53 +00:00
SongFerngWang
c4c07f8b8b [automerger skipped] [MEP] Refactor SlotSidecar API for all of sim page. am: 3597302ae1 am: f54b0ca79f am: bb912216d7 -s ours 
am skip reason: Merged-In I81479a0c514f2b8f58b9167b31d357f017732482 with SHA-1 4d0749febd is already in history

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

Change-Id: I59e8f3f102530f7ba3306ca8ba4afbc575f980a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:12:52 +00:00
SongFerngWang
06090f9837 [automerger skipped] [MEP]The Esim's PhysicalSlotIndex is wrong am: d3f3730721 am: f795e9b6d0 am: 4d039eaefc -s ours 
am skip reason: Merged-In Ic43d6c4a3209d24673769b71b9a148e780ee81ab with SHA-1 28bed8ec9f is already in history

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

Change-Id: I9ea7a2cd19570d60773de57ad39c013177ee6371
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:12:49 +00:00
SongFerngWang
c72a358a86 [automerger skipped] Lost code for setting the list as visible am: 130b739ed1 am: 2b02a6f3d2 am: 094ba6c077 -s ours 
am skip reason: Merged-In If6ad5422a820627873e58b144e7b65a8b0130def with SHA-1 04eec0382c is already in history

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

Change-Id: I59f61990534fb7ebcf6076c4d3095eeecae04981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:12:48 +00:00
SongFerngWang
334a700309 [automerger skipped] The list does not follow the UX dialog design doc in alert dialog. am: f88ffb09fd am: a6794dcc8a am: 22f38eeacd -s ours 
am skip reason: Merged-In I758d60202fcf477aeb49014e60b949e7ad08c082 with SHA-1 f2a8008ae3 is already in history

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

Change-Id: Ia2c3a0b1c7b413bb8945835e7d853fe83dc10c68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:12:46 +00:00