PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
136,023 Commits 1 Branch 0 Tags
11a6558fc5ec91ed1d0bb60b339af1f55a267ee3
Commit Graph

136023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Biggers
11a6558fc5 [automerger skipped] Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main am: 00f5d9e7a6 am: 335752ed98 am: be262063a7 am: a6448e9389 am: faaee7a843 -s ours 
am skip reason: Merged-In I5f1822a34688473cb103eb64dca56e4c19d4dd08 with SHA-1 b547094366 is already in history

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

Change-Id: I18b42713a248678b9d063ff99de954e843ee1889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 22:40:44 +00:00
Hao Dong
ccb414d85b Merge "Fix recreate crash on Enroll v2." into main 2023-10-10 20:12:05 +00:00
Bill Yi
fdd7bff0c4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 7abed595d8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1f1561171dc21a186d5b8cc1c3b83dcf5c284b08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 20:11:09 +00:00
Bill Yi
eee3cdb22c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2568ef188d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id6e16882eae094a2d0edf5e24183b18f26a472c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 20:10:52 +00:00
Bill Yi
7abed595d8 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-10-10 19:44:04 +00:00
Bill Yi
e040f187eb Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-10-10 19:29:51 +00:00
Bill Yi
cd2a1cc46e Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-10-10 19:29:51 +00:00
Bill Yi
8fea7335d9 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-10-10 19:29:51 +00:00
Piotr Wilczyński
3a9777c8e8 Merge "Back up peak refresh rate and min refresh rate" into main 2023-10-10 15:45:28 +00:00
Piotr Wilczyński
176a63a1db Back up peak refresh rate and min refresh rate 
It's possible that in the future the peak refresh rate setting will have multiple values (e.g. 90, 120). For that reason, we shouldn't convert it to a boolean like in the previous CLs (ag/24604787, ag/24604847).

- set peak/min refresh rate to infinity if it's the highest refresh rate so that when we restore the setting on another device, we also choose the highest refresh rate
- back up peak/min refresh rate and add validators
- upgrade settings in SettingsProvider
- create a utils class - RefreshRateSettingsUtils

Bug: 211737588
Test: atest DisplayModeDirectorTest
Test: atest ForcePeakRefreshRatePreferenceControllerTest
Test: atest PeakRefreshRatePreferenceControllerTest
Test: atest SettingsBackupTest
Test: atest SettingsProviderTest
Test: atest RefreshRateSettingsUtilsTest
Change-Id: Ie1d8cfc76e42c7d98c4a36743463ccaf3ca5d483
 2023-10-10 14:10:38 +00:00
Charlotte Lu
47e8c39b0e Merge "Edit flag namespace to settings_experience" into main 2023-10-10 10:36:05 +00:00
Charlotte Lu
b5b1b48af9 Merge "Add disableInit." into main 2023-10-10 09:43:02 +00:00
Chaohui Wang
3780ba5d12 Merge "Improve the performance of AppDataUsagePreference" into main 2023-10-10 09:30:47 +00:00
Treehugger Robot
7f559ca540 Merge "Fix screen time not updated issues." into main 2023-10-10 09:02:09 +00:00
Chaohui Wang
db2f4b844f Merge "Not call refreshStats() in setDuration()" into main 2023-10-10 08:04:10 +00:00
Zaiyue Xue
8e6a5db9a2 Fix screen time not updated issues. 
When slotUsageData is null, the UI should update screen time to 0
instead of skipping update.

Bug: 304432148
Bug: 299801782
Bug: 301943900
Fix: 304432148
Fix: 299801782
Fix: 301943900
Test: manual
Change-Id: I25da1abf8ea79305ebf5468977b2a57ce917609f
 2023-10-10 15:55:37 +08:00
Chaohui Wang
252450b5fc Improve the performance of AppDataUsagePreference 
We only need aggregated summary, but NetworkCycleDataForUidLoader loads
usage for all cycles.

Create AppDataUsageSummaryRepository to reduce the system api call to
only once.

Fix: 304421722
Test: manual - on AppInfoSettings
Test: unit test
Change-Id: I115dfb51dbf77ed3fdde985aa1a968ff7462bebc
 2023-10-10 15:51:40 +08:00
Haijie Hong
a0230b9ba0 Merge "Make bluetooth toggle be on when Bluetooth is turning on" into main 2023-10-10 07:16:05 +00:00
Charlotte Lu
ed5c52f1eb Edit flag namespace to settings_experience 
Fix: 304433296

Test: Visual
Change-Id: I9d81e02d130afb5ab0e2344faaf4fb6ef9449b7c
 2023-10-10 14:30:36 +08:00
Charlotte Lu
0730b167c9 Merge "Use Flags to switch apn insert." into main 2023-10-10 06:25:14 +00:00
Charlotte Lu
7e3b5f4dad Add disableInit. 
Fix: 304433155
Test: Visual Test
Change-Id: I61c478a0d21bd321ea806ae9bd5666675e85db73
 2023-10-10 14:24:43 +08:00
Haijie Hong
8d0c67408e Make bluetooth toggle be on when Bluetooth is turning on 
The logic should be similar to the Wi-Fi one: https://android.googlesource.com/platform/packages/apps/Settings/+/refs/heads/main/src/com/android/settings/wifi/slice/WifiSlice.java#379

BUG: 293264131
Test: unit test
Change-Id: I1222f9f793b91d81d74ed9358f1b055d3049866e
 2023-10-10 13:34:23 +08:00
Charlotte Lu
2faf4cdd57 Use Flags to switch apn insert. 
Fix: 304184645
Test: Visual Test
Change-Id: Iedba1343e9987a87b1adf6c1f7a8150e647e73d5
 2023-10-10 13:00:58 +08:00
