Commit Graph

42133 Commits

Author SHA1 Message Date
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
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
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
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
Calvin Pan
049aa73cb1 Add unit test for AppLocalePickerActivity
Bug: 223503670
Test: atest
Change-Id: I0e92be43d661dd3bff19c3274d1572ef1f4e9c46
2022-04-28 08:15:34 +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
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
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
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
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
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
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
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
Yuri Lin
646e9e4ff8 Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure
This is a global setting that is not per-user, so adjusting it accordingly.

Bug: 225373531
Test: manual
Change-Id: I100cd53a5ffef6ce5f9a01e6add9465a00ceaeb5
2022-04-27 14:31:20 +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
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
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
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
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
Stanley Wang
4ff1183209 Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47 am: 6a58c2faf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767

Change-Id: I95ed08b9518cba1a747185726115f6802e842f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 07:40:10 +00:00
Peter_Liang
fcce62aa77 Logging for the feature "Text and reading options" in Android T.
Logging for the status of five features “Font size”, “Display size”, “Bold Text”, “High contrast text”, and “Reset” in the “Display size and text” page.

Bug: 222661478
Test: manual test
Change-Id: I33060fca860e02ddac7716275e8682e70fbaff1f
2022-04-27 15:25:30 +08:00
Stanley Wang
6a58c2faf1 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: I0189eb7313984ec4989c6febde3b0e977ddb7ecf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 07:22:28 +00: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
TreeHugger Robot
3db1366221 Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9 am: a715a3c7b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674

Change-Id: I0ddd7a373275fe9be0eb3b008ce8f514bb376b4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 06:52:01 +00:00
TreeHugger Robot
a715a3c7b9 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: I08aee9acbacc7d48ddb69c00f56d8111e1e34393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 06:20:28 +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