TreeHugger Robot
1e68cd7694
Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c am: cbd61dd5cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025
Change-Id: I5fc013890ea0b48796df9a8af100a2593f42e2cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 09:25:50 +00:00
SongFerng Wang
b421dfeeac
Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c am: 376ca216ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659
Change-Id: I56e8b9e3330c1a933ed39f426b598791a560bb45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 08:21:03 +00:00
TreeHugger Robot
d2e8495f4c
Merge "Remove search entries from old pages when SC is on." into udc-dev
2023-05-11 08:14:04 +00:00
SongFerng Wang
c487d5a10c
Merge "Update the wording for LE Audio" into udc-dev
2023-05-11 07:11:11 +00:00
Tom Hsu
27a0488790
Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555 am: 9d3ac48f44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916
Change-Id: If2e552263d63342ec69eb3b93ccf357c60bcf59b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 05:32:17 +00:00
TreeHugger Robot
1742524dd3
Merge "Show disable dialog box when none is selected" into udc-dev
2023-05-11 05:02:34 +00:00
SongFerngWang
f4c5c8ef5e
Update the wording for LE Audio
...
Add the summary for LE Audio toggle
Bug: 280000165
Test: build pass
Change-Id: Ic1eee71d6ff70d01e9a37ab0ec06cfaf639fe963
2023-05-11 12:30:59 +08:00
Tom Hsu
5576947555
Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev
2023-05-11 04:30:19 +00:00
Angela Wang
cd1a68db34
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 am: ae04daac19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916
Change-Id: Ic2362f572bd3be5a857788e62d9e6afb97e06b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 03:00:38 +00:00
Becca Hughes
8e9119f5ab
Show disable dialog box when none is selected
...
Also remove from CMPP since that will be
hidden.
Test: ondevice
Bug: 281147573
Merged-In: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
Change-Id: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
2023-05-11 02:28:54 +00:00
Angela Wang
22d3116188
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev
2023-05-11 01:41:47 +00:00
Becca Hughes
9272c0e3c8
Show disable dialog box when none is selected
...
Also remove from CMPP since that will be
hidden.
Test: ondevice
Bug: 281147573
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:16d3b54aaf802c66be439bf65c877cba60c4390d )
Merged-In: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
Change-Id: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
2023-05-10 23:41:56 +00:00
Treehugger Robot
8a36c107a9
Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: 5e8e9ace78
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657
Change-Id: If411aa4ef2cc867e14a4838c7e3c96c568c70885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:19:54 +00:00
Treehugger Robot
ae518d8f14
Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a am: f53c4e872d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330
Change-Id: I8eb5c88cdfe891a791c8d7db62059060b225f757
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:17:04 +00:00
Jigar Thakkar
b6e12d7ff1
Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120 am: 854a93c2d3 am: 28449684ca am: 33f1f4c479
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582
Change-Id: I196a12897085e7dd54caf5dcc3110c9b4a8a922e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 20:46:31 +00:00
Treehugger Robot
17facb603f
Merge "Refine optimize page log pattern" into udc-dev am: d865ccc2ed am: 48002a9d03 am: 961a19c1f8 am: ca3dd86485
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23129577
Change-Id: Ica08043dff2238a9330a30e78305049d9433a040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 19:40:36 +00:00
YK Hung
6d50c00a2b
Merge "Remove the legacy smart battery tip from Settings" into udc-dev am: 2aff060aca am: 40dee4b7a9 am: 9d173f318d am: ede7353183
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23129578
Change-Id: I2299f38e4342891ab589c4011078719f7d8351df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 19:40:26 +00:00
Treehugger Robot
d275317781
Merge "Hide carrier service package in Wi-Fi data usage settings" into udc-dev am: 7a7193c865 am: b6a07fdf0b am: 22b844fb59 am: 0516f5480c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123005
Change-Id: I400c3891de86550d36d85011455e3e5a68c07b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 19:40:17 +00:00
YK Hung
94aafb11c2
Merge "Move duplicate operations in the BackupHelper to OptimizeUtils" into udc-dev am: b7cfe00235 am: aed98fc75e am: fb8d52d1c5 am: 56008450b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123004
Change-Id: I04dc90b3f6730c5dd22d74c928df74eaabed37ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 19:40:08 +00:00
Marcello Galhardo
6255d37ad9
Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 am: d608996d1f am: d478fe535e am: af658f1ab4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850
Change-Id: Iab8c01d073f10dbbb55ebead9b8a883f5a93065a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 18:57:21 +00:00
Daniel Huang
615b76a79d
Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb am: d7bec8275e am: ad9525bd97 am: 87d9d70efc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896
Change-Id: I2ca92ca73104faf38bc158625c33eda0d41046ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 18:56:42 +00:00
Guangjie (Jerry) Shi
a38a249fda
Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498 am: 8e70a25893 am: 02f56a627a am: 15eb2fd250
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101
Change-Id: Ie547fcc52b468e91ea35ab2b3596cc561b2f3ddb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 18:55:59 +00:00
Chaohui Wang
166368ef2d
Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919 am: 8178129fca am: 7b7ff6e1db am: 6a8a4127c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494
Change-Id: I49fc59707e85a2c271ddd1b0f13e952689741596
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 18:55:33 +00:00
Becca Hughes
fd6a0d786b
Merge "If you tap outside dialog then re-enable" into udc-dev am: 90b344e760 am: cb0643a885 am: fce08f688d am: af5ce05bf9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121656
Change-Id: If9fc21cb1198a3e0a305df89351d908101452a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 18:54:43 +00:00
tom hsu
0617631408
[Settings] Avoid NPE if BT device is changed by framework.
...
- Do not register only one BT device for primary to avoid primary
BT devcie change to another.
- Register and unregister all BT devices
Bug: 280236099
Test: atest passed
Change-Id: I610144c7f8f649e40d99cf1dc7f50d1f3b80f109
2023-05-11 02:53:19 +08:00
Becca Hughes
68470a4f27
Warn earlier about 5 provider limit
...
Test: ondevice
Bug: 281616441
Change-Id: I4c4d257e1a0a6396b3948a2b50462bbef1987729
2023-05-10 17:42:21 +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
Bill Lin
4caa3ece94
[conflict] Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc am: f6d23468b1 am: e5dfcc0270 am: 547f6d63a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802
Change-Id: I61fed7e932c8dc476b689ca61bbf8ee919924bed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 16:29:52 +00:00
Jigar Thakkar
33f1f4c479
Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120 am: 854a93c2d3 am: 28449684ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582
Change-Id: I465db655dd963b47551c57f7686f77adca6234d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 14:48:19 +00:00
Jigar Thakkar
28449684ca
Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120 am: 854a93c2d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582
Change-Id: I5260cc0cf08d72f1d37b9689355b6a894a01dd8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 14:01:30 +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
ca3dd86485
Merge "Refine optimize page log pattern" into udc-dev am: d865ccc2ed am: 48002a9d03 am: 961a19c1f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23129577
Change-Id: I61f47fec2799685d0f4efadec893b28ac0e3c6b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 12:28:17 +00:00
YK Hung
ede7353183
Merge "Remove the legacy smart battery tip from Settings" into udc-dev am: 2aff060aca am: 40dee4b7a9 am: 9d173f318d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23129578
Change-Id: I08be3957949e44209cf26e38d9ca6f10d736f81f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 12:27:56 +00:00
Treehugger Robot
0516f5480c
Merge "Hide carrier service package in Wi-Fi data usage settings" into udc-dev am: 7a7193c865 am: b6a07fdf0b am: 22b844fb59
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123005
Change-Id: I48fc5d770bcf2466cfb975c9644de0b618a1a23d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 12:27:40 +00:00
YK Hung
56008450b4
Merge "Move duplicate operations in the BackupHelper to OptimizeUtils" into udc-dev am: b7cfe00235 am: aed98fc75e am: fb8d52d1c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123004
Change-Id: Ieb084890183ca938ac5d4dae9108d795a31d05de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 12:27:16 +00:00
Treehugger Robot
961a19c1f8
Merge "Refine optimize page log pattern" into udc-dev am: d865ccc2ed am: 48002a9d03
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23129577
Change-Id: I6379666d415eec7e2daf23b517acbf2df2192214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 12:05:57 +00:00
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
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