Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add missing settings strings" into tm-dev am: e1bcab3b51 am: 0a10b8cc8b am: 28218e2b73

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944324

Change-Id: I3d8676e87d9c6860ff117c5e571a0e6a011c7413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kholoud Mohamed
2022-05-05 09:51:21 +00:00
committed by Automerger Merge Worker
parent 30ab6065fb 28218e2b73
commit 488e74e5af
2 changed files with 58 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
core/java/android/app/admin/DevicePolicyResources.java
View File

@@ -862,12 +862,6 @@ public final class DevicePolicyResources {
public static final String REMOVE_AND_UNINSTALL_DEVICE_ADMIN =
PREFIX + "REMOVE_AND_UNINSTALL_DEVICE_ADMIN";
/**
* Title for selecting device admin apps
*/
public static final String SELECT_DEVICE_ADMIN_APPS =
PREFIX + "SELECT_DEVICE_ADMIN_APPS";
/**
* Message when there are no available device admin apps to display
*/
@@ -909,11 +903,6 @@ public final class DevicePolicyResources {
public static final String ACTIVE_DEVICE_ADMIN_WARNING =
PREFIX + "ACTIVE_DEVICE_ADMIN_WARNING";
/**
* Title for screen to set a profile owner
*/
public static final String SET_PROFILE_OWNER_TITLE = PREFIX + "SET_PROFILE_OWNER_TITLE";
/**
* Simplified title for dialog to set a profile owner
*/
@@ -1173,7 +1162,8 @@ public final class DevicePolicyResources {
/**
* Header for items under the personal user
*/
public static final String PERSONAL_CATEGORY_HEADER = PREFIX + "CATEGORY_PERSONAL";
public static final String PERSONAL_CATEGORY_HEADER =
PREFIX + "PERSONAL_CATEGORY_HEADER";
/**
* Text to indicate work notification content will be shown on the lockscreen.
@@ -1196,8 +1186,7 @@ public final class DevicePolicyResources {
/**
* Text for toggle to enable auto-sycing work data
*/
public static final String AUTO_SYNC_WORK_DATA = PREFIX
+ "AUTO_SYNC_WORK_DATA";
public static final String AUTO_SYNC_WORK_DATA = PREFIX + "AUTO_SYNC_WORK_DATA";
/**
* Summary for "More security settings" section when a work profile is on the device.
@@ -1212,11 +1201,18 @@ public final class DevicePolicyResources {
public static final String LOCK_SETTINGS_NEW_PROFILE_LOCK_TITLE = PREFIX
+ "LOCK_SETTINGS_NEW_PROFILE_LOCK_TITLE";
/**
* Title for screen asking the user to update the type of screen lock (such as a
* pattern, PIN, or password) that they need to enter to use their work apps
*/
public static final String LOCK_SETTINGS_UPDATE_PROFILE_LOCK_TITLE = PREFIX
+ "LOCK_SETTINGS_UPDATE_PROFILE_LOCK_TITLE";
/**
* Title for section listing information that can be seen by organization
*/
public static final String INFORMATION_SEEN_BY_ORGANIZATION_TITLE = PREFIX
+ "information_seen_by_organization_title";
+ "INFORMATION_SEEN_BY_ORGANIZATION_TITLE";
/**
* Title for section listing changes made by the organization.
@@ -1229,6 +1225,30 @@ public final class DevicePolicyResources {
*/
public static final String ENTERPRISE_PRIVACY_FOOTER =
PREFIX + "ENTERPRISE_PRIVACY_FOOTER";
/**
* Title for spell checker settings for work.
*/
public static final String SPELL_CHECKER_FOR_WORK =
PREFIX + "SPELL_CHECKER_FOR_WORK";
/**
* Title for personal dictionary for work settings.
*/
public static final String PERSONAL_DICTIONARY_FOR_WORK =
PREFIX + "PERSONAL_DICTIONARY_FOR_WORK";
/**
* Summary for switch preference to indicate it is disabled by the admin
*/
public static final String DISABLED_BY_ADMIN_SWITCH_SUMMARY =
PREFIX + "DISABLED_BY_ADMIN_SWITCH_SUMMARY";
/**
* Summary for switch preference to indicate it is enabled by the admin
*/
public static final String ENABLED_BY_ADMIN_SWITCH_SUMMARY =
PREFIX + "ENABLED_BY_ADMIN_SWITCH_SUMMARY";
}
/**

25
packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java
View File

@@ -16,10 +16,14 @@
package com.android.settingslib;
import static android.app.admin.DevicePolicyResources.Strings.Settings.DISABLED_BY_ADMIN_SWITCH_SUMMARY;
import static android.app.admin.DevicePolicyResources.Strings.Settings.ENABLED_BY_ADMIN_SWITCH_SUMMARY;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.annotation.NonNull;
import android.app.AppOpsManager;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.res.TypedArray;
import android.os.Process;
@@ -37,6 +41,8 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceViewHolder;
import androidx.preference.SwitchPreference;
import com.android.settingslib.utils.BuildCompatUtils;
/**
* Version of SwitchPreference that can be disabled by a device admin
* using a user restriction.
@@ -117,8 +123,13 @@ public class RestrictedSwitchPreference extends SwitchPreference {
CharSequence switchSummary;
if (mRestrictedSwitchSummary == null) {
switchSummary = getContext().getText(isChecked()
? R.string.enabled_by_admin : R.string.disabled_by_admin);
switchSummary = isChecked()
? getUpdatableEnterpriseString(
getContext(), ENABLED_BY_ADMIN_SWITCH_SUMMARY,
R.string.enabled_by_admin)
: getUpdatableEnterpriseString(
getContext(), DISABLED_BY_ADMIN_SWITCH_SUMMARY,
R.string.disabled_by_admin);
} else {
switchSummary = mRestrictedSwitchSummary;
}
@@ -153,6 +164,16 @@ public class RestrictedSwitchPreference extends SwitchPreference {
}
}
private static String getUpdatableEnterpriseString(
Context context, String updatableStringId, int resId) {
if (!BuildCompatUtils.isAtLeastT()) {
return context.getString(resId);
}
return context.getSystemService(DevicePolicyManager.class).getResources().getString(
updatableStringId,
() -> context.getString(resId));
}
@Override
public void performClick() {
if (!mHelper.performClick()) {