Becca Hughes
68470a4f27
Warn earlier about 5 provider limit
...
Test: ondevice
Bug: 281616441
Change-Id: I4c4d257e1a0a6396b3948a2b50462bbef1987729
2023-05-10 17:42:21 +00:00
Treehugger Robot
4fde620b4f
Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122
Change-Id: If7930aac56969335f549e208c56744aad22488cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 17:37:36 +00:00
Bill Yi
cd402bd739
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683
am: 74737aa45e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122
Change-Id: I8eb20cddf535b6e0bf431039862ed21e31ac851b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 17:37:29 +00:00
Treehugger Robot
b8e02ef73f
Merge changes from topic "tc_change_2305100725_22" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683
Import translations. DO NOT MERGE ANYWHERE
2023-05-10 17:26:27 +00:00
Becca Hughes
7a5ec88784
Fix credman provider not showing
...
Test: ondevice
Bug: 281787107
Change-Id: I4cc4cc2216a7c452ee63cb742a292dadbd46714f
2023-05-10 17:24:22 +00:00
Becca Hughes
347c165521
Fix change not picking up work profile
...
Test: ondevice
Bug: 281787107
Change-Id: I676384877ce21ae1f1e6972646fc465828013c74
2023-05-10 17:02:02 +00:00
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
Bill Yi
74737aa45e
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122
Change-Id: I47fbf6522118645f92ca7d0611282ae70079dac3
2023-05-10 14:31:59 +00:00
Bill Yi
f637cc7f49
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667
Change-Id: I24760694eb939797e648180e2578a74f008280e3
2023-05-10 14:31:15 +00:00
Elliot Sisteron
d86c590440
Remove search entries from old pages when SC is on.
...
There was already some code to guard this, but this wasn't overriding
the `isPageSearchEnabled` as well to support dynamic indexing.
Bug: 280596858
Test: manual
Change-Id: If4793d9fa2a7d68eac78258c18d04e9fb7d8fcea
2023-05-10 13:48:03 +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
Bill Yi
66c1c35717
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I24e3086598c78dbdd81a99fa8355dba0615adea6
2023-05-09 19:20:45 -07:00
Bill Yi
6b8c61c9a6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ica68575ce29c2ca9f82bfc8a694750f589fbb492
2023-05-09 19:19:35 -07:00
Bill Yi
13c4c2accb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4df0fe515c3acf2eddfeabef5b6088f437ad1b8d
2023-05-09 19:15:29 -07:00
Bill Yi
227df01c9b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibd86c070b71afe024df51354f05d5dc5313e5efd
2023-05-09 19:13:07 -07:00
Bill Yi
e69bec0564
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If7cdbc4d2562b4104a9de90f1f97b67eadcc4ad1
2023-05-09 19:10:50 -07:00
Bill Yi
7a494fc7c5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I041ed592d479aeb038cb23092fa85b14d71df157
2023-05-09 19:08:51 -07:00
Bill Yi
f6e1ce0079
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If67335f6cb1c4d116442209acd6161b966e5560c
2023-05-09 19:07:40 -07:00
Bill Yi
be6f57545f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I33712e7c3fd9062f28b3043d2dd6189a52532254
2023-05-09 19:06:37 -07:00
Bill Yi
63af1d8683
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id5b16e70d8c5cc99699281eed833bcabbcd8e8aa
2023-05-09 19:04:28 -07:00
Bill Yi
eac02feb2d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I752b8c12cf13fcb989dbb335b3230198d3be3201
2023-05-09 19:02:21 -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