Commit Graph

1784 Commits

Author SHA1 Message Date
Bonian Chen
c4033b6d3e Merge "[Settings] Ignore failure test cases - NetworkProviderSimListControllerTest" into tm-dev 2022-05-09 02:58:00 +00:00
Bonian Chen
a89902e9c9 Merge "[Settings] Ignore failure test cases - ProviderModelSliceHelperTest" into tm-dev 2022-05-09 02:56:35 +00:00
Bonian Chen
52a1fdf310 Merge "[Settings] Ignore failure test cases - SubscriptionUtilTest" into tm-dev 2022-05-09 02:52:24 +00:00
Arc Wang
da6cf3046a Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316 am: dc4104be6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197506

Change-Id: I21fb697c81015d8a6683283d75d10c2f7ae6d073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 01:40:19 +00:00
Arc Wang
16f21bb14c Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316 am: f6093ba54c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197506

Change-Id: I53299c2a955b03c945583e03682bb8eabfea9222
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 01:39:53 +00:00
Arc Wang
94a2138316 Merge "Verify ringtone from ringtone picker is audio" into tm-dev 2022-05-09 01:06:46 +00:00
Bonian Chen
830d8e0fec [Settings] Ignore failure test cases - NetworkProviderSimListControllerTest
This is a change regarding ignoring the failure of test cases within
NetworkProviderSimListControllerTest in order to keep build green.

Bug: 231883966
Test: presubmit
Change-Id: I11bf23c1cab0e97619688ce1ed2c0f539f42a3be
2022-05-09 08:02:28 +08:00
Bonian Chen
e25b88a8f9 [Settings] Ignore failure test cases - DefaultSubscriptionControllerTest
This is a change regarding ignoring the failure of test cases within
DefaultSubscriptionControllerTest in order to keep build green.

Bug: 231886723
Test: presubmit
Change-Id: Ice611f1a893e5604b044f69d6b6076fc64844074
2022-05-09 07:39:14 +08:00
Bonian Chen
9a2663325e Merge "[Settings] Remove the subscription name verification." into tm-dev am: 361fea8f6b am: 4608fbc8a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214682

Change-Id: I63b89da5a640650d729899df25d67ab40f8d154f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 23:37:16 +00:00
Bonian Chen
c0a990abd0 Merge "[Settings] Remove the subscription name verification." into tm-dev am: 361fea8f6b am: b04c73a448
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214682

Change-Id: I4417b1be695dea67a712782fff0594ddbabdf2c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 23:36:51 +00:00
Bonian Chen
651a548e84 [Settings] Ignore failure test cases - SubscriptionUtilTest
This is a change regarding ignoring the failure of test cases within
SubscriptionUtilTest in order to keep build green.

Bug: 231886555
Test: presubmit
Change-Id: I0f5c13511968740e439a69be936a75d9f34e4c30
2022-05-09 07:32:13 +08:00
Bonian Chen
a34f5053df [Settings] Ignore failure test cases - ProviderModelSliceHelperTest
This is a change regarding ignoring the failure of test cases within
ProviderModelSliceHelperTest in order to keep build green.

Bug: 231886711
Test: presubmit
Change-Id: I0138c9eefad1541a6302393c035b641fc3f4bfac
2022-05-09 07:23:28 +08:00
Bonian Chen
649ad42457 [Settings] Remove the subscription name verification.
Subscription name may override by other design (for instance, unique
name display).
A verification of subscription name within this test case could be
inappropirate.

Bug: 231660194
Test: unit test
Change-Id: I4182d1de3c0d210bdc1ac699a4f8f862dcf55266
2022-05-08 19:52:14 +08:00
Arc Wang
e4c22580c9 Verify ringtone from ringtone picker is audio
To improve privacy.

Bug: 221041256
Test: atest com.android.settings.DefaultRingtonePreferenceTest
Change-Id: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
2022-05-06 17:42:30 +08:00
Vadim Caen
ed1c9acc0d Add Settings for back animation developer option DO NOT MERGE am: d268b11e85 am: ae9ed5fdbc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: I1e0c0e99f02ff8fd51b60fe18fb3bcd337ba2760
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:43:47 +00:00
Vadim Caen
d268b11e85 Add Settings for back animation developer option DO NOT MERGE
Bug: 228936326
Test: BackAnimationPreferenceController
Change-Id: I48516c1f68de799473eac99d35a086046d7e6de9
2022-05-02 18:07:27 +00:00
Xinyi Zhou
aafebb3890 Delete Fast Pair Settings am: 3438e20da1 am: e2db47e9ab am: 4be70892e9 am: 815bbd8c1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888

