PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
135,644 Commits 1 Branch 0 Tags
384ed0c9f0db109c4ba3d10f0bfc0230038aa79c
Commit Graph

135644 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Angela Wang
7a15ecafde Hide pair other ear button after device connected via CSIP 
The pair other ear button should disappear after both ears of binaural
hearing aids are connected.

Remove checking if CSIP is enabled since CSIP is always enabled in
pairing stage.

Bug: 296646732
Test: check the UI manually
Change-Id: I804819eef41b5d3754ad0a79d9fc1afc66cef5cc
 2023-09-19 04:49:35 +00:00
Xinyi Mao
b7b653d66e [automerger skipped] Merge "App anomaly tips on PowerUsage App list" into udc-qpr-dev am: 821ed07099 am: 8d91b3116b -s ours 
am skip reason: Merged-In Ic02db49cb3794ef134759d9dcec5f5ef32454a95 with SHA-1 56ba1c09d9 is already in history

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

Change-Id: I5916e93a6c1d88256641b766b92e9117da7b9e8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 03:38:48 +00:00
Treehugger Robot
88c1d16d8f Merge "Update the Spatial audio strings for tablet." into udc-qpr-dev am: 724e3c430d am: d297394f68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24632576

Change-Id: I8526c0e639b9952741303e8a766aad189ece025d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 03:37:30 +00:00
Xinyi Mao
8d91b3116b Merge "App anomaly tips on PowerUsage App list" into udc-qpr-dev am: 821ed07099 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24677374

Change-Id: I15dad922e0942175e56370a7001ada1afe2c19b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 03:36:03 +00:00
Xinyi Mao
821ed07099 Merge "App anomaly tips on PowerUsage App list" into udc-qpr-dev 2023-09-19 03:10:17 +00:00
Xinyi Mao
acb47b00f4 Merge "App anomaly tips on PowerUsage App list" into main 2023-09-19 03:09:48 +00:00
Charlotte Lu
4964deb8b5 Add ApnData class and SettingsOutlinedTextField. 
Bug: 298906796
Test: Munual
Change-Id: Iba6563fee091302989d2653c0b59b5c18accce4d
 2023-09-19 11:03:00 +08:00
Treehugger Robot
d297394f68 Merge "Update the Spatial audio strings for tablet." into udc-qpr-dev am: 724e3c430d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24632576

Change-Id: Iadc0656d48d1027123d6ea2f2186b7b8a23a9715
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 02:42:44 +00:00
Treehugger Robot
724e3c430d Merge "Update the Spatial audio strings for tablet." into udc-qpr-dev 2023-09-19 01:50:18 +00:00
Guojing Yuan
dfc20ff941 [CDM Perm Sync] Fix a NPE for Perm Sync toggle am: 8c51d9c71d am: cf705cf873 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24790419

Change-Id: I10fccd7b4036a57cdb665eb22a79b600fb006898
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-18 23:17:16 +00:00
Guojing Yuan
cf705cf873 [CDM Perm Sync] Fix a NPE for Perm Sync toggle am: 8c51d9c71d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24790419

Change-Id: I8cdf0fb8b740ffd32fac9c01aa0d4dfa51904b14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-18 22:20:37 +00:00
Becca Hughes
0335c2281a Use isPrimary bit when determining settings data change 
Test: ondevice
Bug: 300538357
Change-Id: Ic155835761f850358527648a0628b72aab9a2323
 2023-09-18 14:00:00 -07:00
Becca Hughes
d0375beae9 Fix crash in settings page (enterprise) 
Fixes a crash on the settings page
where the managed user fetcher
will return null.

Test: cts, atest, flash on enterprise device
Bug: 298678607
Change-Id: I8866bad92790f342a8a767b317967b5bf784d865
 2023-09-18 13:32:09 -07:00
Guojing Yuan
8c51d9c71d [CDM Perm Sync] Fix a NPE for Perm Sync toggle 
Bug: 290063372

