Commit Graph

102887 Commits

Author SHA1 Message Date
Bill Yi
f93775c7da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 52bb0b7039 -s ours am: e7ce899b93 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic36653e79a65cd19da106cb0a26d4cce93e5f8b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:32:08 +00:00
Bill Yi
38e89c3879 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 4c08f33493 -s ours am: c77e41302b -s ours
am skip reason: subject contains skip directive

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

Change-Id: If087ba6206b066b97ee7290644dae64203fd8a96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:32:03 +00:00
TreeHugger Robot
e6ecfff870 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0a2b1de3a5 -s ours am: 6c9433b31e -s ours am: 2a21fa1024 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id3016b501da1528f4ff2e36b6a3eeb2d051f8a79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:31:57 +00:00
Bill Yi
c0bf62368b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b81da264a8 -s ours am: e0da5747da -s ours am: 1a4297414e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idd4216b0320c03ed78e20caeeb9fdbee0ead6eab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:31:56 +00:00
Bill Yi
365338b6d0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 0b07e79cc1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I38710b182545fc2b88f8c8a195ae07548dabd06f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:31:04 +00:00
Bill Yi
a01a68689f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 am: bf87406634 -s ours am: 53993399da -s ours am: 44f1eb9246 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib69e8795a0db09502a3b27f595e4c6f61fc2f450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:31:02 +00:00
Bill Yi
e7ce899b93 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 52bb0b7039 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2255dc24bfe7120b071b2d0eb276c7ed1eeef2c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:31:01 +00:00
Bill Yi
1df006f84c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 7a2a5bd916 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib72b241a27bc95e319ab02bec34c4dd4857c79fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:30:58 +00:00
Bill Yi
c77e41302b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 4c08f33493 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8a3d96a7c13aadb307de14e0702ebe0b1896e3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:30:55 +00:00
TreeHugger Robot
23d0c812a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0a2b1de3a5 -s ours am: 6c9433b31e -s ours am: 2a21fa1024 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icddf4caafcc806812acfc9957b047bef3c3b3851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:30:12 +00:00
Bill Yi
f25a5f3d8d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b81da264a8 -s ours am: e0da5747da -s ours am: 1a4297414e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifb28bb2247e83c4c035d511e8ca200d8b38742be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:30:10 +00:00
Bill Yi
59b8a120d0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 am: bf87406634 -s ours am: 53993399da -s ours am: 44f1eb9246 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2f79d61a8ce4de9e4d35cb7791bf191443e509fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:29:40 +00:00
Bill Yi
1836db16f7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours am: 5e07d7fd84 -s ours am: d75e8abee9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I99d69b8e647e305a479b153fc02214669d1a2afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:29:38 +00:00
Bill Yi
0b07e79cc1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id91cf446e28fb0ced0561e2be10ced8c69ab6427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:06:03 +00:00
Bill Yi
7a2a5bd916 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3933eb376b11ac6d0944db6ada4c75b52ff87674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:05:58 +00:00
TreeHugger Robot
2a21fa1024 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0a2b1de3a5 -s ours am: 6c9433b31e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia5113f388898f79c43b714ec80cd73b19e75814a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:05:01 +00:00
Bill Yi
1a4297414e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b81da264a8 -s ours am: e0da5747da -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1806d21043651eccf7da31df5bc4268782bb3d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:05:00 +00:00
Bill Yi
52bb0b7039 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iec9abc61990ce43e48934499ce7847a18f01a82f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:04:58 +00:00
Bill Yi
4c08f33493 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id3fdf81ecb5a85ea1a482ff4cfc649c4e0351114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:04:53 +00:00
Bill Yi
44f1eb9246 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 am: bf87406634 -s ours am: 53993399da -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie7a15d3be281479c7e29f34a2862ca9e1c0dd15e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:04:48 +00:00
Bill Yi
d75e8abee9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours am: 5e07d7fd84 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4c0e9c3e7134386a49cfaa8271c9a109f2c55d03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:04:25 +00:00
TreeHugger Robot
6c9433b31e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0a2b1de3a5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1109dc7c1fa291d2a19dc0b14b8facfa01a6d411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:31:33 +00:00
Bill Yi
e0da5747da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b81da264a8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5099a137fe14d98967f9d055bfcd4c41d8d4f05a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:31:27 +00:00
Bill Yi
53993399da [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 am: bf87406634 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4d10981a2dc1b03f85c26814667640167620a5b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:31:19 +00:00
Bill Yi
5e07d7fd84 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I048fe580663c03d27cae41e605f9d6719507e0c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:28:28 +00:00
Bill Yi
a509cd4695 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I014dc4924b12540a4eb6c97d93fd0b4d67155879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:26:44 +00:00
Bill Yi
f46213941c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idccc655c084ed720a595d4a8946738fa9eecb39b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:26:27 +00:00
Bill Yi
223d9c81f2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iee353b944bfcf19af8b5333daa0dfcfcbaa85cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:26:16 +00:00
Vadim Caen
d268b11e85 Add Settings for back animation developer option DO NOT MERGE
Bug: 228936326
Test: BackAnimationPreferenceController
Change-Id: I48516c1f68de799473eac99d35a086046d7e6de9
2022-05-02 18:07:27 +00:00
Automerger Merge Worker
d0d96f6703 Merge "Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb am: d7e5195565" into tm-d1-dev-plus-aosp 2022-05-02 15:03:24 +00:00
Lucas Silva
a8b6c03607 Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb am: b58d2ed5cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768

Change-Id: I256e53b6d9f41c7cef1ec510cbf5d85a59dd1ae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 15:03:20 +00:00
Lucas Silva
c161b3f1e0 Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb am: d7e5195565
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768

Change-Id: Ib864b89911a0a314471c60e1b0af6fbb1df5d96f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 15:03:19 +00:00
Lucas Silva
d7e5195565 Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768

Change-Id: I7ff9e34ba73ec61aa8cf75fbf23ad79afe3bcde8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 14:45:19 +00:00
Lucas Silva
b58d2ed5cd Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768

Change-Id: I9bb07c53e0dbd2f78e4d7191ebf597af3de12a06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 14:44:00 +00:00
Lucas Silva
dc44eb1feb Merge "Update dream settings logic to keep the customize button unselected." into tm-dev 2022-05-02 14:19:22 +00:00
Bonian Chen
382d27f9c7 [Settings] Preferred network mode appears during in-call
Preferred networko mode should only presented when allowed.

Bug: 225291570
Test: local
Change-Id: I22edf0f6176a5bd3de12604895d9b14c3b015795
2022-05-02 20:19:02 +08:00
Bonian Chen
ec3264f831 [Settings] Stop listening data connected intent for presenting reset APN dialog
Suspening the monitering of intent(TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED)
during the stage of resetting default APN, since its more like a noice
once the reset progress stared (since user pressed the menu button).

Bug: 190127964
Test: local
Change-Id: I524fb4a3b06b50706556b8e68cb36dc5efbd9a07
2022-05-01 15:28:42 +08:00
Bill Yi
e3a2158816 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2ee9e1d1586aa68ef5550412bd95e338468c6de2
2022-04-30 04:41:12 +00:00
Bill Yi
472713f47c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6c404b66a8d0d64ba763fd278dc004b60bb2b91d
2022-04-30 04:33:44 +00:00
Bill Yi
d251c2e700 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib01f577b1b637109db4750c0078aa8c5542273a1
2022-04-30 04:26:58 +00:00
Joshua Mccloskey
97ee75162c [automerger skipped] Merge "Fix final UDFPS enrollment haptic." into tm-dev am: 8f463f5c88 -s ours am: d7855afb3e -s ours
am skip reason: Merged-In I8623771016b9819d4211d07a19b50291a8b06cd9 with SHA-1 d3001a1a01 is already in history

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

Change-Id: Ib799e33df37f6e0119edc5e3359d96e21a6d30e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:52:22 +00:00
Joshua McCloskey
09c666a56a [automerger skipped] Fix final UDFPS enrollment haptic. am: b7f3001cea -s ours am: 8495275d81 -s ours
am skip reason: Merged-In I8623771016b9819d4211d07a19b50291a8b06cd9 with SHA-1 d3001a1a01 is already in history

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

Change-Id: Ifd8449e4c332fa111151a3b205c8c35520b928ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:52:21 +00:00
Bonian Chen
04a404a37a Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev am: 5ef52de6b2 am: b32415b955
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950069

Change-Id: Ie1dc845a1c9b4c3e6bd0f4cb6537b18cc71e7cf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:51:59 +00:00
Bonian Chen
d35a538b3c Merge "[Settings] Rename title of SIM UI when changed" into tm-dev am: 7bdf717410 am: 01e97e371e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983870

Change-Id: I9062d3ebca72493f6cde66f12b7b6174f8074239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:51:53 +00:00
TreeHugger Robot
51b96696e3 Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev am: 38989c9c6a am: d1c67e389d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062823

Change-Id: I8414d37bd52ba16055c3d76064824771fbaa6e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:51:46 +00:00
Jan Tomljanovic
705bfe5d71 Merge "Update the SafetyCenter icon" into tm-dev am: 297028ea69 am: 3c357dec8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029249

Change-Id: I78871d48d7ed784f3dc50eb7d3357ae750b1aa23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:51:40 +00:00
TreeHugger Robot
0c32b23f28 Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev am: 30bba3bbdb am: 1c16e6b314
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062822

Change-Id: I65b7f1424fcc1b29b45ff97decf42445d691a6f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:51:32 +00:00
TreeHugger Robot
bbb080d614 Merge "Remove tab symbol for app pinning strings" into tm-dev am: 5d31a69d65 am: 7d1f75839d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030885

Change-Id: I98a8b86f890361546a8659104765a75bca2a9d42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:51:26 +00:00
Chaohui Wang
66647772aa Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd am: 19356dae5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070

Change-Id: I87f3614bc5496b73e3f5224f1430454859b246d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:51:19 +00:00
Tom Hsu
f591ba9c73 Merge "[Panlingual] Avoid activity restart during rotation" into tm-dev am: 1d0f85a3d6 am: 169517aacc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030882

Change-Id: Ie29131dff4c62b1c8d0f8d093b7c5116833c0ca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:51:13 +00:00