Commit Graph

109364 Commits

Author SHA1 Message Date
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
TreeHugger Robot
05cce4044b Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 7446f16681 am: a1c18a04f0 am: 5626e65991
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: Ide1fef172aea36fa314b08b637d8f7179aa7078c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 16:29:56 +00:00
TreeHugger Robot
af8571f33e Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 5022535781 am: 89d131727c am: db835221af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: I5d834ada23cc33b85355d94275e32a4c0791af86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 16:29:23 +00:00
TreeHugger Robot
5626e65991 Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 7446f16681 am: a1c18a04f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: Icf2c8b9a451ca18d8dc6910a037ba153695ad4bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 15:02:10 +00:00
TreeHugger Robot
db835221af Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 5022535781 am: 89d131727c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: Id4746d7bc0d46e6294df04db54a92288a5b60016
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 15:01:51 +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
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
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
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
2a4097b074 Merge "Settings: Optimize the selected WFD route preference summary" am: 1143a4e8dc am: a312e1f404 am: c158467eaf am: 6315a724f8 am: 8347125177
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2089683

Change-Id: I4c2aed48cd5bfab0ffbb95751f1625ec03d9308e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 14:16:08 +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
8347125177 Merge "Settings: Optimize the selected WFD route preference summary" am: 1143a4e8dc am: a312e1f404 am: c158467eaf am: 6315a724f8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2089683

Change-Id: Ieace3ca857cc2bdb5912b5d16ecb4344cef1ba80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 13:31:07 +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
Automerger Merge Worker
76fcaf0052 Merge "Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 8f8b11bce7" into tm-d1-dev-plus-aosp am: d66473c3a3 am: 03c9d79940
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413

Change-Id: Ib714e89611e10b8416e9c5db95422fe778b63394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 12:39:55 +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
Arc Wang
bf6d4704af Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 3975972483 am: 928a73c82b am: 70a1b477e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413

Change-Id: I293b5bfa6578b050f6cb4359f07e91172bdcbb12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 12:39:20 +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
Automerger Merge Worker
03c9d79940 Merge "Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 8f8b11bce7" into tm-d1-dev-plus-aosp am: d66473c3a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413

Change-Id: Ide18a64ca4d8db8b196f97effcc5ca1748e92c2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 11:46:46 +00:00
Arc Wang
70a1b477e3 Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 3975972483 am: 928a73c82b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413

Change-Id: If39c9c61e974eb69a59d9c13dd758efec33da859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 11:46:31 +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
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
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
c48cdd12b6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bcd32c74c1 -s ours am: 934a23b5b7 -s ours am: 6f3b662abb -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: I44fb30680dde741538dfa8c6c5f744e96cc5f21d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 09:38:53 +00:00
Bill Yi
eb430537b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e958634cc6 -s ours am: 021988e0b5 -s ours am: 5ce154fce2 -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: I2fdb88824b0861950220901640b7a587feb9d662
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 09:38:44 +00:00
TreeHugger Robot
0490f05394 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d10c148d38 -s ours am: a607e20ce5 -s ours am: eadeca7ebd -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: I5a13e0d27653cb37952939dd6407e3b39b0c9c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 09:38:28 +00:00
Bill Yi
4b8b60e89d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6aadac2448 -s ours am: af0f88f108 -s ours am: 9f481ea62f -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: I26ec2542df926daa244ae9e9cecbc24d5ad2e61b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 09:38:08 +00:00
TreeHugger Robot
6f3b662abb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bcd32c74c1 -s ours am: 934a23b5b7 -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: I1a8ecb7c4b3ae58da0057568385a4a5b7b26a9f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 09:11:08 +00:00
Bill Yi
5ce154fce2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e958634cc6 -s ours am: 021988e0b5 -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: Ib38f813c007baf2d95b0bac1ccf1301ec9874a2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 09:10:58 +00:00
TreeHugger Robot
eadeca7ebd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d10c148d38 -s ours am: a607e20ce5 -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: Iab21e838082e6cd1e61285c317d39ce7b6ee06f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 09:10:40 +00:00