Commit Graph

122513 Commits

Author SHA1 Message Date
Treehugger Robot
d5d3d55bbd Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776

Change-Id: If0f86befeac5448ec837a86654c875c2d38db595
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 16:47:50 +00:00
Treehugger Robot
6a06cdd1bf Merge "Fix mistake in test" into udc-dev 2023-05-10 15:59:23 +00:00
TreeHugger Robot
1e7990341c Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496

Change-Id: I3e9f8ee058f36819fad9675afd69f07d6524cbe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 15:24:16 +00:00
TreeHugger Robot
c0c0edd078 Merge "Fix title of no-screen-lock notification" into udc-dev 2023-05-10 14:33:36 +00:00
Jigar Thakkar
854a93c2d3 Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582

Change-Id: I1b5382aa0f132545d23082e3273e4756aa5d54ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 13:40:58 +00:00
Jigar Thakkar
002f06e120 Merge "Modify clone profile accounts info section" into udc-dev 2023-05-10 13:38:58 +00:00
Treehugger Robot
48002a9d03 Merge "Refine optimize page log pattern" into udc-dev am: d865ccc2ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23129577

Change-Id: I2b93bc7208779fbc08bd3476f10864b64272f38a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 11:49:03 +00:00
Treehugger Robot
d865ccc2ed Merge "Refine optimize page log pattern" into udc-dev 2023-05-10 11:38:38 +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
Wesley Wang
1f78ebd8aa Refine optimize page log pattern
- Add timestamp and prefix string
 - Chagne Action.MANUAL to LEAVE for better readability
 screenshot: https://screenshot.googleplex.com/ALTvMaPWVEq8y7c.png

Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I69d1beceb98444d823f6ffc3a015cf61a7d7a66d
2023-05-10 10:11:28 +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
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
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
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
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
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
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
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
90b344e760 Merge "If you tap outside dialog then re-enable" into udc-dev 2023-05-10 00:33:11 +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
81180f985e 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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22381242

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

Change-Id: Ibef3433141e67938efd2f3c07978870525e14a70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 22:02:14 +00:00
Himanshu Gupta
53bf6b1dc8 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 2023-05-09 22:00:36 +00:00
Becca Hughes
847e29faf7 Hide enable dialog and prefix pref wrongly enabled am: e513c71189
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23114516

Change-Id: I1dd252d3452d0591313e3544a421d29def096cc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 22:00:18 +00:00
Becca Hughes
5031d67f21 Merge "Fix provider update bug" into udc-dev 2023-05-09 21:48:13 +00:00
Becca Hughes
e513c71189 Hide enable dialog and prefix pref wrongly enabled
Test: ondevice
Bug: 281329396
Bug: 280905737
Change-Id: I82652a2520a2f9ca9bc7f8f78cf020bef7af0b15
2023-05-09 21:16:01 +00:00
Becca Hughes
49d11e4995 Fix provider update bug
Test: make
Bug: 280905737
Change-Id: Ia7f33f4c5e1168cadd66119c42bd52e0a80eda10
2023-05-09 20:41:51 +00:00
Florian Mayer
8512191c33 Fix mistake in test
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=DevelopmentMemtagPageTest
Bug: 280021647
Change-Id: I74aa8764933d2abe9ae9dfd47c9f010411a3efee
2023-05-09 12:25:20 -07:00
Derek Jedral
fff41e6aa3 Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996

Change-Id: I7aaeed6ad5967a88b04583b19f8b35e2551a3b3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 18:04:09 +00:00
Derek Jedral
9c67ee1eb1 Merge "Remove feature flag for active unlock" into udc-dev 2023-05-09 17:17:11 +00:00
Treehugger Robot
6dd01a2ef9 Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: I71ec2340aaa88c8f6b2404a967b9876735af6121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 16:41:55 +00:00
Treehugger Robot
f4939a4bda Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev 2023-05-09 15:59:32 +00:00
Nan Wu
cd6d1d53ca Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev am: 38b99012f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497

Change-Id: I3d52133a999da5163b9d14d09afa9e8561292c9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 14:29:30 +00:00
Nan Wu
38b99012f4 Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev 2023-05-09 13:49:06 +00:00
danielwbhuang
c92bd9789d [Fixed] UI issues after rotation
1. Use onSaveInstanceState to store the data.
2. Do not repeat to automatically select the keyboard layout.

Bug: 281481973
Bug: 281461013
Test: manual
Change-Id: Ieaa8fa3d2e6c22c39b34313d255e4f7869777a8b
2023-05-09 20:03:17 +08:00
Vincent Wang
1e8948fbcb Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022

Change-Id: I68350a070fd57a6358b099bd303fb37ac84bf6ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 11:25:12 +00:00
Chaohui Wang
b52b6f6d46 Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917

Change-Id: Ifff45d0c5fb5a65681c2ad60de6d854a5dd36c99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 11:25:01 +00:00