Commit Graph

17802 Commits

Author SHA1 Message Date
Weng Su
a81bb19618 Show policy transparency dialog if adding Wi-Fi config is not allowed
- When the user is restricted by UserManager.DISALLOW_ADD_WIFI_CONFIG, clicking on a Wi-Fi network will show the Settings policy transparency dialog.

- The "Not allowed by your organization" summary in Wi-Fi networks will be removed in a separate CL.

Bug: 233871529
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=Wifi

Change-Id: Ia978be8e85a5809de1331f3e0edc11fbc8925c80
2022-10-07 02:34:49 +08:00
Milton Wu
328be58b48 Do not show 2nd FingerprintErrorDialog
When fingerprint enrollment is stopped because of credential timeout, it
pops a FingerprintErrorDialog, and this error dialog triggers
onWindowFocusChanged(), and the 2nd FingerprintErrorDialog is shown. To
fix this case, checking mIsCanceled flag do nothing  in
onWindowFocusChanged() method.

On the first dialog, the 'Try again' button relaunch activity with new
Intent, and it causes that activity result fails to pass back to caller.
To fix this bug, add FLAG_ACTIVITY_FORWARD_RESULT on new Intent to pass
result back.

Bug: 248165760
Test: Manually test credential timeout behavior and dialog buttons
Test: Manually test enrollment process has been cancelled for scenarios,
      like "Swipe down Notification Shade" and "Recents"
Test: robo test for FingerprintEnrollEnrollingTest
Change-Id: I4441ba026db9b594f1d6184280668a374126a2fb
2022-10-06 15:40:51 +08:00
Alice Kuo
6ecbe4c18e Remove A2dp offload disabled and LE audio offload enabled combination
In order to reduce the complexity, LE audio offload couldn't be
enabled as a2dp offload disabled. Remove the combination from the
developer option
1. As a2dp offload disabled, LE audio offload couldn't be switched.
2. As the user disable a2dp offload, LE audio offload would be disabled
   as well

Bug: 238268927
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioHwOffloadPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothA2dpHwOffloadPreferenceControllerTest
Change-Id: I9ebe26c6a8058798ea654523ad1405a8447268b8
Merged-In: I9ebe26c6a8058798ea654523ad1405a8447268b8
(cherry picked from commit 7cc845026c)
2022-10-06 10:35:03 +08:00
Xin Li
2af8366306 Merge "Merge TP1A.221005.003" 2022-10-05 22:20:14 +00:00
Treehugger Robot
c6c8515d00 Merge "Remove A2dp offload disabled and LE audio offload enabled combination" am: bcde51cf09 am: fe38c3c91e am: bf19bf23a5 am: b969c8a4c7 am: ff788fa9b9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240358

Change-Id: I57bbacb82d15770d21a45b9043a8954ec268bf62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 18:23:43 +00:00
Treehugger Robot
ff788fa9b9 Merge "Remove A2dp offload disabled and LE audio offload enabled combination" am: bcde51cf09 am: fe38c3c91e am: bf19bf23a5 am: b969c8a4c7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240358

Change-Id: I011b9815444d73b85b470db94d0bb53f5479c51b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 17:54:58 +00:00
Treehugger Robot
b969c8a4c7 Merge "Remove A2dp offload disabled and LE audio offload enabled combination" am: bcde51cf09 am: fe38c3c91e am: bf19bf23a5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240358

Change-Id: Ibae8540c83dbabec5cf5bfa96ddaab3219ec5b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 17:26:59 +00:00
Treehugger Robot
bf19bf23a5 Merge "Remove A2dp offload disabled and LE audio offload enabled combination" am: bcde51cf09 am: fe38c3c91e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240358

Change-Id: I3db9d784789e88ee04f50f040eb3741a87768640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 16:59:01 +00:00
Neil Fuller
15910795f2 Merge "Track method renames" 2022-10-05 15:45:42 +00:00
Alice Kuo
7cc845026c Remove A2dp offload disabled and LE audio offload enabled combination
In order to reduce the complexity, LE audio offload couldn't be
enabled as a2dp offload disabled. Remove the combination from the
developer option
1. As a2dp offload disabled, LE audio offload couldn't be switched.
2. As the user disable a2dp offload, LE audio offload would be disabled
   as well

