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
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
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
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
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
Bill Lin
8a8fe4fabd
Merge "Apply dark light theme for enrollment activities" into tm-qpr-dev am: a46b426bcf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19989471
Change-Id: I4b46bef348873f663b4c7368a2e659359e6f8486
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 02:46:29 +00:00
Bill Lin
a46b426bcf
Merge "Apply dark light theme for enrollment activities" into tm-qpr-dev
2022-09-22 01:55:59 +00:00
Daniel Sandler
ba81fe61cf
Merge "Launch the platform easter egg in a new task." into tm-qpr-dev am: e43bf3cd9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20003711
Change-Id: I794c118911d6d2fa47ff9190a6108fc1e3d0f11c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:22:53 +00:00
TreeHugger Robot
9a4844c2a9
Merge "Show app list in Battery Usage page when there is no battery level data." into tm-qpr-dev am: 53f1e23d63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949396
Change-Id: Id8871a6434f46e39f9814490c6cb85eb9529d50e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:22:16 +00:00
Gil Cukierman
4429054bb1
Use AAPT2 For SettingsUnitTests
...
Forces tradefed to use aapt2 for SettingsUnitTests to get around
the issue of Settings.apk not being parseable by aapt.
Bug: 247779071
Test: atest SettingsUnitTests
Change-Id: I8af260f8d2c438512d3e61f0028accf7b40c8a00
2022-09-21 17:48:20 +00:00
jasonwshsu
35e20d5ace
Fix not on the top when entering device detail page
...
Root Cause: Added SpacePreference in xml let the page renders order
incorrectly.
Solution: That SpacePreference should only be visible when the device is
hearing aid.
Bug: 245681095
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsPairOtherControllerTest
Merged-In: Ic0be940c8466b5e1e301255868c29d06bd4428bd
Merged-In: I442445a861898258a73f37ad8f85bcee387fbf58
Change-Id: Icca48d9c2643507638b2b581d052530521cce5df
2022-09-21 23:54:15 +08:00
Daniel Sandler
e43bf3cd9d
Merge "Launch the platform easter egg in a new task." into tm-qpr-dev
2022-09-21 14:11:57 +00:00
Dan Sandler
5eeb6c3792
Launch the platform easter egg in a new task.
...
This ensures that when PlatLogoActivity is launched on a
large-screen device, it properly takes over the full screen
(and doesn't hide the status bar for Settings!).
Bug: 243407943
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FirmwareVersionDetailPreferenceControllerTest
Change-Id: Icf10aa43e5b4a27a2fa98ea41b5a9e9cf659e895
2022-09-20 20:10:17 -04:00
Kuan Wang
bd9042c47f
Show app list in Battery Usage page when there is no battery level data.
...
https://drive.google.com/file/d/1iQxKmEp_weNYdT4JnsiZgYy9mCdn7SRv/view?usp=sharing
Bug: 246233366
Test: make RunSettingsRoboTests + manually
Change-Id: If536c93652506c8009f5cabf3d0ae373b6825bfc
Merged-In: If536c93652506c8009f5cabf3d0ae373b6825bfc
2022-09-20 12:11:25 +08:00
lbill
fd269d08ec
Apply dark light theme for enrollment activities
...
Override onApplyThemeResource() and apply SetupWizardPartnerResource
to make the dark light theme activate.
Theme change scope:
1) FingerprintEnrollEnrolling
2) FingerprintEnrollFindSensor
3) SetupFingerprintEnrollEnrolling
4) SetupFingerprintEnrollFindSensor
Bug: 245684949
Test: manual in SUW `adb shell cmd uimode night yes` and check visual
Test: manual in SUW enrolling check timeout dialog apply theme
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
SetupFingerprintEnrollFindSensorTest
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
FingerprintEnrollEnrollingTest
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
FingerprintEnrollFindSensorTest
Change-Id: I16f1070612e3e27546e6aa004fc4cdd3d7947191
2022-09-20 01:30:28 +00:00
TreeHugger Robot
dd238fd0ad
Merge "Show greyed out icon when Wi-Fi network is restricted to configurate" into tm-qpr-dev am: 74a748ece8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19967514
Change-Id: I5646b7ff9e291b70295cbbb180f3e0513f51866f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-19 04:23:30 +00:00
TreeHugger Robot
74a748ece8
Merge "Show greyed out icon when Wi-Fi network is restricted to configurate" into tm-qpr-dev
2022-09-19 03:52:34 +00:00
Weng Su
3499db23ff
Show greyed out icon when Wi-Fi network is restricted to configurate
...
- Use Drawable#setTintList() instead of Drawable#setTint() to show greyed out icon when the preference is disabled.
Bug: 233175849
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiEntryPreferenceTest
Change-Id: I451106530bc19bc733fd58a57e8ac336b023e65e
2022-09-19 02:22:47 +08:00
TreeHugger Robot
6c0140b340
Merge "Add Spatial audio settings for LE Audio devices" into tm-qpr-dev am: f4d0d420bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19967512
Change-Id: I5dcdb9766382a9b4c9d36601ef71da4181e1dea2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-16 21:00:54 +00:00
Hugh Chen
bdfd8531a9
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
Merged-In: I1278a5e0c93fdc5a4873df68032128ffedfe72d6
(cherry picked from commit f8704add51
)
2022-09-16 15:51:15 +00:00
TreeHugger Robot
2f40a918e1
Merge "Update App battery usage page and add tests." into tm-qpr-dev am: 50c7cb834e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19951824
Change-Id: I680de6c08f5a1533779f4c73ff1bd3f7cd8ad0d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-16 08:37:40 +00:00
Tiffany Nguyen
99d3b54a70
Update App battery usage page and add tests.
...
- Add tests
- Remove duplicated "Set battery usage for apps" text
- Clean up some code
Screenshot: https://screenshot.googleplex.com/8LHhyxFA6X4ZFkT.png
Test: make RunSettingsRoboTests -j40
Bug: 244995036
Change-Id: Iaac9b0af10f541100e91b10affacf3307bd5edca
2022-09-15 13:40:12 +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
TreeHugger Robot
9386416103
Merge "Fix incorrect choose screen lock during unicorn" into tm-qpr-dev am: 094d7badba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880532
Change-Id: I7ef1ebee9bc4ba6e165f2dfab8fbef70fdc0d2c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 06:45:45 +00: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
TreeHugger Robot
094d7badba
Merge "Fix incorrect choose screen lock during unicorn" into tm-qpr-dev
2022-09-13 06:23:40 +00: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
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
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
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
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
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
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