Treehugger Robot
f062d1cd6e Merge "Telephony.Carriers.MVNO_TYPE is Deprecated." into main 2023-10-10 03:28:29 +00:00
Chaohui Wang
ceb23d4407 Merge "Unify the default template and title" into main 2023-10-10 03:27:50 +00:00
Chaohui Wang
7a0134f195 Not call refreshStats() in setDuration() 
refreshStats() needs to be called on worker thread, and all usage places
call refreshStats() after setDuration().

So no need to call refreshStats() in setDuration(), this also prevent
ANRs.

Fix: 241167275
Test: manual - on dev options
Change-Id: I8f4ad57c3843f14f6baee1d06d29eea1341509f1
 2023-10-10 10:50:34 +08:00
Charlotte Lu
2d029133f2 Telephony.Carriers.MVNO_TYPE is Deprecated. 
Fix: 304180380
Test: Visual Test
Change-Id: Ibd1574e2f5004c27a4aafb94a679db5a60113c62
 2023-10-10 10:33:15 +08:00
Bill Yi
fe96df972e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: 8b1c1daa2c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib4a837b192401ca8a7d35348b0ba4f07cae0d426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:26:29 +00:00
Bill Yi
4635c20976 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: 8ab6607212 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1baddb104b760a23861d3d4c0d69265fde52f51b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:26:22 +00:00
Bill Yi
6d60af849e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 1339a18c72 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia2685a2492f898b211a427eec667c4c0a07693d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:26:02 +00:00
Bill Yi
8b1c1daa2c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I04b5745e3328aef37834d7f0b918ca7ec9f67c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 00:01:18 +00:00
Bill Yi
8ab6607212 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If5dbbcd84d41012900279173b8d9c35778e05ea3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 00:01:08 +00:00
Bill Yi
1339a18c72 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I103e7e3d4562ecd7dd5e6972dd286b795ac06fd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 00:00:51 +00:00
Eric Biggers
faaee7a843 Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main am: 00f5d9e7a6 am: 335752ed98 am: be262063a7 am: a6448e9389 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776714

Change-Id: Ifade3ffd8878fc8c738ffa1eb927d2f3507fc643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-09 23:26:11 +00:00
Jacky Wang
65cc68ef9f Merge "Add nullaway errorprone plugin for nullness check" into main 2023-10-09 23:20:03 +00:00
Bill Yi
acf52df7a6 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-10-09 23:12:56 +00:00
Eric Biggers
a6448e9389 Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main am: 00f5d9e7a6 am: 335752ed98 am: be262063a7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776714

Change-Id: Ie1cba1fa73d9cfbf12aca28027854bf9afcfcd7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-09 22:21:50 +00:00
Bill Yi
df703b920b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72eabac183 -s ours am: e461f358c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I056a08c4782c1ba50031404b4c2a5c7a895887c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-09 22:18:25 +00:00
Hao Dong
619e36272c Fix recreate crash on Enroll v2. 
Replay sensorType once to avoid |contentLayoutId| to be null when
Education is recreated.

Bug: 295206773
Test: manual test - proceed Enroll page and rotate, no crash happens
Change-Id: I0ec49d138ebe74044ba3554b38722984e78ed5d7
 2023-10-09 21:55:31 +00:00
Eric Biggers
be262063a7 Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main am: 00f5d9e7a6 am: 335752ed98 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776714

Change-Id: I7aa857ea6fd3bb5f36e8d6fda1fa27ce6df27f2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-09 21:47:02 +00:00
Bill Yi
62cdc36799 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 50bc3c3456 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I18032d134ce8100e4f1c2a53c305df50b1ec021a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-09 21:45:50 +00:00
Bill Yi
e461f358c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72eabac183 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I50c9f998d24d83fb5dbe8e9f77cdcf259e9fba1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-09 21:41:05 +00:00
Eric Biggers
335752ed98 Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main am: 00f5d9e7a6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776714

Change-Id: I86824875e218614c30e5150e21f4b63107438ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-09 20:50:35 +00:00
Eric Biggers
00f5d9e7a6 Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main 2023-10-09 19:10:53 +00:00
Treehugger Robot
ffe8ee8048 Merge "Don't show lottie if font is too big." into main 2023-10-09 17:48:43 +00:00
Joshua McCloskey
8bdd8d31d4 Don't show lottie if font is too big. 
Test: Manually verified lottie isn't shown when font size is increased.
Fixes: 293068457
Change-Id: I00ee2a130ce64b5457b2ca5ae88210ff815993c4
 2023-10-09 16:45:54 +00:00
Chaohui Wang
6395cf8d30 Unify the default template and title 
On AppDataUsage page, using single source of truth to calculate the
default template, and set title base on the current template.

Fix: 213266028
Fix: 234104784
Test: visual - on AppDataUsage
Test: unit test
Change-Id: I80facca0b000964e901905af51a344a4bc9f498b
 2023-10-09 18:40:03 +08:00
Chaohui Wang
b7f8c15ff0 Merge "Status header not clickable in DataUsageSummary" into main 2023-10-09 10:37:37 +00:00
Chaohui Wang
51e1576c34 Status header not clickable in DataUsageSummary 
Status header (DataUsageSummaryPreference) is not clickable in the
DataUsageSummary.

So remove the legacy logics, to unblock unified default template.

Bug: 234104784
Test: m RunSettingsRoboTests
Change-Id: I3dddf4ec3f84d53fd07afbb62d171942a6acce5d
 2023-10-09 16:51:18 +08:00
Chaohui Wang
741979bc02 Create AppDataUsageCycleController 
To improve performance and better organization and testings.

Fix: 240931350
Test: manual - on AppDataUsage
Test: unit test
Change-Id: I277133b55378a3445aceb826d771b14c0fc91e4a
 2023-10-09 16:19:08 +08:00