Bug: 238268927
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioHwOffloadPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothA2dpHwOffloadPreferenceControllerTest
Change-Id: I9ebe26c6a8058798ea654523ad1405a8447268b8
2022-10-04 23:48:11 +08:00
Tsung-Mao Fang
fa7394afbc Disable eager initialization of Jetpack libraries
Test: atest -c SettingsUnitTests
Fix: 208883742
Fix: 213872855
Change-Id: Ia2a2f88939d16c84255404696ea159c4a01b3bb5
2022-10-04 15:51:45 +08:00
Xin Li
f51d201af3 Merge TP1A.221005.003
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
Change-Id: Ia7b51d3cc694287b930d240c77e5ba0ed9a527f4
2022-10-03 13:17:48 -07:00
TreeHugger Robot
b85726f975 Merge "Make preference unselectable" 2022-10-03 13:58:28 +00:00
Neil Fuller
f3c4f68abf Track method renames
Track method renames:

getSuggestManualTimeZoneCapability() ->
getSetManualTimeZoneCapability()

getSuggestManualTimeCapability() ->
getSetManualTimeCapability()

Assuming that TimeManager.setManualTime() and
TimeManager.setManualTimeZone() become system APIs in the next release,
they can be used in SettingsUI in place of
TimeDetector.suggestManualTime() and
TimeZoneDetector.suggestManualTimeZone() (in a later commit).

Bug: 236612872
Test: build only
Change-Id: Ifffc022c109fa68ae705e32400db9bfc8a1632ca
2022-10-03 13:59:00 +01:00
Bill Lin
e4bf1025d1 Merge "Do not override SUW Glif theme when onApplyThemeResource() callback" into tm-qpr-dev am: e5a4e38c8c am: 6b763d1999
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20080179

Change-Id: I6ead342e386b2a208515997686e9a341075cdce2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-01 00:55:08 +00:00
Bill Lin
6b763d1999 Merge "Do not override SUW Glif theme when onApplyThemeResource() callback" into tm-qpr-dev am: e5a4e38c8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20080179

Change-Id: I5a16ac472b0a08273d2410b39741675a6f998f51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-01 00:22:29 +00:00
Bill Lin
e5a4e38c8c Merge "Do not override SUW Glif theme when onApplyThemeResource() callback" into tm-qpr-dev 2022-09-30 23:54:31 +00:00
Tsung-Mao Fang
05412c37c7 Make preference unselectable
Because Encrypt phone is not an entry which can launch to next page,
let's make it unselectable now.

Change-Id: I860c76c501fccc488b2e120a4702c652f1bee134
Test: Manual test
Fix: 249193859
2022-09-30 15:15:50 +08:00
lbill
39175b2f87 Do not override SUW Glif theme when onApplyThemeResource() callback
1. Accodring to settings & setupdesign lib theme architecture
Only force apply sytle SetupWizardPartnerResource for current
activity/contextThemeWrapper is sufficient, override GlifV3Theme
again will cause incorrect resource mapping of private attributes.

2. Set Theme_AlertDialog style for AlertDialog in for Material design
- FingerprintEnrollEnrolling
- FingerprintEnrollFindSensor

3. Add test for AlertDialog theme, and fix broken test cases

Fixes: 245684949
Bug: 249789759
Bug: 248994476
Test: manual in SUW `adb shell cmd uimode night yes` and check visual
Test: manual in SUW enrolling check timeout dialog apply theme
Test: manual in SUW enroll UDFPS tips lottie view showing expectedly
Test: manual in SUW enroll UDFPS landscape showing correct layout
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
      SetupFingerprintEnrollFindSensorTest
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
      FingerprintEnrollEnrollingTest
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
      FingerprintEnrollFindSensorTest
Change-Id: I17cbf26e38318e6681ba124d23bf86317a0f1e1d
2022-09-30 04:58:28 +00:00
Tom Hsu
f0635482c7 Merge "Revert "[Languages] Add new information to system language page."" into tm-qpr-dev am: 43ceaa85ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064133

