Commit Graph

17491 Commits

Author SHA1 Message Date
Chaohui Wang
28d838d5e7 Clean up some UnusedResources detected by lint
Bug: 234570979
Test: Manual with Settings App
Change-Id: I2ad634d9beba623a5cdcff015c9aa28d78525cb7
2022-09-09 16:51:12 +08:00
Shen Lin
78fc8a21a4 Fix potential NPE crash in ConversationHeaderPreferenceController
mChannel is nullable and we have to do a null-check before calling its method.

Bug: 245506600

Test: manual and atest
Change-Id: Ib739f0f66f1a2aee1b2741263e7c206341782892
2022-09-09 10:16:29 +08:00
Rambo Wang
c21d77b724 Merge "Support AIDL IDumpstateDevice service in verbose vendor logging" into tm-qpr-dev am: 31cd5304ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19885633

Change-Id: I7b90423f637140df909eedc024a801d700148e42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 22:23:55 +00:00
Rambo Wang
31cd5304ab Merge "Support AIDL IDumpstateDevice service in verbose vendor logging" into tm-qpr-dev 2022-09-08 21:57:11 +00:00
TreeHugger Robot
d7d4d9db50 Merge "Support AIDL IDumpstateDevice service in verbose vendor logging" 2022-09-08 17:18:16 +00:00
Milton Wu
4f93ef7790 Fix incorrect choose screen lock during unicorn
ChooseLockGeneneric uses intent extra key to determine correct strings
on "Choose screen lock" screen.

Bug: 219419005
Test: atest BiometricEnrollActivityTest
Test: Manully test SUW as following combinations
      1. W/ unicorn flow or W/O unicorn flow
      2. Fingerprint only devices or Fingerpirnt+Face devices
Change-Id: I2abf9555676f3fb3b92dd6ddcc091ea8158bfe9f
2022-09-08 07:54:53 +00:00
Jason Chiu
1adeb1bda6 Merge "Add a config to control whether SettingsIntelligence supports Slice" 2022-09-08 06:56:35 +00:00
Rambo Wang
c9292dc792 Support AIDL IDumpstateDevice service in verbose vendor logging
IDumpstateDevice HAL switched to AIDL service in P22 devices.
This change will firstly apply to AIDL service if available and
fall back to HIDL service if not, making the feature work for
both HIDL an AIDL based devices.

Bug: 242634531
Test: make && make RunSettingsRoboTests
Change-Id: I4a2ec44092804574a60113e5be3df19b586bfa64
Merged-In: I4a2ec44092804574a60113e5be3df19b586bfa64
(cherry picked from commit 17a9fb6bec)
2022-09-08 05:29:10 +00:00
TreeHugger Robot
94d1718089 Merge "Support accessibility for battery chart (1)" 2022-09-08 05:09:37 +00:00
Menghan Li
5f9570381f Merge "Fix extra dim turns on failed in setting search bar" into tm-qpr-dev am: 299057e294
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880529

Change-Id: I0e107181ccbf59fc80d1b429768f8281128092cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 02:31:25 +00:00
Rambo Wang
17a9fb6bec Support AIDL IDumpstateDevice service in verbose vendor logging
IDumpstateDevice HAL switched to AIDL service in P22 devices.
This change will firstly apply to AIDL service if available and
fall back to HIDL service if not, making the feature work for
both HIDL an AIDL based devices.

Bug: 242634531
Test: make && make RunSettingsRoboTests
Change-Id: I4a2ec44092804574a60113e5be3df19b586bfa64
2022-09-08 02:21:43 +00:00
Bill Lin
6f9bf171a9 Merge "Fix regression of pressing power key cancel sfps enrollment" into tm-qpr-dev am: b9263732ee am: 37785c81ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880527

Change-Id: Id4de390f6bf0276795ca1f73759a2172e25ef7e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 02:18:58 +00:00
Menghan Li
299057e294 Merge "Fix extra dim turns on failed in setting search bar" into tm-qpr-dev 2022-09-08 02:02:26 +00:00
Bill Lin
37785c81ce Merge "Fix regression of pressing power key cancel sfps enrollment" into tm-qpr-dev am: b9263732ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880527

