PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,666 Commits 1 Branch 0 Tags
2fe33aa7acd7b779ff47201ef149d36bd97b7580
Commit Graph

120666 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tiger Huang
2fe33aa7ac Merge "Add an developer option to enable config_navBarDefaultTransparent" into udc-dev am: 2238b4e807 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21519268

Change-Id: Ic22cc9637bdcde8bfaff44f9a3c8d25794408f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 12:59:21 +00:00
Tiger Huang
2238b4e807 Merge "Add an developer option to enable config_navBarDefaultTransparent" into udc-dev 2023-03-08 12:47:29 +00:00
Maciej Żenczykowski
7477332a61 Merge "settings: allow enabling ethernet tethering independent of link state" am: 905d584b15 am: f73112b56e am: 7e21dec65e am: 850993d166 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2475089

Change-Id: I50ac04fe755c24fc9f32aba71c03bd361c6ca3ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 06:03:23 +00:00
Maciej Żenczykowski
850993d166 Merge "settings: allow enabling ethernet tethering independent of link state" am: 905d584b15 am: f73112b56e am: 7e21dec65e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2475089

Change-Id: I5e5711aeb90bb8bd860fd8515975f2b7d90ce689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 05:28:51 +00:00
Maciej Żenczykowski
7e21dec65e Merge "settings: allow enabling ethernet tethering independent of link state" am: 905d584b15 am: f73112b56e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2475089

Change-Id: I68e8a5898af8426250e1f0eb2d187e977f82dd13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 04:15:54 +00:00
Maciej Żenczykowski
f73112b56e Merge "settings: allow enabling ethernet tethering independent of link state" am: 905d584b15 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2475089

Change-Id: I3976958e427d18b9b5c3d6ce59cb45969145fa23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 03:41:54 +00:00
Ankita Vyas
03f3ff3d6d Merge "Add config for display Cloned Apps page in Settings." into udc-dev am: 080e4b02c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21734149

Change-Id: I2cc4f828af525b1835b9cc85731d5b358faabdf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 03:26:07 +00:00
Maciej Żenczykowski
905d584b15 Merge "settings: allow enabling ethernet tethering independent of link state" 2023-03-08 03:05:53 +00:00
Ankita Vyas
080e4b02c7 Merge "Add config for display Cloned Apps page in Settings." into udc-dev 2023-03-08 02:48:24 +00:00
Candice Lo
68d7e80bca Merge "Set the settings key when the font size is changed" into udc-dev am: 0290fb1cf3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21858523

Change-Id: I3211ab9df213d7614f5d400c3326d2a8c9d58cfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 01:18:58 +00:00
Patrick Rohr
6f9062297f settings: allow enabling ethernet tethering independent of link state 
A user should be able to enable tethering even if the interface does not
have link yet. Therefore, the toggle should be active if any interface
is available, independent of its link state.

Test: TH
Bug: 234036868
Change-Id: I2ae25207a766d71217dd6d17f3f9b74ceb261238
 2023-03-08 00:57:03 +00:00
Candice Lo
0290fb1cf3 Merge "Set the settings key when the font size is changed" into udc-dev 2023-03-08 00:41:02 +00:00
Becca Hughes
f4c15c8921 Merge "Move CredentialProviderInfo for test/settings (settings)" into udc-dev am: 9e2e47c553 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21546156

