Commit Graph

102199 Commits

Author SHA1 Message Date
Xinyi Zhou
14c317a689 Delete Fast Pair Settings am: 3438e20da1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888

Change-Id: Iefb16d41b1901b275f4a5019e78326de8d2e917d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 02:53:51 +00:00
Xinyi Zhou
3438e20da1 Delete Fast Pair Settings
Fast Pair will not be launched in T.

Test: -m
Fix: 228614515
Fix: 229356812
Change-Id: I173453e84f0d1b525ea4796ed875f53f30c20d96
2022-04-27 12:29:59 -07:00
Bonian Chen
935706425d Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304

Change-Id: I7837b1a347c978e0d952365de22e34352d38f65b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 16:42:48 +00:00
Yuri Lin
0e7619f290 Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev am: 29c62e7873
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944009

Change-Id: Ia890b87537a3bc1d87c3d955a504ca5ad1a46857
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 16:42:39 +00:00
Bonian Chen
f211a82f23 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: I227b64a070259d448cd3c7fe8f6256fcc137e7f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 16:42:22 +00:00
Lais Andrade
e673e22181 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: I7f8ddde6995c2d124c9682ce65781900ca44b58a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 16:42:11 +00:00
TreeHugger Robot
54467e3eb8 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: I58c7a9174a5b8892acf930554cfe8860e4194a6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 16:41:18 +00:00
Bonian Chen
43cf210f90 Merge "[Settings] Fix flaky presubmit failure" into tm-dev 2022-04-27 16:23:09 +00:00
Yuri Lin
29c62e7873 Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev 2022-04-27 16:08:55 +00:00
Bonian Chen
68981a3004 [Settings] Fix flaky presubmit failure
Bug: 229689535
Test: unit test
Change-Id: Iabea21aa5d7dd9e489b7b5839c8fcc32c9ba979c
2022-04-27 15:58:06 +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
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
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
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
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
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
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
Stanley Wang
17365c8e47 Merge "Fixe the problem of invalid switch preference" into tm-dev 2022-04-27 07:00:10 +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
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
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
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
Hugh Chen
ec5aa12cec Merge "Fix NPE in Bluetooth Settings." into tm-dev 2022-04-27 04:00:33 +00:00
Stanley Wang
031cda05c3 Fixe the problem of invalid switch preference
- SettingsMainSwithBar will be recreated after the page is resumed.
  We should keep the OnMainSwitchChangeListener for
  SettingsMainSwitchPreference and re-register the listeners after
  the page is resumed.

Fix: 228930107
Fix: 222384287
Test: Manually test and see the UI
Change-Id: I9b57053989e611288cf4814b2a0ecbf9e3c55145
2022-04-27 03:41:06 +00:00
TreeHugger Robot
9c9dea5406 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -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: I2a71ed5ef40a7abbe1761cb58724c67065a51070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 02:55:37 +00:00
Bill Yi
88e3db5ba2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -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: I6c46ca3849c391c750828976413318d0237dab09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 02:55:07 +00:00
TreeHugger Robot
37c4a74b27 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-27 02:31:39 +00:00
TreeHugger Robot
e26c4e41ad [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74 -s ours am: 1f6b29b35a -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: I50c8e8a036ba16be1de8ddd2f7933615a51ac94d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 01:19:48 +00:00
Bill Yi
a344350db7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f -s ours am: 7146184316 -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: I948f2dc9f4c7ffbd63bf0b56391192f221eddb4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 01:19:33 +00:00
TreeHugger Robot
1f6b29b35a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74 -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: I4907deaeaf6cf14c6f22f8ee58036ca33e7782ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 00:59:23 +00:00
Bill Yi
7146184316 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f -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: Id264da7161d5c6f04fcbc948596e8b2c376047f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 00:58:57 +00:00
TreeHugger Robot
daf63cf01e 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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022

Change-Id: Ibcf50a295606d3e3b03dead22a1f4423cafb1e45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 00:40:11 +00:00
TreeHugger Robot
3e8135ea74 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-27 00:39:28 +00:00
Bonian Chen
3bddc056d8 Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"
This reverts commit aeac0619df.

Reason for revert: merge failure in other branches

Change-Id: I601e674be41fc5d4c97bd8db54ab1982377455f1
2022-04-27 00:03:20 +00:00
TreeHugger Robot
a72b9398fb 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 2022-04-26 23:45:12 +00:00
Bill Yi
cb6059d24d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours am: fa497ab8af -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: I28db6646b415272be6807778e135a7923d87e3c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 23:08:58 +00:00
Bill Yi
fa497ab8af [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -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: I37b7ef953f06dedbfd1aae0f3c75ae9f3f86daa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 23:01:50 +00:00
Yuri Lin
e540c8165d Fix ZenModeScheduleRuleSettingsTest to test onAttach
this follows the model of the change to ZenModeEventRuleSettingsTest in ag/17607148

Fixes: 215062934
Test: settings robotests
Change-Id: I44abec9316f78be318b51ba541d20b863eb86c8d
2022-04-26 14:23:06 -04:00
Bonian Chen
1d1c2826c9 Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev am: 73c8e2f45a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859326

Change-Id: I334058bf9a010783514ab685885c9c6c8d86cc8b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 11:34:33 +00:00
Bonian Chen
6483721f20 Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev am: 3fc05a917e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903597

Change-Id: I1d5d21181e8675669ce2eec07995105c82dd947b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 11:34:16 +00:00
Bonian Chen
73c8e2f45a Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev 2022-04-26 10:25:31 +00:00
Bonian Chen
3fc05a917e Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev 2022-04-26 10:25:02 +00:00
Alex Johnston
e8bbf576c9 Fix USB tethering grey out behaviour
Grey out USB tethering when USB is disconnected

Bug: 200113957
Bug: 223477825
Test: Manual testing with TestDPC
Change-Id: I40eb04d6e96f4963129dc9d6dc9001b0c54185ef
2022-04-26 10:18:01 +01:00
Jason Hsu
c0fb12cf7c Merge "Correct Magnification shortcut title" into tm-dev am: 12c10cfa5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910930

Change-Id: I5370613843e746c5c0c71f5da9155612d97f34dd
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 09:01:42 +00:00
Jason Hsu
12c10cfa5c Merge "Correct Magnification shortcut title" into tm-dev 2022-04-26 08:07:37 +00:00