Commit Graph

105604 Commits

Author SHA1 Message Date
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
Bonian Chen
8789731cde Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"
This reverts commit 81d230b250.

Reason for revert: merge failure in other branches

Change-Id: If8661f5f321f22df96aab54eb8ba967c232348ac
2022-04-27 05:13:30 +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
Hugh Chen
07089739be 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: I9650808a7a8d133a8dd306cb20a2bf03dad860c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 04:21:31 +00:00
Hugh Chen
dcd868531f 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: I392bc8403460c386d7938ce87f523a1187778c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 04:20:06 +00:00
Joshua Mccloskey
da01a1b5c1 Merge "Fix final UDFPS enrollment haptic." into tm-d1-dev am: dfc6bd1edb am: 3fd02b1492
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17917343

Change-Id: I1039a68cc28a81997ed75872248b0e2c46c58504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 04:15:52 +00:00
TreeHugger Robot
8838625058 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours am: 4106452f17 -s ours am: ae8bd84a09 -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: Ic75e2d17dedde1a24e9443cca42f0138ec3e143d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 04:12:17 +00:00
Bill Yi
aed191087f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: ac0f2ae37e -s ours am: a0048fb9cf -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: I1e6686a0490a0f4b036e9792bbc7b32aa6e9f682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 04:12:03 +00:00
Joshua Mccloskey
c128e0423c Merge "Fix final UDFPS enrollment haptic." into tm-d1-dev am: dfc6bd1edb am: 5ba13f2c14
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17917343

Change-Id: Ibd6b1621b8f20279178afb6df4582a22edb6e3ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 04:10:27 +00:00
TreeHugger Robot
efc499a2ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours am: 4106452f17 -s ours am: 4df4520afd -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: Ic9aa51da1fa1a11c8d36dbd6bd581281206c4b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 04:08:32 +00:00
Bill Yi
4aa1d180cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: ac0f2ae37e -s ours am: afc0b47d1b -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: I8d98f29072da1a0085258ce5273e867433485594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 04:08:19 +00:00
TreeHugger Robot
e634981491 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours am: 9c9dea5406 -s ours am: 4eef82d108 -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: I4647829f1a73afbd36762a995c2fcf33b1994752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 04:05:28 +00:00
Bill Yi
d29e5cc4ec [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: 88e3db5ba2 -s ours am: 4112503af4 -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: I1639746b2396b3042dba2e560fd543811918a4fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 04:05:13 +00:00
Hugh Chen
ec5aa12cec Merge "Fix NPE in Bluetooth Settings." into tm-dev 2022-04-27 04:00:33 +00:00
Joshua Mccloskey
5ba13f2c14 Merge "Fix final UDFPS enrollment haptic." into tm-d1-dev am: dfc6bd1edb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17917343

Change-Id: I43e4a9ee87f90fa25282cd6498cbc1dac5ce17bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 03:54:45 +00:00
Joshua Mccloskey
3fd02b1492 Merge "Fix final UDFPS enrollment haptic." into tm-d1-dev am: dfc6bd1edb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17917343

Change-Id: I92fb413b68432035cbab2c8ae56cf5102330133d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 03:53:22 +00:00
TreeHugger Robot
4df4520afd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours am: 4106452f17 -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: Ib8bacd0548b88594bec1485a4b312c3144be6d27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 03:51:41 +00:00
TreeHugger Robot
ae8bd84a09 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours am: 4106452f17 -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: I5631a445038cf7cf27ba008d2933f84741c14979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 03:51:27 +00:00
Bill Yi
afc0b47d1b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: ac0f2ae37e -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: I17da94794bbc6d9f0a2d14d34a5e599e25ed9371
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 03:51:19 +00:00
Bill Yi
a0048fb9cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: ac0f2ae37e -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: I9acc40bf6a14fcfad9eecf3d49fccd3b1af17611
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 03:51:12 +00:00
TreeHugger Robot
4eef82d108 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours am: 9c9dea5406 -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: I336a6a406817b58ac895644289f80c2690cf6d74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 03:42:54 +00:00
Bill Yi
4112503af4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: 88e3db5ba2 -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: I70e53b6c9d53214814bc43f1fa46a9e6f1b0cf34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 03:42:41 +00:00