Change-Id: I94e5b6495d8e45584c6bc7f8e11eeb2412da2432
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 22:58:08 +00:00
Becca Hughes
9e2e47c553 Merge "Move CredentialProviderInfo for test/settings (settings)" into udc-dev 2023-03-07 22:40:46 +00:00
Julia Reynolds
d647dabea4 [automerger skipped] Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb am: 56e2a08f3f am: 769dc23f37 am: 0cb9c59631 -s ours am: e84f0aeda4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I960b475282677438d191e0bcd22e95705c72c498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 21:43:55 +00:00
Valentin Iftime
16ac7dfefe [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7 am: fe2ad5085f am: b25fcaab93 am: 1dd5830b05 -s ours am: 0b42ff676a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e89da484737f6a16c6c9be4a073b2587839f2af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 21:43:41 +00:00
Iavor-Valentin Iftime
5f4d2903ef [automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4 am: e116e63a91 -s ours am: 91ade78763 -s ours am: 89c9dc07df -s ours am: 7a997113d1 -s ours am: 5cd3dc7d1d -s ours am: 66b0c4e41b -s ours am: fa8d8ba74c -s ours am: 67fb12cbfd -s ours am: 6bf58bff25 -s ours 
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3 is already in history

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

Change-Id: I077165d521212bbf115f1f380ac10bfe2e29e1d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 21:40:31 +00:00
Presubmit Automerger Backend
1141961afe [automerger skipped] [automerge] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails 2p: 9a7bd79ca3 am: dbd4423d03 -s ours am: 3d35d4f195 -s ours am: d9561eccb6 -s ours am: ca46a99755 -s ours am: 27a594a80a -s ours am: def8d0261d -s ours am: a24080f47f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3ea3744bbe9991e03d31cbf2ea1448d8193196b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 21:38:19 +00:00
Valentin Iftime
7e3d7f7cbb [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: d374ca1324 -s ours am: 34c63adf58 -s ours am: 0fd2472a0a -s ours am: f383a0a176 -s ours am: cf9f09008b -s ours am: ed73e49a2c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ae3afbd925b1396d302b2ff433fe0e87c2c075f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 21:34:09 +00:00
Julia Reynolds
e84f0aeda4 [automerger skipped] Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb am: 56e2a08f3f am: 769dc23f37 am: 0cb9c59631 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I05e42da71f9c3dc7ebed33cc511d2c773ea48daf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 21:24:20 +00:00
Valentin Iftime
0b42ff676a [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7 am: fe2ad5085f am: b25fcaab93 am: 1dd5830b05 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaaee2a2cb381616fb44c78e48d8956df187650c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 21:23:55 +00:00
Iavor-Valentin Iftime
6bf58bff25 [automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4 am: e116e63a91 -s ours am: 91ade78763 -s ours am: 89c9dc07df -s ours am: 7a997113d1 -s ours am: 5cd3dc7d1d -s ours am: 66b0c4e41b -s ours am: fa8d8ba74c -s ours am: 67fb12cbfd -s ours 
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3 is already in history

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

Change-Id: Ieab49e4788480ca22ddc26998640fa1c2955146e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 21:20:24 +00:00
Presubmit Automerger Backend
a24080f47f [automerger skipped] [automerge] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails 2p: 9a7bd79ca3 am: dbd4423d03 -s ours am: 3d35d4f195 -s ours am: d9561eccb6 -s ours am: ca46a99755 -s ours am: 27a594a80a -s ours am: def8d0261d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9a458d6df499022ed9ded204e344397e8d311d4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 21:13:35 +00:00
Valentin Iftime
ed73e49a2c [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: d374ca1324 -s ours am: 34c63adf58 -s ours am: 0fd2472a0a -s ours am: f383a0a176 -s ours am: cf9f09008b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3aa4a584e42eef11cc12c790488aff284cd93acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 20:44:33 +00:00
Patty Huang
41129ad8f6 Merge "Add LE Audio allow list feature switcher in the developer option menu" am: 5bb798f518 am: 0086b200d0 am: ced8230ee9 am: 9745460cad 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2387973

Change-Id: I48a46d9c549756176884690f011641cf28f3a041
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 20:17:21 +00:00
Patty Huang
9745460cad Merge "Add LE Audio allow list feature switcher in the developer option menu" am: 5bb798f518 am: 0086b200d0 am: ced8230ee9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2387973

Change-Id: I30cf2f5e5fcf534877986839aba2f908b8f3b461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 19:44:08 +00:00
Treehugger Robot
e156d81b9f [automerger skipped] Merge "Add getSubscriptionId API" am: 7813c4a9a3 am: 5e84729b10 am: 98a648d4f2 -s ours am: 3e7889ce0d -s ours 
am skip reason: Merged-In I0a43d33daf523e6f0bea054c8965281bafbbcaa4 with SHA-1 f4982a080b is already in history

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

Change-Id: I8d57c15841efe6546f32a81501af96e6346980db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 19:29:44 +00:00
Treehugger Robot
3e7889ce0d [automerger skipped] Merge "Add getSubscriptionId API" am: 7813c4a9a3 am: 5e84729b10 am: 98a648d4f2 -s ours 
am skip reason: Merged-In I0a43d33daf523e6f0bea054c8965281bafbbcaa4 with SHA-1 f4982a080b is already in history

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

Change-Id: I63e0e83bad08da0869f07ae4b58c18f2e80cd874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 19:00:10 +00:00
Matías Hernández
f4246207e5 Merge "Don't allow setting channels to bypass DND if the app cannot show notifications" into udc-dev am: 4f4368b7c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21873239

Change-Id: Ia323480883767904e0ab753d042cd8a774430431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 18:25:18 +00:00
Matías Hernández
4f4368b7c2 Merge "Don't allow setting channels to bypass DND if the app cannot show notifications" into udc-dev 2023-03-07 18:18:27 +00:00
Becca Hughes
e174f66a71 Move CredentialProviderInfo for test/settings (settings) 
This is a precusor CL to adding a subtitle for settings
to use so we need to move CPI where it can be used
by settings, atest and CTS.

Test: ondevice & atest & cts
Bug: 253157366
Change-Id: Ief25f562eb5c2ca4438701de8a8e26941a8370a3
(cherry picked from commit on googleplex-android-review.googlesource.com host: 573e844275)
Merged-In: Ief25f562eb5c2ca4438701de8a8e26941a8370a3
 2023-03-07 17:14:09 +00:00
Candice Lo
dbaea0f1c2 Set the settings key when the font size is changed 
The key ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED will be always ON
after users modify the font size for the first time.

Bug: 269679768
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FontSizeDataTest
Change-Id: I382e4ecd3c335d7b046f157cedc093fc40c3a77a
 2023-03-07 15:42:29 +00:00
Matías Hernández
bf1b95e0fe Don't allow setting channels to bypass DND if the app cannot show notifications 
The fix makes the flow more consistent with preexisting behavior:
* Apps appear in the "Apps that can interrupt" section only if some channels are set to bypass DND *and* the app is able to show notifications.
* Channels cannot be set to bypass if those individual channels are blocked.

Fixes: 265064188
Test: atest AppChannelsBypassingDndPreferenceControllerTest
Change-Id: If10f086fd60f0f70f53adb8f5cd67f90936bc35f
 2023-03-07 16:41:36 +01:00
TreeHugger Robot
f0d12adb00 Merge "Fix battery saver switch test case" into udc-dev am: e4058d20a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809668

Change-Id: I8158359950190992acbab484f1d369c4d06ab780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 13:53:23 +00:00
TreeHugger Robot
e4058d20a7 Merge "Fix battery saver switch test case" into udc-dev 2023-03-07 13:13:19 +00:00
Wesley Wang
5d18287b3b Fix battery saver switch test case 
- Fix the test fail which cause by ag/21784766, and also mentioned at
   ag/21644522

Bug: 260380584
Test: make SettingsRoboTests
Change-Id: I72a7a24f57a7eeeacefeb40eef3025398329379b
 2023-03-07 11:44:55 +00:00
Sunny Shao
f336246896 Merge "Add the SPA page enter/leave logging metrcis." into udc-dev am: cb24cb29db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21787864

Change-Id: I68678e710d61ca13a8a7f1790a83880e6e26b486
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 10:22:58 +00:00
Daniel Huang
fb03625f42 Merge "Update KeyboardLayoutPickerControllerTest" into udc-dev am: a2375807ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809665

Change-Id: Ied198e591c3d003dc6a9f763f8268c3f457ef0d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 10:22:18 +00:00
Sunny Shao
cb24cb29db Merge "Add the SPA page enter/leave logging metrcis." into udc-dev 2023-03-07 10:12:55 +00:00
Daniel Huang
a2375807ec Merge "Update KeyboardLayoutPickerControllerTest" into udc-dev 2023-03-07 10:08:10 +00:00
SongFerng Wang
c680bd69c3 Merge "Using upper case country code" into udc-dev am: 524b15c627 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809663

Change-Id: Id4b6f60415b6d029df04c60d956b88a8cfb0558b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 10:05:05 +00:00
SongFerng Wang
524b15c627 Merge "Using upper case country code" into udc-dev 2023-03-07 09:43:30 +00:00
danielwbhuang
cf4be05b64 Update KeyboardLayoutPickerControllerTest 
The logic is changed, so we need to update the test. (https://screenshot.googleplex.com/AnrJgmGfK2fPxmQ.png)

Bug: 270109384
Test: atest KeyboardLayoutPickerControllerTest
[1/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#isAlwaysAvailable: PASSED (5.876s)
[2/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#test_createPreferenceHierarchy_shouldAddTwoPreference: PASSED (192ms)
[3/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testOnDeviceRemove_getSameDevice_shouldFinish: PASSED (5.797s)
[4/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testLifecycle_onStart_shouldRegisterInputManager: PASSED (1.495s)
[5/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#test_createPreferenceHierarchy_shouldAddOnePreference: PASSED (75ms)
[6/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testOnDeviceRemove_getDifferentDevice_shouldNotFinish: PASSED (366ms)
[7/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testLifecycle_onStop_shouldCancelRegisterInputManager: PASSED (65ms)
[8/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testLifecycle_onStart_NoInputDevice_shouldReturn: PASSED (309ms)

Change-Id: I018873cba9e73c6d684d828858cc1b08d3f2f7f9
 2023-03-07 16:31:15 +08:00
SongFerngWang
d1d1ecc9d3 Using upper case country code 
According to the ISO 3166-1, the two letters country code is upper case.

Bug: 271753491
Test: build pass and local test
Change-Id: Ia71cb6de45682407e4d988522c50d83659fe0017
 2023-03-07 16:27:36 +08:00
Sunny Shao
de797e1198 Add the SPA page enter/leave logging metrcis. 
- Add the SpaLogProvider and SpaLogData for logging writing.
- Write the SPA page enter/leave logging.

Fixes: 271793388
Bug: 253979024
Test: atest SpaActivityTest SpaLogDataTest MetricsDataModelTest
Change-Id: I0ad5af39ba207ac00d58f6392496effa3adc42f4
 2023-03-07 16:10:56 +08:00
Angela Wang
8ec2b4b113 Merge "Updates to use flash notification settings keys in settings provider" into udc-dev am: ccb009c34f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21507358

Change-Id: Idf61369b8241d9b6da635e45c6986560a35c3cef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 07:19:20 +00:00
Angela Wang
ccb009c34f Merge "Updates to use flash notification settings keys in settings provider" into udc-dev 2023-03-07 06:58:53 +00:00
Tom Hsu
358c2d9aaa Merge "Add confirmation dialog for system locale change." into udc-dev am: 39129e09d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21740799

Change-Id: I0e603ed199f26e043502408da66f12c71280309b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 03:47:11 +00:00
Tom Hsu
39129e09d3 Merge "Add confirmation dialog for system locale change." into udc-dev 2023-03-07 03:31:02 +00:00
Julia Reynolds
c469bfbaa2 [automerger skipped] Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb am: 03d8116dec -s ours am: a5cb399e33 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idec70387698702bbcbfea68d4d5d2b61606595cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 01:56:11 +00:00