diff --git a/res/values/strings.xml b/res/values/strings.xml index a50c51a5386..5cbdb603804 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -12032,20 +12032,44 @@ Financed device info - - Types of information your device administrator can see - - Data associated with your account, such as email and calendar info - - Changes made by your device administrator - - Device administrator can lock this device and reset password - - Device administrator can delete all device data - - Failed password attempts before deleting device data - - Your credit provider can change settings and install software on this device.\n\nTo learn more, contact your creditor provider. + + Your credit provider can change settings and install software on this device.\n\nIf you miss a payment, your device will be locked.\n\nTo learn more, contact your credit provider. + + If your device is financed, you can\u2019t: + + Install apps from outside the Play Store + + Reboot your device into safe mode + + Add multiple users to your device + + Change date, time, and time zones + + Use developer options + + Your credit provider can: + + Access your IMEI number + + Factory reset your device + + If your device is locked, you can only use it to: + + Make emergency calls + + View system info like date, time, network status, and battery + + Turn your device on or off + + View notifications & text messages + + Access apps that are allowed by the credit provider + + Once you pay the full amount: + + All restrictions are removed from the device + + You can uninstall the creditor app diff --git a/res/xml/financed_privacy_settings.xml b/res/xml/financed_privacy_settings.xml index 742d7e1e9eb..4e5a46a32af 100644 --- a/res/xml/financed_privacy_settings.xml +++ b/res/xml/financed_privacy_settings.xml @@ -19,66 +19,102 @@ xmlns:settings="http://schemas.android.com/apk/res-auto" android:title="@string/financed_privacy_settings"> - + + + + + + + + + + - + - + - - - - + android:layout_height="wrap_content" + android:title="@string/financed_privacy_factory_reset" + android:selectable="false" /> - - + + android:layout_height="wrap_content" + android:title="@string/financed_privacy_emergency_calls" + android:selectable="false" /> + + + + - - - - + + + - diff --git a/src/com/android/settings/enterprise/PrivacySettingsFinancedPreference.java b/src/com/android/settings/enterprise/PrivacySettingsFinancedPreference.java index 12901a63c15..8612f6a1314 100644 --- a/src/com/android/settings/enterprise/PrivacySettingsFinancedPreference.java +++ b/src/com/android/settings/enterprise/PrivacySettingsFinancedPreference.java @@ -20,10 +20,8 @@ import android.content.Context; import android.provider.SearchIndexableResource; import com.android.settings.R; -import com.android.settings.widget.PreferenceCategoryController; import com.android.settingslib.core.AbstractPreferenceController; -import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -61,18 +59,6 @@ public class PrivacySettingsFinancedPreference implements PrivacySettingsPrefere */ @Override public List createPreferenceControllers(boolean async) { - final List controllers = new ArrayList<>(); - controllers.add(new NetworkLogsPreferenceController(mContext)); - controllers.add(new BugReportsPreferenceController(mContext)); - controllers.add(new SecurityLogsPreferenceController(mContext)); - final List exposureChangesCategoryControllers = - new ArrayList<>(); - exposureChangesCategoryControllers.add(new EnterpriseInstalledPackagesPreferenceController( - mContext, async)); - controllers.addAll(exposureChangesCategoryControllers); - controllers.add(new PreferenceCategoryController(mContext, KEY_EXPOSURE_CHANGES_CATEGORY) - .setChildren(exposureChangesCategoryControllers)); - controllers.add(new FailedPasswordWipeCurrentUserPreferenceController(mContext)); - return controllers; + return Collections.emptyList(); } } diff --git a/tests/robotests/src/com/android/settings/enterprise/AbsBasePrivacySettingsPreference.java b/tests/robotests/src/com/android/settings/enterprise/AbsBasePrivacySettingsPreference.java index 5cf22248001..34b218a9ed4 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AbsBasePrivacySettingsPreference.java +++ b/tests/robotests/src/com/android/settings/enterprise/AbsBasePrivacySettingsPreference.java @@ -84,18 +84,6 @@ public abstract class AbsBasePrivacySettingsPreference { protected void verifyFinancedPreferenceControllers( List controllers) { - assertThat(controllers).isNotNull(); - assertThat(controllers.size()).isEqualTo(6); - int position = 0; - assertThat(controllers.get(position++)).isInstanceOf(NetworkLogsPreferenceController.class); - assertThat(controllers.get(position++)).isInstanceOf(BugReportsPreferenceController.class); - assertThat(controllers.get(position++)).isInstanceOf( - SecurityLogsPreferenceController.class); - assertThat(controllers.get(position++)).isInstanceOf( - EnterpriseInstalledPackagesPreferenceController.class); - assertThat(controllers.get(position++)).isInstanceOf( - PreferenceCategoryController.class); - assertThat(controllers.get(position)).isInstanceOf( - FailedPasswordWipeCurrentUserPreferenceController.class); + assertThat(controllers).isEmpty(); } }