PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
130,241 Commits 1 Branch 0 Tags
efa54fce9cfd4a8eeda7263338f7cf4d8ca0268c
Commit Graph

130241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chun-Ku Lin
de5809a4f6 Pass the constant actionId directly when calling 
performAccessibilityAction

**Root cause**
When constructing an AccessibilityAction, robolectric's
ShadowAccessibilityAction uses reflection to get the private static
final variable `ACTION_TYPE_MASK` to check if the passed action is a
valid action.

However, since ag/I744b3a94fe3c3cc3b559758a95ab0b5b181155bb we renamed
the internal variable, hence robolectric is not able to find the
ACTION_TYPE_MASK variable when using reflection.

By passing the action id directly when calling
performAccessibilityAction, we don't need to use
ShadowAccessibilityAction anymore.

Bug: 279082331
Test: atest AccessibilityQuickSettingsTooltipWindowTest

Change-Id: Ie956de44c9b19a2d19470ad670866d77ca272b3b
 2023-06-02 23:23:22 +00:00
TreeHugger Robot
3362e7999e Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51 am: 4834abe241 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: I77fd8d9224b1d9428aea7b14ba8924fd8cedead5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 23:12:36 +00:00
TreeHugger Robot
965278dc4d Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: a7b0933819 am: f716dc591a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: Iedeec213bb906a6a65f0ac8e85297e80742bc60f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 23:12:10 +00:00
TreeHugger Robot
f6f0c966a9 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51 am: 565f4b5730 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: I045be75427f44db3ca778391bb64cbfe81822c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 23:10:47 +00:00
TreeHugger Robot
e22ced8920 Merge "Fix AccessibilityButtonFragmentTest" 2023-06-02 23:07:47 +00:00
Chun-Ku Lin
c7cd3783ba Fix ToggleFeaturePreferenceFragmentTest#setupFragment_getExpectedPreferenceScreenResId 
**Root cause**
Robolectric doesn't like to launch a spy'ed fragment. You will get an
error like java.lang.IllegalStateException: Can't access ViewModels from detached fragment

Since the test itself doesn't require launch a fragment, I removed the
setup part and renamed the test.

Bug: 279082331
Test: atest ToggleFeaturePreferenceFragmentTest
Change-Id: Iafc431fd8c9cf7812ea99164e5e85683f3e0c121
 2023-06-02 22:52:13 +00:00
TreeHugger Robot
916c168218 Merge "Add @UsesReflection to FeatureFactory reflection usage" 2023-06-02 22:47:10 +00:00
Jason Chiu
f6d48fd77c Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae am: a8142278e9 am: 8d939360ec am: 13873ddeda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247

Change-Id: I3d52a6c0e64105f89dc104f65a6acd3e95bb3b08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 22:23:54 +00:00
TreeHugger Robot
f716dc591a Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: a7b0933819 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: Idd15de9c7629187ee022bc01b16fba419857cb66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 22:23:53 +00:00
TreeHugger Robot
4834abe241 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: I763e30e24d32f456b30bf174eeacc899149b0ffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 22:23:17 +00:00
TreeHugger Robot
701610cd39 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: ac91d63f00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: I240fa0143b223161965c470d6eaae678c0133026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 22:21:54 +00:00
TreeHugger Robot
565f4b5730 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: I2bc382165446ca91d4662b151174463781ae5c4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 22:21:34 +00:00
Taran Singh
9260c67352 DO NOT MERGE: Prevent non-system IME from becoming device admin 
Currently selected IME can inject KeyEvent on DeviceAdminAdd screen to
activate itself as device admin and cause various DoS attacks.

This CL ensures KeyEvent on "Activate" button can only come from system
apps.

Bug: 280793427
Test: atest DeviceAdminActivationTest
Change-Id: I6470d1684d707f4b1e86f8b456be0b4e0af5f188
(cherry picked from commit 70a501d02e)
 2023-06-02 22:20:30 +00:00
Chun-Ku Lin
e63659e6db Fix AccessibilityButtonFragmentTest 
**Root cause**
We expected the spy resources will be used when calling
context.getResources(). However, we didn't set up the connection. Hence
the test failed due to trying to use the original resources.

Bug: 279082331
Test: atest AccessibilityButtonFragmentTest
Change-Id: Ib6e51b2b2607bec7980b9288a0a8076e4a036863
 2023-06-02 22:15:15 +00:00
Jason Chiu
7768f56635 Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae am: ac614d26f0 am: 52df3a5f64 am: 2191eb763e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247

