Alex Johnston
636bf7d186
Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503
am: d45cab5850
am: 8f02d3da63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005
Change-Id: Ia9c8dd4f72e29104824b798748376451cef3b81d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 11:18:34 +00:00
Alex Johnston
f8ee374a19
Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503
am: d45cab5850
am: 8229b0fbf7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005
Change-Id: I869c4ec4f03b7aa68c5690a7cfb4b36c348d7cd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 11:18:18 +00:00
Weng Su
952ba0d0de
Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b
am: b53c4ddcec
am: 0f036c9a27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025
Change-Id: I6a82b380d3cfc5f8d0e0a44f01d56319736cfd55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 11:16:09 +00:00
Weng Su
705da26629
Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b
am: 6428d536c6
am: 977f9577a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025
Change-Id: I1806a2a872cd42ef033a2ecaf997294c2ca29cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 11:15:26 +00:00
Weng Su
ad513bf05f
Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b
am: 6428d536c6
am: 342e16a4c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025
Change-Id: I4db62e3ada4b3d713a2efe7f0c4fde30a5817fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 11:12:57 +00:00
Alex Johnston
447dae8143
Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503
am: 56807e16f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005
Change-Id: I52077bae42bcbba32ebe7698e7384a5d40a42f43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 10:49:21 +00:00
Alex Johnston
8f02d3da63
Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503
am: d45cab5850
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005
Change-Id: I8c94063066310b4195f27974d45a692dec55367e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 10:48:35 +00:00
Alex Johnston
8229b0fbf7
Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503
am: d45cab5850
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005
Change-Id: I0e601bf1e59337f17f9e025d4842842b118948e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 10:48:32 +00:00
Weng Su
342e16a4c1
Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b
am: 6428d536c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025
Change-Id: I1b11216110c58e862e2f2d909f7cea393932c88b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 10:48:09 +00:00
Weng Su
0f036c9a27
Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b
am: b53c4ddcec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025
Change-Id: Iaae096ddf40a78e63b2b78ddef8d4214fbb8a27f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 10:48:06 +00:00
Weng Su
977f9577a1
Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b
am: 6428d536c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025
Change-Id: I6cf8e9c86a6299bb94f2f2f57e1b348d5caae87a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 10:47:33 +00:00
Alex Johnston
d45cab5850
Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005
Change-Id: Ib3be129b788d2a02850ef0f29887063e3037600f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 10:46:56 +00:00
Alex Johnston
6509505975
Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005
Change-Id: I4642f01d20a5119ea91670f410c174640657a4ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 10:45:10 +00:00
Alex Johnston
56807e16f5
Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005
Change-Id: Iab96cc0c488a9e3326735dc7fbe7570365e1235d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 10:44:45 +00:00
Weng Su
6428d536c6
Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025
Change-Id: I0bc8a5110999c1144b6441c158f20b57abba7ed4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 10:26:34 +00:00
Weng Su
37169b93d3
Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025
Change-Id: I401d6333fce88b91c424620db90cf079683d5cc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 10:26:32 +00:00
Weng Su
b53c4ddcec
Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025
Change-Id: I6d31a98f1a7b2ac727c28e9071d1bf9a1f437e80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 10:26:31 +00:00
Alex Johnston
7828dda503
Merge "Fix USB tethering grey out behaviour" into tm-dev
2022-04-27 10:21:50 +00:00
Weng Su
b6629ab55b
Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev
2022-04-27 09:33:26 +00:00
Automerger Merge Worker
426722502b
Merge "Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47
am: a01cbf2774" into tm-d1-dev-plus-aosp am: fa2ba5bc88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767
Change-Id: Ib907a2d7f7ebc730d1c74faaccaa0b200d90e542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 09:08:27 +00:00
Stanley Wang
1ae40c50a0
Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47
am: 6a58c2faf1
am: 4ff1183209
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767
Change-Id: Id54425e7c5f4221a05af30c6384c577381e5baf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 09:02:35 +00:00
Stanley Wang
79513e38bf
Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47
am: 6a58c2faf1
am: ff185afde7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767
Change-Id: If3371ce91e7ca4e22e9fb3508fb55d23e553e4f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 09:01:42 +00:00
Sunny Shao
d790fa2800
Fix collapsing toolbar can't collapse problem
...
- Use the NestedScrollView instead of ScrollView.
Fixes: 216276444
Test: manual test
Change-Id: I3872bcc2f165ba8cf55f1782aa76f59adde5d3aa
2022-04-27 15:51:45 +08:00
Automerger Merge Worker
fa2ba5bc88
Merge "Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47
am: a01cbf2774" into tm-d1-dev-plus-aosp
2022-04-27 07:40:15 +00:00
Stanley Wang
df81c450a9
Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47
am: a01cbf2774
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767
Change-Id: Ifd0c82f5b58d1633743db0381891e1ed6f0086bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 07:40:12 +00:00
Stanley Wang
4ff1183209
Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47
am: 6a58c2faf1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767
Change-Id: I95ed08b9518cba1a747185726115f6802e842f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 07:40:10 +00:00
Stanley Wang
ff185afde7
Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47
am: 6a58c2faf1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767
Change-Id: Id255444e533e231df91699b6f33b2d97a31c2e56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 07:40:07 +00:00
Stanley Wang
6a58c2faf1
Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767
Change-Id: I0189eb7313984ec4989c6febde3b0e977ddb7ecf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 07:22:28 +00:00
Stanley Wang
07b4f09127
Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767
Change-Id: I3dc68b80553344a5535f3c34b3803280926a1d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 07:21:22 +00:00
Stanley Wang
a01cbf2774
Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767
Change-Id: I9cc73d08f88a2f12600d9ae805bb89873c7a59b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 07:21:00 +00:00
Automerger Merge Worker
e563a0a15a
Merge "Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9
am: 3e1e0cd837" into tm-d1-dev-plus-aosp am: d8bcd8b4b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674
Change-Id: Iee62474ce8ec4df48e3701f76293c85203f9629f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 07:13:38 +00:00
TreeHugger Robot
a3ea2e28df
Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9
am: a715a3c7b9
am: 3db1366221
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674
Change-Id: Ie0df3bcd91610369515638e21ca063be63f371a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 07:13:28 +00:00
TreeHugger Robot
e1d863f156
Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9
am: a715a3c7b9
am: 01753159e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674
Change-Id: Ib4caf65494f7b9b6f4ddb274ecb17319826decf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 07:13:12 +00:00
Stanley Wang
17365c8e47
Merge "Fixe the problem of invalid switch preference" into tm-dev
2022-04-27 07:00:10 +00:00
Automerger Merge Worker
d8bcd8b4b5
Merge "Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9
am: 3e1e0cd837" into tm-d1-dev-plus-aosp
2022-04-27 06:52:04 +00:00
TreeHugger Robot
3db1366221
Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9
am: a715a3c7b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674
Change-Id: I0ddd7a373275fe9be0eb3b008ce8f514bb376b4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 06:52:01 +00:00
TreeHugger Robot
8b7a48a243
Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9
am: 3e1e0cd837
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674
Change-Id: Ibe6df22ad94f1c360e142eb6eb2573f5e29a98a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 06:52:01 +00:00
TreeHugger Robot
01753159e5
Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9
am: a715a3c7b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674
Change-Id: I7ad8faf6db40db67987d892690c77bac6428eb86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 06:51:59 +00:00
Angela Wang
11dc02d115
Make the checkbox item large enough to click.
...
When checkbox display contents in a single line, the clickable area is
less than 48dp and making it hard to click. Setting the minimum height to 48dp can ensure the clickable area is large enough.
Bug: 226538268
Test: manual test
Change-Id: I341455bc98415bfe9292ff5ba4cf6c2153d487d7
2022-04-27 06:30:59 +00:00
TreeHugger Robot
a715a3c7b9
Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674
Change-Id: I08aee9acbacc7d48ddb69c00f56d8111e1e34393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 06:20:28 +00:00
TreeHugger Robot
85705f38d1
Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674
Change-Id: Iff69fc96ab9fc59b00ca8ef6ff2e4aac35e07dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 06:19:24 +00:00
TreeHugger Robot
3e1e0cd837
Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674
Change-Id: Ib9b86811540faf757fd85061934654b8a94fa36a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 06:19:06 +00:00
TreeHugger Robot
c28169adb9
Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev
2022-04-27 05:56:10 +00:00
Hugh Chen
035a9dd4e7
Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec
am: 07089739be
am: 14984ce5ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602
Change-Id: Ied8749869e0844f62b6894a370e47762352fb7ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 05:30:28 +00:00
Hugh Chen
a01f125313
Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec
am: 07089739be
am: 3aaf35cac1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602
Change-Id: Ic0ee1f85167a0673ed4d553de3b913031b19c8a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 04:58:26 +00:00
Hugh Chen
ecb9508fef
Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec
am: dcd868531f
am: f42f401c1d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602
Change-Id: I1c5418cadee00311b14e67b53792eef13b7c97a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 04:58:17 +00:00
Hugh Chen
14984ce5ca
Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec
am: 07089739be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602
Change-Id: I8361dee6e24ff2bcc401ad2b235e1a6dd6727380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 04:45:43 +00:00
Hugh Chen
3aaf35cac1
Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec
am: 07089739be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602
Change-Id: I5738e71927166b3f5d50cb3df235bde22a36caf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 04:44:25 +00:00
Hugh Chen
f42f401c1d
Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec
am: dcd868531f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602
Change-Id: I6d63cf33569e84ab04353020d37c92d291014926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 04:37:12 +00:00
Hugh Chen
681d69b2b9
Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602
Change-Id: I0d473f7d49bfec4cf179dc670b2c7e74d5e83bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 04:21:38 +00:00