Test: manual test on the breaking build.
Change-Id: I1f0a5c3840a4c97962fa9986d8f67ab0f652015f
 2023-09-18 18:44:10 +00:00
Behnam Heydarshahi
7549d613e6 Set a11y focus for selected Settings item 
When a Settings preference item is selected via a settings panel or
settings search, the system takes user to its corresponding subsettings
activity. There, in the past, the selected preference was highlighted
but the a11y focus was set on the back button. This code sets the a11y
focus on the selected preference.

Bug: b/285512439
Test: atest HighlightablePreferenceGroupAdapterTest
Change-Id: I7edc697e2e3870b1822279c115230add14e82df0
 2023-09-18 18:30:12 +00:00
Chaohui Wang
79f0f6e368 Clean up ChartDataUsagePreference.setColors() 
This method is no-op.

Bug: 290856342
Test: manual - on DataUsageList
Change-Id: Ice64630bc43afe7116b797425a5ea81b2d0ad5af
 2023-09-18 23:45:54 +08:00
Jason Chang
f0fccc22a4 Fix rotate device at face unlock detailed page, device will display 
redundant face unlock header.

In AndroidManifest.xml to apply Theme.Settings.NoActionBar theme
attribute to avoid action_bar appears accidentally.

Bug: 293978245

Test: manually check UI with reproducible steps:
Pre-Condition:
1) enroll face
2) enable auto rotate

Procedure:
1) go to settings > security > face & fingerprint unlock
2) enter screen lock
3) click face unlock
4) rotate device into landscape mode and then back to portrait mode
5) check the UI

Change-Id: I065ff5821a91eb8060dd98b373fce34cae769c66
 2023-09-18 12:28:43 +00:00
mxyyiyi
56ba1c09d9 App anomaly tips on PowerUsage App list 
Screenshots:
[in bg - banner] https://screenshot.googleplex.com/MzLC6LfX93TkkYf
[in bg - hints] https://screenshot.googleplex.com/9JLXNsRiVG8arAU
[in fg - banner] https://screenshot.googleplex.com/9oYbwUkeeLbQX2t
[in fg - hints] https://screenshot.googleplex.com/53DTTUCUnf8rsoE
[apps anomaly highlight hint + settings anomaly banner]
https://screenshot.googleplex.com/8NdS2VMrSzwv2DM

Bug: 291689643
Bug: 291689623
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bfd0f5859b6e5ffef4727ee562009f2050de7a58)
Change-Id: Ic02db49cb3794ef134759d9dcec5f5ef32454a95
 2023-09-18 10:41:27 +00:00
mxyyiyi
e9378d27f7 App anomaly tips on PowerUsage App list 
Screenshots:
[in bg - banner] https://screenshot.googleplex.com/MzLC6LfX93TkkYf
[in bg - hints] https://screenshot.googleplex.com/9JLXNsRiVG8arAU
[in fg - banner] https://screenshot.googleplex.com/9oYbwUkeeLbQX2t
[in fg - hints] https://screenshot.googleplex.com/53DTTUCUnf8rsoE
[apps anomaly highlight hint + settings anomaly banner]
https://screenshot.googleplex.com/8NdS2VMrSzwv2DM

Bug: 291689643
Bug: 291689623
Bug: 284893240
Test: manual
Change-Id: Ic02db49cb3794ef134759d9dcec5f5ef32454a95
Merged-In: Ic02db49cb3794ef134759d9dcec5f5ef32454a95
Merged-In: I7015cdf5a96d518febb160934d780ae84fe14427
 2023-09-18 18:28:20 +08:00
Treehugger Robot
71235aa403 Merge "Fixed the robo test failed in FoldLockBehaviorSettingsTest" into main 2023-09-18 07:36:10 +00:00
Sudheer Shanka
abbb5c4dc3 Add controls in dev options to quarantine apps. 
Bug: 297934650
Test: m -j RunSettingsRoboTests
Test: atest SettingsUnitTests
Change-Id: Ic0f35b370c04dd4ed3baaf3610b46ff1b37a0463
 2023-09-18 07:27:37 +00:00