Change-Id: I878e145a67fd799b5868af4a5e15b196cd6f985a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 05:32:17 +00:00
William Leshner
2950e7c84d Merge "Disable screen saver setting for non-system users." into tm-qpr-dev am: ed5ba9a647 am: e708b185e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871948

Change-Id: Iba3719c80fccd9b8b7a6e88c7ed5dc334804f52d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 23:59:44 +00:00
Xinyi Zhou
4be70892e9 Delete Fast Pair Settings am: 3438e20da1 am: e2db47e9ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888

Change-Id: I44ecf5ea109b9a002a178f42d609a7fbf7bfcf1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 03:27:55 +00:00
Xinyi Zhou
3438e20da1 Delete Fast Pair Settings
Fast Pair will not be launched in T.

Test: -m
Fix: 228614515
Fix: 229356812
Change-Id: I173453e84f0d1b525ea4796ed875f53f30c20d96
2022-04-27 12:29:59 -07:00
Bonian Chen
5b79b590c4 Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90 am: 313284a9ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304

Change-Id: I40880131de703e446a06a5876438e4a8ab8bdcca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:35:27 +00:00
Bonian Chen
a725b0c3da Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e am: dbbab09d11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950673

Change-Id: Id2c1fa8af2948da18269e729f32613bb33b23c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:35:17 +00:00
Bonian Chen
68981a3004 [Settings] Fix flaky presubmit failure
Bug: 229689535
Test: unit test
Change-Id: Iabea21aa5d7dd9e489b7b5839c8fcc32c9ba979c
2022-04-27 15:58:06 +00:00
Bonian Chen
b92156c03e Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev 2022-04-27 15:57:30 +00:00
TreeHugger Robot
01753159e5 Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9 am: a715a3c7b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674

Change-Id: I7ad8faf6db40db67987d892690c77bac6428eb86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 06:51:59 +00:00
TreeHugger Robot
c28169adb9 Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev 2022-04-27 05:56:10 +00:00
Bonian Chen
8789731cde Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"
This reverts commit 81d230b250.

Reason for revert: merge failure in other branches

Change-Id: If8661f5f321f22df96aab54eb8ba967c232348ac
2022-04-27 05:13:30 +00:00
Bonian Chen
3bddc056d8 Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"
This reverts commit aeac0619df.

Reason for revert: merge failure in other branches

Change-Id: I601e674be41fc5d4c97bd8db54ab1982377455f1
2022-04-27 00:03:20 +00:00
William Leshner
ed5ba9a647 Merge "Disable screen saver setting for non-system users." into tm-qpr-dev 2022-04-26 18:16:57 +00:00
Bonian Chen
73c8e2f45a Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev 2022-04-26 10:25:31 +00:00
Bonian Chen
3fc05a917e Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev 2022-04-26 10:25:02 +00:00
Hugh Chen
00a8568b1b Merge "Implement advanced vpn ui in vpn settings" 2022-04-26 05:33:27 +00:00
SongFerng Wang
87a5e19b64 Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev am: 564c88485a am: a7a5061f08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598

Change-Id: I65b36d6e24bb218870f27dd887b316b2d52857f1
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 08:13:13 +00:00
Hugh Chen
cf210dd00b Implement advanced vpn ui in vpn settings
Bug: 220684478
Test: atest -c VpnSettingsTest

Change-Id: If89de16d02cb8b1f387b8f388f8fcf82ad39066b
2022-04-25 07:59:13 +00:00
SongFerng Wang
564c88485a Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev 2022-04-25 07:40:43 +00:00
Bonian Chen
cc7474d50d [Settings] Fix flaky presubmit failure
Bug: 229689535
Test: unit test
Change-Id: I0fc193d6f34cfff13d15487ad0c1f646f67d4c97
2022-04-23 17:53:14 +00:00
Will
640247eb58 Disable screen saver setting for non-system users.
On devices where non-system users are not allowed to dream, disable the
screen saver setting when the current user is not the system user.