Change-Id: Ie4a6ec648a8a524d25f44dca22cbc145884c664b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 16:27:06 +00:00
Tom Hsu
43ceaa85ee Merge "Revert "[Languages] Add new information to system language page."" into tm-qpr-dev 2022-09-29 15:52:32 +00:00
Tom Hsu
6dbf883bd8 Merge "Revert "[Languages] Add new information to system language page."" 2022-09-29 09:08:09 +00:00
Tom Hsu
a4c78e3820 Revert "[Languages] Add new information to system language page."
This reverts commit 3cbb6f8680.

Reason for revert: b/248456615

Change-Id: I3bc5088784ed97f69ffadb0ea69078bfcf7dc39d
Merged-In: I3bc5088784ed97f69ffadb0ea69078bfcf7dc39d
2022-09-29 04:38:30 +00:00
Tom Hsu
2f753c7ba7 Revert "[Languages] Add new information to system language page."
This reverts commit 3cbb6f8680.

Reason for revert: b/248456615

Bug: b/248456615
Test: Manual test pass

Change-Id: I3bc5088784ed97f69ffadb0ea69078bfcf7dc39d
2022-09-29 04:01:03 +00:00
SongFerng Wang
1a53831df1 Merge "Add the way for hiding the "contact sharing" on the pairing dialog" into tm-qpr-dev am: f970d63b3b am: d57eb2054b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20033811

Change-Id: I9c0d24248c6e67d9c43139fa4668fbd4fc813c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 20:46:23 +00:00
SongFerng Wang
d57eb2054b Merge "Add the way for hiding the "contact sharing" on the pairing dialog" into tm-qpr-dev am: f970d63b3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20033811

Change-Id: Ic22f2dd71f84556397bf44344812aa5fe156c024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 20:09:16 +00:00
SongFerng Wang
f970d63b3b Merge "Add the way for hiding the "contact sharing" on the pairing dialog" into tm-qpr-dev 2022-09-28 19:45:33 +00:00
Evan Severson
5ba4065703 Make SensorToggleControllers lifecycle aware
We need to watch the lifecycle so that we can unregister callbacks and
not cause leaks.

This change also rewrites the SensorPrivacyManagerHelper. The previous
implmementation was using deprecated apis. It also had an issue where
if a callback was added it would not necessarily register alistener with
the callback with the service since that was only done when the value is
checked. Now we register a listener when the class is instantiated and
with the new API there will only be the 1.

Finally we impove the tests to have more coverage and test both
SensorToggleControllers and the SensorPRivacyManagerHelper class.

Test: Use profiler to verify no more leaks
      SensorToggleControllerTest, SensorPrivacyManagerHelperTest
Bug: 244280065
Change-Id: Ibf0bcee455444a104ca6800302907c3dc0de8f1f
2022-09-28 11:42:01 -07:00
TreeHugger Robot
e7e1f37321 Merge "Restrict Wi-Fi configuration if settings UI is restricted" into tm-qpr-dev am: ee21072a5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20063305

