Brandon Liu
da401305b0
Merge "Developer option for Grammatical Gender" into main
2023-07-21 23:39:26 +00:00
Vincent Wang
cd4b4f10cb
Merge "Fix enroll introduction page was not closed in background" into udc-qpr-dev am: 11b9933fea
am: 2b255a1f3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24074845
Change-Id: I1da62994914c93695cf34feabdb527b8644b327f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-21 04:06:50 +00:00
Vincent Wang
11b9933fea
Merge "Fix enroll introduction page was not closed in background" into udc-qpr-dev
2023-07-21 03:32:32 +00:00
Angela Wang
8a373a5b14
Merge "Show connecting hearing devices in A11y hearing devices page" into udc-qpr-dev
2023-07-21 02:39:10 +00:00
Michael Mikhail
1ff1626fd5
Merge "Override the state description of volume seekbar." into udc-qpr-dev am: 4b77d876b9
am: 31f420ce9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23985544
Change-Id: I74b6b1e03877780f28779b563ea8ad088aa1233d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-20 16:55:25 +00:00
Weng Su
122668a911
Merge "Show Instant Tether network icon" into udc-qpr-dev am: 8cdbeab57c
am: 988568f64b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24122143
Change-Id: Ib363d47fc121b1f1c1c0f63f5f5d0906ae783607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-20 16:08:02 +00:00
Michael Mikhail
4b77d876b9
Merge "Override the state description of volume seekbar." into udc-qpr-dev
2023-07-20 15:32:28 +00:00
Michael Mikhail
b222b96407
Override the state description of volume seekbar.
...
This overrides the state description of seekbar in order to adjust the
progress percentage. The percentage of seekbar is not matching with the
percentage said by talkback feature when the volume changes. This CL
rounds the percentage to match what is said by talkback.
Bug: 285458191
Test: Enabled talkback and checked percentages of sliders of all sounds
and vibrations volumes. Video attached in bug link.
Test: atest VolumeSeekBarPreferenceTest.
Change-Id: Iedcf3eccb13b7f8ee1a4ca521f0783c55d7a1902
2023-07-20 14:11:26 +00:00
Vania Januar
bbf2dc4991
Merge "USB firmware update for stylus in Stylus USI Device Details" into udc-qpr-dev
2023-07-20 13:42:55 +00:00
Treehugger Robot
facadb94c1
Merge "Remove duplicate routing logic from Settings app" into main
2023-07-20 10:06:33 +00:00
Edgar Wang
ab75ea8099
Restrict toggle/slider slice when the preference restricted
...
Bug: 289980550
Test: robotest & manual
Change-Id: Id87fbf12a2722344dd07886e810e7c61a9f401aa
2023-07-20 03:36:35 +00:00
Brandon Liu
28800ec247
Developer option for Grammatical Gender
...
Bug: b/272626712
Test: Added and verified affected atests pass
Change-Id: Ie07f80d608b78dfce3309533ac02d9a907e5e7b4
2023-07-19 17:29:50 +00:00
Weng Su
8cdbeab57c
Merge "Show Instant Tether network icon" into udc-qpr-dev
2023-07-19 17:18:40 +00:00
Vania Januar
982a13a6e8
Merge "Do not show a summary in Tail button preferences if no app found" into udc-qpr-dev am: 82c36c5cb5
am: 53988c6fe7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23876589
Change-Id: I1cdf019d8dd73e233e647670af4c6d8d48bf9851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 16:13:53 +00:00
Iván Budnik
f9fc86593c
Remove duplicate routing logic from Settings app
...
Also, remove unused MediaRouter2Manager references.
This is a non-functional change.
Bug: 192657812
Test: Presubmit
Change-Id: I72f5f40e157cea922ad40a2602fba881572fb708
2023-07-19 15:58:39 +00:00
Vania Januar
82c36c5cb5
Merge "Do not show a summary in Tail button preferences if no app found" into udc-qpr-dev
2023-07-19 14:57:54 +00:00
Weng Su
c32f5cf3dc
Show Instant Tether network icon
...
- Show hotspot device type icons without signal strength (no Wi-Fi level)
Bug: 268550769
Bug: 290805980
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiEntryPreferenceTest
Change-Id: Iaab5f05f4d2db2d0603825d38c05a840c15484b5
2023-07-19 16:28:57 +08:00
Chaohui Wang
80744abb37
Remove context from BluetoothFeatureProviderImpl
...
Which is not used.
Bug: 286764889
Test: m Settings
Change-Id: I3f82d53f667d9802585f67f0e028ca52114a055e
2023-07-19 15:14:44 +08:00
Angela Wang
653ff8a485
Show connecting hearing devices in A11y hearing devices page
...
We only show connected hearing devices in the hearing devices page now.
When user pairing a device from pairing page and back to the hearing
devices page after the device is bonded, it's confusing no device shown
in the list because the device is still connecting to profiles. We
should show the connecting device to avoid confusion.
Bug: 283268686
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DeviceListPreferenceFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableHearingDeviceUpdaterTest
Change-Id: Id3b29c12b80c282736a3e6ca73bcf317e0652b89
Merged-In: Id3b29c12b80c282736a3e6ca73bcf317e0652b89
2023-07-19 06:29:11 +00:00
Angela Wang
14d35107e8
Merge "Show connecting hearing devices in A11y hearing devices page" into main
2023-07-19 03:19:25 +00:00
Iván Budnik
5c44a4b751
Merge "Inline shouldDisableMediaOutput into Settings app" into main
2023-07-18 14:31:40 +00:00
Vania Januar
986fe4ebc1
USB firmware update for stylus in Stylus USI Device Details
...
Bug: 288850921
Test: StylusUsbFirmwareControllerTest, UsbStylusBroadcastReceiverTest
Change-Id: Ic7cb35799ff00f9998ca569eb4ae091f8010780a
Merged-In: Ic7cb35799ff00f9998ca569eb4ae091f8010780a
2023-07-18 14:09:05 +00:00
Zoey Chen
09294a4e49
Merge "[Language] Should show confirm dialog when deleting the system language and making the second language automatically become the system language" into udc-qpr-dev am: 7fd3730909
am: 6572d4d09e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069201
Change-Id: If40a1678b673aa4331fa3e9624f4c7b858da3ebf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 10:03:00 +00:00
Zoey Chen
e9589de8e5
Merge "[Language] Do not back to previous page if dialog is displaying." into udc-qpr-dev am: 43bd9db3c6
am: 7cabb0d55f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23902484
Change-Id: Ief4ec36d8ebeb3085bb3cf7ee33f1160f151048d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 10:02:14 +00:00
Vania Januar
a7d9944090
Merge "USB firmware update for stylus in Stylus USI Device Details" into main
2023-07-18 09:16:13 +00:00
Zoey Chen
7fd3730909
Merge "[Language] Should show confirm dialog when deleting the system language and making the second language automatically become the system language" into udc-qpr-dev
2023-07-18 08:34:37 +00:00
Zoey Chen
43bd9db3c6
Merge "[Language] Do not back to previous page if dialog is displaying." into udc-qpr-dev
2023-07-18 08:34:34 +00:00
Angela Wang
940e02b807
Show connecting hearing devices in A11y hearing devices page
...
We only show connected hearing devices in the hearing devices page now.
When user pairing a device from pairing page and back to the hearing
devices page after the device is bonded, it's confusing no device shown
in the list because the device is still connecting to profiles. We
should show the connecting device to avoid confusion.
Bug: 283268686
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DeviceListPreferenceFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableHearingDeviceUpdaterTest
Change-Id: Id3b29c12b80c282736a3e6ca73bcf317e0652b89
2023-07-18 04:30:59 +00:00
Shawn Lin
b30887fff4
Merge "Revert "Fix lock pattern is truncated during SUW in folded state"" into udc-qpr-dev am: c23c6164bb
am: 0e404ee882
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24100906
Change-Id: I8603c84920403b90f46e63ce0bd6d6a23a90a7df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 04:28:31 +00:00
Shawn Lin
c23c6164bb
Merge "Revert "Fix lock pattern is truncated during SUW in folded state"" into udc-qpr-dev
2023-07-18 03:18:12 +00:00
Chun-Wei Wang
56d26ff56c
Merge changes from topic "simplify_pw" into udc-qpr-dev am: e414d40e60
am: 3f4b3fdce8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23840849
Change-Id: I3e2974a91c86aecf459ce51f9afdbf6175b8faed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 02:36:44 +00:00
Chun-Wei Wang
e414d40e60
Merge changes from topic "simplify_pw" into udc-qpr-dev
...
* changes:
Handle EXTRA_KEY_REQUEST_WRITE_REPAIR_MODE_PW
Extract common code to SaveChosenLockWorkerBase
2023-07-18 01:17:13 +00:00
Chun-Wei Wang
80d348e343
Merge changes If96ac99a,I45ab17cf into udc-qpr-dev am: 394baf2919
am: dc02e7cbf2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24059809
Change-Id: I413fd5b6323c32438574ec609edc1a80ae0094cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 21:52:16 +00:00
Shivangi Dubey
b5a6c7a020
Merge "Add 'Stay unlocked on fold' toogle to settings" into udc-qpr-dev am: 8c68b0e7e2
am: 32d914ea56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23832963
Change-Id: I340d008ea78939a614e8b33f83c212421d4388d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 16:48:24 +00:00
Vania Januar
f04363547a
USB firmware update for stylus in Stylus USI Device Details
...
Bug: 288850921
Test: StylusUsbFirmwareControllerTest, UsbStylusBroadcastReceiverTest
Change-Id: Ic7cb35799ff00f9998ca569eb4ae091f8010780a
2023-07-17 13:49:30 +00:00
Shawn Lin
072a0e0068
Revert "Fix lock pattern is truncated during SUW in folded state"
...
This reverts commit a2e032bb8e
.
Reason for revert: b/290721507
Change-Id: Ifaaecde6c168ebe22d3b2245df1fd5b0a9c1b8c2
2023-07-17 12:20:42 +00:00
Iván Budnik
470b661c82
Inline shouldDisableMediaOutput into Settings app
...
This allows the removal of a MediaRouter2Manager reference in
SettingsLib. Eventually, the inlined methods should be replaced with an
appropriate long-term alternative through SettingsLib.
This is a non-functional change.
Bug: 192657812
Test: Presubmit
Change-Id: I9f5dd6720fd95389335fec9e0689a40d88d30d46
2023-07-17 10:16:42 +00:00
Chaohui Wang
683296f180
Merge "[BT] Correct the filter when addCachedDevices" into udc-qpr-dev
2023-07-17 02:36:29 +00:00
Chun-Wei Wang
394baf2919
Merge changes If96ac99a,I45ab17cf into udc-qpr-dev
...
* changes:
Remove invalid test
Remove invalid test
2023-07-14 22:18:19 +00:00
Zoey Chen
4900bcfa5c
[Language] Should show confirm dialog when deleting the system language
...
and making the second language automatically become the system language
Bug: 286508825
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=LocaleListEditorTest
Change-Id: I556eecc9eec1ddcdb8947d5ba69d0db2c016e33c
2023-07-14 16:06:40 +00:00
Shivangi Dubey
8c68b0e7e2
Merge "Add 'Stay unlocked on fold' toogle to settings" into udc-qpr-dev
2023-07-14 13:35:55 +00:00
Zoey Chen
088bb6a35e
[Language] Do not back to previous page if dialog is displaying.
...
Bug: 288827218
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=LocaleDialogFragmentTest
Change-Id: I914b1e1d96aacf5369e5149f34968ef625548525
2023-07-14 09:05:10 +00:00
Chaohui Wang
0b48ffdd6e
Merge "Remove context from powerUsageFeatureProvider" into main
2023-07-14 08:36:27 +00:00
Vincent Wang
291714418c
Fix enroll introduction page was not closed in background
...
Bug: 291023102
Test: 1. Launch FingerprintEnrollFindSensor and back to introducntion
2. Go to home screen
3. Launch FingerprintEnrollFindSensor from recent app
4. Check if FingerprintEnrollFindSensor is stopped
5. make RunSettingsRoboTests -j96 ROBOTEST_FILTER=com.android.settings.biometrics.fingerprint
Change-Id: I65504f663340a0e66d1f8bcd2e7d4b3659282884
2023-07-14 07:49:41 +00:00
Treehugger Robot
3b7abccc6e
Merge "Fix testUidCache_switchLocale_shouldCleanCache in BatteryEntryTest" into udc-qpr-dev am: b544871b38
am: 486451e9cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002332
Change-Id: I470e36951003125f6a97dca2c71d655b2904abcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 06:16:48 +00:00
Chun-Wei Wang
e0c2d574a7
Merge "Re-enable most tests" into udc-qpr-dev am: a671c3014e
am: 4fbf549bdf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24059806
Change-Id: I354313db70332a413b80431d3337ace97da80514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 06:15:43 +00:00
Chaohui Wang
512caa568a
[BT] Correct the filter when addCachedDevices
...
In Change Ia9750adb6b4c1424d084381e9d7c2ca8e7912391, addCachedDevices()
becomes async, but the filter is set outside of addCachedDevices(),
which makes the filter not apply to addCachedDevices().
Direct pass the filter to addCachedDevices() to fix this issue.
Also migrate the test to Kotlin so we can test coroutine.
Fix: 289876965
Test: manual - check BT pairing page
Test: m RunSettingsRoboTests
Change-Id: I95b16840881747ec9f69e5cd778e456bcc8a7626
(cherry picked from commit 8dd32ab07d
)
Merged-In: I95b16840881747ec9f69e5cd778e456bcc8a7626
2023-07-14 05:40:03 +00:00
Treehugger Robot
b544871b38
Merge "Fix testUidCache_switchLocale_shouldCleanCache in BatteryEntryTest" into udc-qpr-dev
2023-07-14 04:29:02 +00:00
Chun-Wei Wang
a671c3014e
Merge "Re-enable most tests" into udc-qpr-dev
2023-07-14 03:52:01 +00:00
Bill Lin
88bc013487
Merge "Update screen lock and biometrics options in order" into udc-qpr-dev am: 8ea74c3d76
am: f0278e6835
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896224
Change-Id: I470152428e4fe0ecf1fc9e8f3d499fca89d114db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 02:06:19 +00:00