PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update layout and strings for DO Disclosures"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-09 12:33:05 +00:00
committed by Android (Google) Code Review
parent 5ec2747426 1a8399ffd0
commit a7e95c27fe
34 changed files with 235 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java
View File

@@ -40,7 +40,7 @@ public abstract class AdminActionPreferenceControllerBase extends PreferenceCont
public void updateState(Preference preference) {
final Date timestamp = getAdminActionTimestamp();
preference.setSummary(timestamp == null ?
mContext.getString(R.string.enterprise_privacy_never) :
mContext.getString(R.string.enterprise_privacy_none) :
DateUtils.formatDateTime(mContext, timestamp.getTime(),
DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_SHOW_DATE));
}

5
src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceController.java
View File

@@ -17,8 +17,6 @@ package com.android.settings.enterprise;
import android.Manifest;
import android.content.Context;
import com.android.settings.R;
public class AdminGrantedCameraPermissionPreferenceController extends
AdminGrantedPermissionsPreferenceControllerBase {
@@ -26,8 +24,7 @@ public class AdminGrantedCameraPermissionPreferenceController extends
= "enterprise_privacy_number_camera_access_packages";
public AdminGrantedCameraPermissionPreferenceController(Context context) {
super(context, new String[] {Manifest.permission.CAMERA},
R.plurals.enterprise_privacy_number_camera_access_packages);
super(context, new String[] {Manifest.permission.CAMERA});
}
@Override

5
src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceController.java
View File

@@ -17,8 +17,6 @@ package com.android.settings.enterprise;
import android.Manifest;
import android.content.Context;
import com.android.settings.R;
public class AdminGrantedLocationPermissionsPreferenceController extends
AdminGrantedPermissionsPreferenceControllerBase {
@@ -27,8 +25,7 @@ public class AdminGrantedLocationPermissionsPreferenceController extends
public AdminGrantedLocationPermissionsPreferenceController(Context context) {
super(context, new String[] {Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.ACCESS_FINE_LOCATION},
R.plurals.enterprise_privacy_number_location_access_packages);
Manifest.permission.ACCESS_FINE_LOCATION});
}
@Override

5
src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceController.java
View File

@@ -17,8 +17,6 @@ package com.android.settings.enterprise;
import android.Manifest;
import android.content.Context;
import com.android.settings.R;
public class AdminGrantedMicrophonePermissionPreferenceController extends
AdminGrantedPermissionsPreferenceControllerBase {
@@ -26,8 +24,7 @@ public class AdminGrantedMicrophonePermissionPreferenceController extends
= "enterprise_privacy_number_microphone_access_packages";
public AdminGrantedMicrophonePermissionPreferenceController(Context context) {
super(context, new String[] {Manifest.permission.RECORD_AUDIO},
R.plurals.enterprise_privacy_number_microphone_access_packages);
super(context, new String[] {Manifest.permission.RECORD_AUDIO});
}
@Override

10
src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
View File

@@ -18,6 +18,7 @@ import android.content.Context;
import android.content.res.Resources;
import android.support.v7.preference.Preference;
import com.android.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.core.PreferenceController;
import com.android.settings.overlay.FeatureFactory;
@@ -25,14 +26,11 @@ import com.android.settings.overlay.FeatureFactory;
public abstract class AdminGrantedPermissionsPreferenceControllerBase extends PreferenceController {
private final String[] mPermissions;
private final int mStringResourceId;
private final ApplicationFeatureProvider mFeatureProvider;
public AdminGrantedPermissionsPreferenceControllerBase(Context context, String[] permissions,
int stringResourceId) {
public AdminGrantedPermissionsPreferenceControllerBase(Context context, String[] permissions) {
super(context);
mPermissions = permissions;
mStringResourceId = stringResourceId;
mFeatureProvider = FeatureFactory.getFactory(context)
.getApplicationFeatureProvider(context);
}
@@ -45,8 +43,8 @@ public abstract class AdminGrantedPermissionsPreferenceControllerBase extends Pr
preference.setVisible(false);
} else {
preference.setVisible(true);
preference.setTitle(mContext.getResources().getQuantityString(
mStringResourceId, num, num));
preference.setSummary(mContext.getResources().getQuantityString(
R.plurals.enterprise_privacy_number_packages, num, num));
}
});
}

6
src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java
View File

@@ -41,8 +41,10 @@ public class CaCertsCurrentUserPreferenceController extends PreferenceController
return;
}
preference.setTitle(mContext.getResources().getQuantityString(
mFeatureProvider.isInCompMode() ? R.plurals.enterprise_privacy_ca_certs_personal
: R.plurals.enterprise_privacy_ca_certs_user, certs, certs));
mFeatureProvider.isInCompMode() ? R.plurals.enterprise_privacy_ca_certs_personal :
R.plurals.enterprise_privacy_ca_certs_user, certs));
preference.setSummary(mContext.getResources().getQuantityString(
R.plurals.enterprise_privacy_number_ca_certs, certs, certs));
preference.setVisible(true);
}

4
src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java
View File

@@ -41,7 +41,9 @@ public class CaCertsManagedProfilePreferenceController extends PreferenceControl
return;
}
preference.setTitle(mContext.getResources().getQuantityString(
R.plurals.enterprise_privacy_ca_certs_work, certs, certs));
R.plurals.enterprise_privacy_ca_certs_work, certs));
preference.setSummary(mContext.getResources().getQuantityString(
R.plurals.enterprise_privacy_number_ca_certs, certs, certs));
preference.setVisible(true);
}

