Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
138,018 Commits 1 Branch 0 Tags
98a522c45c84516b976fbdcb1531f0e5826d078f
Commit Graph

30501 Commits

Author SHA1 Message Date
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
Michael Mikhail
1db4bc3676 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 am: 7c53d299a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044

Change-Id: I95fc65d5a3fd0ef2962742769927deacfd92620d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-05 16:29:52 +00:00
Michael Mikhail
7c53d299a2 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044

Change-Id: I978498d9acbb734534bf2ad1dad7e5cfb2434237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-05 15:51:23 +00:00
Michael Mikhail
f7b82efb83 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044

Change-Id: If9ced263d3b60723d39ec471d1e32f800334c046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-05 15:47:08 +00:00
Michael Mikhail
83c13d6563 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev 
* changes:
  Trigger talkback for notification volume change
  Add content description to volume title in settings.
 2023-07-05 15:11:09 +00:00
Rhed Jao
6c7e4560a2 Update strings for the repair mode lock password screen 
Bug: 289325981
Test: build
Change-Id: I347397fa0445436a231bc82529215c6031e4d80d
 2023-07-04 09:44:50 +00:00
Angela Wang
2539a6a10e Enable scrolling in screen flash color selector dialog 
Screen flash color selector dialog doesn't display correctly in
landscappe mode when adjust to large display size from 'Accessibility >
Display size and text > Display size'. Make the layout be scrollable to
prevent strange clipped UI.

Bug:287671988
Test: check the UI manually
Change-Id: I37eb604d362fe4373d26f97a9397230babc6eafd
 2023-07-04 07:56:31 +00:00
Michael Mikhail
48faaab788 Merge changes from topic "cherrypick-volume-gar-chain-" into udc-qpr-dev am: c156b6c427 am: 0d1b67b73e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830401

Change-Id: I5793b74a6737ad920bbdf1dd49667adf231b2e5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 14:34:07 +00:00
Michael Mikhail
0d1b67b73e Merge changes from topic "cherrypick-volume-gar-chain-" into udc-qpr-dev am: c156b6c427 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830401

Change-Id: Ied51926e720f598bceb21bae336d77d4313b6724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 13:52:36 +00:00
Michael Mikhail
c156b6c427 Merge changes from topic "cherrypick-volume-gar-chain-" into udc-qpr-dev 
* changes:
  Trigger talkback for notification volume change
  Add content description to volume title in settings.
 2023-06-30 12:56:45 +00:00
Zoey Chen
1ff6971261 Merge "[Regional Preference] Add content descripiton to the img for Talkback" into udc-qpr-dev am: 3a7c5d9fa1 am: 63a3e0056a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23840845

Change-Id: Ieb756a5b380202e50bf1b3988eb277d671d7c842
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 05:46:25 +00:00
Zoey Chen
63a3e0056a Merge "[Regional Preference] Add content descripiton to the img for Talkback" into udc-qpr-dev am: 3a7c5d9fa1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23840845

Change-Id: I3d080a3a007ebd0e379d193e6ae60efd853ffa35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 05:02:33 +00:00
Zoey Chen
3a7c5d9fa1 Merge "[Regional Preference] Add content descripiton to the img for Talkback" into udc-qpr-dev 2023-06-30 04:18:16 +00:00
Hao Dong
55ec9b88d6 Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev am: 72f2058d3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830605

Change-Id: I0411207e8f9a2c955c268b456b83f0b9c871dbb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:06:58 +00:00
Joshua Mccloskey
cde233abf0 Merge "Moving FingerprintSettings to Kotlin" 2023-06-29 12:31:22 +00:00
Chaohui Wang
99457e53a8 Clean up assist gesture from Settings 
This one is replaced by "Press & hold power button".

Bug: 287566056
Test: m Settings
Change-Id: Ic9fe8ab29a0b72f1a47f05b18da99ccf68a7f766
 2023-06-29 18:17:10 +08:00
Chaohui Wang
a935e680b0 Merge "Refactor FeatureFactory" 2023-06-29 09:01:17 +00:00
Tetiana Meronyk
a15932274b Merge "Remove "Allow guest to use phone" from devices without telephony." into udc-qpr-dev am: f059fb9a27 am: 434b34c79f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23781311

Change-Id: Ie611bc46b118990db4ea58ff1bc17c953b7c9a21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-29 08:43:49 +00:00
Tetiana Meronyk
434b34c79f Merge "Remove "Allow guest to use phone" from devices without telephony." into udc-qpr-dev am: f059fb9a27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23781311

Change-Id: I8ef824acc1e0d61f520ecf0fb6cdc0486200c73e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-29 08:02:19 +00:00
Tetiana Meronyk
f059fb9a27 Merge "Remove "Allow guest to use phone" from devices without telephony." into udc-qpr-dev 2023-06-29 07:31:06 +00:00
Jason Chang
c0f0b0ca1a Fix the “screen lock option” and password restriction view are 
in the wrong position on PIN/Password/Pattern in the landscape mode.

1. Move the description position under the GlifLayout header
2. Move the position "Screen lock options" button under the
GlifLayout header

Bug: 272676038
Bug: 285271342

Test: manully test with reproducible steps:
STEPS TO REPRODUCE:
1. Go through the setup flow
2. Continue steps until “set pin” page
3. The “screen lock option” is in the wrong position

Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings
.password.SetupChooseLockPasswordTest"

Change-Id: I24464e6b7e93f20abbeb59426919ed7fec5c7cbb
 2023-06-29 07:11:42 +00:00
SongFerng Wang
1fd4ecb4c3 Merge "Revert "Update the wording for LE Audio"" into udc-qpr-dev am: 73c811b289 am: 4b970a47ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23844564

Change-Id: I67a908138990fe72d62082de21d7e6807cdbb503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-29 04:00:12 +00:00