Stanley Wang
f781d8a02a
Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076
Change-Id: I72be188119ae313ba3908dd9c10c1e5e99ce7ef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:36:04 +00:00
Kweku Adams
59e93d5225
Merge "Make final factors configurable." into tm-dev am: 3663986909
am: 4c5cbeb882
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486
Change-Id: Ie840b13d8f234eb83978124781a4ff3796579da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:31:56 +00:00
Kweku Adams
5262325601
Merge "Make final factors configurable." into tm-dev am: 3663986909
am: 4c5cbeb882
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486
Change-Id: I20dad61683ad461bf3c16e15e3a49a54822cc7e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:30:50 +00:00
Stanley Wang
6ef0f6fed7
Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993
am: 5e5ea25a2b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076
Change-Id: Id58665699afa3a9382bd71a3720650cca9c55537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:30:22 +00:00
Xinyi Zhou
425316caae
Delete Fast Pair Settings am: 3438e20da1
am: 14c317a689
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: Id001dbcfca557ec12118f3d9fd3d513fb1f5eb1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:30:18 +00:00
Stanley Wang
602b1f3d9d
Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993
am: 5e5ea25a2b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076
Change-Id: Ia927700b1a9e593e6b04e10338fedfb9ce188bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:29:14 +00:00
Xinyi Zhou
d318a79c25
Delete Fast Pair Settings am: 3438e20da1
am: e2db47e9ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: I20ade5a70e7c36297c969cb4cc6725c74cd14882
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:27:59 +00:00
Xinyi Zhou
4be70892e9
Delete Fast Pair Settings am: 3438e20da1
am: e2db47e9ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: I44ecf5ea109b9a002a178f42d609a7fbf7bfcf1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:27:55 +00:00
Kweku Adams
4c5cbeb882
Merge "Make final factors configurable." into tm-dev am: 3663986909
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486
Change-Id: I1b843304bb15bb3b719dbf906a4b96c29b58264c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:02:23 +00:00
Stanley Wang
5e5ea25a2b
Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076
Change-Id: Iff5be7799232d27c83d1a826d94c559c4d117ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:01:48 +00:00
Kweku Adams
3663986909
Merge "Make final factors configurable." into tm-dev
2022-04-28 02:59:29 +00:00
Stanley Wang
0e861f0993
Merge "Fixe the problem of invalid switch preference." into tm-dev
2022-04-28 02:59:20 +00:00
Xinyi Zhou
e2db47e9ab
Delete Fast Pair Settings am: 3438e20da1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: I76dc3c719352bfd0441a03adef1407b147cee9df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 02:54:55 +00:00
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
aaf90b2592
Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90
am: 313284a9ae
am: 6ed05ee86f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304
Change-Id: I992cb714a5ba7ecd7773cf1d385d7a5abf89e67f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 18:05:11 +00:00
Automerger Merge Worker
1b777b7d8b
Merge "Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev am: 29c62e7873
am: b16261a8e1" into tm-d1-dev-plus-aosp am: 2e0303ef25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944009
Change-Id: Ibd7cf0196893c998b042bff3873ea604e5c4e5a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 18:05:05 +00:00
Bonian Chen
e09189620d
Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90
am: 935706425d
am: 3a21d96f32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304
Change-Id: I1ffbe2b734e365ffb4197f9485c36f233f3df708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 18:04:56 +00:00
Bonian Chen
6fdeff527b
Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e
am: dbbab09d11
am: a9026bb486
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950673
Change-Id: I66ae3de52ec0e2cd415d299691f259c45f704ae8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 18:04:49 +00:00
Yuri Lin
9bc2aff5d7
Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev am: 29c62e7873
am: 0e7619f290
am: 16a5535dd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944009
Change-Id: I6c091ce85dca6810db25cb5a3a51aeeefbf70c1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 18:04:35 +00:00
Lais Andrade
b34d581d2c
Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb
am: 9066672c7d
am: 4e60155f11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337
Change-Id: I85fca83fcf7e03b306277508da6d6b4880474f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 18:04:22 +00:00
Bonian Chen
0c22cd1ddd
Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e
am: f211a82f23
am: fc454f31aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950673
Change-Id: I39539a49e5d8e383976f61b0d63882fce717f7bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 18:04:15 +00:00
Lais Andrade
b760de645d
Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb
am: e673e22181
am: ae1ae56fb2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337
Change-Id: Id60b72fccac5d79ca86854d9109bd20d30899eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 18:03:51 +00:00
TreeHugger Robot
e0c25fddba
Merge "Make the checkbox item large enough to click." into tm-dev am: 9fd4377ddb
am: 54467e3eb8
am: 966e1e8e49
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950068
Change-Id: If903749685371471f3fdee44818dd55800412e9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 18:02:59 +00:00
Bonian Chen
14ccecd03b
Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90
am: 313284a9ae
am: 5b79b590c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304
Change-Id: I344d752191996e60dfbbed3151e8df0acba89ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 18:02:27 +00:00
Yuri Lin
727d912d0b
Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev am: 29c62e7873
am: b16261a8e1
am: 8a3c983398
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944009
Change-Id: I41f31d859bd28ea0ac1955fc345677293b0abea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 18:02:13 +00:00
Bonian Chen
3c4956b7c4
Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e
am: dbbab09d11
am: a725b0c3da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950673
Change-Id: Ie33fe0bbd2e508d7c3ce99160846cbe3da13c60b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 18:01:56 +00:00
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
Kweku Adams
d7189cc7ce
Make final factors configurable.
...
1. Add configuration support for the ongoing rewards (that are normally
less than 1 ARC).
2. Fix key/configuration of instant rewards
3. Fix UI string issue
Bug: 158300259
Bug: 189850067
Bug: 191876714
Bug: 191877052
Test: Use UI to change factors. Check Settings via adb and TARE dumpsys
Change-Id: I571e188faa6915ea74826b725c9883a825ab152a
2022-04-27 17:57:01 +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