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
|
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 |
|
Bonian Chen
|
6ed05ee86f
|
Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90 am: 313284a9ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304
Change-Id: I60924ce91004828801baa9b6c0f085f5627d6b75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 17:35:49 +00:00 |
|
Automerger Merge Worker
|
2e0303ef25
|
Merge "Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev am: 29c62e7873 am: b16261a8e1" into tm-d1-dev-plus-aosp
|
2022-04-27 17:35:44 +00:00 |
|
Bonian Chen
|
3a21d96f32
|
Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90 am: 935706425d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304
Change-Id: I33a00d266ebd0788303e68b7326901aecf6037aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 17:35:41 +00:00 |
|
Yuri Lin
|
9bc4003f46
|
Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev am: 29c62e7873 am: b16261a8e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944009
Change-Id: Iff2f85b5fefab31d546086aebd7f166629d9d009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 17:35:41 +00:00 |
|
Bonian Chen
|
a9026bb486
|
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: I9c59270150584c596bb5b99c04523b171dda875e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 17:35:34 +00:00 |
|
Bonian Chen
|
5b79b590c4
|
Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90 am: 313284a9ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304
Change-Id: I40880131de703e446a06a5876438e4a8ab8bdcca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 17:35:27 +00:00 |
|
Yuri Lin
|
16a5535dd3
|
Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev am: 29c62e7873 am: 0e7619f290
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944009
Change-Id: I4b5a32189d034940faa1b136b23bf39661717c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 17:35:23 +00:00 |
|
Yuri Lin
|
8a3c983398
|
Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev am: 29c62e7873 am: b16261a8e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944009
Change-Id: I3218d36ca49c6ee373d4d81551dfd58e979c135b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 17:35:22 +00:00 |
|
Lais Andrade
|
4e60155f11
|
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: I39800c9e070c5e5420b291dc6fac1eb5c105c67a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 17:35:20 +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 |
|
Bonian Chen
|
fc454f31aa
|
Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e am: f211a82f23
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950673
Change-Id: I77667041b1b5d606a017e30f9e99f15d7ca0f625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 17:35:14 +00:00 |
|
Lais Andrade
|
ae1ae56fb2
|
Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb am: e673e22181
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337
Change-Id: If3074ab20444f5b592a9e2c026147d00f51f811b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 17:35:07 +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
|
966e1e8e49
|
Merge "Make the checkbox item large enough to click." into tm-dev am: 9fd4377ddb am: 54467e3eb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950068
Change-Id: I26aa356e6022d1f5ca6f2c369d21e3b491d6215f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 17:34:53 +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
|
313284a9ae
|
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: I343a94b53f92e403fdb70bb0d176c494faee3483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 16:43:53 +00:00 |
|
Yuri Lin
|
b16261a8e1
|
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: I1fadf7a04b661102fa55e7fec779aaa3e4d83c8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 16:43:46 +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
|
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 |
|
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 |
|