Commit Graph

106591 Commits

Author SHA1 Message Date
Bill Yi
acd5abd4a7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106 -s ours am: da1aaa3069 -s ours am: 7463359b05 -s ours am: 649022d0f9 -s ours am: 224cea2d4f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099393

Change-Id: I239b47c33314895998693b3ee0cd6fedaf8f074c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 20:11:41 +00:00
Bill Yi
b9868733db Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf am: b8f6039a2a am: b76604c461 am: 621712f1a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: I820722f348f076eea575e402755ba1209721e77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 20:04:22 +00:00
Bill Yi
7eeb35888d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -s ours am: d7503db15f -s ours am: ae99e62db9 -s ours am: cb97a038c6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: I9f4349e1ab5b2bb8aff8dbce8fbedcc847f40a5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 20:04:19 +00:00
Bill Yi
f7234f9d3d Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf am: a467f9dcba am: 4872c85344 am: 6f2c137f85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: If20e8177816335763cca686761f6f2b2121ba33b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 19:58:19 +00:00
Bill Yi
7fd35e5153 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -s ours am: 58da6d7afd -s ours am: 8cd5792307 -s ours am: ad7dda471e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: Ie0408b5f132fa2b5864135a56647f2db7f166c6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 19:58:14 +00:00
Bill Yi
224cea2d4f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106 -s ours am: da1aaa3069 -s ours am: 7463359b05 -s ours am: 649022d0f9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099393

Change-Id: I775455c93abc0719c7b759fbc8e9ea72971b097a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:31:05 +00:00
Bill Yi
621712f1a2 Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf am: b8f6039a2a am: b76604c461
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: I1457c726f025dc057638d81fc8276cba601d0091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:28:45 +00:00
Bill Yi
cb97a038c6 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -s ours am: d7503db15f -s ours am: ae99e62db9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: I00c79841ef5438b9f64918f2b065ffc4f6bdbf49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:28:37 +00:00
Bill Yi
6f2c137f85 Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf am: a467f9dcba am: 4872c85344
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: I8e5dc7a789817969e32d5b0bdb5eb262a7ae9f5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:26:43 +00:00
Bill Yi
ad7dda471e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -s ours am: 58da6d7afd -s ours am: 8cd5792307 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: I21e9bdbfdda5cf195e809a3a3eae22487eabcefc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:26:41 +00:00
TreeHugger Robot
471e1d1463 Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b am: 5a138163b4 am: 38468ab17a am: 447bb4b1bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: I5ea4b9259345b7cf0279abfa432891059c3c8adb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:14:28 +00:00
Automerger Merge Worker
b3134ea5b8 Merge "Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d5f1760bc2" into tm-d1-dev-plus-aosp am: 0a6ed415d0 am: 451bd2870c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: Id2fa2d079d038cc064a9b4588e6783f3af413bfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:14:11 +00:00
TreeHugger Robot
452e546c4b Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b am: 4a79ecce7f am: 9f25dfbe24 am: acdb95ce03
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: I5ccdf0496a12ac718815399bb82830a6ca822bea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:13:47 +00:00
TreeHugger Robot
171159ea9a Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d61d5316a3 am: aa2edb9be4 am: a51b25158e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: Ie098b1dc69e05a0b36171cf7c0a65d46a71a776f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:13:32 +00:00
TreeHugger Robot
900645554a Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b am: 5a138163b4 am: 4c10d54239 am: 66262e1052
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: Ib5b9b4c566d0996c03dd3115aa2e57848444b513
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:13:09 +00:00
TreeHugger Robot
b997b7ea40 Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d5f1760bc2 am: 1ea5c4947f am: d01c722530
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I384afaacb8221af78180d27359f7f7aec56c6e6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:12:45 +00:00
Bill Yi
649022d0f9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106 -s ours am: da1aaa3069 -s ours am: 7463359b05 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099393

Change-Id: Ifca310ffea5b59ef7ff47b036d4e02254b232b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:59:56 +00:00
Bill Yi
b76604c461 Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf am: b8f6039a2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: I02ffbbea7abcf4c87a61cc62d2e9f33eefa964ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:57:04 +00:00
Bill Yi
4872c85344 Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf am: a467f9dcba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: Ia33ce6c8b40831d506ae00da3b9a6833e418de89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:57:04 +00:00
Bill Yi
ae99e62db9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -s ours am: d7503db15f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: Ib402de15b16ea2a2413939f48b61f96427e85119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:57:00 +00:00
Bill Yi
8cd5792307 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -s ours am: 58da6d7afd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: I72d43c17448a40f5ec5bd96576a6e78df5c4667b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:56:59 +00:00
Bill Yi
7463359b05 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106 -s ours am: da1aaa3069 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099393