Change-Id: I60e52637331ca2801845999334a8d83f4bec04fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 01:46:49 +00:00
Bill Lin
b9263732ee Merge "Fix regression of pressing power key cancel sfps enrollment" into tm-qpr-dev 2022-09-08 00:59:09 +00:00
menghanli
aaee157fdd Fix extra dim turns on failed in setting search bar
Root cause: Don't call displayPreference before setChecked called.
Solution: Don't show quick settings tooltips if preference is not ready.

Bug: 237850687
Bug: 244676175
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest
Change-Id: I52425190cce4ab3cf31be025a743bf8b212fa1f9
Merged-In: I52425190cce4ab3cf31be025a743bf8b212fa1f9
2022-09-08 07:44:17 +08:00
Jason Chiu
5e365d3541 Add a config to control whether SettingsIntelligence supports Slice
Fix: 240371240
Test: manual, robotest
Change-Id: Iddb08b521011a5e5134b8358a135cefb34809371
2022-09-07 16:17:39 +08:00
lbill
82a42834b1 Fix regression of pressing power key cancel sfps enrollment
Previous ag/19699461 used to fix UdfpsControllerOverlay bug.
However, we didn't consider a feature click power button to
notify user with a Toast on sfps project.

Bug: 245383975
Bug: 228261883
Bug: 242478941
Bug: 227905887
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Test: manual verify sfps enrollment, press/long press power key would
not cancel enrollment.
Test: manual verify udfps enrollment, UdfpsControllerOverlay lose focus
cancel enrollment.

Change-Id: I44394bdb91660b27a704064a7f7cdc5d0ad95d30
2022-09-07 04:01:40 +00:00
TreeHugger Robot
0c57c18276 Merge "Fix Incorrect Trust Agent Count" into tm-qpr-dev am: 9f1dba6017 am: 32c2f9b75f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19669514

Change-Id: I4ca6c2bf0fe35d88d99a1b1e96c074e2734993b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06 19:46:23 +00:00
TreeHugger Robot
32c2f9b75f Merge "Fix Incorrect Trust Agent Count" into tm-qpr-dev am: 9f1dba6017
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19669514

Change-Id: I2334c56c62c3f019ad50d505a91b08351c392aee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06 19:01:06 +00:00
TreeHugger Robot
9f1dba6017 Merge "Fix Incorrect Trust Agent Count" into tm-qpr-dev 2022-09-06 18:29:43 +00:00
Jason Hsu
2ee7ebdf61 Merge changes If6c3b2f3,I8dafefbb
* changes:
  Fix 'Hearing aids' of Accessibility page didn't display connected info promptly when mobile restart
  Fix after dis/reconnect HA, DUT will request to re-pair one side of HA
2022-09-06 08:26:37 +00:00
TreeHugger Robot
7929ab9e8b Merge "Refine WifiWakeupPreferenceController" 2022-09-06 07:42:03 +00:00
jasonwshsu
6e7a8422ac Fix 'Hearing aids' of Accessibility page didn't display connected info promptly when mobile restart
Root Cause: get empty result in hearingAidProfile.getConnectedDevices()

Solution: Need to listen to onServiceConnected() to wait for HearingAidService get connected

Bug: 243489972
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityHearingAidPreferenceControllerTest
Change-Id: If6c3b2f3df81388c44e744e364e6258bde8bb645
2022-09-06 15:08:34 +08:00
menghanli
8541423080 Fix incorrect remove animation switch status after turned off Talkback
Root cause: The ag/3373822 introduce the comparison by string since 2017, but it would conflict with AccessibilityService#setAnimationScale(float) which is  added by API level 33.
Solution: Use float comparison instead and observe the key changed to update status if the setting page is on foreground.

Bug: 244687190
Test: atest DisableAnimationsPreferenceControllerTest
Change-Id: I59b7edb70a27af4276eccd6f19d2ef46ba30b604
2022-09-06 09:43:37 +08:00
Menghan Li
d7d1d9451b Merge "Refactor ToggleAutoclickPreferenceFragment to improve maintainability" 2022-09-05 23:39:44 +00:00
TreeHugger Robot
ada5c33946 Merge "Hide toggle to Turn on Wi-Fi automatically preference in Search settings" into tm-qpr-dev am: 06cc4ed4ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19816198

