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
Yuri Lin
e540c8165d
Fix ZenModeScheduleRuleSettingsTest to test onAttach
...
this follows the model of the change to ZenModeEventRuleSettingsTest in ag/17607148
Fixes: 215062934
Test: settings robotests
Change-Id: I44abec9316f78be318b51ba541d20b863eb86c8d
2022-04-26 14:23:06 -04: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
a28e63c502
Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev am: 73c8e2f45a
am: bad5635b38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859326
Change-Id: I9ade4e92571b1d10f2abcf6b161c670a2b33713b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 11:43:01 +00:00
Bonian Chen
13ae7a955c
Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev am: 3fc05a917e
am: e8619c8d08
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903597
Change-Id: Id300a894ede7308c77a2ef39848d20485c907289
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 11:42:41 +00:00
Bonian Chen
bad5635b38
Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev am: 73c8e2f45a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859326
Change-Id: Iee91e59319e1003f6bea8258ed4de08fff75e942
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 11:35:59 +00:00
Bonian Chen
e8619c8d08
Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev am: 3fc05a917e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903597
Change-Id: I7afa87de1ae7ec6d271dec993794a8c7295195f6
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 11:35:52 +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
Chaohui Wang
d1573cd417
Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0
am: 61a35e7b85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523
Change-Id: I88d0995852b1864a6ce85d2b304bcc7084d444f4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 07:27:28 +00:00
Chaohui Wang
815ee3779b
Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0
am: 334335bc6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523
Change-Id: I87294478784f6518f58e57aaeba0eef5af5b0297
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 07:26:55 +00:00
Weng Su
71b9cc0e32
Check Wi-Fi permissions for QrCode scanner
...
- Launched package require ACCESS_WIFI_STATE and ACCESS_FINE_LOCATION permissions to get results
Bug: 187176859
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiDppQrCodeScannerFragmentTest
Change-Id: Ie80c4e5b3a5863749de518e4736873390478816e
2022-04-26 07:10:57 +00:00
Chaohui Wang
61a35e7b85
Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523
Change-Id: I71d0c09c5c1419f48bd3dd754eeaafa1acbf17f7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 06:52:31 +00:00
Chaohui Wang
1a39660de0
Merge "Update Personal / work selection UI." into tm-dev
2022-04-26 06:34:37 +00:00
Hugh Chen
00a8568b1b
Merge "Implement advanced vpn ui in vpn settings"
2022-04-26 05:33:27 +00:00
Lais Andrade
cc8790f7b3
Create separate On/Off string resources for Vibration & haptics
...
Some translators need to be able to adapt the text for On/Off preference
state to match the preference title "Vibration & haptics", which
requires a different inflection and plural form on some languages.
This change separates this resource string from the more generic one
that was used before to allow this flexible translation.
Fix: 228342641
Fix: 229060423
Test: VibrationPreferenceControllerTest
Change-Id: Ib46b3e0d0a980ff57e91f55c73348c440327bad7
2022-04-25 17:15:39 +01:00
Chaohui Wang
f250493787
Update Personal / work selection UI.
...
Implement the new-look by using AlertDialog's
custom title and custom view.
Using the RecyclerView so we can display profile
horizontally.
Bug: 174626616
Test: manual & robolectric
Change-Id: I9f5a7685d9217fc62e01799ad73f9b9a3ddbf19a
2022-04-25 19:12:38 +08:00
SongFerng Wang
2f29b5be0f
Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev am: 564c88485a
am: 78a9701de0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598
Change-Id: I413c08fc365319302f5a5885c846523404e1f942
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:14:01 +00:00
Prabal Singh
c771c8bf94
Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38
am: 888deb9328
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17915088
Change-Id: Ie60a5a246352930881c50774b61197ced7f7c5ce
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:53 +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
Prabal Singh
60615cbf3b
Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38
am: 9fa00378f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17915088
Change-Id: I8f065a47384084cee16321c2ebe9ab61aa4eaa30
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:05 +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
78a9701de0
Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev am: 564c88485a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598
Change-Id: I91a231d6c86a2f594feb5eb9604653247273e6ae
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 07:49:45 +00:00
Prabal Singh
888deb9328
Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17915088
Change-Id: Ic3d77ecb6d22e632feefc75773b84e6d7da270c8
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 07:49:38 +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
Prabal Singh
67007e5933
Use settingslib util methods for work policy info
...
Bug: b/229889270
Test: make ROBOTEST_FILTER=EnterprisePrivacyFeatureProviderImplTest RunSettingsRoboTests -j40
Change-Id: I0d968732a4dd601955e18b2ebb2af365638b450f
2022-04-23 20:35:41 +01: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
Joshua McCloskey
d3001a1a01
Fix final UDFPS enrollment haptic.
...
Test: Verified both accessibility/non-accessibility flows
have correct haptic feedback.
Fixes 229804277
Change-Id: I8623771016b9819d4211d07a19b50291a8b06cd9
2022-04-22 21:06:21 +00: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
TreeHugger Robot
172e1f5958
Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev am: 49cc66afd3
am: fb74f218a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859346
Change-Id: I50c8138aa47d696e68f1d45059de7da4ca0a38ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 06:34:50 +00:00
TreeHugger Robot
fb74f218a9
Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev am: 49cc66afd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859346
Change-Id: Ia682eb788f6ecc8c7f7f9b1533f1e78d0b8c93b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 06:08:49 +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
TreeHugger Robot
5ff02d62de
Merge "[Settings] Code refactor for Lifecycle listening" into tm-dev am: a7e03159cb
am: c3ea2c20d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859345
Change-Id: I5015dec25f994cce0193da3c9a87c14a94dc3593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 09:41:40 +00:00
TreeHugger Robot
c3ea2c20d2
Merge "[Settings] Code refactor for Lifecycle listening" into tm-dev am: a7e03159cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859345
Change-Id: Ifa819b3296a90f9b15ff0246ada10530fb6534db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 09:18:20 +00:00
Neil Fuller
131d297dbd
Merge "Fix logic used for auto time zone settings" into tm-qpr-dev
2022-04-21 08:33:06 +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
PETER LIANG
b579c1aa43
Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev am: 8cb0439d9c
am: cc4af05607
am: 37fa12e2d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822267
Change-Id: I078115b77edc9cd16a8ac4c5eb56f88b2048f2d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 14:07:51 +00:00
PETER LIANG
37fa12e2d6
Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev am: 8cb0439d9c
am: cc4af05607
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822267
Change-Id: I74bb43797299b183a40f9050b6256e768361c7d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 13:20:24 +00:00
PETER LIANG
cc4af05607
Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev am: 8cb0439d9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822267
Change-Id: I14be163454ca16655f88e1d9195e891e065c21bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 13:01:07 +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