Yanting Yang
91d18534a3
Merge "Update the about device warning message" into main
2023-07-18 07:44:58 +00:00
Yanting Yang
65f22b9b18
Update the about device warning message
...
Apply a common warning description for all products as per the product
and UX review.
Bug: 282233849
Test: visual
Change-Id: I6e4939fca8cf6c67c400e5a417fb370495cb15e0
2023-07-18 12:14:19 +08: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
Bill Yi
de9926a79b
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-07-15 00:10:25 +00:00
Bill Yi
2531d5736b
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-07-14 19:57:27 +00:00
Shivangi Dubey
32d914ea56
Merge "Add 'Stay unlocked on fold' toogle to settings" into udc-qpr-dev am: 8c68b0e7e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23832963
Change-Id: I1bd342d5e2649e13734aa504f461bf12a141c819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 14:22:00 +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
Bill Yi
3f21bb3ba0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1d4a3c3a0dcb4669918482a2b0022f1eedd37f75
2023-07-13 21:22:04 -07:00
Bill Yi
9fd352f12f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1ce687c28620f4880b1d170c913f5a456797f129
2023-07-13 21:19:38 -07:00
Peiyong Lin
b6c849e27c
Merge "Add warning on enabling ANGLE." into udc-qpr-dev am: e8e302b551 am: 7da022c74c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24041836
Change-Id: Ieb4d272ea6870e24f50aea7f4b40a5672638ef3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 02:32: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
Peiyong Lin
7da022c74c
Merge "Add warning on enabling ANGLE." into udc-qpr-dev am: e8e302b551
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24041836
Change-Id: I4055ff6b3712b7c9029555b3259ce888ca40f976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 01:45:39 +00:00
Peiyong Lin
e8e302b551
Merge "Add warning on enabling ANGLE." into udc-qpr-dev
2023-07-14 00:28:03 +00:00
Bill Lin
f0278e6835
Merge "Update screen lock and biometrics options in order" into udc-qpr-dev am: 8ea74c3d76
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896224
Change-Id: Ia5ee770bc367d6dc30610dbdc4582d343a28df32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 00:01:30 +00:00
Bill Lin
8ea74c3d76
Merge "Update screen lock and biometrics options in order" into udc-qpr-dev
2023-07-13 23:18:19 +00:00
Pavel Grafov
735f8ee883
Merge "Set profile pattern visibility controller in xml" into main
2023-07-13 10:11:48 +00:00
Peiyong Lin
39eb3a5ad0
Add warning on enabling ANGLE.
...
Enabling ANGLE on incompatible devices may cause some applications to
crash, add a warning.
Bug: b/287909344
Test: atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: I4f856ee1912a59052a6aaf7dff087ce1b649935e
2023-07-12 18:10:03 +00:00
Joshua McCloskey
5a4211ec82
Implement basic Fingerprint functionality.
...
Test: Verified enroll/deletion/renaming/authentication flows.
Test: atest FingerprintSettingsViewModelTest
Test: atest FingerprintManagerInteractorTest
Bug: 280862076
Change-Id: Ic34fd89f01f24468d0f769ef0492e742d9330112
2023-07-11 20:46:43 +00:00
Joshua McCloskey
b7f0d7a8ff
Moving FingerprintSettings to Kotlin
...
This change is the first of many, it will
1. Change java -> kotlin
2. Use the MVVM architecture
3. Be feature flagged
This change in particular is focused on transitions to and from various activities.
Enable feature via
adb shell setprop sys.fflag.override.settings_biometrics2_fingerprint true
Bug: 280862076
Test: atest FingerprintSettingsViewModelTest
Change-Id: I8eb5c30e6f2e92c256ae7c257a9d560439ba418f
Merged-In: I8eb5c30e6f2e92c256ae7c257a9d560439ba418f
2023-07-11 17:43:07 +00:00
SongFerng Wang
5da5fb57cc
Merge "Revert "Revert "Update the wording for LE Audio""" into udc-qpr-dev am: 997ef1e5b3 am: 340d592bbf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018266
Change-Id: Ia48ceb51044166be7c09f3b241e181331c77d2ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 14:43:40 +00:00
Treehugger Robot
1e4b60db07
Merge "[BiometricsV2] Add retry button" into main
2023-07-11 14:40:15 +00:00
SongFerng Wang
340d592bbf
Merge "Revert "Revert "Update the wording for LE Audio""" into udc-qpr-dev am: 997ef1e5b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018266
Change-Id: Iac910dd53cfa1ee4b67548d7cfd025c6809a88e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 14:14:27 +00:00
SongFerng Wang
997ef1e5b3
Merge "Revert "Revert "Update the wording for LE Audio""" into udc-qpr-dev
2023-07-11 13:33:14 +00:00
lbill
7f8197da82
Update screen lock and biometrics options in order
...
Previously the screen lock and biometrics order is :
UI & UX: b/182806496, b/183649070
- PIN • Face • Fingerprint
- Pattern • Face • Fingerprint
- Password • Face • Fingerprint
By requirement, we need to reverse Fingerprint & Face position
- PIN • Fingerprint • Face
- Pattern • Fingerprint • Face
- Password • Fingerprint • Face
Also remove unused strings
Fixes: 242143765
Test: Manual login corp, and observe the UI in Choose screen lock
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Change-Id: I1938f867360512121ecfdae8e2ca6de7002156f4
2023-07-11 12:30:22 +00:00
Chaohui Wang
b515ed5fee
Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a am: 47803f6b10 am: fc275fef2e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23939155
Change-Id: I2d9d02579aec65fdc5916522563fad4daada58c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 09:54:45 +00:00
Milton Wu
f94932801a
[BiometricsV2] Add retry button
...
Add retry button for FingerprintEnrollErrorDialog and make sure that
this button works well in the whole enrollment flow.
Bug: 287168522
Test: manually test this dialog with error and rotate devices
Test: atest FingerprintEnrollEnrollingViewModelTest
Test: atest FingerprintEnrollErrorDialogViewModelTest
Test: atest FingerprintEnrollProgressViewModelTest
Test: atest FingerprintEnrollmentActivityTest
Test: atest biometrics-enrollment-test
Change-Id: Ica1d91d077ca322caca5551068f2a3c23b544361
2023-07-11 17:25:26 +08:00
Chaohui Wang
fc275fef2e
Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a am: 47803f6b10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23939155
Change-Id: I624e8cf060dae2dfb7a1b0b06c4610adeeddde79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 09:12:13 +00:00
Chaohui Wang
1806b3032f
Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23939155
Change-Id: I46c9e35554f3a7021bb52c79cc73e09971ca4232
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 08:34:42 +00:00
Chaohui Wang
47803f6b10
Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23939155
Change-Id: I159db196a31270e20a213796e8236eb9808d418a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 08:30:00 +00:00
SongFerng Wang
513f38cb17
Revert "Revert "Update the wording for LE Audio""
...
This reverts commit c123b2e5a8 .
Reason for revert: Since the phase 2 launch plan was moved to next timeline at b/289884263.
Change-Id: I54ff20c0d9599da7f47e2254f721be6007a9204a
2023-07-11 08:20:23 +00:00
Chaohui Wang
fe38ff963a
Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev
2023-07-11 07:50:49 +00:00
Joshua Mccloskey
1c7a298038
Merge "Moving FingerprintSettings to Kotlin" into udc-qpr-dev-plus-aosp
2023-07-10 19:02:01 +00:00
Pavel Grafov
b758a84e07
Set profile pattern visibility controller in xml
...
Bug: 289967858
Test: manual, with TestDPC
Change-Id: I72f271e162d468bb4cd5cfa9f23d467c4504f1e9
2023-07-10 18:02:07 +01:00
Jason Chang
c805b2e163
Merge "Fix the “screen lock option” and password restriction view are in the wrong position on PIN/Password/Pattern in the landscape mode." into udc-qpr-dev am: 5a0d4d1cc3 am: 17d1e70930
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712165
Change-Id: Ic73f5be63e2d9de3ede40fcfdb63357cab867634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-10 04:19:00 +00:00
Jason Chang
17d1e70930
Merge "Fix the “screen lock option” and password restriction view are in the wrong position on PIN/Password/Pattern in the landscape mode." into udc-qpr-dev am: 5a0d4d1cc3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712165
Change-Id: I8c58292e2b93f0e827d059c44046002d72eb772b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-10 03:41:17 +00:00
Jason Chang
5a0d4d1cc3
Merge "Fix the “screen lock option” and password restriction view are in the wrong position on PIN/Password/Pattern in the landscape mode." into udc-qpr-dev
2023-07-10 03:06:07 +00:00
Chaohui Wang
590b4e7af8
[Regulatory Labels] Load labels from overlays
...
When config_regulatory_info_overlay_package_name is configured, load
regulatory labels directly from overlay package.
Also fix RegulatoryInfoDisplayActivity missing dialog theme.
Bug: 283170651
Test: unit test
Test: manual - check regulatory labels
Change-Id: Ia1f6848abe0da9facf34f47abab09e88d57e74d6
2023-07-07 14:52:26 +00:00
Bill Yi
582cf66067
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idc462ee6332fe825138ef085aed3bdfb0dcdee62
2023-07-06 22:16:10 -07:00
Bill Yi
8fdcdc8d40
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ieca8db4959a8a8299ae801af4a19fc49fa813656
2023-07-06 22:13:52 -07:00
Bill Yi
89d279b73f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaaac18d136c9f399b9a9313e7fed700fcb4b12b1
2023-07-06 21:32:47 -07:00
Chun-Ku Lin
79ffa2a45f
Merge "use L10n-friendly runtime number formatting based on locale" into main
2023-07-06 17:09:25 +00:00
dshivangi
8f4122ad5d
Add 'Stay unlocked on fold' toogle to settings
...
Added 'Stay unlocked on fold' toogle to display settings. Enabling this
setting will allow user to keep their device awake after the fold the
device.
Test: atest StayAwakeOnFoldPreferenceControllerTest LogicalDisplayMapperTest
Test: manual
Built and flashed foldable device and manually tested by
1. unfolded device -> enable setting -> folded device
2. unfolded device -> disabled setting -> folded devices
Built and flashed non-foldable device and manually tested by
1. Went to Settings -> display -> the toogle setting is not visible
Bug: 274447767
Change-Id: I35fbd0f5d1297ee6e14896e8f3be8301cda6622f
2023-07-06 11:42:35 +00:00
Treehugger Robot
e761690e08
Merge "Clean up assist gesture from Settings" into main
2023-07-06 05:42:20 +00:00
Treehugger Robot
b41e910e10
Merge "[Terms of Address] Add new strings of Terms of Address" into main
2023-07-06 05:31:02 +00:00
Zoey Chen
56c9081f2d
[Terms of Address] Add new strings of Terms of Address
...
Bug: 289489649
Test: manual
Change-Id: I066f1163141bf1e775e29b862c57faf761869a18
2023-07-06 04:13:36 +00:00
Rhed Jao
b889744aa0
Merge "Update strings for the repair mode lock password screen" into udc-qpr-dev am: 2070808a62 am: a357341837
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23874782
Change-Id: Ifa2f36ed8d30e68c99fc982dbcbf24f38fed261e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 03:11:35 +00:00
Rhed Jao
a357341837
Merge "Update strings for the repair mode lock password screen" into udc-qpr-dev am: 2070808a62
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23874782
Change-Id: I72588a3e8ff494cd31f72531ada1baef867fb7cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 02:51:45 +00:00
Rhed Jao
2070808a62
Merge "Update strings for the repair mode lock password screen" into udc-qpr-dev
2023-07-06 02:36:45 +00:00
Michael Mikhail
2b49d000b6
Add content description to volume title in settings.
...
Adds content description that is announced by talkback when a11y focus
is on volume preference. This improves talkback announcement when view changes.
Fixes: 285529113
Bug: 285455826
Fixes: 285487766
Test: atest VolumeSeekBarPreferenceControllerTest
Test: atest VolumeSeekBarPreferenceTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:499f965c1c79cea14377c37028133a9f8717693d )
Merged-In: Ibe80b4b1d489dc058df1cc79c96b034d5ddc6e56
Change-Id: Ibe80b4b1d489dc058df1cc79c96b034d5ddc6e56
2023-07-05 23:27:34 +00:00