Change-Id: I6b16ef9121b890647e1ff49ee6e380b8bbdaa832
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 08:36:45 +00:00
TreeHugger Robot
06cc4ed4ab Merge "Hide toggle to Turn on Wi-Fi automatically preference in Search settings" into tm-qpr-dev 2022-09-05 07:51:36 +00:00
Tiffany Nguyen
3fa60efb6c Add Apps > Battery optimization page implementation. am: 6147e0fa5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19726219

Change-Id: I3498f3c1482acf6ece57bd1297bffd9c08d81c5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 04:04:13 +00:00
Tiffany Nguyen
6147e0fa5c Add Apps > Battery optimization page implementation.
Moving the old restricted page to the new optimization page will happen
in a follow-up CL.

Test: Unit, manual
Bug: 238026672
Change-Id: I5fee9ebe03284a013da6bfca9ada8b166c6af91c
(cherry picked from commit 5ecb1a1d69)
Merged-In: I5fee9ebe03284a013da6bfca9ada8b166c6af91c
2022-09-04 15:44:18 +00:00
jasonwshsu
88f36dccc7 Fix after dis/reconnect HA, DUT will request to re-pair one side of HA
Root Cause: Another side of HA jumps to connecting state after pair-other-ear dialog appears.

Solution: Listen to onDeviceAttributesChanged() callback to know when
the sub device gets connected, then to dismiss dialog.

Bug: 236782832
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidUtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidPairingDialogFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaDeviceGroupControllerTest
Change-Id: I8dafefbb05e7cf1cadf37a7acbb2c5d66f2d0a78
2022-09-03 18:28:11 +08:00
Weng Su
f49c24cb82 Hide toggle to Turn on Wi-Fi automatically preference in Search settings
- If the location setting is enabled, keep the current design. that the user can switch the toggle directly in the search settings to the "Turn on Wi-Fi automatically" toggle preference.

- If the location setting is disabled, hide the switch toggle to "Turn on Wi-Fi automatically" preference to avoid unexpected behavior.

- The user can click the "Turn on Wi-Fi automatically" preference to jump to the Network preference settings, and see a reminder message in the summary to enable the location settings first before switching the toggle.

- Move the check for mFragment to a suitable location to avoid unnecessary checks.

Bug: 235421460
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiWakeupPreferenceControllerTest

Change-Id: Ib2c6b90308606d32179334d13be91e308971084f
Merged-In: Ib2c6b90308606d32179334d13be91e308971084f
(cherry picked from commit 59403ef3f2)
2022-09-02 18:36:00 +00:00
Weng Su
0e570cd2f8 Refine WifiWakeupPreferenceController
- Move the check for mFragment to a suitable location to avoid unnecessary checks.

Bug: 235421460
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiWakeupPreferenceControllerTest

Change-Id: I638cc6f2399b1332ee7a7092854d1e2442cacccd
2022-09-03 02:29:59 +08:00
YK Hung
b637d56d09 Merge "Update defend tips card" into tm-qpr-dev am: 8bf872331b am: 06e92f5e45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764101

Change-Id: I6bf829b5f72796eb136bc2e6745008e56032cfc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 16:22:41 +00:00
YK Hung
06e92f5e45 Merge "Update defend tips card" into tm-qpr-dev am: 8bf872331b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764101

Change-Id: I6c4d4d551dc4ccd1897422cd65bf26cadeb9994c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 15:46:17 +00:00
YK Hung
8bf872331b Merge "Update defend tips card" into tm-qpr-dev 2022-09-02 15:18:50 +00:00
TreeHugger Robot
52892dad16 Merge "Hide toggle to Turn on Wi-Fi automatically preference in Search settings" 2022-09-01 09:32:05 +00:00
TreeHugger Robot
4d6e33e3e8 Merge "Update the timestamp label into uppercase and increase vertical offset" into tm-qpr-dev am: 0f1f02693e am: 23c78beab2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19784482