5
src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
View File

@@ -44,9 +44,8 @@ public class EnterpriseInstalledPackagesPreferenceController extends PreferenceC
preference.setVisible(false);
} else {
preference.setVisible(true);
preference.setTitle(mContext.getResources().getQuantityString(
R.plurals.enterprise_privacy_number_enterprise_installed_packages,
num, num));
preference.setSummary(mContext.getResources().getQuantityString(
R.plurals.enterprise_privacy_number_packages, num, num));
}
});
}

5
src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
View File

@@ -68,9 +68,8 @@ public class EnterpriseSetDefaultAppsPreferenceController extends PreferenceCont
preference.setVisible(false);
} else {
preference.setVisible(true);
preference.setTitle(mContext.getResources().getQuantityString(
R.plurals.enterprise_privacy_number_enterprise_set_default_apps,
num, num));
preference.setSummary(mContext.getResources().getQuantityString(
R.plurals.enterprise_privacy_number_packages, num, num));
}
}

4
src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceController.java
View File

@@ -15,8 +15,6 @@ package com.android.settings.enterprise;
import android.content.Context;
import com.android.settings.R;
public class FailedPasswordWipeManagedProfilePreferenceController
extends FailedPasswordWipePreferenceControllerBase {
@@ -24,7 +22,7 @@ public class FailedPasswordWipeManagedProfilePreferenceController
= "failed_password_wipe_managed_profile";
public FailedPasswordWipeManagedProfilePreferenceController(Context context) {
super(context, R.plurals.enterprise_privacy_failed_password_wipe_work);
super(context);
}
@Override

10
src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
View File

@@ -18,17 +18,16 @@ import android.content.Context;
import android.content.res.Resources;
import android.support.v7.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.overlay.FeatureFactory;
public abstract class FailedPasswordWipePreferenceControllerBase extends PreferenceController {
private final int mStringResourceId;
protected final EnterprisePrivacyFeatureProvider mFeatureProvider;
public FailedPasswordWipePreferenceControllerBase(Context context, int stringResourceId) {
public FailedPasswordWipePreferenceControllerBase(Context context) {
super(context);
mStringResourceId = stringResourceId;
mFeatureProvider = FeatureFactory.getFactory(context)
.getEnterprisePrivacyFeatureProvider(context);
}
@@ -42,8 +41,9 @@ public abstract class FailedPasswordWipePreferenceControllerBase extends Prefere
preference.setVisible(false);
} else {
preference.setVisible(true);
preference.setTitle(mContext.getResources().getQuantityString(
mStringResourceId, failedPasswordsBeforeWipe, failedPasswordsBeforeWipe));
preference.setSummary(mContext.getResources().getQuantityString(
R.plurals.enterprise_privacy_number_failed_password_wipe,
failedPasswordsBeforeWipe, failedPasswordsBeforeWipe));
}
}

4
src/com/android/settings/enterprise/FailedPasswordWipePrimaryUserPreferenceController.java
View File

@@ -15,8 +15,6 @@ package com.android.settings.enterprise;
import android.content.Context;
import com.android.settings.R;
public class FailedPasswordWipePrimaryUserPreferenceController
extends FailedPasswordWipePreferenceControllerBase {
@@ -24,7 +22,7 @@ public class FailedPasswordWipePrimaryUserPreferenceController
= "failed_password_wipe_primary_user";
public FailedPasswordWipePrimaryUserPreferenceController(Context context) {
super(context, R.plurals.enterprise_privacy_failed_password_wipe_device);
super(context);
}
@Override

4
src/com/android/settings/enterprise/ImePreferenceController.java
View File

@@ -40,8 +40,8 @@ public class ImePreferenceController extends PreferenceController {
preference.setVisible(false);
return;
}
preference.setTitle(mContext.getResources().getString(
R.string.enterprise_privacy_input_method, ownerSetIme));
preference.setSummary(mContext.getResources().getString(
R.string.enterprise_privacy_input_method_name, ownerSetIme));
preference.setVisible(true);
}

12
src/com/android/settings/enterprise/InstalledPackagesPreferenceController.java
View File

@@ -24,7 +24,7 @@ import com.android.settings.overlay.FeatureFactory;
public class InstalledPackagesPreferenceController extends PreferenceController {
private static final String KEY_NUMBER_INSTALLED_PACKAGES = "number_installed_packages";
private static final String KEY_INSTALLED_PACKAGES = "installed_packages";
private final ApplicationFeatureProvider mFeatureProvider;
public InstalledPackagesPreferenceController(Context context) {
@@ -38,8 +38,12 @@ public class InstalledPackagesPreferenceController extends PreferenceController
mFeatureProvider.calculateNumberOfInstalledApps(
ApplicationFeatureProvider.IGNORE_INSTALL_REASON,
(num) -> {
preference.setTitle(mContext.getResources().getQuantityString(
R.plurals.enterprise_privacy_number_installed_packages, num, num));
if (num == 0) {
preference.setSummary("");
} else {
preference.setSummary(mContext.getResources().getQuantityString(
R.plurals.enterprise_privacy_number_packages, num, num));
}
});
}
@@ -50,6 +54,6 @@ public class InstalledPackagesPreferenceController extends PreferenceController
@Override
public String getPreferenceKey() {
return KEY_NUMBER_INSTALLED_PACKAGES;
return KEY_INSTALLED_PACKAGES;
}
}