PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,402 Commits 1 Branch 0 Tags
486451e9cf7ef63b51fdcf567c09d1058ca01b50
Commit Graph

19486 Commits

Author SHA1 Message Date
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
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
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
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
Chaohui Wang
fe38ff963a Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev 2023-07-11 07:50:49 +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
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
Joshua Mccloskey
1c7a298038 Merge "Moving FingerprintSettings to Kotlin" into udc-qpr-dev-plus-aosp 2023-07-10 19:02:01 +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
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
SongFerngWang
d94ac12190 To fix waiting too long issue when psim -> esim 
if the user swithes slot from psim to esim, then the settings
need to wait the simSlotMapping completed and it has a timer to avoid
UI stay here too long.

Since the framework did not sned the carrier config changed with vaild
subId in MEP + psim->esim case, it cause the settings does not know the
simSlotMapping completed and it stay here until timeout.

For MEP case, changing this condition as SimSlotStatusChanged

Bug: 273813956
Test: atest UiccSlotUtilTest
Change-Id: Ic09dbcb3629fe13770f3ad301c0a396d6745969f
 2023-07-07 10:22:49 +00:00
ykhung
ef66549e64 Add a mechanism to log battery usage periodic job events 
Example history log:
      	Jul 07, 2023, 15:28:51 SCHEDULE_JOB triggerTime=Jul 07, 2023, 16:00:00
      	Jul 07, 2023, 15:32:16 FETCH_USAGE_DATA
      	Jul 07, 2023, 15:32:17 INSERT_USAGE_DATA size=37
      	Jul 07, 2023, 15:43:45 FETCH_USAGE_DATA
      	Jul 07, 2023, 15:43:48 INSERT_USAGE_DATA size=47
      	Jul 07, 2023, 15:43:49 SCHEDULE_JOB triggerTime=Jul 07, 2023, 16:00:00

Bug: 284893240
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge
Change-Id: I45a1ce0ce9b70f095702727e53d7b7ce8824abdb
 2023-07-07 17:47:19 +08:00
Tetiana Meronyk
70bdc38d4a Merge "Fix "Allow guest to use telephony" toggle not updating its value" into udc-qpr-dev am: 8141b10269 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23899169

Change-Id: I44ca0e373d432ab38e8a3fe8a19a4676ca31a771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-06 14:01:26 +00:00
Tetiana Meronyk
8141b10269 Merge "Fix "Allow guest to use telephony" toggle not updating its value" into udc-qpr-dev 2023-07-06 13:17:36 +00:00
Quang Luong
e90bb0aedc Merge "Use speed string from WifiEntry" into udc-qpr-dev am: 062c4b634d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23783053

Change-Id: Ica238c0140af95a1fc3a42a6ded4838bd03d7412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-06 02:28:36 +00:00
Quang Luong
062c4b634d Merge "Use speed string from WifiEntry" into udc-qpr-dev 2023-07-06 01:49:56 +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
Treehugger Robot
721efc0ed5 Merge "Fix test case failure." into udc-qpr-dev am: b2f436f310 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23902483

Change-Id: I7e3bcef9a4dc00d76c934ce2c55759089179f99a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-05 09:35:31 +00:00
Treehugger Robot
b2f436f310 Merge "Fix test case failure." into udc-qpr-dev 2023-07-05 08:44:06 +00:00
Yi-Ling Chuang
434a04b32c Fix test case failure. 
Fix the test failure of BatterySettingsFeatureProviderImplTest. The
actual method call can't be passed with an argument matcher. Use the
real object instead.

Fixes: 289737082
Test: robotests
Change-Id: Ia48e7b67ba94a8bb67ac1d26c502894a664c2b70
 2023-07-05 15:43:34 +08:00
Tetiana Meronyk
b88bad678d Fix "Allow guest to use telephony" toggle not updating its value 
Bug: 283004333
Test: atest GuestTelephonyPreferenceControllerTest
Change-Id: I2f13a989bbe6a925c0e88350dbc215f6f188fe17
 2023-07-04 15:32:14 +00:00
Chaohui Wang
e76ff6ffa5 Fix DataUsagePreferenceController ANR am: d42cc8e5e2 am: eb8948e309 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225

Change-Id: I3e6b70cb33a51348b9504226787de2e149af5870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-04 09:41:58 +00:00
Chaohui Wang
a51e013746 Fix DataUsagePreferenceController ANR am: d42cc8e5e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225

Change-Id: Ia0463b25a848a1b65f10bfb3950b7875bc3498b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-04 09:03:56 +00:00
Chaohui Wang
eb8948e309 Fix DataUsagePreferenceController ANR am: d42cc8e5e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225

Change-Id: I6893681f93746af66e6566d2a642c2e1a93aef51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-04 08:59:57 +00:00
Chaohui Wang
d42cc8e5e2 Fix DataUsagePreferenceController ANR 
Offload calculation work from main thread to fix.

Fix: 286082055
Test: manual - on Mobile Settings page
Test: unit test
Change-Id: I7865823d6af2c812afa35d047bd79b60ae4b0fb7
 2023-07-04 12:06:53 +08:00
Daniel Huang
0b95f9562a Merge "Log metrics for PK settings topics" into udc-qpr-dev am: 114d068fbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23593768

Change-Id: I6360dd0b9ced21331d5e04a54ef91b7612d35c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-04 03:29:21 +00:00
Daniel Huang
114d068fbb Merge "Log metrics for PK settings topics" into udc-qpr-dev 2023-07-04 02:26:13 +00:00
Allen Su
477102b991 Merge "[Panlingual]Log metrics for App's locale from the suggested" into udc-qpr-dev am: 5d207a7b4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23832124

Change-Id: Ied97c0d79cbea42830b43b6a2240ac9e5b376f0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 16:41:03 +00:00
Allen Su
5d207a7b4b Merge "[Panlingual]Log metrics for App's locale from the suggested" into udc-qpr-dev 2023-06-30 16:08:25 +00:00
Treehugger Robot
fedd6b35a4 Merge "Check P2P channel before requesting network info" into udc-qpr-dev am: dc98948cc1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23869864

Change-Id: I661f8298b34ef531038006e4881b7caf984bd4d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 15:36:49 +00:00