Joshua Mccloskey
c320afa70d
Merge "Added UI tests for FingerprintEnrollIntro" into main
2023-10-11 18:53:38 +00:00
Saumya Pathak
2770170e0d
Merge "Show a separate tab for the Private Space" into main
2023-10-11 16:58:41 +00:00
YK Hung
589c129f43
Merge "Fix the issue that system component items are missing in main branch." into main
2023-10-11 16:20:15 +00:00
YK Hung
f0f49746e0
Merge "Fix battery usage database is not clear when time is changed" into main
2023-10-11 15:05:46 +00:00
Iavor-Valentin Iftime
54bec848cc
Merge "Settings for Polite Notifications" into main
2023-10-11 12:04:37 +00:00
Manish Singh
6efc455f2c
Show a separate tab for the Private Space
...
This covers all the known Settings pages using the tabbed view model.
https://docs.google.com/document/d/1CdjUjAE84-5ZEPRIfw5KYFjLVHtEZxc_sF0w95su8DA/edit?resourcekey=0-dAACT9HRexY1IyoxMmkVlw#heading=h.58jd58rmznte
Screenshots:
all apps
https://screenshot.googleplex.com/3E5Jm7Pi2JfN64r
with work tab:
https://screenshot.googleplex.com/8egk4yHK5jSENjR
PS Apps Special media management apps
https://screenshot.googleplex.com/BHHafqW7bgUwSGg
with work tab:
https://screenshot.googleplex.com/3cocdhruEmCCh5k
PS Location Services tab view
https://screenshot.googleplex.com/3DqJcT2BFTEpvYT
with work tab:
https://screenshot.googleplex.com/6Avpx6hxSrdGJw5
PS on screen keyboard tab view
https://screenshot.googleplex.com/4FzVNnBWwbUeJNw
with work tab:
https://screenshot.googleplex.com/8E8UhpWq8PL5nxU
PS password account tab view
https://screenshot.googleplex.com/6bDR4AKtth2S3EW
with work tab:
https://screenshot.googleplex.com/9msXV2TdHdJapch
PS storage tab view
https://screenshot.googleplex.com/5Nk2FTxwdmpEv3B
with work tab:
https://screenshot.googleplex.com/79tw2EaWZKfMsnC
PS appl_languages_work
https://screenshot.googleplex.com/3qrREeg3RQdHhhH
Bug: 302278487
Test: manual
Change-Id: I8cd39170827fbe251bc4075ef306206020b3a022
2023-10-11 12:32:17 +01:00
Zaiyue Xue
011725f89e
Fix battery usage database is not clear when time is changed
...
[Root Cause]: Intent.ACTION_TIME_CHANGED is listened in the java code, but it is not registered in the AndroidManifest.xml.
Bug: 304700667
Bug: 303352170
Fix: 304700667
Fix: 303352170
Test: manual
Change-Id: I326c525c4a370493e8caa70258580b6bd9dfe357
2023-10-11 17:40:14 +08:00
Zaiyue Xue
97fab476b4
Fix the issue that system component items are missing in main branch.
...
Please see the root cause in the bug description.
Bug: 304694899
Fix: 304694899
Test: manual
Change-Id: I89a146e979ed9eeca60cb03b464517359e6a3475
2023-10-11 16:51:30 +08:00
Charlotte Lu
6a9297df54
Add updateApnType.
...
Fix: 304457374
Test: Visual Test
Change-Id: I29e1feb6d213a8629e670a4d8f8286f9a8b6082f
2023-10-11 14:13:12 +08:00
Charlotte Lu
7be5d1cc43
Add updateApnDataToDatabase.
...
Fix: 304672976
Test: Visual Test
Change-Id: If0ed6b8090a37c5a98ab2eeb29fba61c1173c0a7
2023-10-11 13:38:54 +08:00
Charlotte Lu
5b2de59480
Add validateAndSaveApnData.
...
Fix: 304649927
Test: Visual Test
Change-Id: I900a096a6e27f1db66af204201d4ca2523537c0d
2023-10-11 11:22:39 +08:00
YK Hung
74927c7e11
Merge "Fix NullPointerException when full charge unplug a device with work profile" into main
2023-10-11 01:58:24 +00:00
Zaiyue Xue
7385665d8c
Merge "Use empty BatteryDiffData instead of null to avoid NullPointerException" into main
2023-10-11 01:54:39 +00:00
Eric Biggers
03aa2e444e
[automerger skipped] Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main am: b862d378bd
am: 12c1013250
am: c44a165ec7
am: 15c5cd2478
-s ours am: e249035b89
-s ours
...
am skip reason: Merged-In If196bbef4755c644b3188043ed47e99817bf1856 with SHA-1 938902d2df
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776713
Change-Id: Ic3b58db092ca05b3a0bf27d5e5ea9901b1b16215
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-11 01:42:34 +00:00
Eric Biggers
54df046ca2
[automerger skipped] ShadowLockPatternUtils: remove patternEverChosen methods am: 938902d2df
-s ours
...
am skip reason: Merged-In If196bbef4755c644b3188043ed47e99817bf1856 with SHA-1 795a02c92a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25001398
Change-Id: I989b4b3ff97c74354caa472a7e6d437f44153dbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-11 01:19:12 +00:00
Automerger Merge Worker
df06711096
Merge changes from topic "am-ed5d77f7685c443197cbca230cef63e8" into udc-qpr-dev-plus-aosp am: 97246649e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: Iad0abf615b6d67107abd2317bf4a1e7d09989720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 23:42:43 +00:00
Bill Yi
1da00881c9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6
-s ours am: eaeb26adb0
-s ours am: ea17648df4
-s ours am: 1c503fed67
-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: Ib2f82bc298c89edda06a60d029fe7fbe19d7a6a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 23:42:30 +00:00
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
e249035b89
[automerger skipped] Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main am: b862d378bd
am: 12c1013250
am: c44a165ec7
am: 15c5cd2478
-s ours
...
am skip reason: Merged-In If196bbef4755c644b3188043ed47e99817bf1856 with SHA-1 938902d2df
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776713
Change-Id: I71396e731f92073d32644f991cc5deaa6e1dc8e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 22:54:23 +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
Eric Biggers
15c5cd2478
Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main am: b862d378bd
am: 12c1013250
am: c44a165ec7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776713
Change-Id: I344e3a8d2a8a3e6cdb9056a9b06a7fe5b6b5741a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 21:51:41 +00:00
Eric Biggers
c44a165ec7
Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main am: b862d378bd
am: 12c1013250
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776713
Change-Id: I3c6492ee12dc88b518079e167583b37435743d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 21:18:01 +00:00
Hao Dong
ccb414d85b
Merge "Fix recreate crash on Enroll v2." into main
2023-10-10 20:12:05 +00:00
Eric Biggers
12c1013250
Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main am: b862d378bd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776713
Change-Id: Ib504b453a8caac0789084affcaa70a33e8b554d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 20:11:52 +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
Eric Biggers
b862d378bd
Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main
2023-10-10 19:43:59 +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
Zaiyue Xue
0e277429cb
Fix NullPointerException when full charge unplug a device with work profile
...
Block BatteryUsageBroadcastReceiver when context is work profile.
Bug: 304441610
Fix: 304441610
Test: manual
Change-Id: I91a41d5570e7cacf77a8d126c7700ee4bd766d40
2023-10-10 21:26:06 +08: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