Bonian Chen
|
3c4956b7c4
|
Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e am: dbbab09d11 am: a725b0c3da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950673
Change-Id: Ie33fe0bbd2e508d7c3ce99160846cbe3da13c60b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 18:01:56 +00:00 |
|
Lais Andrade
|
94c826bda7
|
Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb am: 9066672c7d am: 109b181126
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337
Change-Id: Ie62b21422489a62129b9d5c64ab8049413069cba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 18:01:48 +00:00 |
|
TreeHugger Robot
|
9a9d90d8d3
|
Merge "Make the checkbox item large enough to click." into tm-dev am: 9fd4377ddb am: 39cbfbfed5 am: c1cdae7699
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950068
Change-Id: I644835a33aa770d626b82de69dec265c7c5c0f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 18:01:44 +00:00 |
|
TreeHugger Robot
|
520db6c09d
|
Merge "Make the checkbox item large enough to click." into tm-dev am: 9fd4377ddb am: 39cbfbfed5 am: 094cde648b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950068
Change-Id: I12fe1a56f729a1696020eed1e915e0abd6117075
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 18:01:33 +00:00 |
|
Bonian Chen
|
a725b0c3da
|
Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e am: dbbab09d11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950673
Change-Id: Id2c1fa8af2948da18269e729f32613bb33b23c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 17:35:17 +00:00 |
|
Lais Andrade
|
109b181126
|
Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb am: 9066672c7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337
Change-Id: I2495f0494ac54bf8b7e034a919e63870c2460b0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 17:35:05 +00:00 |
|
TreeHugger Robot
|
094cde648b
|
Merge "Make the checkbox item large enough to click." into tm-dev am: 9fd4377ddb am: 39cbfbfed5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950068
Change-Id: Ie59e5e885dddd98a98cbbe7d7c5e54474a418f50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 17:34:44 +00:00 |
|
TreeHugger Robot
|
c1cdae7699
|
Merge "Make the checkbox item large enough to click." into tm-dev am: 9fd4377ddb am: 39cbfbfed5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950068
Change-Id: Idc112a03695a65fb7e3b1151e4bce3fac2ada91a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 17:34:42 +00:00 |
|
Bonian Chen
|
dbbab09d11
|
Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950673
Change-Id: Idde5263cb84e0e7facb17bc9e6ff00e33d43673f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 16:43:39 +00:00 |
|
Lais Andrade
|
9066672c7d
|
Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337
Change-Id: Id95a6ec5976aa397bac923a92601ea709b8fd8bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 16:43:29 +00:00 |
|
TreeHugger Robot
|
39cbfbfed5
|
Merge "Make the checkbox item large enough to click." into tm-dev am: 9fd4377ddb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950068
Change-Id: I5c8c755d17243cdd242d61c0eac062b5861b9d90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 16:43:08 +00:00 |
|
Bonian Chen
|
b92156c03e
|
Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev
|
2022-04-27 15:57:30 +00:00 |
|
TreeHugger Robot
|
61e4005b0c
|
Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28 am: b0bf5dd13f am: 46dda94691
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164
Change-Id: I82c3423d68dd8fcb9805b5491665ff8fd8dc4b8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 14:05:00 +00:00 |
|
TreeHugger Robot
|
8325e40813
|
Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28 am: aee4b8e3d4 am: 2a742b1774
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164
Change-Id: Icabb8076bc44122b57716e470274fc65fbeaa910
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 14:04:37 +00:00 |
|
TreeHugger Robot
|
fae9bbbb2e
|
Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28 am: aee4b8e3d4 am: 8f618ea83a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164
Change-Id: I0a234e963a38f2578966ae30e522eca689cf91eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 14:04:08 +00:00 |
|
Lais Andrade
|
9c8d1e94fb
|
Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev
|
2022-04-27 13:54:13 +00:00 |
|
TreeHugger Robot
|
9fd4377ddb
|
Merge "Make the checkbox item large enough to click." into tm-dev
|
2022-04-27 13:51:14 +00:00 |
|
TreeHugger Robot
|
46dda94691
|
Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28 am: b0bf5dd13f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164
Change-Id: I7bf2cde21b48a7621044c9cfcb9b3c01231e7670
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 13:43:17 +00:00 |
|
TreeHugger Robot
|
2a742b1774
|
Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28 am: aee4b8e3d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164
Change-Id: I6ff4801edb22824bf62b1674642695a516b0bb0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 13:42:58 +00:00 |
|
TreeHugger Robot
|
8f618ea83a
|
Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28 am: aee4b8e3d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164
Change-Id: Ibf56b1cbb189dfc9095f73d8be2d373882248a43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 13:42:57 +00:00 |
|
TreeHugger Robot
|
aee4b8e3d4
|
Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164
Change-Id: I736374cee128700e24000f21fc4cbe64d2cc34f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 13:20:20 +00:00 |
|
TreeHugger Robot
|
b0bf5dd13f
|
Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164
Change-Id: I1c72f82bf7ceb1a13d7a14c3a0ab5ad48beee760
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 13:18:56 +00:00 |
|
TreeHugger Robot
|
5395a4eb28
|
Merge "Fix collapsing toolbar can't collapse problem" into tm-dev
|
2022-04-27 12:46:52 +00:00 |
|
Alex Johnston
|
a08ffe1256
|
Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503 am: 56807e16f5 am: 447dae8143
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005
Change-Id: I99a7488ac9116cbb27c9765fd551782219c8d5f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 11:20:10 +00:00 |
|
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
|
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
|
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 |
|