Betty Chang
79949be124
Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev am: 5dea2176a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030886
Change-Id: I487df2695fe2c7ead09d86286b32f75b3a343d98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 07:33:21 +00:00
Edgar Wang
278b99f743
Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev am: 37ad451324
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029962
Change-Id: I3a8d34d848f6cde3d906c4343f6052f7e56a681c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 07:33:13 +00:00
Betty Chang
5dea2176a2
Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev
2022-05-03 07:21:11 +00:00
Edgar Wang
37ad451324
Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev
2022-05-03 07:14:24 +00:00
Weng Su
e37a553e94
Show restricted message in Wi-Fi hotspot settings
...
- Remove Wi-Fi hotspot preferences in settings search if Wi-Fi hotspot is disallowed
- See the result screenshot in b/203168953#comment12
Bug: 203168953
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest
Change-Id: Id4416fd0659b596e4e6f31890a139198219f4552
2022-05-03 13:58:54 +08:00
changbetty
f31b5769d7
[LE] Launch the dialog for the user to broadcast or find broadcast
...
- Launch the broadcast dialog from entry point in Media Volume Slice
- Fix the broadcast dialog to follow the dialog style
- Start broadcast and launch the MediaOutputBroadcastDialog from
broadcast dialog
Bug: 229577518
Test: manual test
Change-Id: I1329b3f35b03afc441142494df883ae17f373656
2022-05-03 03:16:08 +00:00
Bill Yi
67d1684f28
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours am: 5e07d7fd84
-s ours am: d75e8abee9
-s ours am: 1836db16f7
-s ours am: a8f28ed7c5
-s ours am: 551016f43b
-s ours am: 41b6a6c820
-s ours am: a82a1ff84e
-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: I9f32b652574da07d2f3a141c996d17a9ec92e65a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 00:33:31 +00:00
Bill Yi
9e755959ac
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours am: 5e07d7fd84
-s ours am: d75e8abee9
-s ours am: 1836db16f7
-s ours am: a8f28ed7c5
-s ours am: b8d61f99e0
-s ours am: 10abd90819
-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: I56da951d2c301dfa95ec3da70a3bce4e2ae7e79e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 00:32:52 +00:00
Bill Yi
a82a1ff84e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours am: 5e07d7fd84
-s ours am: d75e8abee9
-s ours am: 1836db16f7
-s ours am: a8f28ed7c5
-s ours am: 551016f43b
-s ours am: 41b6a6c820
-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: I76e5a942e34ed88eb8bccc0651f3faf2d7536922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 00:31:51 +00:00
Bill Yi
41b6a6c820
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours am: 5e07d7fd84
-s ours am: d75e8abee9
-s ours am: 1836db16f7
-s ours am: a8f28ed7c5
-s ours am: 551016f43b
-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: Id66275160d51b92ccd9285f85143bc699b375a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 00:00:48 +00:00
Bill Yi
10abd90819
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours am: 5e07d7fd84
-s ours am: d75e8abee9
-s ours am: 1836db16f7
-s ours am: a8f28ed7c5
-s ours am: b8d61f99e0
-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: Ia097d604caed1a90740d24c5dbe05807242127ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 00:00:46 +00:00
Bill Yi
551016f43b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours am: 5e07d7fd84
-s ours am: d75e8abee9
-s ours am: 1836db16f7
-s ours am: a8f28ed7c5
-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: I5cea3e375757e71dc4f940d0e02aaa6425cc8136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 23:29:26 +00:00
Bill Yi
c5cbc6044c
[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: 365338b6d0
-s ours am: ec31d2697d
-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: Ie622f99dae37f0c276aad327f14964f8f03b3d76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 23:28:39 +00:00
Bill Yi
97f8879cff
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c
-s ours am: f46213941c
-s ours am: 7a2a5bd916
-s ours am: 1df006f84c
-s ours am: 9f888216b4
-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: I1e5fe4b221792ee36b4512b421cd0a4d9c34f3d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 23:28:32 +00:00
Bill Yi
b8d61f99e0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours am: 5e07d7fd84
-s ours am: d75e8abee9
-s ours am: 1836db16f7
-s ours am: a8f28ed7c5
-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: I8e84a4ec5b0aa8c75372ac26088a3b4da51dfef6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 23:28:29 +00:00
Bill Yi
a8f28ed7c5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours am: 5e07d7fd84
-s ours am: d75e8abee9
-s ours am: 1836db16f7
-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: Ib411051ca0e3f2d2b849688bce481a663a44fadb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 22:53:37 +00:00
Bill Yi
ec31d2697d
[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: 365338b6d0
-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: Ibab132c360957a95e11a84dd1f7b88cc178a1381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 22:53:28 +00:00
Bill Yi
9f888216b4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c
-s ours am: f46213941c
-s ours am: 7a2a5bd916
-s ours am: 1df006f84c
-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: I0b27088d1c07bfaf369d2da9689e2c10eb3c4eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 22:53:21 +00:00
Bill Yi
a5ebf55708
[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: I417725150925f81370959c4acea726122359c194
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 22:31:26 +00:00
Bill Yi
1f00d35c4f
[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: Ib32fc8b21ac7ff855eb41b010bca35b0077bcf38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 22:31:20 +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
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
TreeHugger Robot
c1b2acfb3b
[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: I8e9f299fa94e9d69c778daaadc18ddacfbd51022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 22:31:00 +00:00
Bill Yi
c453a65ed2
[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: I0f90f520b15abdb1fe0d6fb61158e6fdfec433a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 22:30:59 +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
Bill Yi
94a1ab304a
[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: I3a217f11889d90a9a51c519432d00899ef45a33e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 22:30:18 +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
Lucas Silva
b0bd5b21e3
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: Ibd114267c5254a0eb6484c92bfb6015ddc67f69a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 14:44:19 +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
Edgar Wang
0e92c7e777
Adjust profile category padding in factory reset page.
...
This page usd SetupWizard them, so we should not set paddingStart
Bug: 223514471
Test: visual verify
Change-Id: I3a02be7534c6571c8d6735c5592ad4230a7c9e9e
2022-05-02 13:39:28 +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
c50bf31396
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381
Change-Id: Ic1312b9a4bfe68bde034d23eacf2bbdc2a95200b
2022-05-01 01:29:56 +00:00