PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
133,019 Commits 1 Branch 0 Tags
034fc4ae63bc89a9eb2518e8ed1c7f54338d46ac
Commit Graph

133019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Milton Wu
20fb5fc2b4 Merge "[BiometricsV2] Refactor EnrollmentViewModel" into main 2023-07-11 14:41:30 +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
8dd32ab07d [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
 2023-07-11 19:30:04 +08:00
Treehugger Robot
8b5d117809 Merge "[BiometricsV2] Refactor EnrollFinishFragment" into main 2023-07-11 11:17:45 +00:00
Daniel Huang
bb79f00fbe Merge "Use EXTRA_ENTRYPOINT to log entry point for metrics" into udc-qpr-dev am: 2b40635f07 am: 73b2b137cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913078

Change-Id: I60e8adc40c0d10f4dc30a58c8a6171ac4136c363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 09:55:49 +00:00
Chaohui Wang
efb28219cb Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a am: 1806b3032f am: d9e7141a78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23939155

Change-Id: Ic08377495eb547dfe53e787c53e926409ba22788
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 09:55:34 +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
Edgar Wang
aa0ec9ec4e Prevent screen capture for Desktop Backup Password 
Bug: 254028772
Change-Id: I9c75398413f0f4a92d7a8f11d1e0b8d1e26e2961
Test: manual
 2023-07-11 09:36:53 +00:00
Mill Chen
f43f87fd16 Remove unused preference controller 
Bug: 289967665
Test: robotest pass
Change-Id: I927d12a3978f00661d3079a655d22cd0aacbdf32
 2023-07-11 17:31:59 +08:00
Milton Wu
9a7afc9216 [BiometricsV2] Refactor EnrollmentViewModel 
Refactor FingerprintEnrollmentViewModel to kotlin

Bug: 286198096
Test: atest FingerprintEnrollmentViewModelTest
Test: atest FingerprintEnrollmentActivityTest
Test: atest biometrics-enrollment-test
Test: manually test enrollment
Change-Id: If1b87fa115db1c3fde853ac13fe6204879d34ca8
 2023-07-11 17:30:57 +08: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
Daniel Huang
73b2b137cc Merge "Use EXTRA_ENTRYPOINT to log entry point for metrics" into udc-qpr-dev am: 2b40635f07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913078

Change-Id: Iad5339178401ca44b5e36f16e9509efec088c3b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 09:18:48 +00:00
Chaohui Wang
d9e7141a78 Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a am: 1806b3032f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23939155

Change-Id: Ia06c3c91c64a40300f0468ab0cc6208a169bdbdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 09:18: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
Daniel Huang
2b40635f07 Merge "Use EXTRA_ENTRYPOINT to log entry point for metrics" into udc-qpr-dev 2023-07-11 09:09:03 +00:00
Weng Su
e3b554b296 [RESTRICT AUTOMERGE] Restrict ApnEditor settings 
- Finish ApnEditor settings if user is not an admin

- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction

Bug: 279902472
Test: manual test
atest -c ApnEditorTest

Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
 2023-07-11 08:35:17 +00:00
Weng Su
6afcad7626 [RESTRICT AUTOMERGE] Restrict ApnEditor settings 
- Finish ApnEditor settings if user is not an admin

- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction

Bug: 279902472
Test: manual test
atest -c ApnEditorTest

Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
 2023-07-11 08:34:53 +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
Jean Chen
9a2e9c966b Merge "Set the shortcut size to large when user enabled Magnification" into main 2023-07-11 07:43:01 +00:00
Treehugger Robot
70c66ab121 Merge "Add a mechanism to log battery usage periodic job events" into udc-qpr-dev am: 4ac05f8cac am: 5c046f1d4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23971085

Change-Id: I36e646b84ae373672328a6f145803ef5743a33b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 07:07:38 +00:00
Milton Wu
4baccb32a9 [BiometricsV2] Refactor EnrollFinishFragment 
Refactor FingerprintEnrollFinishFragment to kotlin and add bindView()
method for it

Bug: 286197658
Test: atest FingerprintEnrollmentActivityTest
Test: atest biometrics-enrollment-test
Test: Manually test enrollment
Change-Id: I59af5cc96369e63a4d755f5618f05dcf89cb0a50
 2023-07-11 07:06:21 +00:00
Treehugger Robot
5c046f1d4e Merge "Add a mechanism to log battery usage periodic job events" into udc-qpr-dev am: 4ac05f8cac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23971085

Change-Id: I32334ef24562e212e8817df7792b386a61f822f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 06:52:26 +00:00
SongFerng Wang
a6050f563f Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f am: d3f8caa506 am: dbeb0fb911 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080

Change-Id: I7e9317cdc3f7a7282a2447cbfc7ea7b939d4ec58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 06:45:15 +00:00
SongFerng Wang
b42d46fed5 Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f am: 96c2da1340 am: 723c5e8754 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080

Change-Id: I85cddc2f530b8d7308dcb742736e8b4210d7bb99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 06:44:49 +00:00
Treehugger Robot
4ac05f8cac Merge "Add a mechanism to log battery usage periodic job events" into udc-qpr-dev 2023-07-11 06:09:54 +00:00
SongFerng Wang
dbeb0fb911 Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f am: d3f8caa506 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080

Change-Id: I871b3e1f3e66d9de564d1761bc160b9e5ea1e0da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 06:07:56 +00:00
SongFerng Wang
723c5e8754 Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f am: 96c2da1340 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080

Change-Id: I2f10b967b2b98903e7bba9a9e0a74ab02ce1a8e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 06:02:24 +00:00
SongFerng Wang
d3f8caa506 Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080

Change-Id: Ifd57844fa7d17836a8c681b16b8b7e1830aabfec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 05:26:45 +00:00
SongFerng Wang
96c2da1340 Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080

Change-Id: Iabad339cd438114562b16a495f2e9c15249c38b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 05:22:21 +00:00
SongFerng Wang
717ce2b91f Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev 2023-07-11 04:55:18 +00:00
Chun-Wei Wang
a372258805 [automerger skipped] Merge "ChooseLockPattern: remove redundant setting of visible pattern default" into udc-qpr-dev am: c680da15c3 am: 05dc85a094 -s ours 
am skip reason: Merged-In I63f29c68f9a508fee0ee2f03f2cca33317fb8a32 with SHA-1 6c3de30086 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23988224

Change-Id: I2ff73736f6915398184d9fc34a5ffa9c4259c04e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 04:39:43 +00:00
Chun-Wei Wang
05dc85a094 Merge "ChooseLockPattern: remove redundant setting of visible pattern default" into udc-qpr-dev am: c680da15c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23988224

Change-Id: Icc8a1a86241bc4e41e77e72c1d69f8d7d3d92c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 04:04:17 +00:00
Chun-Wei Wang
c680da15c3 Merge "ChooseLockPattern: remove redundant setting of visible pattern default" into udc-qpr-dev 2023-07-11 03:24:17 +00:00
Jean
137cc9af68 Set the shortcut size to large when user enabled Magnification 
Set the settings shortcut size to large when the Magnification shortcut it enabled. Provide users with the large size as the default, which is easy to see.

Bug: 283844702
Test: manually - attach videos in the bug
Test: atest ToggleScreenMagnificationPreferenceFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ToggleScreenMagnificationPreferenceFragmentTest
Change-Id: I8fac5780b8388b1b4f124cffbdd305235f035e72
 2023-07-11 02:21:09 +00:00
Joshua Mccloskey
9416328ab7 [automerger skipped] Merge "Moving FingerprintSettings to Kotlin" into udc-qpr-dev-plus-aosp am: 1c7a298038 -s ours 
am skip reason: Merged-In I8eb5c30e6f2e92c256ae7c257a9d560439ba418f with SHA-1 9642d1e8cb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23354293

Change-Id: Icb57f324d1ca18913961c51cff8a72cdca2d179e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 19:37:27 +00:00
Joshua McCloskey
eb36bd7c34 [automerger skipped] Moving FingerprintSettings to Kotlin am: 2f46489926 -s ours 
am skip reason: Merged-In I8eb5c30e6f2e92c256ae7c257a9d560439ba418f with SHA-1 9642d1e8cb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23354293

Change-Id: Iac65e152e90559ff7398b3b075d057e443bba5e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 19:37:23 +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
Treehugger Robot
3365eb3e7a Merge "Improve volume slider" into main 2023-07-10 10:27:21 +00:00
Chaohui Wang
b9502d2c05 [automerger skipped] Fix crash when call getMobileTemplate am: 9132535e5e am: 1578772d63 am: 057c15c26a -s ours 
am skip reason: Merged-In I6227f973ec38e5b0520f54a41ac2ede2929a1bcc with SHA-1 77fd6aa117 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328

Change-Id: I8840616271d8d05fd60cdca24ae04acee83bae35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 09:39:22 +00:00
Chaohui Wang
b62324d39d [automerger skipped] Fix crash when call getMobileTemplate am: 9132535e5e am: f3d6684e14 am: dc3fc1dff0 -s ours 
am skip reason: Merged-In I6227f973ec38e5b0520f54a41ac2ede2929a1bcc with SHA-1 77fd6aa117 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328

Change-Id: I8ff5fa12bc170a5601964051d9d33ddbf4f491bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 09:38:41 +00:00
Daniel Huang
f57f2efef5 Merge "Add @SearchIndexable annotation." into main 2023-07-10 09:20:28 +00:00
Chaohui Wang
057c15c26a Fix crash when call getMobileTemplate am: 9132535e5e am: 1578772d63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328

Change-Id: I9d6300da831dff79e2ae605e59d3a3af41f48c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 09:02:44 +00:00
Iván Budnik
ff2fd768bc Merge "Fix adjust volume call on MediaDeviceUpdateWorker" into main 2023-07-10 09:00:17 +00:00