Change-Id: I3e4661df4a20415b44390eb6484811e3073e9f58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 17:32:08 +00:00
TreeHugger Robot
ee21072a5e Merge "Restrict Wi-Fi configuration if settings UI is restricted" into tm-qpr-dev 2022-09-28 16:48:10 +00:00
Milton Wu
9c3b6ef6fc [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b894f am: 23e9e62a23
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566

Change-Id: I845d15a1cca778eb3becaeb7cb8eae80da9b246d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 03:45:33 +00:00
Milton Wu
1ec2b21d42 [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b894f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566

Change-Id: I2a898ea074fa01c6ffd8742e9d41762bed20fab4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 03:43:32 +00:00
Milton Wu
23e9e62a23 [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b894f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566

Change-Id: Ie15c1ba2581ec94323d365e55e623e355fc26069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 03:40:12 +00:00
Ats Jenk
ecc62eb469 Merge "Add support to hide developer tile based on a flag" into tm-qpr-dev am: f1807d897b am: 6d69676059
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20031235

Change-Id: If41ee31670d44d19c0b4faf2fb3d258203191abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 16:49:59 +00:00
Ats Jenk
6d69676059 Merge "Add support to hide developer tile based on a flag" into tm-qpr-dev am: f1807d897b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20031235

Change-Id: I9715ad0b620212e08d4d2f744d17c12da26b26e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 16:19:51 +00:00
Weng Su
6629b12a08 Restrict Wi-Fi configuration if settings UI is restricted
- Don't launch W-Fi configuration settings if the settings UI is restricted (including guest users).

Bug: 246301667
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Merged-In: Id82498f41765f955e01bb311bb221d26f9574f31
Change-Id: Id82498f41765f955e01bb311bb221d26f9574f31
(cherry picked from commit aaa65fc6f0)
2022-09-27 14:31:09 +00:00
SongFerngWang
51cabc5553 Add the way for hiding the "contact sharing" on the pairing dialog
There is the way to hide the "contact sharing" at the "device details"
page, but it did not be implemented on the pairing dialog. Add this way
on pairing dialog.

Bug: 246668278
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothPairingControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothPairingDialogTest

Change-Id: I472acb80e70fe5d2a59cb9eed95fcbccfa417fa5
2022-09-27 16:06:49 +08:00
TreeHugger Robot
934dfd746d Merge "Restrict Wi-Fi configuration if settings UI is restricted" 2022-09-27 07:50:15 +00:00
TreeHugger Robot
9b6a9884f6 Merge "Show WiFi minimum level when the Wi-Fi level is UNREACHABLE" 2022-09-27 07:48:14 +00:00
Weng Su
673f06c2ec Show WiFi minimum level when the Wi-Fi level is UNREACHABLE
- Use WIFI_LEVEL_MIN instead of WIFI_LEVEL_UNREACHABLE to get the Wi-Fi icon resource to avoid app crashing because no valid Wi-Fi icon could be found.

Bug: 213294802
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest

Change-Id: Ia805e902716c25db3276b96116a84d0dd2d96a1b
2022-09-26 20:54:19 +08:00
Kuan Wang
56d1c2fa55 Extract the logic of loading battery usage data form BatteryUsageStats
in DataProcessor to make it reusable by BatteryUsageLoaderService.

Bug: 246233366
Test: make RunSettingsRoboTests + manually
Change-Id: I5c721120cc4005044def63937506cc64339a3e6b
2022-09-26 10:45:30 +00:00
Nikhil Kumar
4c5fb86e80 Merge "Enable Name and Avatar change without turning on multi-user" 2022-09-26 08:52:49 +00:00
Weng Su
aaa65fc6f0 Restrict Wi-Fi configuration if settings UI is restricted
- Don't launch W-Fi configuration settings if the settings UI is restricted (including guest users).

Bug: 246301667
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Id82498f41765f955e01bb311bb221d26f9574f31
2022-09-26 03:35:12 +08:00
Ats Jenk
618876c6c9 Add support to hide developer tile based on a flag
Define new meta-data option for development tiles that can be used to
specify a sysprop flag.
If this meta-data is present, the value will be used as the flag name
that has to be enabled for the preference to show up.

Bug: 248363970
Test: atest SettingsRoboTests:DevelopmentTilePreferenceControllerTest
Change-Id: I66d56777a6290d7fee739492bd2871f637791d75
2022-09-22 19:31:47 -07:00
Gil Cukierman
340c2c3fb4 Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a am: 24ac97a0bf am: 1f750fcba6 am: ccfd44162f am: 02ef8722be
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737

Change-Id: Ife21ec23f145a7d4c52f2f6109cba514a9779370
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:40:18 +00:00
Gil Cukierman
02ef8722be Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a am: 24ac97a0bf am: 1f750fcba6 am: ccfd44162f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737

Change-Id: I22634f05290d7c86c79e804b15a0db29d807911b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 17:50:11 +00:00
Gil Cukierman
ccfd44162f Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a am: 24ac97a0bf am: 1f750fcba6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737

Change-Id: I43a581174938d47bb6b5aea5eb552057a5ce9b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 16:12:54 +00:00
Gil Cukierman
1f750fcba6 Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a am: 24ac97a0bf
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737

Change-Id: I50305e27b205160d85825143f614cd52b1bab2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 15:23:54 +00:00
Jason Hsu
b161bade37 Merge "Fix not on the top when entering device detail page" into tm-qpr-dev am: 9ac1712145
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20008465

Change-Id: I2a8dd8e4bb9f11ab239ec7a4e420b38c52623a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 08:27:44 +00:00
Jason Hsu
9ac1712145 Merge "Fix not on the top when entering device detail page" into tm-qpr-dev 2022-09-22 07:37:28 +00:00