SongFerng Wang
ae7b0b0996
Merge "Add try-catch for set/get wifiCalling mode" into main
2023-10-24 06:40:24 +00:00
SongFerngWang
5ce87cb03d
Add try-catch for set/get wifiCalling mode
...
The APIs can throw IllegalArgumentExceptionm, the UI need the try-catch.
Bug: 299239773
Bug: 287946939
Test: build pass
Change-Id: I4b413abc985dfa871d3c2d39798b51dc1a686313
2023-10-24 13:47:30 +08:00
Joshua Mccloskey
5036a9cb17
Merge "Created biometric provider." into main
2023-10-24 00:41:18 +00:00
Jim Shargo
da2c46d926
Merge "Revert "Adding back screenshot test to Settings."" into main
2023-10-24 00:06:03 +00:00
Jim Shargo
0d67f55cba
Revert "Adding back screenshot test to Settings."
...
This reverts commit 4dc4e1c02a
.
Reason for revert: broke the build
Change-Id: I3037248a5df06d6f92dfa9c5666625f23230646a
Bug: 307406217
2023-10-24 00:05:48 +00:00
Joshua Mccloskey
29c9e4c0b6
Merge "Adding back screenshot test to Settings." into main
2023-10-23 21:16:42 +00:00
Joshua Mccloskey
4dc4e1c02a
Adding back screenshot test to Settings.
...
Test: atest SettingsScreenshotTests
Fixes: 307356833
Change-Id: I9e168010d6c83aad44969c60deaef8e61a10ddd1
2023-10-23 20:08:29 +00:00
Bill Yi
ff55fd7cb5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 639cfd9c3f
-s ours am: cccaf5a711
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25126854
Change-Id: I9483ec7ff7785033d8a2f95fe86e102c29246a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-23 19:57:47 +00:00
Bill Yi
5d64ed8097
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d94436f2
-s ours am: 7093b062bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25126854
Change-Id: If9d7a79acd028544048e92cbbb80a7d9d22674c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-23 19:57:44 +00:00
Bill Yi
2741f41063
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ff0925c00f
-s ours am: 00f546568c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25126852
Change-Id: I6634d9e1a454a92a547ea8c16adf9bb7ba487e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-23 19:57:31 +00:00
Bill Yi
9899094182
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f6854e60a
-s ours am: 0bf6e27ecc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25126852
Change-Id: Ide4b96e7f93ba6df8e957abd4d2c0c040b8e8d95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-23 19:57:13 +00:00
Bill Yi
cccaf5a711
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 639cfd9c3f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25126854
Change-Id: Id72c67f45850ce7ee070bf953337451d901da59c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-23 19:36:53 +00:00
Bill Yi
7093b062bb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d94436f2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25126854
Change-Id: I67aa0cb798b4efb40a90935455b7cf0797ab956c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-23 19:36:49 +00:00
Bill Yi
00f546568c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ff0925c00f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25126852
Change-Id: I621a669257f47089b2ca8ee08063f321d55d23d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-23 19:36:40 +00:00
Bill Yi
0bf6e27ecc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f6854e60a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25126852
Change-Id: I2256098a5f45dd8844461368ec6cb9824ae4143c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-23 19:36:18 +00:00
Jihoon Kang
4721b48cbe
Merge "Temporarily disable nullaway plugin" into main
2023-10-23 19:29:13 +00:00
Bill Yi
639cfd9c3f
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-10-23 19:16:21 +00:00
Bill Yi
ff0925c00f
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-10-23 19:16:21 +00:00
Bill Yi
b638507751
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fb88ae863a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25126850
Change-Id: I030b6955dd756c1b44a78f52589701af3116e61e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-23 19:14:40 +00:00
Bill Yi
40b64880ba
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-10-23 19:08:22 +00:00
Bill Yi
603e5f9e68
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-10-23 19:08:22 +00:00
Bill Yi
b5a8f86550
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-10-23 19:08:22 +00:00
Joshua McCloskey
7526b9259e
Created biometric provider.
...
Test: Manually verified data was fetched successfully.
Test: adb shell device_config put biometrics_framework
com.android.settings.flags.biometric_settings_provider true
Test: atest BiometricSettingsProviderTest
Bug: 303595205
Change-Id: I154754eed7c36d659853ed83cc18a2e446fb7678
2023-10-23 18:50:58 +00:00
Jihoon Kang
f528f7eaf3
Temporarily disable nullaway plugin
...
The nullaway plugin fails in errorprone build with stubs generated from
the API signature files, although the nullability information between
the from-text and from-source stubs are identical. Below is the failing
error message:
```
packages/apps/Settings/src/com/android/settings/accessibility/AccessibilitySettingsContentObserver.java:54: error: An unhandled exception was thrown by the Error Prone static analysis plugin.
contentResolver.registerContentObserver(uri, false, this);
^
Please report this at https://github.com/google/error-prone/issues/new and include the following:
error-prone version: 2.15.0
BugPattern: NullAway
Stack Trace:
com.google.common.util.concurrent.UncheckedExecutionException: java.lang.RuntimeException: expected call to iterator(), instead saw null
```
The error message indicates that the nullaway plugin is throwing an
uncaught exception. Given that the plugin has been recently introduced
to the tree and is currently being only used by Settings, this change
proposes to temporarily disable the plugin to unblock the from-text stub
generation feature and re-enable the plugin once the issue is fixed.
Test: m Settings
Bug: 306242755
Bug: 304077181
Change-Id: I617d8f20ceeefb339b3c1f8cd03af94a8c37fd39
2023-10-23 18:20:59 +00:00
Yiyi Shen
2bf233e30b
Merge "Fix crash when showing the device not found dialog." into main
2023-10-23 12:16:23 +00:00
Mark Kim
35629bd16b
Merge "Tests that archived apps are returned for AllAppListPage when "android.content.pm.archiving" flag is enabled" into main
2023-10-23 11:46:01 +00:00
Chaohui Wang
15ca95a31b
Migrate to TwoStatePreference
...
SwitchPreference and SwitchPreferenceCompat are both TwoStatePreference.
Using TwoStatePreference in Java will helps migration in the future.
Bug: 306771414
Test: manual - check Settings pages
Change-Id: I84e1d7b09451106797c2b23d127855c6976678ca
2023-10-23 09:28:57 +00:00
Yiyi Shen
a7d0d00f4a
Fix crash when showing the device not found dialog.
...
If users click to pair a not foundable device and then close the Settings page,
Settings will crash becasue dialog holder is closed.
This CL is part of the fix. It set the context to null when the activity
stops.
Bug: 306548036
Test: atest
Change-Id: If68e3e9cd62216ad83b2e5058f504fce35e36a06
2023-10-23 17:26:17 +08:00
Cassie Wang
7976f1e76d
Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4
am: ccdd06e496
am: f582544551
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2685406
Change-Id: Iaedb4a2933ce24fbd8bd4aabb03da908beab5131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-23 07:02:30 +00:00
Cassie Wang
3b7f437db8
Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4
am: 16e99c187f
am: 16677a5492
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2685406
Change-Id: I5dee3042db1274b1203b08afa09dfe6798f3c4ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-23 07:01:38 +00:00
Cassie Wang
f582544551
Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4
am: ccdd06e496
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2685406
Change-Id: Ib3b89b09bc61d2bc780a6863ce4b202ff56a041c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-23 06:32:36 +00:00
Cassie Wang
16677a5492
Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4
am: 16e99c187f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2685406
Change-Id: I25a47d376b7fa31a144cdc74bee6c9a99a6b2525
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-23 06:31:50 +00:00
Cassie Wang
ccdd06e496
Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2685406
Change-Id: Ie98613fd98bfac9f620dd6755e5a118a3433c171
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-23 06:15:05 +00:00
Cassie Wang
16e99c187f
Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2685406
Change-Id: Ib8a236bd666204b48faac0189fbcc1acfcb3e8ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-23 06:13:58 +00:00
Cassie Wang
5abd3420c4
Merge "Add a config to show the Vpn options menu." into main
2023-10-23 05:53:32 +00:00
Chaohui Wang
4358467948
Merge "Remove Settings preference_widget_primary_switch" into main
2023-10-23 04:17:52 +00:00
Anthony Zhang
17a04a246f
Merge "Add pace for UdfpsEnrollHelper" into udc-qpr-dev am: c9606ad732
am: 8155c507f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24755290
Change-Id: I7485782ee1b939e12f2c4f87fd1a8405227dd182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-20 21:21:23 +00:00
Anthony Zhang
8155c507f2
Merge "Add pace for UdfpsEnrollHelper" into udc-qpr-dev am: c9606ad732
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24755290
Change-Id: I5d7c5820749057aeecee9c21eb62f8c6d480ce5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-20 20:59:55 +00:00
Anthony Zhang
c9606ad732
Merge "Add pace for UdfpsEnrollHelper" into udc-qpr-dev
2023-10-20 20:40:59 +00:00
Faye Yan
540d810107
Merge "Add setting flag for enabling voice activation apps in Special app access." into main
2023-10-20 18:37:40 +00:00
Julia Reynolds
88f146a3fe
Merge "Allow background start from notif history" into main
2023-10-20 18:10:14 +00:00
Mark Kim
90781a3014
Tests that archived apps are returned for AllAppListPage when "android.content.pm.archiving" flag is enabled
...
Test: AllAppListTest
#AndroidArchiving
Bug: 304255511
Change-Id: Id3523a6290f57e2c74287f960c1adb8f0cc876bc
2023-10-20 17:11:22 +00:00
Julia Reynolds
55f14ae70d
Allow background start from notif history
...
Test: Tap on entries in 'Recently Dismissed'
Fixes: 304651874
Change-Id: Ifcdd881cbd17903b47f93303bf33a72f718dc181
2023-10-20 13:10:27 -04:00
Joshua Mokut
7f25a5edb8
Merge "Added width specs when creating brightness dialog from settings" into main
2023-10-20 15:48:59 +00:00
Yiyi Shen
3df78993d6
Merge "Update the wording for subsequent pair devices in Settings." into main
2023-10-20 12:09:49 +00:00
Treehugger Robot
5ccd4fee6b
Merge "Only allow clearing of Euicc Data by owner or demo user" into main am: f1cbe74e08
am: ce0d7e1c61
am: 549ca35ebb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2264402
Change-Id: I3b9598f350ef2a18e92611b79e675af99552a239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-20 10:12:55 +00:00
Treehugger Robot
f7f2f0600b
Merge "Only allow clearing of Euicc Data by owner or demo user" into main am: f1cbe74e08
am: ad49e33f01
am: c200d097e9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2264402
Change-Id: I53046b290eebcfc8647f19e66539dbb84f34afee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-20 10:12:38 +00:00
Treehugger Robot
549ca35ebb
Merge "Only allow clearing of Euicc Data by owner or demo user" into main am: f1cbe74e08
am: ce0d7e1c61
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2264402
Change-Id: I8d0bbf66beaaa568e4ee7aaa4bce2409a6a06e9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-20 09:48:43 +00:00
Treehugger Robot
c200d097e9
Merge "Only allow clearing of Euicc Data by owner or demo user" into main am: f1cbe74e08
am: ad49e33f01
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2264402
Change-Id: I46d8bdaac17ed33fffedeefbfbfc01e1aa1b145c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-20 09:47:35 +00:00
Treehugger Robot
ce0d7e1c61
Merge "Only allow clearing of Euicc Data by owner or demo user" into main am: f1cbe74e08
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2264402
Change-Id: I696de52a418fd1f02291d9ef811d989f5b4e25a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-20 09:10:21 +00:00