Sunny Shao
572636110a Fixed the robo test failed in FoldLockBehaviorSettingsTest 
- Use the ShadowSystemSettings instead of SystemSettings.

Fixes: 300201006
Test: atest SettingsRoboTests:com.android.settings.display.FoldLockBehaviorSettingsTest
Change-Id: I360bda0b0b35692e0eaf2060aadb791ecb9dd039
 2023-09-18 14:27:16 +08:00
Charlotte Lu
fcf31b668d Merge "Use flag to switch to the new UI." into main 2023-09-18 05:24:30 +00:00
Charlotte Lu
0ce7202d7a Use flag to switch to the new UI. 
Bug: 194175217
Test: Munual
Change-Id: Ie3047cebd4a79dea07614b48ad33ba759802cbe8
 2023-09-18 12:03:27 +08:00
Alice Kuo
aa734eb52a Use system properties for the le audio toggle ui config instead 
Config LE audio UI per devices. Change to use system properties instead

Bug: 300807171
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioDeviceDetailsPreferenceControllerTest
Change-Id: Id0d624f516b9fdbe2380e5f10da5c69b08eea6a4
 2023-09-18 03:05:59 +00:00
Chaohui Wang
0cb8d91e4e Create DataUsageListAppsController 
Move apps group logic from DataUsageList.

Also add key to AppDataUsagePreference, which reduce flaky and keep
scroll position when back from app detail page.

Bug: 290856342
Test: manual - on DataUsageList
Test: unit test
Change-Id: I61e2b6bd9b192b7230e3553dbc6038f5d59bd303
 2023-09-17 13:51:11 +08:00
Chaohui Wang
56deb8465e New NetworkOperatorSettingsTest 
Also DataUsageSettingsTest and NfcSettingsTest.

Fix: 236276001
Test: ui test
Change-Id: Idba525e3d4bbf40fbb414cf76afb9c71166179d9
 2023-09-16 13:23:50 +08:00
Guojing Yuan
089318d92f [automerger skipped] Merge "[CDM] Add Permissions Sync toggle" into udc-qpr-dev am: d43d6f259a am: e0cce7bf6a -s ours 
am skip reason: Merged-In I75d4370eed98275e2f99d65620229bdb57193fb8 with SHA-1 756d23cad1 is already in history

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

Change-Id: I671bb4be5173026121760ab83d18ffde0137868b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 03:17:19 +00:00
Behnam Heydarshahi
e711c0f256 Merge "PanelSlicesAdapter: load slice label safely" into udc-qpr-dev am: c46e8546b5 am: a38edf1ab2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24664970

Change-Id: I09416fd5dee6842179358c6bb9bba6c533841045
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 02:55:24 +00:00
Treehugger Robot
f54ad5e03c Merge "Use launcher namespace instead of settings-ui namespace." into udc-qpr-dev am: d78136fe29 am: 713c4b3bf5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24761915

Change-Id: I319ee97f1105bc5cf83aa561ee336c0effc19414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 02:52:49 +00:00
Graciela Putri
13821ceb45 Merge "Remove moreOptions in aspect ratio settings" into udc-qpr-dev am: 263126b580 am: 285a139c6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24757660

Change-Id: I7fd06c631b9ad2ffd1749ec05f074883e730fe01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 02:52:37 +00:00
Treehugger Robot
ca00cd7778 [automerger skipped] Merge "Refresh title in the Network details header" into udc-qpr-dev am: 6aaf49dc1d am: 51749d4418 -s ours 
am skip reason: Merged-In I4634c152b550c59bd9854cde1b91da44442aa879 with SHA-1 54d0709409 is already in history

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

