TreeHugger Robot
1dd5c06a0b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 12a30b9511
-s ours am: 7ab31e744a
-s ours am: cc7d18bd75
-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: I655b0105e8c8da4a3c2ca6669ecd46eb73a1679b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:45:53 +00:00
Bill Yi
81edec4bda
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d941a36042
-s ours am: 900e78b59d
-s ours am: d425079d95
-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: If993a97d2e77df725736eb3542f0ddb6921f8c5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:45:38 +00:00
Bill Yi
633d46e399
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8b7a9fe8
-s ours am: 66ad02c375
-s ours am: 0f52443ebb
-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: I96925bc0e420f259b95363f8f3fc2969fbfb576d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:45:22 +00:00
TreeHugger Robot
cc7d18bd75
[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: Ie645e9ed2f3b8a84f63bd2f066ff3ccb3656950a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:20:32 +00:00
Bill Yi
d425079d95
[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: I891e7c48b1750ae8ae3313c46c995fb80763ad1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:20:19 +00:00
Bill Yi
0f52443ebb
[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: Iaae6f1a7be5ef43b552088d1506d367d1c94345d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:20:00 +00:00
Bill Lin
ab47efa4f9
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: Iadac0b4aa55b86354503798b3027a26596b5ef67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 02:04:57 +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
TreeHugger Robot
a1c18a04f0
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: I07358095922c4b054950bf81160fa569680989cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 14:33:31 +00:00
TreeHugger Robot
89d131727c
Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec
am: 5022535781
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599
Change-Id: I7f2b9aaa1f03d0bb186021329c44553ff748243f
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
5022535781
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: I14897ac1fe5897d9ea26892e5edc7e03de1e8f97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 14:14:10 +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
Treehugger Robot
6315a724f8
Merge "Settings: Optimize the selected WFD route preference summary" am: 1143a4e8dc
am: a312e1f404
am: c158467eaf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2089683
Change-Id: I2e8c76b3d7b93172af52f83292f4b26b49467e5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 13:14:01 +00:00
Treehugger Robot
c158467eaf
Merge "Settings: Optimize the selected WFD route preference summary" am: 1143a4e8dc
am: a312e1f404
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2089683
Change-Id: I585e48ec5b375f1bbd9734e423709c150c9a93d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 12:39:36 +00:00
Treehugger Robot
a312e1f404
Merge "Settings: Optimize the selected WFD route preference summary" am: 1143a4e8dc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2089683
Change-Id: I10970f3d2e7b8c916d2ef6231cb21d59fe6dcd44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 12:01:29 +00:00
Treehugger Robot
1143a4e8dc
Merge "Settings: Optimize the selected WFD route preference summary"
2022-05-16 11:32:24 +00:00
Automerger Merge Worker
d66473c3a3
Merge "Fix Settings crash when setting a null ringtone am: ec3ae8bb17
am: 8f8b11bce7" into tm-d1-dev-plus-aosp
2022-05-16 11:18:08 +00:00
Arc Wang
907ede0c27
Fix Settings crash when setting a null ringtone am: ec3ae8bb17
am: 8f8b11bce7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413
Change-Id: Ie101d74c8b36c8f01de869496d75538910cc41e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 11:18:04 +00:00
Arc Wang
928a73c82b
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: I62d726f6228d77cc8f0fac314743e41f7897b714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 11:18:00 +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
Arc Wang
8f8b11bce7
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: Ie19d5955539861bcbde10461863db5ad43167ea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 10:49:17 +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
934a23b5b7
[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: I0057cd6a06025ac138fd0d32c0753ba6513a2235
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 08:16:22 +00:00
Bill Yi
021988e0b5
[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: I7d1ebcfad04483a737c455886340eacfdf35f609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 08:16:00 +00:00
TreeHugger Robot
a607e20ce5
[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: I49825190a24c9ca309adccf03d50ccfb496169a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 08:15:41 +00:00
Bill Yi
af0f88f108
[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: Ib68c0d4c26747aa7b22f1ef5ef534f76d0ff05f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 08:15:25 +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
Yi-Ling Chuang
33e4d8dc5a
Merge "Make sure loading extra info once" into tm-dev am: 14d31677d6
am: cb652d47e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350202
Change-Id: Icb711ca8b4a5b8f56f1ed1ca606f76999fbbe03b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 05:20:00 +00:00
Yi-Ling Chuang
2e707d1191
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: If7bbcfffc952092480bb7eb953d7033f6abaa3a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 05:19:51 +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
Yi-Ling Chuang
cb652d47e3
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: I24ee693aefc90721dd4e560062fdec5a7f729680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 04:03:15 +00:00
Jason Chiu
111eaa1c9c
Merge "Refine the homepage app bar layout" into tm-dev am: 44aab7c55f
am: 4d89bbfffb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332035
Change-Id: I894a975e09bbb31c96ad9e9c5d5297ab1a2ab43d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 03:53:14 +00:00
Jason Chiu
e50f38d3dd
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: I2400e4ef5c4dfc39e004f837efdc61d55268aad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 03:53:03 +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
4d89bbfffb
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: Idaf47302e96540e79f95e510950621c7f0861d10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 03:16:25 +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
Bill Yi
e958634cc6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifd0b6f1e99b321e7c3fa34e488c0a0e135409cf4
2022-05-15 08:34:23 -07:00
Bill Yi
6aadac2448
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5d3a009cbf24589f47133461c8f6b375bb7e98c2
2022-05-15 08:26:30 -07:00
Automerger Merge Worker
4a349650d3
Merge "Merge "Pop up pairing another ear dialog when detecting hearing aid is a set" into tm-dev am: 13438e6084
am: 403e292044" into tm-d1-dev-plus-aosp
2022-05-15 10:19:36 +00:00
Jason Hsu
a5744e107f
Merge "Pop up pairing another ear dialog when detecting hearing aid is a set" into tm-dev am: 13438e6084
am: 403e292044
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17291804
Change-Id: I0ec03aadb6b749f5641ec9728b38ef088f280e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-15 10:19:34 +00:00