Change-Id: Iec164b894ac9fb7101709262e1703642d80d4515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 07:02:03 +00:00
TreeHugger Robot
23c78beab2 Merge "Update the timestamp label into uppercase and increase vertical offset" into tm-qpr-dev am: 0f1f02693e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19784482

Change-Id: Ic5be9dd619cb394992f829dc5d2f43c6cf2bd246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 06:42:11 +00:00
TreeHugger Robot
0f1f02693e Merge "Update the timestamp label into uppercase and increase vertical offset" into tm-qpr-dev 2022-09-01 06:35:09 +00:00
Wesley
243b450428 Update defend tips card
- Update defend tips card to unclickable
 - Update secondary button's action and content description
 screenshot: https://screenshot.googleplex.com/BYU8Mh5abJ9Tirh.png

Bug: 243769797
Bug: 243641857
Bug: 244219076
Test: make SettingsRoboTests
Change-Id: I7fdf5f7404d33f0374a992c83a7653a01b9f11bc
2022-09-01 04:09:31 +00:00
Grace Cheng
35125a3d2b Merge "Implement SFPS guided enrollment for T6" into tm-qpr-dev am: 2c9dab6f0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19562137

Change-Id: I11ce675560e40ab1c946b01e14fee329e77bfac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 01:13:36 +00:00
Grace Cheng
2c9dab6f0a Merge "Implement SFPS guided enrollment for T6" into tm-qpr-dev 2022-09-01 00:47:41 +00:00
Grace Cheng
4a187e15d6 Implement SFPS guided enrollment for T6
Reduces perception of long enrollment process by introducing new enrollment layout and stages for SFPS. Also adds user feedback via new animated assets with dynamic colors, and all associated strings and a11y labels.

Test: Observe new guided enrollment process on T6
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Fixes: 232024488
Fixes: 233091341
Fixes: 241165082
Fixes: 242218240
Fixes: 243813773
Change-Id: I1fa0b9349545586919eceeb9d05f365c2f2ec491
Merged-In: I1fa0b9349545586919eceeb9d05f365c2f2ec491
2022-09-01 00:47:22 +00:00
Grace Cheng
230f4193fb Merge "Implement SFPS guided enrollment for T6" 2022-09-01 00:46:25 +00:00
Grace Cheng
219b28bb8d Implement SFPS guided enrollment for T6
Reduces perception of long enrollment process by introducing new enrollment layout and stages for SFPS. Also adds user feedback via new animated assets with dynamic colors, and all associated strings and a11y labels.

Test: Observe new guided enrollment process on T6
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Fixes: 232024488
Fixes: 233091341
Fixes: 241165082
Fixes: 242218240
Change-Id: I1fa0b9349545586919eceeb9d05f365c2f2ec491
2022-08-31 20:15:55 +00:00
Diya Bera
c1288af511 Merge "SecuritySettings test" into tm-qpr-dev am: 73e4742941 am: c18579f168
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19672131

Change-Id: I81fdcec2fe19926da3d40d52fa9e92972c0ad676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 19:55:26 +00:00
Diya Bera
c18579f168 Merge "SecuritySettings test" into tm-qpr-dev am: 73e4742941
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19672131

Change-Id: I9bd7d32f1ada80c9bf6456905a8be6fbe1b1d4e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 18:56:36 +00:00
Weng Su
59403ef3f2 Hide toggle to Turn on Wi-Fi automatically preference in Search settings
- If the location setting is enabled, keep the current design. that the user can switch the toggle directly in the search settings to the "Turn on Wi-Fi automatically" toggle preference.

- If the location setting is disabled, hide the switch toggle to "Turn on Wi-Fi automatically" preference to avoid unexpected behavior.

- The user can click the "Turn on Wi-Fi automatically" preference to jump to the Network preference settings, and see a reminder message in the summary to enable the location settings first before switching the toggle.

Bug: 235421460
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiWakeupPreferenceControllerTest

Change-Id: Ib2c6b90308606d32179334d13be91e308971084f
2022-08-31 18:52:54 +00:00
Diya Bera
73e4742941 Merge "SecuritySettings test" into tm-qpr-dev 2022-08-31 18:25:45 +00:00