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
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
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
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
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
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
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
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
Bill Yi
9f481ea62f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6aadac2448
-s ours am: af0f88f108
-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: I9e5b9a3d0799e3e1336803021a6600ed131c13a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 09:10:23 +00: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
54891b0c0d
Merge "Make sure loading extra info once" into tm-dev am: 14d31677d6
am: cb652d47e3
am: 33e4d8dc5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350202
Change-Id: I7f99a88c83e6a17c8eb0c53476091ce8ee92583e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 05:55:15 +00:00
Yi-Ling Chuang
869953ba31
Merge "Make sure loading extra info once" into tm-dev am: 14d31677d6
am: c481752bf6
am: 2e707d1191
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350202
Change-Id: I2a6782c095d1480b1f6fe0a05fc5046c435f7acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 05:54:42 +00:00
KUAN WANG
166c0633aa
Merge "Reset Optimization Mode of apps when users reset app settings." into tm-qpr-dev am: 614d2dfc0b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309249
Change-Id: Ib7e9e58435110c22bf6ca10c4cd9f4181d1f9e7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 05:54:28 +00:00
Yi-Ling Chuang
27171f5fc5
Merge "Make sure loading extra info once" into tm-dev am: 14d31677d6
am: c481752bf6
am: 6bafe542fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350202
Change-Id: I59d75f7353f03fbc0dd12b48a8e156bdacb545a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 05:54:20 +00: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
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
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
Jason Chiu
15b107ed6d
Merge "Refine the homepage app bar layout" into tm-dev am: 44aab7c55f
am: 4d89bbfffb
am: 111eaa1c9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332035
Change-Id: I46bfb3a9c74d1955d05f116e208919ca27a8d9fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 04:45:46 +00:00
Jason Chiu
b00bf23856
Merge "Refine the homepage app bar layout" into tm-dev am: 44aab7c55f
am: f26c448c1e
am: e50f38d3dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332035
Change-Id: I902b3537a140e2b03b2215497c15de22b3b38661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 04:45:11 +00:00
Jason Chiu
da6d689633
Merge "Refine the homepage app bar layout" into tm-dev am: 44aab7c55f
am: f26c448c1e
am: c5ee465b14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332035
Change-Id: I8e1e7fc19f40e96275b7d6ba81f0f80c3f0b0f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 04:44:49 +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
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
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