Bill Lin
918d7659bb
Merge "Fix RestrictedPreference icons do not align view state" into udc-qpr-dev am: 18d0e96e33
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210404
Change-Id: Ia87a8b547ee8efacd881b01bfcb2d58ee1bbd92a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 08:01:06 +00:00
lbill
021a546a9d
Fix RestrictedPreference icons do not align view state
...
Add android:tint="?android:attr/colorControlNormal" in vector drawable
Bug: 193514112
Test: Manual, set RestrictedPreference to disabled state and check
if icons of preference grey out
Change-Id: Icf2821317da731d862d5eebe968b5704ef78271c
2023-07-26 12:21:50 +00:00
Graciela Putri
dc86dbe24b
Merge "[2/n] Add aspect ratio app list page under apps" into udc-qpr-dev am: 4e86d0d6b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23819684
Change-Id: Iac8fc9b4d80e287a84e4a7d2917e76954ae64a9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-21 22:13:34 +00:00
Graciela Putri
4e86d0d6b3
Merge "[2/n] Add aspect ratio app list page under apps" into udc-qpr-dev
2023-07-21 21:28:44 +00:00
Graciela Wissen Putri
b4c4f6cbe6
[2/n] Add aspect ratio app list page under apps
...
Apps > General > Screen Size
To enable feature:
adb shell device_config put window_manager enable_app_compat_user_aspect_ratio_settings true
adb shell am force-stop com.android.settings
Fix: 287448088
Test: Manual
atest AspectRatioAppsPageProviderTest
atest AspectRatioUtilsTest
All CUJs passed in go/settings-cujs
Change-Id: I4de6c3cbdbdfbc79ed839ec149fb633344dcd3a7
2023-07-21 08:02:09 +00:00
Vania Januar
3a67c3e17f
Merge "USB firmware update for stylus in Stylus USI Device Details" into udc-qpr-dev am: bbf2dc4991
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23221022
Change-Id: Ied0222e7235e2643553e7401ac9b4c0ece442cee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-20 16:22:47 +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
Angela Wang
079ac4f3a5
Merge "Enable scrolling in screen flash color selector dialog" into udc-qpr-dev am: 81a3646462
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23875506
Change-Id: Ifd3337358a62ba1eb28095e8111b673fc1fb7043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 07:43:30 +00:00
Angela Wang
81a3646462
Merge "Enable scrolling in screen flash color selector dialog" into udc-qpr-dev
2023-07-19 07:07:04 +00:00
Joshua Mccloskey
22b67802f5
Merge "Implement basic Fingerprint functionality." into udc-qpr-dev am: 1412f391d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23480676
Change-Id: If0de6ed25832d88a049f82ad86485fb4b1d027e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 16:45:52 +00:00
Joshua Mccloskey
1412f391d5
Merge "Implement basic Fingerprint functionality." into udc-qpr-dev
2023-07-18 16:16:52 +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
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
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
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
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
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
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
89d279b73f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaaac18d136c9f399b9a9313e7fed700fcb4b12b1
2023-07-06 21:32:47 -07: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
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
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
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
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
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