PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
132,702 Commits 1 Branch 0 Tags
78f3760d26a30cae2637b812497f25e5afdb19cc
Commit Graph

132702 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Chaohui Wang
dc3fc1dff0 Fix crash when call getMobileTemplate am: 9132535e5e am: f3d6684e14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328

Change-Id: Ifbeab53d402207c0cd63ab225f30af6bdc4da824
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 08:56:59 +00:00
Chaohui Wang
1578772d63 Fix crash when call getMobileTemplate am: 9132535e5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328

Change-Id: I01c40793839a7d5fbd0b7834c67184c228356c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 08:16:04 +00:00
Chaohui Wang
f3d6684e14 Fix crash when call getMobileTemplate am: 9132535e5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328

Change-Id: Ia4b74067049da536c8f98230e588b579379fdad6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 08:12:07 +00:00
danielwbhuang
4add2adf00 Add @SearchIndexable annotation. 
Settings search collects all index data through SearchIndexablesProvider.
Users can enter keywords to query these index data in Settings search.

Bug: 289967511
Test: build pass
Change-Id: Ib934becbf8bc433489ca81aea10cecbcc5584a77
 2023-07-10 15:41:14 +08:00
Zaiyue Xue
c93fe0b509 Fix testUidCache_switchLocale_shouldCleanCache in BatteryEntryTest 
Remove unused code and test

Bug: 290318160
Fix: 290318160
Test: presubmit
Change-Id: I20c612270c67f55e0b01fa849514ba670b696db3
 2023-07-10 15:06:57 +08:00
Chaohui Wang
9132535e5e Fix crash when call getMobileTemplate 
There are 2 versions of getMobileTemplate.

The previous Change I7865823d6af2c812afa35d047bd79b60ae4b0fb7 change
from the correct version to the wrong version.

Change back to fix the issue.

Fix: 290381395
Test: manual - on Mobile Settings page
Test: unit test
Change-Id: Icb3147558176d53dc77e7bd39ab54a5dad13c12b
Merged-In: I6227f973ec38e5b0520f54a41ac2ede2929a1bcc
 2023-07-10 14:20:07 +08: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
Bill Yi
f7fc9d1087 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-07-10 03:27:44 +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
Patty Huang
698ce52a17 Show LE audio toggle in Device Detail by default 
Bug: 289884263
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioDeviceDetailsPreferenceControllerTest
Test: Checks the LE Audio toggle is shown in Device Detail by default
Change-Id: I3affeebd9b2c59d24f4eaa76a1a22a714e968976
 2023-07-10 11:05:35 +08:00
Treehugger Robot
3943e14eff Merge "Fix do not disturb bypass user restriction" into main 2023-07-10 02:44:53 +00:00
Bill Yi
326807b65e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: f89feda95a -s ours am: 7e7dbde91c -s ours am: 03378d121f -s ours am: d148a02796 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib454886456991966d365c8592a031acc62a10a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:57:25 +00:00
Bill Yi
598146af20 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 5e19b2f723 -s ours am: fef711a1be -s ours am: 2e914d0f97 -s ours am: bed14260bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id3900b9291800f143ca519fa4ca633b79da99679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:57:10 +00:00
Bill Yi
ea649e658a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: d1e4580468 -s ours am: 9242c61918 -s ours am: fc779544aa -s ours am: f0e9f6102d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4337cfdf834212d9660eeb946ca6238bdb89723f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:55:51 +00:00