Change-Id: I40fa171f4805849e892fdcd7cb566f5368fd433d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 22:01:56 +00:00
TreeHugger Robot
a7b0933819 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: Ic495c899a15cfbfaca7edb76f4be6cb79c8f8c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 21:37:08 +00:00
TreeHugger Robot
cd51494303 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: I010e1b780b880a07990a572e06015670803af3a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 21:37:00 +00:00
TreeHugger Robot
ac91d63f00 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: I924f88568e39e4dd6fe8be4bbced5c69d72cac0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 21:36:43 +00:00
TreeHugger Robot
f0503e2a51 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: Ifdc153ead7f9c45046bf5df96b1d44cd576f561b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 21:36:40 +00:00
Jason Chiu
50b64ad622 Merge "Do not init dashboard categories when SetupWizard isn't finished yet" am: 428e97cdfa am: 390c348d4b am: 2b8067e797 am: d103243e8b am: 933d3279a1 am: 9b0c989265 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608473

Change-Id: I8c35bca4ef1fd104bfb5759ddd6051c1fab12be7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 20:52:58 +00:00
TreeHugger Robot
25d24e0cf0 Merge "Restrict SimDialogActivity" into udc-dev 2023-06-02 20:41:47 +00:00
Jared Duke
2278b3f952 Add @UsesReflection to FeatureFactory reflection usage 
Ensure FeatureFactory implementations are kept using a @UsesReflection
annotation at the callsite where they are instantiated via reflection.

Bug: 272041779
Test: m + validate FeatureFactoryImpl is kept
Change-Id: Ia9b8c4fd2c438805f33561dcacd5c10ed49dee19
 2023-06-02 20:30:39 +00:00
Chaohui Wang
aeb630b1f5 Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 2f3132c132 am: 27000f18aa am: 6186231aa9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250

Change-Id: Id95986075fffe9b5ea74188e942138b3db46ee21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 19:42:15 +00:00
Chaohui Wang
05f1ec0685 Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792c2 am: 64d1cc6a13 am: 5ba8511fc7 am: a310e7235d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484426

Change-Id: I29a78c5bfeb2f388534dda31024c421c153f4a32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 19:42:06 +00:00
Chaohui Wang
498acf1628 Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 3916082b8a am: 6a8c87c194 am: e334639a8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250

Change-Id: I0a91d10f602ecdbe59674586acfe232316b06a7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 19:41:39 +00:00
Chaohui Wang
dd4c639517 Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792c2 am: 129e80c7d8 am: 623f93a963 am: d6819273ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484426

Change-Id: I118be416c46f4b322f6765a5de6ede84b5bf3f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 19:41:30 +00:00
Treehugger Robot
7f3fd90d15 Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635 am: 3b13b37028 am: 0339f763b9 am: 425c4da7d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077

Change-Id: I0a5ad0e04318769d7ff78ffaa899f66ffbca6a00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 19:41:20 +00:00
Yanli Wan
11d3da27c0 Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678 am: 4764e9a4da am: 41b7cb56c7 am: 1d471854ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457

Change-Id: I1e1b12579cef140684f1eca223541494a2253d67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 19:41:13 +00:00
Treehugger Robot
7ea0951b61 Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635 am: 91737c0b3b am: da647c56cf am: 73147518c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077

Change-Id: Ic0b2ebd6342c6ca11fe16e70afde3c61c79c4b34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 19:41:05 +00:00
Yanli Wan
d4276a8a12 Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678 am: f120e3d563 am: c7ba6daae6 am: cdffe9016b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457

Change-Id: I055bfef3a63b6b848662b548c684fd2bd8c4e7ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 19:40:57 +00:00
TreeHugger Robot
f3dc050a3a Merge "Default show LE audio toggle in Device Detail" into udc-d1-dev am: df23aab9bf am: f2e08c31a5 am: 1b59061046 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486040

Change-Id: I6613e5c5ba5937d782af96220588061091f75637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 19:40:47 +00:00
TreeHugger Robot
cddd329f80 Merge "Fix ToggleScreenMagnificationPreferenceFragmentTest" 2023-06-02 19:39:07 +00:00
TreeHugger Robot
f58dccad49 [automerger skipped] Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e am: 07366fc787 -s ours am: e523ee97f3 -s ours am: d286605885 -s ours 
am skip reason: Merged-In I0dfa0da22e70d267d8d8ed8e9c5be3d6db107841 with SHA-1 7a8602dce9 is already in history

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