Change-Id: I3e280a5b5b24cee615f9997de42e829c63edd7ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:46:35 +00:00
Bill Yi
a467f9dcba Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: I3e0f7907f7836ab2edb63dba3d4deeb431913b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:41:07 +00:00
Bill Yi
58da6d7afd [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: Ib180e8d399762411648d527ba4075f8b152f18da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:41:00 +00:00
Bill Yi
b8f6039a2a Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: I01f7dce50e08466c636f0589250cedc812be15d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:40:29 +00:00
Bill Yi
d7503db15f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: Ie6b8bf897e3f5ad1371ce8fd0881adb6fc193276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:40:22 +00:00
Bill Yi
da1aaa3069 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099393

Change-Id: Ic359719019638ea11ed7571906b3e04af3f5890f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:40:21 +00:00
TreeHugger Robot
447bb4b1bd Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b am: 5a138163b4 am: 38468ab17a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: Ib57d7586ece0fca82ced2023276abd80a0912ee9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:38:50 +00:00
Automerger Merge Worker
451bd2870c Merge "Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d5f1760bc2" into tm-d1-dev-plus-aosp am: 0a6ed415d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I6fdf3933b25ce5f7c250d8bcbb0163fa70917084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:38:26 +00:00
TreeHugger Robot
acdb95ce03 Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b am: 4a79ecce7f am: 9f25dfbe24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: I975e5e816a6ffc96d7c5234a986dfb997e2b7401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:37:50 +00:00
TreeHugger Robot
a51b25158e Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d61d5316a3 am: aa2edb9be4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I0d5a728a095f4c3003c2789c4afc2faa1ea6a5c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:37:30 +00:00
TreeHugger Robot
66262e1052 Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b am: 5a138163b4 am: 4c10d54239
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: Ie7ca0f9c93d2a062f3e8513218f4566d91eee2e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:36:58 +00:00
TreeHugger Robot
d01c722530 Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d5f1760bc2 am: 1ea5c4947f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I9bf57c8573062d0b6c2eb9b110c4b419197fb4ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:36:43 +00:00
Bill Yi
261936eccf Merge changes from topic "tc_change_21" into tm-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0
  Import translations. DO NOT MERGE ANYWHERE
2022-05-04 17:07:37 +00:00
TreeHugger Robot
38468ab17a Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b am: 5a138163b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: Ife8cf047608c12e7d89b101f7eadd80b99cc10dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:54:28 +00:00
TreeHugger Robot
4c10d54239 Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b am: 5a138163b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: I43abc251d6e3e98614c577a76efbec7d9eeb1daa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:54:21 +00:00
Automerger Merge Worker
0a6ed415d0 Merge "Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d5f1760bc2" into tm-d1-dev-plus-aosp 2022-05-04 16:53:54 +00:00
TreeHugger Robot
093f22058c Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d5f1760bc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I548ff88e2c15005b9be8ef1cfe60400c53ec39fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:53:52 +00:00
TreeHugger Robot
9f25dfbe24 Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b am: 4a79ecce7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: I394ab524cd11acf93961e557ea94ea83599b1eda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:53:50 +00:00
TreeHugger Robot
aa2edb9be4 Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d61d5316a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: If1618fdc467bde0a76db51f7456af999acbdd476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:53:34 +00:00
TreeHugger Robot
1ea5c4947f Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d5f1760bc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I7eb86f07e158a8bae3d5423c002547d031c0ae13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:53:33 +00:00
TreeHugger Robot
5a138163b4 Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: I21294fc5b06c6eaaf512cdb84d5c83f318baa140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:32:18 +00:00
TreeHugger Robot
d5f1760bc2 Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I2b49fcfb402b1269c38c35f840d8d09e53dacb91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:30:58 +00:00
TreeHugger Robot
4a79ecce7f Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: Ic6dcbe5d513d4fa3a9ca3fb7e03add4eb978d145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:29:50 +00:00
TreeHugger Robot
d61d5316a3 Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I39353aff59e39b3fc6219f52a836e03920cb99cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:28:55 +00:00
TreeHugger Robot
3fb9c1a24b Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev 2022-05-04 16:01:35 +00:00
TreeHugger Robot
2e6d03d0f4 Merge "Remove Wi-Fi toggle in settings search" into tm-dev 2022-05-04 15:51:34 +00:00
Chaohui Wang
64a5bdd286 Merge "Fix a11y label for LE Audio Battery" into tm-dev am: 22cda47705 am: c2ff0c7b74 am: bf5fe0477b am: 4f4aa1e071
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090791

Change-Id: I4d623b24a2a18744b84d5950212380d0ae18a68a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 14:30:51 +00:00
Jason Hsu
f985c3228e Merge "Save user's option when clicking 'Change setting' in triple-tap warning dialog" into tm-dev am: c53c5a906f am: f754ec4926 am: f50e29957c am: deb5573b2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090126

Change-Id: Id2f689580c13f642eec53e54ff5c6e07bb5f64cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 14:29:11 +00:00
Edgar Wang
2709ee4c08 Merge "Adjust profile category padding in factory reset page." into tm-dev am: 1098684b19 am: e1c20560d4 am: 17f03413f9 am: d7ae5ee813
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090789

Change-Id: Iaeda94562a0ced5381a6a0735cc01e6b76ecf2de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 14:27:49 +00:00