Commit Graph

105474 Commits

Author SHA1 Message Date
TreeHugger Robot
0a4de94f81 [automerger skipped] Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9 am: 85705f38d1 -s ours
am skip reason: skipped by user bonianchen

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

Change-Id: I57386b761ffbf62eee86d601f83c5fe59c9a59f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 23:49:14 +00:00
Hugh Chen
0c128aca74 Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec am: 681d69b2b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602

Change-Id: I72fc05a7068125f4c6b68ab27b3a1532ef5f61c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:50:51 +00:00
TreeHugger Robot
cd1904d9ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours am: 5ffb8f9140 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I436cbf5fca6e2501887ce457969b8eefac2d1318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:44:27 +00:00
Bill Yi
168d5f1029 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: ecb3697aec -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7158f1ed670f3af6f6707a4991eb85dd42bee67e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:44:10 +00:00
TreeHugger Robot
7d99d82233 Merge "MainClear: remove obsolete check for multi-volume FDE" 2022-04-27 18:42:32 +00:00
TreeHugger Robot
e8731b9422 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 584d9ef1f2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I347d29c5dbd465567ba62e06f58715c58801c2b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:40:45 +00:00
Bill Yi
6efb9966c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aaa5c995b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I16041617955ee84b8bc4b5d5e4d799ba94ef9a03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:40:29 +00:00
TreeHugger Robot
c3ad3d8276 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74 -s ours am: 1f6b29b35a -s ours am: d35e6c93ae -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1703187cb8781b73e95be142383b530b6b961a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:34:16 +00:00
Bill Yi
bb0ba936d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f -s ours am: 7146184316 -s ours am: 10a83a199a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I87fa781d28a254ef5a6be80c98e37abd52b46572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:34:02 +00:00
TreeHugger Robot
b0b62f812b Merge "Fix the description of one-handed mode doesn't change immediately in Gestures page after users turn on/off in Quick Settings" into tm-dev am: a72b9398fb am: c05c41717e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022

Change-Id: Ie172ade12edeae024b1ad3eb90d72848be57837c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:32:53 +00:00
Bill Yi
97c746c76f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours am: fa497ab8af -s ours am: debd5bf4bb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8ecc5adaf09e37dfe9a7e21142143e75004cb17d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:29:25 +00:00
Bonian Chen
b3afc78e2d [automerger skipped] Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev am: 73c8e2f45a am: 065ca3dd2f -s ours
am skip reason: skipped by user bonianchen

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

Change-Id: I736b591ea94a7c46e334f73e63ff5650ab351aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:28:39 +00:00
Bonian Chen
9257c94546 [automerger skipped] Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev am: 3fc05a917e am: 0667c64841 -s ours
am skip reason: skipped by user bonianchen

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

Change-Id: I69de781290c6e719236e68b7816fbf7f07084b8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:54:26 +00:00
Lais Andrade
c09c49fcf2 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: I107d9d6220d4102ee7d592cf2a4f2f307d881302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 16:42:28 +00:00
TreeHugger Robot
f468355b99 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: I74b59fa059f6c1cf93def1d90c1d46c7d8478596
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 16:42:03 +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
505a0b8798 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: Ifc535fae02c81f86e3b278004b6e0d66fbc6fb02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 13:19:14 +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
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
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
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