Change-Id: Ic443ca027b87d8864ce4f5d5855144f31d8cc53a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 19:34:06 +00:00
YK Hung
ec8690deed Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09 am: 2bfdf17d69 am: 439c0b0057 am: 0441e7a70d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351

Change-Id: If95d73a1a59fdfdc7552b8fae7599dddb7fe5baa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 19:27:18 +00:00
TreeHugger Robot
94322a289b [automerger skipped] Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e am: 01360b3729 am: 4d22ed26ff -s ours am: 0c91d2948e -s ours 
am skip reason: Merged-In I0dfa0da22e70d267d8d8ed8e9c5be3d6db107841 with SHA-1 7a8602dce9 is already in history

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

Change-Id: I56ef29a811f76ae93f9e8ca314ea6604251bf653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 19:27:07 +00:00
YK Hung
ac94084be6 Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09 am: 4eabcdea6d am: 9ec0a502ac am: 5ceb227f59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351

Change-Id: I4590f3b406299ce78f9ed7c5e3e7d1863272dc53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 19:11:29 +00:00
Jason Chiu
13873ddeda Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae am: a8142278e9 am: 8d939360ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247

Change-Id: I232a076a6c8a494da3c067f68ebe712f54438612
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 18:54:44 +00:00
Jason Chiu
312088859d Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae am: 809d641517 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247

Change-Id: Id5ae9644d58f4f0fac157e9cd3518189e0133b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 18:52:13 +00:00
Jason Chiu
2191eb763e Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae am: ac614d26f0 am: 52df3a5f64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247

Change-Id: Idd220dad1ed9e5ce5dfa75c99d704a1b80cf01fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 18:40:51 +00:00
Jason Chiu
a655b96c28 Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae am: a8142278e9 am: d48ba61155 am: 3812b37db7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247

Change-Id: Icfcbba42c812f93f7ee960f7f4aa46ba1d337c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 18:28:38 +00:00
Chaohui Wang
2eb4c7400f Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 3916082b8a am: d9efea9f79 am: 7804e5a59c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250

Change-Id: I435128614cb5f80755cbc223c997d999f1aebd40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 18:11:21 +00:00
Chaohui Wang
4ac5fb616b Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792c2 am: 129e80c7d8 am: 317ca924a0 am: cbb127a4e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484426

Change-Id: I877ab9d59455f29f980342e61713b178cb224b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 18:11:10 +00:00
Treehugger Robot
703523a375 Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635 am: 91737c0b3b am: d19f4f85fd am: 5a718028b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077

Change-Id: I4cc6017dca94c1d50f048e41e96f2a425fabf928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 18:11:03 +00:00
Yanli Wan
2d37b582cd Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678 am: f120e3d563 am: d3516aa5d0 am: 859df29cf0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457

Change-Id: Id94acad7703cb28f200f950539d8ba0e66b7b21a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 18:10:54 +00:00
TreeHugger Robot
b4409c9bf3 Merge "Default show LE audio toggle in Device Detail" into udc-d1-dev am: df23aab9bf am: aac695129e am: 374aefc2d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486040

Change-Id: I5c6a6d3c6b3698c07585e06c00073e7c7c76e19a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 18:10:46 +00:00
TreeHugger Robot
25b154d2ea [automerger skipped] Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e am: 01360b3729 am: 800256a4c7 am: 0663defcd3 -s ours 
am skip reason: Merged-In I0dfa0da22e70d267d8d8ed8e9c5be3d6db107841 with SHA-1 7a8602dce9 is already in history

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

Change-Id: I9a96122b62491014b0af7962e84ea51cadba53c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 18:10:37 +00:00
Chaohui Wang
14f7f6c818 Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 3f05e59982 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250

Change-Id: I0837bd1fd686f4d77c148a2405fe5ae8a644ac99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 18:04:47 +00:00
Jason Chiu
9b0c989265 Merge "Do not init dashboard categories when SetupWizard isn't finished yet" am: 428e97cdfa am: 390c348d4b am: 2b8067e797 am: d103243e8b am: 933d3279a1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608473

Change-Id: Ia57214d2c4211882b68df1f06a87ac83715ff11b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 18:04:17 +00:00
Treehugger Robot
249107bc45 Merge "Fix AccessibilityHearingAidPreferenceControllerTest" 2023-06-02 17:48:23 +00:00
Chaohui Wang
6186231aa9 Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 2f3132c132 am: 27000f18aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250

Change-Id: I19477cb7eeef63d2a9d027cf373295100c0c010f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 17:46:02 +00:00