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
TreeHugger Robot
ff36a38719
Merge changes from topic "presubmit-am-36bba661a52b4792a8d74b3037c240af" into sc-mainline-prod
...
* changes:
[automerge] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline 2p: 1c4142e1ae
RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline
2022-05-16 17:08:28 +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
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
Edgar Wang
f3270e5c1c
Recalculate view's height when tab is selected
...
Viewpager2 created view based on the first tab height, when tab is
selected, viewpager2 should recalculate height.
But this solution may not suitable for App list, so we only enable
for Location Settings which have different items in personal & work
profile.
Bug: 224521665
Test: manual
Change-Id: Ib19b30cb82b8b4f13f651795906289da53ded4ed
2022-05-16 15:59:21 +08: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
TreeHugger Robot
9f9f0706d1
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-05-16 07:38:01 +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