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
Wesley Wang
cf1190c7cb
Update battery health state intent (2/3)
...
- Update the extra from overheated to longlife
Bug: 278192441
Test: make SettingsRoboTests
Change-Id: I5a906e64effbd9aaf84446c0670249afefdf7da8
2023-05-11 11:27:16 +08:00
Bill Yi
541d74eb4d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5
-s ours am: c8c199020a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: Id45461b6303f6d7f3da8e2b6c2c7c0e34447c74b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 03:26:10 +00:00
ykhung
8f56114489
Record app optimization mode backup into BatteryHistoricalLog
...
App optimization mode format:
https://screenshot.googleplex.com/di9DDzBfYf7ihfV
App optimization mode backup format:
https://screenshot.googleplex.com/GkVW5HrgGvmv5yh
Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I60a9a76a8ffc89d625ee3f77c138a19181c81c38
2023-05-11 10:48:47 +08:00
Bill Yi
c8c199020a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: Id8b9494bf8edd0e1ea401b95e3bdfc558c58eb49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 02:40:17 +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
e9106f35ce
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916
Change-Id: Ifac01d28e06f50734882f9f8a04d3040809e3553
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 02:20:02 +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
Hao Dong
755a67a931
Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen.
...
Bug: 279823572
Test: atest FingerprintSettingsFragmentTest
Test: atest ChooseLockGenericTest
Change-Id: Ie4bc18bf245eb7a755862401c710d85381063ff9
Merged-In: Ie4bc18bf245eb7a755862401c710d85381063ff9
2023-05-10 23:26:02 +00:00
Treehugger Robot
d8e8583c71
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: I1723c2ace801c978f758dd6695e82b4a8b38a98a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:18:32 +00:00
Bill Yi
33dd95eda1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: I656fa19574d6b26b0bc6a0e222ffddd3bc88df3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:18:30 +00:00
Treehugger Robot
6ace5ad965
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d28f600d0e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: I1137ad757c184c85d469fac6a122f5ed64a93fe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:18:26 +00:00
Bill Yi
6cc5e5c226
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69bec0564
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: Ibc0f5f91d03bc40177cfede61315be094e93c5a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:18:06 +00:00
Treehugger Robot
76d0d8c12b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3b7b23acb8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: Ideac433a7a33a20cf5346649e0f479c379117ea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:17:45 +00:00
Bill Yi
e578c1477f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be6f57545f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: I3299fc21dc12c5983f47f184ddbd5c078c8dafcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:17:30 +00:00
Treehugger Robot
7670083b52
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-10 21:57:56 +00:00
Treehugger Robot
8eb849c4b2
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-10 21:57:56 +00:00
Treehugger Robot
52978dea76
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-10 21:57:56 +00:00
Treehugger Robot
767a923ecd
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-10 21:55:15 +00:00
Treehugger Robot
d28f600d0e
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-10 21:55:15 +00:00
Treehugger Robot
3b7b23acb8
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-10 21:55:15 +00:00
Treehugger Robot
14ffc962b8
Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657
Change-Id: Iea1841e0a8b214e6783403f511e4d3a08519a703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 20:45:19 +00:00
Treehugger Robot
4c6f37b1d6
Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330
Change-Id: Idbc8f808ca0031d19af3d47e6c824aa35ea29daa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 20:44:19 +00:00
Treehugger Robot
f6eab0c9de
Merge changes I4c4d257e,I4cc4cc22 into udc-dev
...
* changes:
Warn earlier about 5 provider limit
Fix credman provider not showing
2023-05-10 20:00:29 +00:00
Treehugger Robot
3061bcf10a
Merge "Fix change not picking up work profile" into udc-dev
2023-05-10 19:57:22 +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
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