Commit Graph

123138 Commits

Author SHA1 Message Date
YK Hung
9d173f318d Merge "Remove the legacy smart battery tip from Settings" into udc-dev am: 2aff060aca am: 40dee4b7a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23129578

Change-Id: Ie4074c0ad4d8f97ef740eb11a0c4ba14aac7b2f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 12:05:49 +00:00
Treehugger Robot
22b844fb59 Merge "Hide carrier service package in Wi-Fi data usage settings" into udc-dev am: 7a7193c865 am: b6a07fdf0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123005

Change-Id: I4abe6da32305bad6bfd76e7afd626781b87e3cd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 12:05:40 +00:00
YK Hung
fb8d52d1c5 Merge "Move duplicate operations in the BackupHelper to OptimizeUtils" into udc-dev am: b7cfe00235 am: aed98fc75e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123004

Change-Id: I470fd16ed8c8a9acc5f2df0af028b97cdad491bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 12:05:31 +00:00
YK Hung
40dee4b7a9 Merge "Remove the legacy smart battery tip from Settings" into udc-dev am: 2aff060aca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23129578

Change-Id: Idc577bd9cb2c0435a24c21a32e3f448d887e80a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 11:29:19 +00:00
Treehugger Robot
b6a07fdf0b Merge "Hide carrier service package in Wi-Fi data usage settings" into udc-dev am: 7a7193c865
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123005

Change-Id: If365dc552f5e7dc492fd12552091e3be49f7524d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 11:29:10 +00:00
YK Hung
aed98fc75e Merge "Move duplicate operations in the BackupHelper to OptimizeUtils" into udc-dev am: b7cfe00235
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123004

Change-Id: Ib94ebfd423cf3cf200f8af4bef1c1247bc3a7015
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 11:28:22 +00:00
YK Hung
2aff060aca Merge "Remove the legacy smart battery tip from Settings" into udc-dev 2023-05-10 11:19:28 +00:00
Treehugger Robot
7a7193c865 Merge "Hide carrier service package in Wi-Fi data usage settings" into udc-dev 2023-05-10 10:59:27 +00:00
YK Hung
b7cfe00235 Merge "Move duplicate operations in the BackupHelper to OptimizeUtils" into udc-dev 2023-05-10 10:42:35 +00:00
Marcello Galhardo
751e29cc2c Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 am: d608996d1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850

Change-Id: Ia7882a219f6eb271a0b336d15311d1d559c33ed6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 10:01:23 +00:00
ykhung
2f42eb20f3 Remove the legacy smart battery tip from Settings
Remove the legacy smart battery tip from the battery settings, which
will remind users to eanble the "adaptive battery" if users disable it.

Reasons: 1) 98% users will always keep the AB is enabled, and 2) we move
the AB into the battery saver page, there is no individual page anymore

Fix: 281798483
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.batterytip.*
Change-Id: I85739b88ee9373b95a62271d2eb0137cf411d8cb
2023-05-10 09:48:55 +00:00
Marcello Galhardo
af59a41da5 Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 am: 8f2ebb1510
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850

Change-Id: I0ecf5c9c5af83b4d9e4d8ebf50d0866e4665cfe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 09:45:07 +00:00
Marcello Galhardo
d608996d1f Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850

Change-Id: I1bccba1b2642e39155543448f4d2feba3139f736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 09:44:40 +00:00
Daniel Huang
0be8644109 Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb am: 52567d5ce9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896

Change-Id: I1d2dd9d4ea85542a19ab600bdbdd8ebb6f27fed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 09:43:06 +00:00
Marcello Galhardo
8f2ebb1510 Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850

Change-Id: I9bf03c4fec44e7fe97f3d1023115d823607d20c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 09:40:30 +00:00
Daniel Huang
67e1c060dc Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb am: d7bec8275e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896

Change-Id: Ic9de27ea9701df5ca3bbe7cec284f003065ebdda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 09:39:30 +00:00
Weng Su
f65c4530e4 Hide carrier service package in Wi-Fi data usage settings
- When there is no specified SubscriptionInfo, Wi-Fi data usage will be displayed. In this case, the carrier service package also needs to be hidden.

- Fix failing test cases in DataUsageListTest

Bug: 273167633
Bug: 280021214
Test: manual test

Change-Id: I66ff8a28d9e7f7db77c8a210cb36676a07fc2c7d
2023-05-10 17:30:01 +08:00
Marcello Galhardo
f5a3485300 Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev 2023-05-10 09:23:52 +00:00
Daniel Huang
d7bec8275e Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896

Change-Id: I608e726a2ac9c92b9a565c938688430508276a41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 09:00:16 +00:00
Daniel Huang
52567d5ce9 Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896

Change-Id: I2c554ed2dbe696f2d8c10b5860b6796eba2dccf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 08:56:36 +00:00
ykhung
981726c0e7 Move duplicate operations in the BackupHelper to OptimizeUtils
Test command for backup manager:
adb shell bmgr backupnow com.android.settings
adb shell dumpsys backup | grep Current
adb shell bmgr restore 34bbf79f36c8ed43 com.android.settings

Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I2bc8842849998841aa38af3564f51bb81606c8cf
2023-05-10 08:41:58 +00:00
Daniel Huang
28aa2964fb Merge "[Fixed] UI issues after rotation" into udc-dev 2023-05-10 07:59:20 +00:00
Guangjie (Jerry) Shi
7045faeae1 Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498 am: 54a6dd7217
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101

Change-Id: I3763ee97b9bfb17e1aa2f654abb4e059532d1ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:57:59 +00:00
Guangjie (Jerry) Shi
02f56a627a Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498 am: 8e70a25893
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101

Change-Id: Ibc4efb04f0c68aa79883cb4d7fe37777c38ffc41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:31:33 +00:00
Guangjie (Jerry) Shi
8e70a25893 Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101

