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
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
TreeHugger Robot
6e7e95593a
[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: I729fc21d41ea80d6c25e4d5edaedfdd5934b49b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 08:16:05 +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
Bill Yi
d2388e01b3
[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: I93808f2f0a16f2c6f411cddfde07c8941e22cf95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 08:15:50 +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
TreeHugger Robot
14e9b89377
[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: Ia1bed96468d8dc092ae461f5f044cfd4a8280ae5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 08:15:32 +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
Bill Yi
74a4376590
[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: I80d358866b19448cf3ff50ca2326ad2b9269291a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 08:15:15 +00:00
TreeHugger Robot
299fcbf5dc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 1b69400552
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18396755
Change-Id: Id02c4f6418a31001b766682034eac0807037e47c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 08:14:19 +00:00
TreeHugger Robot
6bc7ea75a7
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-05-16 08:00:24 +00:00
TreeHugger Robot
7b538df037
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-05-16 08:00:24 +00:00
TreeHugger Robot
a695fbef26
Merge changes from topic "tc_change_22051519_20"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5a8474686f
Import translations. DO NOT MERGE ANYWHERE
2022-05-16 07:39:30 +00:00
TreeHugger Robot
1b69400552
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-05-16 07:39:30 +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
Yi-Ling Chuang
11065bfb10
Merge "Make sure loading extra info once" into tm-dev am: 14d31677d6
am: cb652d47e3
am: 33e4d8dc5a
am: 54891b0c0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350202
Change-Id: Ia3278ebdc6c395fe69cd0c6ca05f666a3158d8f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 06:56:22 +00:00
Yi-Ling Chuang
c5e8d5d759
Merge "Make sure loading extra info once" into tm-dev am: 14d31677d6
am: c481752bf6
am: 2e707d1191
am: 869953ba31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350202
Change-Id: I427b2657badb4e467ebf2288225778e798d6d033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 06:56:15 +00:00
KUAN WANG
24f10956e2
Merge "Reset Optimization Mode of apps when users reset app settings." into tm-qpr-dev am: 614d2dfc0b
am: 166c0633aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309249
Change-Id: Iee4d76992c4b18a08adbece2536a1c332f804d3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 06:56:07 +00:00
Yi-Ling Chuang
c7f651c35c
Merge "Make sure loading extra info once" into tm-dev am: 14d31677d6
am: c481752bf6
am: 6bafe542fe
am: 27171f5fc5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350202
Change-Id: Iac3035745db9c8e5ffee4fbc64fbf7631853aac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 06:55:36 +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
Jason Chiu
367456b41b
Merge "Refine the homepage app bar layout" into tm-dev am: 44aab7c55f
am: 4d89bbfffb
am: 111eaa1c9c
am: 15b107ed6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332035
Change-Id: I906bb0ed6948fb2e3cc2b7954015854add04723e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 05:29:03 +00:00
Jason Chiu
04613fd49f
Merge "Refine the homepage app bar layout" into tm-dev am: 44aab7c55f
am: f26c448c1e
am: e50f38d3dd
am: b00bf23856
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332035
Change-Id: I8528596db4bcd4fb8784a5f1ae9b3b3e3f015279
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 05:28:49 +00:00
Jason Chiu
c0842bff69
Merge "Refine the homepage app bar layout" into tm-dev am: 44aab7c55f
am: f26c448c1e
am: c5ee465b14
am: da6d689633
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332035
Change-Id: If0f75b29b04d57b0a7a92c29d274dcba1164d0de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 05:28:10 +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
Yi-Ling Chuang
bf1b84ce38
Merge "Make sure loading extra info once" into tm-dev am: 14d31677d6
am: b0cb78a5e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350202
Change-Id: I3acde90070f921c459b4b3e04a92ddb2433bb2a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 05:19:07 +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
b0cb78a5e2
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: I18ed5f512597e4b7f29e11ac9d5f83b33032c3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 04:03:37 +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
Jason Chiu
35f2c7de14
Merge "Refine the homepage app bar layout" into tm-dev am: 44aab7c55f
am: 50c1b40d30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332035
Change-Id: Ideff36c00c8ccbd8dc89cdd0ff50866657ad4940
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 03:51:58 +00:00