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

19935 Commits

Author SHA1 Message Date
Chaohui Wang
0b48ffdd6e Merge "Remove context from powerUsageFeatureProvider" into main 2023-07-14 08:36:27 +00:00
Treehugger Robot
3b7abccc6e Merge "Fix testUidCache_switchLocale_shouldCleanCache in BatteryEntryTest" into udc-qpr-dev am: b544871b38 am: 486451e9cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002332

Change-Id: I470e36951003125f6a97dca2c71d655b2904abcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 06:16:48 +00:00
Chun-Wei Wang
e0c2d574a7 Merge "Re-enable most tests" into udc-qpr-dev am: a671c3014e am: 4fbf549bdf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24059806

Change-Id: I354313db70332a413b80431d3337ace97da80514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 06:15:43 +00:00
Treehugger Robot
486451e9cf Merge "Fix testUidCache_switchLocale_shouldCleanCache in BatteryEntryTest" into udc-qpr-dev am: b544871b38 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002332

Change-Id: I67b7e296e56e50c9745ca36e5994f06663ccb56d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 05:14:04 +00:00
Chun-Wei Wang
4fbf549bdf Merge "Re-enable most tests" into udc-qpr-dev am: a671c3014e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24059806

Change-Id: Iea86a42398e88a5ef39fd26c7cac566f78b67017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 05:12:40 +00:00
Treehugger Robot
b544871b38 Merge "Fix testUidCache_switchLocale_shouldCleanCache in BatteryEntryTest" into udc-qpr-dev 2023-07-14 04:29:02 +00:00
Chun-Wei Wang
a671c3014e Merge "Re-enable most tests" into udc-qpr-dev 2023-07-14 03:52: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
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
Chun-Wei Wang
203906516e Re-enable most tests 
Most tests are still successful. We don't want to impact
too much test coverage by disabling all tests.

Bug: 291146670
Test: atest ChooseLockPasswordTest --rerun-until-failure 50
Change-Id: Ia8266dc5d44ea9271a28e1bee80c3855b3c2d52b
 2023-07-13 23:14:38 +00:00
Chaohui Wang
36b8227073 Remove context from powerUsageFeatureProvider 
PowerUsageFeatureProviderImpl is created by using application context,
no need pass context in when get.

Bug: 286764889
Test: m Settings
Change-Id: Iec81e98648fcb2f6a20978ef4ce164e1af50a804
 2023-07-13 09:58:54 +08:00
Chaohui Wang
14ab64637e Merge "Remove context from batteryStatusFeatureProvider" into main 2023-07-12 05:03:48 +00:00
Chaohui Wang
46075bf8f4 Merge "[BT] Correct the filter when addCachedDevices" into main 2023-07-12 02:40:29 +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
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
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
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
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
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
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
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
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
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
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
1c7a298038 Merge "Moving FingerprintSettings to Kotlin" into udc-qpr-dev-plus-aosp 2023-07-10 19:02:01 +00:00
Treehugger Robot
3365eb3e7a Merge "Improve volume slider" into main 2023-07-10 10:27:21 +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
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
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
Treehugger Robot
3943e14eff Merge "Fix do not disturb bypass user restriction" into main 2023-07-10 02:44:53 +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
Treehugger Robot
6a12444366 Merge "Restrict ApnEditor settings" into main 2023-07-07 13:50:42 +00:00
Mill Chen
c69899ccef Improve volume slider 
In the Settings, the Preference#onBindViewHolder will be invoked
3 times when a preference is getting highlighted. This caused that a
disabled volume slider becomes enabled after getting highlighted.

This change is to optimize the init method of VolumeSeekbarPreference
to speed up the initial process and fix the unexpected behavior.

Bug: 275352565
Test: manual test and robotest pass
Change-Id: I77f28386f6d6e4a45297f1ca7bcbaf16ed6136a4
 2023-07-07 20:52:13 +08:00