Hugh Chen
39e3ee9b29
[automerger skipped] [automerge] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline 2p: 1c4142e1ae
am: 23ab123ba7
-s ours am: a2d6c9a087
-s ours am: eab5e61360
-s ours am: ccf1ae76aa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330690
Change-Id: I40593e920b3b1883554afa212abfd251bb4826c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:03:06 +00:00
TreeHugger Robot
5c02f888a0
[automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-v2-dev am: c8603dabf2
-s ours am: 04cc0c8073
-s ours am: 166900f537
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330688
Change-Id: I65d29b3d06257428581bbfb2aaf1ed4bfc81280c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:00:29 +00:00
Hugh Chen
5a31f4df51
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 8bae222489
-s ours am: 6774dbbe03
-s ours am: ad2004b17a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330688
Change-Id: I8641b6f6627d0d71407c1fe1f2f1c28955544921
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:00:28 +00:00
Hugh Chen
ccf1ae76aa
[automerger skipped] [automerge] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline 2p: 1c4142e1ae
am: 23ab123ba7
-s ours am: a2d6c9a087
-s ours am: eab5e61360
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330690
Change-Id: I6e029d7e570255074ef9487829d29a8a44629703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 21:34:06 +00:00
TreeHugger Robot
166900f537
[automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-v2-dev am: c8603dabf2
-s ours am: 04cc0c8073
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330688
Change-Id: I8f0bdcb3619a7b0a1b75b371437e89454b1e30f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 21:33:59 +00:00
Hugh Chen
ad2004b17a
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 8bae222489
-s ours am: 6774dbbe03
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330688
Change-Id: I167f358d67e6e35514af4b316e267931728f9112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 21:33:58 +00:00
TreeHugger Robot
12dc1d8a4e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 12a30b9511
-s ours am: 7ab31e744a
-s ours am: 6f1d70a7b1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397897
Change-Id: I75aa5ea4607d1a3949d9a852f91dc73f76a3e6dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 21:02:24 +00:00
Bill Yi
c3dd8bac52
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d941a36042
-s ours am: 900e78b59d
-s ours am: 0dfd96e976
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397897
Change-Id: I885afa28caf438520b7fc48aa1753c08e48a2f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 21:02:08 +00:00
Bill Yi
dad2842b58
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8b7a9fe8
-s ours am: 66ad02c375
-s ours am: ad24a2815a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397896
Change-Id: Iad652f0014b7f2358acc88c3a27b4a83c5d553b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 21:01:52 +00:00
TreeHugger Robot
6f1d70a7b1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 12a30b9511
-s ours am: 7ab31e744a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397897
Change-Id: Ia663b76f3371691c0e43e49f43e293069ba7822c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:45:20 +00:00
Bill Yi
0dfd96e976
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d941a36042
-s ours am: 900e78b59d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397897
Change-Id: I35197080d628e6ef4bfeb3ae8535eb7e9dcfaeaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:45:06 +00:00
Bill Yi
ad24a2815a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8b7a9fe8
-s ours am: 66ad02c375
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397896
Change-Id: I61cf06d1e8f06e3c018231e8d809068353f8c026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:44:48 +00:00
Bill Yi
80b7dc4eb1
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-05-18 17:20:23 +00:00
Bill Lin
c4492becef
Merge "Update biometric_settings_hand_back_to_guardian by device type" into tm-d1-dev am: 3db69adf01
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281783
Change-Id: I48390a1462c42d2676f8d740f1bc7a8c05613c13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 02:04:55 +00:00
Bill Lin
3db69adf01
Merge "Update biometric_settings_hand_back_to_guardian by device type" into tm-d1-dev
2022-05-18 01:43:56 +00:00
Bill Yi
ac5ba6b7cb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7c8978cfb133579ecf2bb4537228e63026e62868
2022-05-16 22:02:32 -07:00
Hugh Chen
eab5e61360
[automerger skipped] [automerge] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline 2p: 1c4142e1ae
am: 23ab123ba7
-s ours am: a2d6c9a087
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330690
Change-Id: If614dae2b5a69b82c149cbd87bb7e3b31002457a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 18:31:22 +00:00
Hugh Chen
a2d6c9a087
[automerger skipped] [automerge] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline 2p: 1c4142e1ae
am: 23ab123ba7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330690
Change-Id: Iace915bd93f479580c597fea6050a545108a8229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 18:23:43 +00:00
TreeHugger Robot
04cc0c8073
[automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-v2-dev am: c8603dabf2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330688
Change-Id: Id08264d8b7bc667db110a9f80e2a2831caa0c6b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 18:22:17 +00:00
Hugh Chen
6774dbbe03
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 8bae222489
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330688
Change-Id: I0aa9d098c3a69771ff874bc35575a8232128d555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 18:22:14 +00:00
TreeHugger Robot
c8603dabf2
Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-v2-dev
2022-05-16 17:08:55 +00:00
TreeHugger Robot
f5b2d6bf85
Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec
am: 7446f16681
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599
Change-Id: I67c2a94cc52dabe6ceeba892a9f7d0bf9ca822ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 14:33:11 +00:00
TreeHugger Robot
7ab31e744a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 12a30b9511
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397897
Change-Id: I71041c5f4ab2f7fed035af85c6c12d11adae03ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 14:21:46 +00:00
Bill Yi
900e78b59d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d941a36042
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397897
Change-Id: I4db5312fb54d53380d583c9563a088f196d99cb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 14:21:30 +00:00
Bill Yi
66ad02c375
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8b7a9fe8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397896
Change-Id: I115c0b84705f3d5b95b9182a747440df07f48fe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 14:21:13 +00:00
TreeHugger Robot
7446f16681
Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599
Change-Id: I9b553601fe759d0593e7c7522c6bb036f6c0afc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 14:15:57 +00:00
TreeHugger Robot
56e3f60dec
Merge "Add the ripple effect to the highlight background" into tm-dev
2022-05-16 13:45:10 +00:00
TreeHugger Robot
12a30b9511
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-05-16 13:35:19 +00:00
Arc Wang
0e2485a762
Fix Settings crash when setting a null ringtone am: ec3ae8bb17
am: 3975972483
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413
Change-Id: I83b8231f06eb2611fdabb2b171090c0904c5908a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 11:18:04 +00:00
Arc Wang
3975972483
Fix Settings crash when setting a null ringtone am: ec3ae8bb17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413
Change-Id: Ibfcbed93b2aeb2d5291b4fd78da3e8092b533430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 10:50:44 +00:00
Jason Chiu
0c5772fdc4
Add the ripple effect to the highlight background
...
Bug: 215267159
Test: visual
Change-Id: I96359342f0b8d40f5cd8dfbe8f1dd8b7d7f1c69b
2022-05-16 18:33:36 +08:00
TreeHugger Robot
6e7e95593a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bcd32c74c1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397885
Change-Id: I729fc21d41ea80d6c25e4d5edaedfdd5934b49b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 08:16:05 +00:00
Bill Yi
d2388e01b3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e958634cc6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397885
Change-Id: I93808f2f0a16f2c6f411cddfde07c8941e22cf95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 08:15:50 +00:00
TreeHugger Robot
14e9b89377
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d10c148d38
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397882
Change-Id: Ia1bed96468d8dc092ae461f5f044cfd4a8280ae5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 08:15:32 +00:00
Bill Yi
74a4376590
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6aadac2448
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397882
Change-Id: I80d358866b19448cf3ff50ca2326ad2b9269291a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 08:15:15 +00:00
TreeHugger Robot
6bc7ea75a7
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-05-16 08:00:24 +00:00
TreeHugger Robot
7b538df037
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-05-16 08:00:24 +00:00
TreeHugger Robot
bcd32c74c1
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-05-16 07:38:50 +00:00
TreeHugger Robot
d10c148d38
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-05-16 07:38:50 +00:00
Arc Wang
ec3ae8bb17
Fix Settings crash when setting a null ringtone
...
Ringtone picker may callback a null ringtone Uri
if users select None.
This change pass null ringtone Uri to RingtoneManager
and return.
Bug: 232502532
Bug: 221041256
Test: maunal
Settings - Sound & Vibration -> Phone ringtone
-> My Sounds -> None
Change-Id: I044b680871472a3c272f6264c4ef272df542112e
2022-05-16 14:36:19 +08:00
KUAN WANG
614d2dfc0b
Merge "Reset Optimization Mode of apps when users reset app settings." into tm-qpr-dev
2022-05-16 05:34:47 +00:00
Yi-Ling Chuang
6bafe542fe
Merge "Make sure loading extra info once" into tm-dev am: 14d31677d6
am: c481752bf6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350202
Change-Id: I2d5504f5c3423b66599ae897853dbb296914646e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 05:19:49 +00:00
Kuan Wang
4028e6123c
Reset Optimization Mode of apps when users reset app settings.
...
Fix the issue that Optimization Mode is not reset when users click the
"Reset apps" button in the setting.
Bug: 222037028
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge" + emulator
Change-Id: I22fb8aa19e284e11882b2920b77b544dee4cc33c
2022-05-16 05:01:20 +00:00
Yi-Ling Chuang
c481752bf6
Merge "Make sure loading extra info once" into tm-dev am: 14d31677d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350202
Change-Id: I8e1b840bddcc56d8a38a1f54e27ae55c6dc61d8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 04:04:54 +00:00
Jason Chiu
c5ee465b14
Merge "Refine the homepage app bar layout" into tm-dev am: 44aab7c55f
am: f26c448c1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332035
Change-Id: If1fc7c77f97a83e6bf640980ab2a54d9897181f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 03:53:13 +00:00
Yi-Ling Chuang
14d31677d6
Merge "Make sure loading extra info once" into tm-dev
2022-05-16 03:26:30 +00:00
Jason Chiu
f26c448c1e
Merge "Refine the homepage app bar layout" into tm-dev am: 44aab7c55f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332035
Change-Id: Idaef98b8499f40d355a1ae5762f9987c874057e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 03:18:08 +00:00
Jason Chiu
44aab7c55f
Merge "Refine the homepage app bar layout" into tm-dev
2022-05-16 02:01:20 +00:00
Bill Yi
d941a36042
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I72edb933db44f747ddd3c5c88e5e3569cd3aa292
2022-05-15 10:28:30 -07:00
Bill Yi
1c8b7a9fe8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I84adbff328986322454db3a886462ebdbbfaf648
2022-05-15 10:24:59 -07:00