Stanley Wang
99c08f3167
Merge "Update the title of Model page" into tm-dev am: 32fa5502ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023
Change-Id: I54136d376ce65122dcee68571be5f423992eff90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 04:05:45 +00:00
Neil Fuller
32a00bf719
Merge "Capitalize TZ display name strings" am: 6a44151bc1 am: 3bb5fc5da8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2055886
Change-Id: Id446433bafe4517f4822abdd1c49bfde99422a40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 04:04:52 +00:00
TreeHugger Robot
d76a6f4cde
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours am: 6389cb3f8d -s ours am: 982553d4f4 -s ours am: 155855fb5a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099395
Change-Id: I8501f40a9ad6e83379996bb8add86bb7c0b6ee45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 03:52:47 +00:00
Bill Yi
49884323fd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours am: 74507642b1 -s ours am: 3ae3da42e5 -s ours am: cd779d5f34 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099395
Change-Id: I7faf0f0f043bb41abf69c788856639f58e952d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 03:52:32 +00:00
TreeHugger Robot
029c0dc147
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours am: b30ca6974e -s ours am: df51e88c27 -s ours am: 2b07d43d13 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18104364
Change-Id: I6a23258abd3b8b3c985d5789741e5423a611e2a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 03:46:56 +00:00
Bill Yi
bd761bf6ea
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours am: d3d4832f60 -s ours am: 21ea9a9a7b -s ours am: d78b644ba5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18104364
Change-Id: I9bd85d77598050b637315e504ed7184c229949bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 03:46:39 +00:00
ykhung
3d1b6fd065
Add a mechanism to configure whether the summary should be set or not
...
Add a mechanism to customize whether the summary information in the
battery entry should be set or not. We can consider is as the extension
for the ag/18062824.
Bug: 220717612
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I3c21148d288f29ce65378f59f9086dab90c14a7b
2022-05-04 11:42:26 +08:00
TreeHugger Robot
dc21cc4a05
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours am: f32c08af1d -s ours am: 73c4650b74 -s ours am: d44eab09af -s ours am: fb5731b0ef -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099387
Change-Id: I3dee9841443bb090924e4a656ae2bab400fa844a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 03:38:39 +00:00
Bill Yi
97150aea2e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours am: eb50f1a254 -s ours am: c439ac1427 -s ours am: fb6f7d4227 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099387
Change-Id: I06b900d0457ba4a087c68622fdc91cff9338a613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 03:38:32 +00:00
TreeHugger Robot
1e7dd9e92b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours am: 93a954046f -s ours am: 1ee8289cb3 -s ours am: 6d3bc56921 -s ours am: 7becd84698 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099388
Change-Id: I6f1e44d07b1218b8953bca4f06daf12b745105e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 03:34:45 +00:00
Bill Yi
738a9edbf0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours am: 1473685f22 -s ours am: e0f893656b -s ours am: 6c517e8a0e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099388
Change-Id: I3abb7c633501aec6f701cc600145e01753e49251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 03:34:25 +00:00
TreeHugger Robot
eb424e22b9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours am: d903116617 -s ours am: 872b52eba8 -s ours am: fc6b26986a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099395
Change-Id: I44eb9a9b967fcc0c1f6f8065cf1f8f827e32002b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 03:17:13 +00:00
Bill Yi
e4b326fb64
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours am: 471a93781b -s ours am: fb4c665f17 -s ours am: b674d0e496 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099395
Change-Id: Ib6c5b16e8adacc740f1134e309f0a75307768df5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 03:16:58 +00:00
Stanley Wang
32fa5502ca
Merge "Update the title of Model page" into tm-dev
2022-05-04 03:15:45 +00:00
TreeHugger Robot
32e1e356bb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours am: 56012b6bb0 -s ours am: 491facc411 -s ours am: 844a81ecd3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18104364
Change-Id: I7f096c6c6bfc2f2beaf1acba7371d5eb5c448e5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 03:13:10 +00:00
Bill Yi
d0528993c9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours am: 4970b3783e -s ours am: 17910cdfa7 -s ours am: 165c951d8a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18104364
Change-Id: I81b852f2fef71b1335ef022c9a4cef762482115d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 03:12:52 +00:00
Automerger Merge Worker
c0016a8199
Merge "Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 am: 179ab49964" into tm-d1-dev-plus-aosp am: 506b83e90e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586
Change-Id: I682cb35ddf1d301490ba3b582decd536ea1dfb56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 03:07:46 +00:00
Chaohui Wang
7222612108
Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 am: 8456f1d5e5 am: da6cba31ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586
Change-Id: I7d8f18cf99bdc67218b9c50feff07835e85efc10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 03:06:35 +00:00
TreeHugger Robot
70918a2ae2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours am: f32c08af1d -s ours am: 8fdc4458ae -s ours am: aceb22d536 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099387
Change-Id: I0c0f9c962c3d006839d3df2c7beb0680d68342d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 03:04:16 +00:00
Bill Yi
9b5cdf865f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours am: 16fe14a809 -s ours am: c9b4aede2b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099387
Change-Id: I5f29e52332480c2d36ef2c1a0ba7d2362ba4ac46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 03:04:11 +00:00
TreeHugger Robot
44702438ba
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d8d5dc02d5 -s ours am: 341a2953e8 -s ours am: b6a4be3395 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099397
Change-Id: Ia12c76dbb7c75c73bd6bf2e837c1797a029a05f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 03:02:58 +00:00
Bill Yi
b107724c44
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d251c2e700 -s ours am: bfb7bb08ca -s ours am: 0cc0806e01 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099397
Change-Id: Ic7bf2cb9d7ad2a8e8850d2e54a637f1556c09072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 03:02:46 +00:00
TreeHugger Robot
9cec02505c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours am: 93a954046f -s ours am: 8d0c594d9a -s ours am: 011098d8c4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099388
Change-Id: Icee5b1aa0514bc1309b1e470304b24169bfa0864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 03:02:31 +00:00
Bill Yi
d7fb82b9e1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours am: 81d691ad75 -s ours am: 1f3bfe46d6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099388
Change-Id: Iac803e62c241ff01cce212ac0068862eefa852ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 03:02:18 +00:00
Automerger Merge Worker
506b83e90e
Merge "Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 am: 179ab49964" into tm-d1-dev-plus-aosp
2022-05-04 02:55:38 +00:00
Chaohui Wang
785eeffb50
Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 am: 179ab49964
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586
Change-Id: I576fbaf5c1c1b9ce52663bc5cafbd7f3ef36d414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:55:28 +00:00
Chaohui Wang
c5a94b2043
Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 am: 8456f1d5e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586
Change-Id: I7f2e8587a2c1c2749e1a806a4202368ed495466c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:55:27 +00:00
Chaohui Wang
da6cba31ce
Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 am: 8456f1d5e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586
Change-Id: Iacfd67d8ea9db028ade85808a23dcd3922ed8605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:55:19 +00:00
TreeHugger Robot
aceb22d536
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours am: f32c08af1d -s ours am: 8fdc4458ae -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099387
Change-Id: I733a059f3c768b428b30f37f3bd76970d68a4162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:53:39 +00:00
TreeHugger Robot
155855fb5a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours am: 6389cb3f8d -s ours am: 982553d4f4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099395
Change-Id: I298a5731ee5ad9b70c2fa27f19cb95c9436f45bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:53:33 +00:00
Bill Yi
c9b4aede2b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours am: 16fe14a809 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099387
Change-Id: I49f55737ab561348ff8cf07e7ee6bba4c4958b4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:53:31 +00:00
Bill Yi
cd779d5f34
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours am: 74507642b1 -s ours am: 3ae3da42e5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099395
Change-Id: Id32cfc9220f693e1f409e27b71371f68f65511fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:53:18 +00:00
TreeHugger Robot
011098d8c4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours am: 93a954046f -s ours am: 8d0c594d9a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099388
Change-Id: I99354e81b48f43663eca100aecf5a6ffba349b04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:52:06 +00:00
Bill Yi
1f3bfe46d6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours am: 81d691ad75 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099388
Change-Id: I95fae25faaaa1ef0b40a6322adea8af4f1fd17b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:51:51 +00:00
TreeHugger Robot
2b07d43d13
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours am: b30ca6974e -s ours am: df51e88c27 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18104364
Change-Id: I17fd3c94ea532929b7a30e3b283921939e33e5a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:45:08 +00:00
Bill Yi
d78b644ba5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours am: d3d4832f60 -s ours am: 21ea9a9a7b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18104364
Change-Id: I7239a06eacdd0bba6337a648fe8aa5a908a89cec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:44:50 +00:00
TreeHugger Robot
982553d4f4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours am: 6389cb3f8d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099395
Change-Id: I1d7aea199fe2084c8f534e9c9a8a142f0984411c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:43:11 +00:00
Bill Yi
3ae3da42e5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours am: 74507642b1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099395
Change-Id: Icbc04b1dff3053ae4e7892773b1e7b98e7cfc6e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:42:47 +00:00
TreeHugger Robot
df51e88c27
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours am: b30ca6974e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18104364
Change-Id: If14640fd4446fac12944fa264005cb875fc36a5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:40:32 +00:00
TreeHugger Robot
fb5731b0ef
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours am: f32c08af1d -s ours am: 73c4650b74 -s ours am: d44eab09af -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099387
Change-Id: I107a01d1892ad71be75aaf348c9e2db5f5a6ac6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:40:26 +00:00
Bill Yi
fb6f7d4227
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours am: eb50f1a254 -s ours am: c439ac1427 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099387
Change-Id: I20fda5282c165374766f58f9ece1a4e5d212b2a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:40:18 +00:00
Bill Yi
21ea9a9a7b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours am: d3d4832f60 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18104364
Change-Id: Ic2d92581c207be3dea7fb1146b15a9430ef76dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:40:02 +00:00
TreeHugger Robot
3d09370874
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c63cd3cce5 -s ours am: 053bd1f8ba -s ours am: 87e365c6e7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108743
Change-Id: I7dac57e144b7923cba92280f4177822c2b07e836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:39:49 +00:00
Bill Yi
ce54655a86
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3a2158816 -s ours am: 1025a9751f -s ours am: 7f13849ae7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108743
Change-Id: I20f735aa75b2b0a551ca6e7a91c6dacd42af6e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:39:36 +00:00
TreeHugger Robot
7becd84698
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours am: 93a954046f -s ours am: 1ee8289cb3 -s ours am: 6d3bc56921 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099388
Change-Id: I7289ef35901140a7c9e34d462a8466f723185a37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:38:19 +00:00
Bill Yi
6c517e8a0e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours am: 1473685f22 -s ours am: e0f893656b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099388
Change-Id: I3cbcb20c522a1f41ba18508253cd0203e37f2255
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:38:05 +00:00
Chaohui Wang
8456f1d5e5
Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586
Change-Id: I702f1ce7d91277aa2fd0a3029690c74a00e38372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:37:53 +00:00
Chaohui Wang
179ab49964
Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586
Change-Id: Ifceba0c8641a36cd8985caa49bbe8719eea3e635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:36:46 +00:00
Chaohui Wang
c7c3fa08fb
Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586
Change-Id: I1af5f3976ee342a53917d6f572014947b3e74b6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:36:15 +00:00
Weng Su
2d3d9b9305
Hide Wi-Fi toggle in the Wi-Fi slice
...
- Hide Wi-Fi toggle and show restriction message in the Wi-Fi slice if Wi-Fi state is disallowed to change
- See the result screenshot in b/203168097#comment30
Bug: 203168097
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiSliceTest
Change-Id: I09ccb6349dadf64a2f903245ba203ce77c86d1e1
2022-05-04 10:26:50 +08:00
