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

136065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
b882be16f1 Merge changes from topic "am-a5286f069992436fa3bf3e411ca3a093" into udc-qpr-dev-plus-aosp am: 656d481e18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968

Change-Id: I6c78e22e43a461a1ab214b4b826114b4422ef0c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 23:35:25 +00:00
Bill Yi
c73e320e2b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: 1e702e6f83 -s ours am: f7b330feac -s ours am: f5617ef79d -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: I6f73fc207580ea66e15175601a7a8efddca577ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 23:35:04 +00:00
Bill Yi
f02cb60c7e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: 1e702e6f83 -s ours am: 292fb5da73 -s ours am: 83ca01c4cb -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: I22ca4aa665b0286cb1dc0e7c015703000b0ac770
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 23:20:20 +00:00
Bill Yi
d59bdd43a0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: eb51dfd4e9 -s ours am: fa9aef9061 -s ours am: e60a24fbb3 -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: I97e7a2dd5046a87eba5040a33af9a780d2b3d433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 23:20:07 +00:00
Bill Yi
ad26ff8788 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 84ed68cd4d -s ours am: c01f48c623 -s ours am: ee91548952 -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: I2132936767ad7272ef3e285a97b4d6619a9ed79e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 23:19:48 +00:00
Automerger Merge Worker
f690b0b38a Merge changes from topic "am-b81a4115f8fa4d15bcbc4e5bc8733990" into udc-qpr-dev-plus-aosp am: 5fbadb8fbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979892

Change-Id: If87411b29242223c00f8c37b3538a50f4a245404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 23:17:08 +00:00
Bill Yi
fbae942a27 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fea268d325 -s ours am: 9a58b15803 -s ours am: 1f9a5c2e17 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iba44592bbb7a5b3fe38d246cbf2721bd1093ddae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 23:16:45 +00:00
Bill Yi
6b607ea637 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fea268d325 -s ours am: 651aaef998 -s ours am: 68dcc0800a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7962136888bcc04deee81ba100e0d373a7798f24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 23:09:00 +00:00
Bill Yi
8a084a6bed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71aaccb248 -s ours am: 84970745cc -s ours am: affc6a9688 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I28df9d34840168b51b8132c48ea15548a59de28c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 23:08:48 +00:00
Bill Yi
0f5c4757bc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b73f33a9e8 -s ours am: fc51d3d77a -s ours am: 211c0a6bb2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iabc7625f6d04bc82d36b8ed4e0892491815612c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 23:08:29 +00:00
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
Automerger Merge Worker
656d481e18 Merge changes from topic "am-a5286f069992436fa3bf3e411ca3a093" into udc-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: 1e702e6f83 -s ours am: f7b330feac -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: eb51dfd4e9 -s ours am: a4e1dd587c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 84ed68cd4d -s ours am: f67e1b0f26 -s ours
 2023-10-10 01:37:11 +00:00
Bill Yi
f5617ef79d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: 1e702e6f83 -s ours am: f7b330feac -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: I794b63cdb4c5a5da0f5ee8887903f89def325210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:32:57 +00:00
Bill Yi
2b4eba117b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: eb51dfd4e9 -s ours am: a4e1dd587c -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: I6a29fa615c0dad12dbe7ced8f68dc75207dbcf8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:32:45 +00:00
Bill Yi
1c03b73998 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 84ed68cd4d -s ours am: f67e1b0f26 -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: Ib3e1723d543331ba49f7c29b9a1a7293ff8de868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:32:29 +00:00
Bill Yi
83ca01c4cb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: 1e702e6f83 -s ours am: 292fb5da73 -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: I8762d02906de08b38a0299488a5d68dfad20b59c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:32:05 +00:00
Bill Yi
e60a24fbb3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: eb51dfd4e9 -s ours am: fa9aef9061 -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: I340d935e94774b5a0bbe2eb1e2f30e6a24c25d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:31:55 +00:00
Bill Yi
ee91548952 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 84ed68cd4d -s ours am: c01f48c623 -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: I99a3e1662962c9bc00465bac19fad9890e593f22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:31:39 +00:00
Automerger Merge Worker
5fbadb8fbb Merge changes from topic "am-b81a4115f8fa4d15bcbc4e5bc8733990" into udc-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fea268d325 -s ours am: 9a58b15803 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71aaccb248 -s ours am: 0b8fb9bf01 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b73f33a9e8 -s ours am: 6c8252e6fa -s ours
 2023-10-10 01:30:33 +00:00
Bill Yi
68dcc0800a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fea268d325 -s ours am: 651aaef998 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0954c56e681eea898e38a76b61dc283cca4c8e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:26:43 +00:00
Bill Yi
affc6a9688 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71aaccb248 -s ours am: 84970745cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f8ebaae898d447aaab09e2644591e6539831777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:26:31 +00: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
211c0a6bb2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b73f33a9e8 -s ours am: fc51d3d77a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iace4128a50e6ad86077c7779eaf7e658eb6186b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:26:16 +00:00