Bug: 213906883
Test: atest ScreenSaverPreferenceControllerTest
Test: Manually with the following steps:
Step 1: On a device with the config setting
config_dreamsOnlyEnabledForSystemUser set to false, make sure that
non-system users can still access the screen saver setting.
Step 2: On a device with the config setting
config_dreamsOnlyEnabledForSystemUser setting is set to true, make sure
that non-system users can not access (or see) the screen saver setting.
Step 3: Make sure that system users can still see the screen saver
setting on a device where config_dreamsOnlyEnabledForSystemUser is set
to true.

Change-Id: I7e167ed5a1ea183c725ba89a57b8d0b372064b82
2022-04-22 16:03:31 -07:00
SongFerngWang
b76feffe4f Gray out the network mode UI before the carrier config is ready
Bug: 202167671
Test: atest EnabledNetworkModePreferenceControllerTest
Change-Id: Ib502ac19ea2c19dae95025302dd82aa2b1c7ff88
2022-04-22 19:28:13 +08:00
Bonian Chen
2615ee4097 Merge "[Settings] Code refactor for monitoring service state" 2022-04-22 10:50:47 +00:00
Bonian Chen
aeac0619df [Settings] Code refactor for combining TelephonyCallback with Lifecycle
This is a helper class which may support monitoring the
TelephonyCallback under the condition of Lifecycle state STARTED or
RESUMED.

Bug: 229689535
Test: unit test
Change-Id: I6d26bee604d9559e207e107b2f26583f700f8e0a
(cherry picked from commit 7c5259efad)
2022-04-22 10:39:04 +00:00
Bonian Chen
6a2479e7d1 Merge "[Settings] Code refactor for monitoring voice call status" 2022-04-22 09:37:08 +00:00
Bonian Chen
e7de4a415d [Settings] Code refactor for monitoring service state
This is for monitoring the status of service state when Lifecycle state
STARTED or RESUMED.

Bug: 229689535
Test: unit test
Change-Id: If6bac5c04caae67d6293c5a69e3130789e9e588e
2022-04-22 13:54:54 +08:00
TreeHugger Robot
49cc66afd3 Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev 2022-04-22 05:50:05 +00:00
Bonian Chen
887ec6c32c [Settings] Code refactor for monitoring voice call status
This is for monitoring the status of voice call when Lifecycle state
STARTED or RESUMED.

Bug: 229689535
Test: unit test
Change-Id: Ifa3e0c5aa474a2539ad66338ea8c3564ea33744e
2022-04-21 11:13:48 +08:00
Bonian Chen
7c5259efad [Settings] Code refactor for combining TelephonyCallback with Lifecycle
This is a helper class which may support monitoring the
TelephonyCallback under the condition of Lifecycle state STARTED or
RESUMED.

Bug: 229689535
Test: unit test
Change-Id: I6d26bee604d9559e207e107b2f26583f700f8e0a
2022-04-21 11:04:44 +08:00
Bonian Chen
81d230b250 [Settings] Code refactor for BroadcastReceiver under Lifecycle
This is an implementation of BroadcastReceiver which supported by
LifecycleCallbackConverter.
Registration of BroadcastReceiver only take place when Lifecycle in
RESUME status.

Bug: 229689535
Test: unit test
Change-Id: Ia2af82d5cbb391034627e5259a9e0c8683a0c5a1
(cherry picked from commit c2030898ef)
2022-04-20 16:54:41 +00:00
Bonian Chen
ee0756f684 Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" 2022-04-20 16:54:04 +00:00
Bonian Chen
3856ac4be9 [Settings] Code refactor for async Lifecycle listening
This is an extension of LifecycleCallbackAdapter.
A postResult(T) and a Consumer<T> is designed for supporting pass result
back to UI thread, and is invoked only when required.

Bug: 229689535
Test: unit test
Change-Id: I0ef5afc31cd23aa865a2dd1d05f9b212242c2e41
(cherry picked from commit 5d2a76cbb4)
2022-04-20 12:47:39 +00:00
Bonian Chen
37a326bd3e [Settings] Code refactor for Lifecycle listening
This is an abstract class for building a set of callback behavior
based on Lifecycle status change.

Through extending this class, the implemented methods are invoked
only when required.

Bug: 229689535
Test: unit test
Change-Id: I7534393546f821738a63ebde121a5a88ee03b23b
(cherry picked from commit 9a4c66d23b)
2022-04-20 12:46:26 +00:00
Bonian Chen
3cf84f393c Merge "[Settings] Code refactor for async Lifecycle listening" 2022-04-20 12:26:17 +00:00