Change-Id: I79921f8f98396e741852d68f81b1d537ba0e87f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:14:52 +00:00
Chaohui Wang
9ea3fb9e53 Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919 am: e98635c9fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494

Change-Id: I8a8e870d4a36effc36110e3bde00b4b7fa0fca89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:11:51 +00:00
Guangjie (Jerry) Shi
54a6dd7217 Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101

Change-Id: I6063d2795be8883e3d46b7a3290a32cb1addc3ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:10:32 +00:00
Chaohui Wang
7b7ff6e1db Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919 am: 8178129fca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494

Change-Id: I425facb683b1af1816c7ae81faf3e91a2fa73c08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 06:56:54 +00:00
Guangjie (Jerry) Shi
ba44f13498 Merge "Add null check for settings default preference controller" into udc-dev 2023-05-10 06:30:37 +00:00
Chaohui Wang
e98635c9fd Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494

Change-Id: Ib24e2c605b64bc20abf7b1cdf2a1af3dee2e0346
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 06:15:55 +00:00
Chaohui Wang
8178129fca Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494

Change-Id: Idd096dfa879208010ce24ae96432d42ceae572d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 06:06:48 +00:00
Chaohui Wang
6619994919 Merge "Fix button not clickable in sim confirm dialog" into udc-dev 2023-05-10 05:26:02 +00:00
Chaohui Wang
9beb5605b8 Fix button not clickable in sim confirm dialog
Bug: 261994361
Fix: 280787593
Test: Manually with Talkback on
Test: Manually with Talkback off
Change-Id: I23d4ea816eb534dcde48cc2ebc6bb4a9770d107e
2023-05-10 04:15:37 +00:00
Jerry Shi
21df117d52 Add null check for settings default preference controller
Test: local built and tested
Bug: 281771729
Change-Id: Ib3467c22262125ac7dac00eb9ea68516ddf53b5a
2023-05-09 21:00:32 -07:00
Becca Hughes
c20caa3150 Merge "If you tap outside dialog then re-enable" into udc-dev am: 90b344e760 am: 654313a55b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121656

Change-Id: Ib3471e50a659bae87fcc590f9e1e8d5bc16f9263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 01:14:32 +00:00
Bill Lin
feeaade45d Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc am: 496ad744db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802

Change-Id: Ie2abbf89ba36673725f642de3f8e9032dbb653b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 01:13:16 +00:00
Becca Hughes
fce08f688d Merge "If you tap outside dialog then re-enable" into udc-dev am: 90b344e760 am: cb0643a885
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121656

Change-Id: Ic8bb677b710a89f1cde4b6c77ea14dce9c2ad9c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 01:10:01 +00:00
Bill Lin
e5dfcc0270 Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc am: f6d23468b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802

Change-Id: I409d9db2155b71005aeec519dadac701f5e5d550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 01:09:37 +00:00
Becca Hughes
cb0643a885 Merge "If you tap outside dialog then re-enable" into udc-dev am: 90b344e760
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121656

Change-Id: I0e83c6d3fe56b9dc06709e8942e51e052e89aa0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 00:51:07 +00:00
Becca Hughes
654313a55b Merge "If you tap outside dialog then re-enable" into udc-dev am: 90b344e760
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121656

Change-Id: I2a2227ff6f5eb821b2ccc61d430b5a12bbbc3ba2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 00:46:49 +00:00
Becca Hughes
90b344e760 Merge "If you tap outside dialog then re-enable" into udc-dev 2023-05-10 00:33:11 +00:00
Bill Lin
496ad744db Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802

Change-Id: I5c1e7bca3eda4ce7bbf056107dd7e7631fd82fd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 00:28:40 +00:00
Bill Lin
f6d23468b1 Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802

Change-Id: I4606997e91b4e23c76480362c6736efb464d7652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 00:28:30 +00:00
Bill Lin
4d5063ffdc Merge "Refine SkipDialog title and desc by device configs" into udc-dev 2023-05-09 23:09:38 +00:00
Becca Hughes
48d406cecc If you tap outside dialog then re-enable
Test: ondevice
Bug: 281696686
Change-Id: I7aee51952b8a905010710a574e0dd39616b2e5d9
2023-05-09 22:48:53 +00:00
Himanshu Gupta
e8fee72eeb Merge "Enabling App Cloning Device Config flags by default. The features will be guarded *only* by config overlays, which are off by default." into udc-dev am: 53bf6b1dc8 am: 1e77d0d6c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22381242

Change-Id: I27f1fd02f26ee1c364b0dce001173d142e99a9d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 22:44:18 +00:00
Becca Hughes
cc9463004f Merge "Fix provider update bug" into udc-dev am: 5031d67f21 am: 75d3f20983
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23112934

Change-Id: I17b218f1cd802bf03c56ba0ed2c5473a27499033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 22:44:09 +00:00
Becca Hughes
431b724199 Hide enable dialog and prefix pref wrongly enabled am: e513c71189 am: 914cd963d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23114516

Change-Id: I49c396704a085e2f124be905b1fd54fce17feb5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 22:43:51 +00:00
Himanshu Gupta
5145d15830 Merge "Enabling App Cloning Device Config flags by default. The features will be guarded *only* by config overlays, which are off by default." into udc-dev am: 53bf6b1dc8 am: 81180f985e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22381242

Change-Id: I5815fd7e5518d503464dfed5cafb7dad63637bda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 22:39:28 +00:00
Becca Hughes
40af741095 Merge "Fix provider update bug" into udc-dev am: 5031d67f21 am: 01b75c9719
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23112934

Change-Id: I337e45dbb93e15e2d1fe0465128555226c54e4b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 22:39:13 +00:00