Prabal Singh
4cdce44fac
Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e am: 7642301f28 am: f52e82eb8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601
Change-Id: I40a8b70116ad90a54c39f8b7405795141c894edd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:25:26 +00:00
Prabal Singh
f52e82eb8c
Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e am: 7642301f28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601
Change-Id: I7e08a7863af94ea3db2138797f18747e046b40ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:01:38 +00:00
Prabal Singh
7642301f28
Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601
Change-Id: I0e90fc35f7916ae920ce08a2da996d69e01cf80f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:51:44 +00:00
Prabal Singh
9a8f44227e
Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev
2022-04-28 17:12:28 +00:00
Prabal Singh
3e2d7f4581
Remove extra argument WorkPolicyUtil constructor
...
Only constructor is required for WorkPolicyInfo constructor. The other
dependencies can be derives
Test: make ROBOTEST_FILTER=EnterprisePrivacyFeatureProviderImplTest RunSettingsRoboTests -j40
Change-Id: I7f35e5ed344d452190b333aad7fa823a010d17b3
2022-04-28 15:21:18 +01:00
Bonian Chen
3a8315d562
Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f am: 69aa69a45d am: cb72c82a18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991
Change-Id: Ic685c3292694e5922de80aaefc6d0d080220a94c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 13:02:19 +00:00
Bonian Chen
ae297c8f19
Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f am: 69aa69a45d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991
Change-Id: Ia1fdd76b65c635d05f3bd74ab4d1ce687794cbf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 12:10:23 +00:00
Bonian Chen
cb72c82a18
Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f am: 69aa69a45d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991
Change-Id: Ibf8b08764cba09c5d72130fd4ecad37960ea2062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 12:10:11 +00:00
Bonian Chen
69aa69a45d
Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991
Change-Id: If187192b7619e4b0dea0b565fbc124651b235466
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 11:42:57 +00:00
Bonian Chen
f9be4c5a5c
Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991
Change-Id: I5f9c37b458f185ac261f182ae290950c2d2fe856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 11:41:24 +00:00
Bonian Chen
783314ae4f
Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev
2022-04-28 11:05:42 +00:00
PETER LIANG
75e30769c1
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 am: 17ddbadb74 am: 0109d6100e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953
Change-Id: Ib3397522957ead248821ca1d362b0a59de73053c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 09:15:15 +00:00
PETER LIANG
ec94752f9d
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 am: acdb3b8a60
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953
Change-Id: Ibd5b4a67660b826c0928b37bc9e6c3cd54ca9e2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 08:42:08 +00:00
PETER LIANG
0109d6100e
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 am: 17ddbadb74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953
Change-Id: If9b7ad6fcce1288eb5c39d1d6150df0e52a3696e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 08:40:23 +00:00
PETER LIANG
17ddbadb74
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953
Change-Id: I900480866ed1fb85fb7629223f37538c46ff11b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 07:53:30 +00:00
PETER LIANG
acdb3b8a60
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953
Change-Id: Ic8db083e3d479c6f85615c36113fa747ce10c62d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 07:51:22 +00:00
PETER LIANG
27aa5f9d94
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev
2022-04-28 06:45:11 +00:00
Kweku Adams
ac66727cde
Merge "Make final factors configurable." into tm-dev am: 3663986909 am: 4c5cbeb882 am: 5262325601
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486
Change-Id: I7db9edd6bd997cbc09a2c48379b9c35772a6ffe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 05:21:12 +00:00
Stanley Wang
bd50a87911
Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993 am: 5e5ea25a2b am: 602b1f3d9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076
Change-Id: I2b9c479450475ce46386ed21edfa415eff272430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 05:19:20 +00:00
Xinyi Zhou
815bbd8c1b
Delete Fast Pair Settings am: 3438e20da1 am: e2db47e9ab am: 4be70892e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: Ie978c707ae47ff97af937bcc114c5a362044aa8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 05:17:58 +00:00
Kweku Adams
664e3805a7
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: I9705e9019fb5a2ef096e1c7a8a8bb6a29bbba0e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:36:35 +00:00
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
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
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
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
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
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
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
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
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
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