Commit Graph

103060 Commits

Author SHA1 Message Date
Chaohui Wang
01431d5ffe Fix flicker in Location page when location is off am: f9ebeadb33
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402153

Change-Id: I01d95d9378a22bcb2c9967baf3cb7698ef9f4452
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:51:13 +00:00
Hugh Chen
d217f66380 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours am: 22ce749aa6 -s ours am: 8ce854af29 -s ours am: 136af4e593 -s ours am: 40ed71c895 -s ours am: c4899bf019 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693

Change-Id: I03b41436fc4f1d9e12642a4336de37d5e5050c28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:51:02 +00:00
Hugh Chen
978ba3a85d [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73 am: d925f52768 -s ours am: 8d4a4b690f -s ours am: f13ceb8aea -s ours am: ddc8e16cd6 -s ours am: 0e568376a3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330692

Change-Id: I9c8a28dcd339ab1baf658d3c93023b6b16bcdede
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:50:38 +00:00
Hugh Chen
1b0e924968 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 9399a699d7 -s ours am: 1e636ad03e -s ours am: dc1023e587 -s ours am: 3d0db8d34f -s ours am: e5d54e867c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330691

Change-Id: I73706a8afaba4c4793e946d0d35b64fda17587c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:50:26 +00:00
Tom Hsu
6a85746757 Merge "[Panlingual] Fix the item clicked is not match target application" into tm-dev am: 45c60f8564
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356600

Change-Id: I1a4398642952106003e6bfd64f4a8d96e1c38c8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:50:14 +00:00
TreeHugger Robot
cfcad71f14 [automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-qpr1-dev am: 20457ad117 -s ours am: e26317b97c -s ours am: ce98ad58a5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330689

Change-Id: I52315f604d72426591a1a74cca31643cfdaedc84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:34:13 +00:00
Hugh Chen
66f147b21f [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 663066691e -s ours am: e178179a9e -s ours am: 97299b8c00 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330689

Change-Id: I7f28034c363d96c13e0cb174454f19cfad1c593f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:34:11 +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
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 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
Chaohui Wang
f9ebeadb33 Fix flicker in Location page when location is off
Caused by the recent location access preferences not have there initial
visible stats set before creating the view.

Refresh the location stats in displayPreference() for them to fix.

Fix: 232342339
Test: manual visual
Change-Id: I4023fd3a5860490e9c6cb733933a19f96824a53d
2022-05-17 10:36:50 +08:00
Hugh Chen
c4899bf019 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours am: 22ce749aa6 -s ours am: 8ce854af29 -s ours am: 136af4e593 -s ours am: 40ed71c895 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693

Change-Id: I843f83e71e4f637f3cd6d851174d8f46745c2eb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:05:35 +00:00
Hugh Chen
40ed71c895 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours am: 22ce749aa6 -s ours am: 8ce854af29 -s ours am: 136af4e593 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693

Change-Id: I9aea03a94b613a948fb141d709a3f59aafc1b047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 21:32:31 +00:00
Hugh Chen
136af4e593 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours am: 22ce749aa6 -s ours am: 8ce854af29 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693

Change-Id: I6b82d1d82654386eeb76efc977d4dc6abfd7e627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 21:06:42 +00:00
Hugh Chen
8ce854af29 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours am: 22ce749aa6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693

Change-Id: Ia756b506704aa52e74946365db61e75d807ec38a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:44:25 +00:00
Hugh Chen
0e568376a3 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73 am: d925f52768 -s ours am: 8d4a4b690f -s ours am: f13ceb8aea -s ours am: ddc8e16cd6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330692

Change-Id: If4c6c7b6e4a52ff3c4e53915a6af9d5196ddcaaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:44:16 +00:00
Hugh Chen
e5d54e867c [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 9399a699d7 -s ours am: 1e636ad03e -s ours am: dc1023e587 -s ours am: 3d0db8d34f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330691

Change-Id: Iab803b2095895dd2c74ddf85d4825f99461379fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:44:08 +00:00
Hugh Chen
ddc8e16cd6 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73 am: d925f52768 -s ours am: 8d4a4b690f -s ours am: f13ceb8aea -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330692

Change-Id: I2974cc1f7229b3fb1dc1a102622fd51f99cce71e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:18:09 +00:00
Hugh Chen
3d0db8d34f [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 9399a699d7 -s ours am: 1e636ad03e -s ours am: dc1023e587 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330691

Change-Id: Ib3757ce8331bca132fac28ef4c07ee67c1949379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:18:03 +00:00
Hugh Chen
22ce749aa6 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693

Change-Id: I7c6a9f85f48ac5a5ccf4eeeb05d90e55c1744ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:16:32 +00:00
Hugh Chen
f13ceb8aea [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73 am: d925f52768 -s ours am: 8d4a4b690f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330692

Change-Id: I2bf3cc43e484dd321a2fbc88e8cce5c4e3f74099
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 19:58:27 +00:00
Hugh Chen
dc1023e587 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 9399a699d7 -s ours am: 1e636ad03e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330691

Change-Id: I5647f69523610c0596b7d58087609b3a50ca59f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 19:58:22 +00:00
Hugh Chen
8ddd1d70b2 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693

Change-Id: Idb833457913af76144b1130b7c83558680ba8b17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 19:58:05 +00:00
Tom Hsu
45c60f8564 Merge "[Panlingual] Fix the item clicked is not match target application" into tm-dev 2022-05-16 18:38:36 +00:00
TreeHugger Robot
ce98ad58a5 [automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-qpr1-dev am: 20457ad117 -s ours am: e26317b97c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330689

Change-Id: I54b9e0292e97a8789653dc1dd8a6bb4e5e444d35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 18:31:32 +00:00
Hugh Chen
97299b8c00 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 663066691e -s ours am: e178179a9e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330689

Change-Id: I525120b808c5742122b74c82e971dc315211058b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 18:31:30 +00: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
TreeHugger Robot
e26317b97c [automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-qpr1-dev am: 20457ad117 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330689

Change-Id: I0999aa18fd2eafee129ec5e22ad5fc4c411d2a79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 18:23:52 +00:00
Hugh Chen
e178179a9e [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 663066691e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330689

Change-Id: I9b5f85e564f46279e0b8413571409ea7d885bc0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 18:23:50 +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
Hugh Chen
8d4a4b690f [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73 am: d925f52768 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330692

Change-Id: Id1e850102f51868de0c30f3a39fdebc0e32ebac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 18:22:38 +00:00
Hugh Chen
1e636ad03e [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 9399a699d7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330691

Change-Id: I190fec06a23bb24407397976630dd49dd6709c69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 18:22:31 +00:00
Hugh Chen
c2bb599eeb RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693

Change-Id: Ic3eecbf76413c2ceeff1f3a838cb7f6250e3a423
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 18:22:30 +00:00
Hugh Chen
d925f52768 RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330692

Change-Id: I96f41ff4642edd74d529102f2ba09bfb0a1a1044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 18:22:19 +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
20457ad117 Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-qpr1-dev 2022-05-16 17:08:57 +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
tom hsu
c5bb55689b [Panlingual] Fix the item clicked is not match target application
- Remove unnecessary action of shift poistion.

Bug: b/232754527
Test: local and see b/232754527#2
Change-Id: Ief8655661dd3cc468e68a085dede528694ede33c
2022-05-16 22:42:20 +08: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
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