Commit Graph

51200 Commits

Author SHA1 Message Date
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
Hao Dong
ccb414d85b Merge "Fix recreate crash on Enroll v2." into main 2023-10-10 20:12:05 +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
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
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
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
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
Chaohui Wang
0bcf5b79f8 Merge "Create AppDataUsageAppSettingsController" into main 2023-10-08 11:46:37 +00:00
Charlotte Lu
93fb316f01 Add ApnDataInit.
Fix: 298906796
Test: Unit Test
Change-Id: Ibf9e12e4f9c4ee033ad6dc2ca1f2267bf1f21912
2023-10-08 17:54:40 +08:00
Chaohui Wang
08e24272e4 Create AppDataUsageAppSettingsController
For better organization and testings.

Bug: 240931350
Test: manual - on AppDataUsage
Test: unit test
Change-Id: Ie3d35f5d112cf06cca585c9859624d705fbe2655
2023-10-08 17:03:48 +08:00
Zaiyue Xue
834e19b188 Use empty BatteryDiffData instead of null to avoid NullPointerException
This is one action post P0 bug b/301362376.

Bug: 304067689
Bug: 303838369
Fix: 304067689
Fix: 303838369
Test: manual
Change-Id: I8bb6bfe9c3fca78ab19dfbfd2a184b0f92f4ef09
2023-10-08 16:38:29 +08:00
Chaohui Wang
4188a571aa Use network type enum for APN
Instead of hardcoded names and values.

Bug: 303971237
Test: unit test
Change-Id: I099a408df7ee35abc886ed5c1d2d09fd31fda7d3
2023-10-08 14:23:37 +08:00
Treehugger Robot
9f49e038a0 Merge "Telephony.Carriers.BEARER is deprecated." into main 2023-10-08 03:33:27 +00:00
Charlotte Lu
11737b956e Telephony.Carriers.BEARER is deprecated.
Fix: 303971237
Test: Unit Test
Change-Id: Id3257b279421eb9f3544430667dc8ae536476e5c
2023-10-07 17:52:16 +08:00
Chaohui Wang
218ef2f087 Merge "Create AppDataUsageListController" into main 2023-10-07 08:42:42 +00:00
Chaohui Wang
b19eb9a4c2 Create AppDataUsageListController
For better organization and testings.

Bug: 240931350
Test: manual - on AppDataUsage
Test: unit test
Change-Id: I77ceeccc7055fcd948fe40d5dfb9cc4a9b9ad2ee
2023-10-07 15:03:27 +08:00
Charlotte Lu
1735474987 Merge "Add SettingsTextFieldPassword enable." into main 2023-10-07 05:04:50 +00:00
Gil Cukierman
18403f2adc Merge changes from topic "cukie-300248708-hide2gremoval" into main
* changes:
  Stop honoring CarrierConfigManager.KEY_HIDE_ENABLE_2G
  Add feature flag for removal of KEY_HIDE_ENABLE_2G
2023-10-04 20:12:53 +00:00
Joy Babafemi
45c932f9a6 Merge "Set ACTION_REQUEST_SET_AUTOFILL_SERVICE to route to DefaultCombinedActivity" into main 2023-10-04 18:12:21 +00:00
Hakjun Choi
5e8e07ce7c Merge "Changed API name from 'isNtn()' to 'isOnlyNonTerrestrialNetwork()' and updated related methods and variables according to API Council recommendations." into main 2023-10-04 17:35:54 +00:00
Matt Pietal
9695477373 Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513 am: 705507d68f am: 8d4d73f152 am: 9e233f3284 am: 84076896f6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870

Change-Id: I361b6926ca06f22211048ad5738b58d3bf21c473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 16:57:42 +00:00
Matt Pietal
84076896f6 Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513 am: 705507d68f am: 8d4d73f152 am: 9e233f3284
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870

Change-Id: I91198eb53fda60d1f5801e5fa8512be2800304e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 16:26:27 +00:00
Matt Pietal
9e233f3284 Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513 am: 705507d68f am: 8d4d73f152
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870

Change-Id: I9a436c40d689ad4db65a9ff9def5ea04c8115894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 15:55:50 +00:00
Matt Pietal
8d4d73f152 Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513 am: 705507d68f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870

Change-Id: Icf1ee16bfff74c784b67417dec19f56caf2fd6a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 15:23:35 +00:00
Matt Pietal
705507d68f Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870

Change-Id: Ia1bfae20044369b8a8e463e21a2393cf9b6e9250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 14:54:22 +00:00
Matt Pietal
3be411d513 Merge "Add support to configure double line clock in lockscreen [2/2]" into main 2023-10-04 14:25:38 +00:00