Commit Graph

14497 Commits

Author SHA1 Message Date
Abel Tesfaye
f00356aee8 Merge "Cleanup listener reference in Screen Attention" 2022-09-15 17:07:18 +00:00
TreeHugger Robot
24f8f3f754 Merge "Add Spatial audio settings for LE Audio devices" 2022-09-15 14:33:38 +00:00
Zaiyue Xue
d4a26a7a80 Merge changes from topic "accessibility1" into tm-qpr-dev am: 9b24df2c38 am: 83ef9001e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19771692

Change-Id: I8bf9b9c1a6f884850ff7c81965589b5724cdd065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 01:39:50 +00:00
Kuan Wang
9059b26db8 Add logging for count of shown / hidden apps in Battery Usage page. am: 676bcedb85 am: 93c0d0227b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19893207

Change-Id: I8014b3155c6f731aa88133c718c986b09893723e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 01:39:00 +00:00
Hugh Chen
f8704add51 Add Spatial audio settings for LE Audio devices
- Adds TYPE_BLE_HEADSE, TYPE_BLE_SPEAKER and TYPE_BLE_BROADCAST for
  display Le audio devices.
- Adds TYPE_HEARING_AID for display hearing aid devices.

Bug: 244528781
Test: make -j64 RunSettingsRoboTests
Change-Id: I1278a5e0c93fdc5a4873df68032128ffedfe72d6
2022-09-14 12:00:45 +00:00
Zaiyue Xue
83ef9001e7 Merge changes from topic "accessibility1" into tm-qpr-dev am: 9b24df2c38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19771692

Change-Id: I80680875b02983c58a9e3c324dc13e055ad75fb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 06:09:40 +00:00
Zaiyue Xue
9479b18cf9 Support accessibility for battery chart (1) am: 9c962b03e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764112

Change-Id: If91f5422518ff8cc76dcc5c216a83a70dd7a337d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 06:09:35 +00:00
Zaiyue Xue
9b24df2c38 Merge changes from topic "accessibility1" into tm-qpr-dev
* changes:
  Support accessibility for battery chart (4)
  Support accessibility for battery chart (3)
  Support accessibility for battery chart (2)
  Support accessibility for battery chart (1)
2022-09-14 05:46:17 +00:00
Kuan Wang
93c0d0227b Add logging for count of shown / hidden apps in Battery Usage page. am: 676bcedb85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19893207

Change-Id: I52977900a9f669fa7b31c2c72cbd5ec10646a28a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 02:36:50 +00:00
Kuan Wang
676bcedb85 Add logging for count of shown / hidden apps in Battery Usage page.
Bug: 245455490
Test: manually
Change-Id: I7342e822f00f9a0aedcef592cae9809251518812
2022-09-14 02:09:16 +00:00
Chaohui Wang
7ef27fbe85 Clean up some UnusedResources detected by lint 4
Bug: 234570979
Test: Manual with Settings App
Change-Id: Icc21ef3bedc7a39e7841271f51b77e9b543f6f0f
2022-09-13 20:00:38 +08:00
Zaiyue Xue
79311805b6 Support accessibility for battery chart (3)
Support accessibilty read out full timestamp labels instead of the short one, e.g "Sunday" instead of "Sun".

Bug: 242989585
Test: manual
Change-Id: Ica2176ef3f07849d278327b9301f8c318782c2d5
2022-09-13 14:43:20 +08:00
Zaiyue Xue
9c962b03e9 Support accessibility for battery chart (1)
Remove the logic of disabling clickable when accessability is on in battery chartview.

Bug: 242989585
Test: manual
Change-Id: I92ce0ff5aac5220d686d600dbdf1d5738fe2c385
Merged-In: I92ce0ff5aac5220d686d600dbdf1d5738fe2c385
2022-09-13 14:21:01 +08:00
Abel Tesfaye
378990e13f Cleanup listener reference in Screen Attention
This will fix a memory leak being caused by dangling listeners.

Test: locally with oriole, make RunSettingsRoboTests -j$(nproc) ROBOTEST_FILTER=AdaptiveSleepCameraStatePreferenceControllerTest,AdaptiveSleepPreferenceControllerTest

Bug: 245990072
Change-Id: I35eeedc3ece719f1f3baff6235cc5ac2d42fbba3
2022-09-12 13:41:31 +00:00
Chaohui Wang
7fe7ef383e Clean up some UnusedResources detected by lint 2
Bug: 234570979
Test: Manual with Settings App
Change-Id: I2421f1147ce8c9b09c2428355610a9089481d547
2022-09-10 17:34:11 +08:00
Treehugger Robot
8552428dbc Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad am: 1f9c4c483a am: 693ce48efb am: 2d1b325cd0 am: 5d3e2d3f42
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776

Change-Id: I6faff06b6096420bd58b7e8de3bf77c691f67c2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09 16:38:50 +00:00
Treehugger Robot
5d3e2d3f42 Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad am: 1f9c4c483a am: 693ce48efb am: 2d1b325cd0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776

Change-Id: I8fc0d30dd8338152ce2e9c7dc7741b9543f6dcf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09 16:10:43 +00:00
Treehugger Robot
2d1b325cd0 Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad am: 1f9c4c483a am: 693ce48efb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776

Change-Id: If71d8f5e024a9ecc993ff35140995c3627c85196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09 15:46:13 +00:00
Treehugger Robot
693ce48efb Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad am: 1f9c4c483a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776

Change-Id: I2b246b643ff341ff8a2158cbabd3f4a33c04703f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09 15:18:57 +00:00
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
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
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
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