Change-Id: I528cc58cc5b2eebd0b90684de54efac56ca19831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 02:52:07 +00:00
Bill Yi
1411687465 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6601eee9a7 -s ours am: dc677b1dae -s ours am: 15d2faa382 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id745a2e010e67d0ed6ceae490362a1bbb3998852
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 02:31:07 +00:00
Bill Yi
1de52d2cbb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a0fbff331 -s ours am: 9132dea94c -s ours am: 0f7805baae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6d75c73f99dc99e77f02b16f1feab05ed2c5ecc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 02:31:04 +00:00
Bill Yi
c8d3c82a0e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 61f7c7c880 -s ours am: 7b008e0d30 -s ours am: 2d940f20b5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If08b297e01224dcf6855dc27cd2acfb4f811bc07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 02:31:01 +00:00
Bill Yi
71ce4344aa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3cedcebd1e -s ours am: a092264ef6 -s ours am: bbb4689c50 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If5d130f8688a385559bc3266403761d81a771853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 02:30:47 +00:00
Bill Yi
9947e031c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6d1533eec9 -s ours am: bd60635182 -s ours am: f3e92a07f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia6bb681ecfd3342bd0839e200bda35622e123436
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 02:30:31 +00:00
Bill Yi
c4eacb8d0f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f75591fa73 -s ours am: 9100600fc1 -s ours am: cba2a350d0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icececfb79e5d5238cbab51831b43a883c7b8f509
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 02:30:15 +00:00
Bill Yi
e87ba3651d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6601eee9a7 -s ours am: 14a4b2ac68 -s ours am: cb2ae5d9ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic4c6b4c27f1498e619db1faa1da7e0b1ce8afdbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 02:24:57 +00:00
Bill Yi
7e16bd12f1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a0fbff331 -s ours am: 17d779411a -s ours am: 52fdc92144 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia7020409018e70b867d06562a0124779a5cd4e52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 02:24:54 +00:00
Bill Yi
d96c68b0bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 61f7c7c880 -s ours am: 837abf9244 -s ours am: 68059e120b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec01161b470902165fab78238c3008cf4f6e0171
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 02:24:51 +00:00
Bill Yi
ca81d2ac22 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3cedcebd1e -s ours am: c66c9a3b8e -s ours am: df130891a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4cd972eceb6fd64d5389c1aabb6fb9c768328c75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 02:24:38 +00:00
Bill Yi
fadc888878 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6d1533eec9 -s ours am: 1c98d2236a -s ours am: 20def9d388 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I11427995bd6193a0a6f1800cc9bb40306d170ae7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 02:24:19 +00:00
Bill Yi
1f47c55166 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f75591fa73 -s ours am: 1840690d24 -s ours am: 02f11dcb34 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I146a3865b925d66e5378d85a0cde381d4bca0e9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 02:24:05 +00:00
Bill Yi
3eca78debd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859 -s ours am: 1f8443d6d2 -s ours am: 49e318ce55 -s ours am: 245712159f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7cb322a355234997d09b722d001f2b9f3052c7a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 01:48:10 +00:00
Bill Yi
2d856f42cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857 -s ours am: 250f3c8c9b -s ours am: 3cf873896e -s ours am: 1fd629396d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib787c46e604163528cd721c7b428784d6d6fa930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 01:48:07 +00:00
Bill Yi
aeb53231b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179 -s ours am: 44adc2b02a -s ours am: 465cf9500b -s ours am: 35d51f1fc8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd6a441644f129a472e5241cc4f22358eaa50f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 01:48:04 +00:00
Bill Yi
3f02db9afd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb -s ours am: 1605dfab0b -s ours am: 779bd81952 -s ours am: a80e2a969d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I751868270d0990b8f7f6d2ae8454087162407f64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 01:47:54 +00:00
Bill Yi
9459f3f372 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e -s ours am: 02cdab0a91 -s ours am: cc92c9228e -s ours am: 6f48b8c62c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If8299adb6c901d1fa389c6c0acf229687bdcdfe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 01:47:42 +00:00
Bill Yi
18049682bd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859 -s ours am: 1f8443d6d2 -s ours am: f673fe0435 -s ours am: 1d28dfd4f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I91f14c6155406517659b1ef6e9b1d45174febc1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 01:42:29 +00:00