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
b5852f6685
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: I01488a3ba0637820cccddaf245971110bb0ee6d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 16:42:57 +00:00
Yuri Lin
48f463d840
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: Idbc80220c6bb562cb64211df806f48db2cf4c13f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 16:42:48 +00: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
Bonian Chen
c406279030
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: If5d73a84e45719786462f0c178b0177035e332c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 16:42:39 +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
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
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
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
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
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
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
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
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
Stanley Wang
10c9cf6cd5
Fixe the problem of invalid switch preference.
...
The source of this problem is that onBindViewHolder is called
after the user add the OnMainSwitchChangeListener. Then
preference gets a new MainSwitchBar in onBindViewHolder and
causes the listener to fail.
Bug: 223325900
Test: Manually test and observe the UI
Change-Id: I6e58c4cf035811bb8805e76bebb5fbb86c7a79da
2022-04-27 17:17:21 +08: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