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

Merge "Home default setting should not shown in managed profile settings" into nyc-dev

Browse Source
This commit is contained in:
Tony Mak
2016-02-17 21:43:02 +00:00
committed by Android (Google) Code Review
parent 2bf0f59048 0e19d2420b
commit 6e7cfdda79
9 changed files with 171 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/applications/DefaultBrowserPreference.java
View File

@@ -25,6 +25,7 @@ import android.os.UserHandle;
import android.util.AttributeSet;
import com.android.settings.AppListPreference;
import com.android.settings.PreferenceAvailabilityProvider;
import java.util.ArrayList;
import java.util.List;
@@ -72,4 +73,11 @@ public class DefaultBrowserPreference extends AppListPreference {
return result;
}
public static class AvailabilityProvider implements PreferenceAvailabilityProvider {
@Override
public boolean isAvailable(Context context) {
return true;
}
}
}

23
src/com/android/settings/applications/DefaultEmergencyPreference.java
View File

@@ -32,6 +32,7 @@ import android.util.ArraySet;
import android.util.AttributeSet;
import com.android.settings.AppListPreference;
import com.android.settings.PreferenceAvailabilityProvider;
import com.android.settings.Utils;
import java.util.List;
@@ -51,10 +52,7 @@ public class DefaultEmergencyPreference extends AppListPreference {
public DefaultEmergencyPreference(Context context, AttributeSet attrs) {
super(context, attrs);
mContentResolver = context.getContentResolver();
if (isAvailable(context)) {
load();
}
load();
}
@Override
@@ -135,13 +133,7 @@ public class DefaultEmergencyPreference extends AppListPreference {
return packages;
}
public static boolean isAvailable(Context context) {
return isCapable(context)
&& context.getPackageManager().resolveActivity(QUERY_INTENT, 0) != null
&& !Utils.isManagedProfile(UserManager.get(context)) ;
}
public static boolean isCapable(Context context) {
private static boolean isCapable(Context context) {
return TelephonyManager.EMERGENCY_ASSISTANCE_ENABLED
&& context.getResources().getBoolean(
com.android.internal.R.bool.config_voice_capable);
@@ -151,4 +143,13 @@ public class DefaultEmergencyPreference extends AppListPreference {
return info.applicationInfo != null
&& (info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
}
public static class AvailabilityProvider implements PreferenceAvailabilityProvider {
@Override
public boolean isAvailable(Context context) {
return isCapable(context)
&& context.getPackageManager().resolveActivity(QUERY_INTENT, 0) != null
&& !Utils.isManagedProfile(UserManager.get(context));
}
}
}

9
src/com/android/settings/applications/DefaultHomePreference.java
View File

@@ -26,8 +26,11 @@ import android.content.pm.UserInfo;
import android.os.Build;
import android.os.UserManager;
import android.util.AttributeSet;
import com.android.settings.AppListPreference;
import com.android.settings.PreferenceAvailabilityProvider;
import com.android.settings.R;
import com.android.settings.Utils;
import java.util.ArrayList;
import java.util.List;
@@ -115,4 +118,10 @@ public class DefaultHomePreference extends AppListPreference {
return false;
}
public static class AvailabilityProvider implements PreferenceAvailabilityProvider {
@Override
public boolean isAvailable(Context context) {
return !Utils.isManagedProfile(UserManager.get(context));
}
}
}

8
src/com/android/settings/applications/DefaultNotificationAssistantPreference.java
View File

@@ -34,6 +34,7 @@ import android.util.Slog;
import java.util.ArrayList;
import java.util.List;
import com.android.settings.PreferenceAvailabilityProvider;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.notification.ManagedServiceSettings;
@@ -111,7 +112,10 @@ public class DefaultNotificationAssistantPreference extends AppListPreference {
return c;
}
public static boolean isAvailable(Context context) {
return !Utils.isManagedProfile(UserManager.get(context));
public static class AvailabilityProvider implements PreferenceAvailabilityProvider {
@Override
public boolean isAvailable(Context context) {
return !Utils.isManagedProfile(UserManager.get(context));
}
}
}

28
src/com/android/settings/applications/DefaultPhonePreference.java
View File

@@ -25,6 +25,8 @@ import android.text.TextUtils;
import android.util.AttributeSet;
import com.android.settings.AppListPreference;
import com.android.settings.PreferenceAvailabilityProvider;
import com.android.settings.Utils;
import java.util.List;
import java.util.Objects;
@@ -36,9 +38,7 @@ public class DefaultPhonePreference extends AppListPreference {
super(context, attrs);
mContext = context.getApplicationContext();
if (isAvailable(context)) {
loadDialerApps();
}
loadDialerApps();
}
@Override
@@ -65,15 +65,19 @@ public class DefaultPhonePreference extends AppListPreference {
return DefaultDialerManager.getDefaultDialerApplication(getContext());
}
public static boolean isAvailable(Context context) {
final TelephonyManager tm =
(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
if (!tm.isVoiceCapable()) {
return false;
}
public static class AvailabilityProvider implements PreferenceAvailabilityProvider {
@Override
public boolean isAvailable(Context context) {
final UserManager um =
(UserManager) context.getSystemService(Context.USER_SERVICE);
return !um.hasUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS);
final TelephonyManager tm =
(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
if (!tm.isVoiceCapable()) {
return false;
}
final UserManager um =
(UserManager) context.getSystemService(Context.USER_SERVICE);
return !um.hasUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS);
}
}
}

18
src/com/android/settings/applications/DefaultSmsPreference.java
View File

@@ -17,6 +17,7 @@ package com.android.settings.applications;
import android.content.ComponentName;
import android.content.Context;
import android.os.UserHandle;
import android.os.UserManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
@@ -25,6 +26,7 @@ import android.util.AttributeSet;
import com.android.internal.telephony.SmsApplication;
import com.android.internal.telephony.SmsApplication.SmsApplicationData;
import com.android.settings.AppListPreference;
import com.android.settings.PreferenceAvailabilityProvider;
import com.android.settings.Utils;
import java.util.Collection;
@@ -68,10 +70,18 @@ public class DefaultSmsPreference extends AppListPreference {
return true;
}
public static boolean isAvailable(Context context) {
TelephonyManager tm =
(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
return tm.isSmsCapable() && !Utils.isManagedProfile(UserManager.get(context));
public static class AvailabilityProvider implements PreferenceAvailabilityProvider {
@Override
public boolean isAvailable(Context context) {
boolean isRestrictedUser =
UserManager.get(context)
.getUserInfo(UserHandle.myUserId()).isRestricted();
TelephonyManager tm =
(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
return !isRestrictedUser
&& tm.isSmsCapable()
&& !Utils.isManagedProfile(UserManager.get(context));
}
}
}

8
src/com/android/settings/applications/ManageAssist.java
View File

@@ -28,6 +28,7 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.PreferenceAvailabilityProvider;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
@@ -179,7 +180,10 @@ public class ManageAssist extends SettingsPreferenceFragment
updateUi();
}
public static boolean isAvailable(Context context) {
return !Utils.isManagedProfile(UserManager.get(context));
public static class AvailabilityProvider implements PreferenceAvailabilityProvider {
@Override
public boolean isAvailable(Context context) {
return !Utils.isManagedProfile(UserManager.get(context));
}
}
}

107
src/com/android/settings/applications/ManageDefaultApps.java
View File

@@ -24,15 +24,17 @@ import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.SearchIndexableResource;
import android.provider.Settings;
import android.support.v4.util.ArrayMap;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;
import android.util.Log;
import com.android.internal.content.PackageMonitor;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.PreferenceAvailabilityProvider;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Index;
@@ -48,18 +50,23 @@ public class ManageDefaultApps extends ProfileSettingsPreferenceFragment
private static final String TAG = ManageDefaultApps.class.getSimpleName();
private static final String KEY_DEFAULT_HOME = "default_home";
private static final String KEY_ASSIST_AND_VOICE_INPUT = "assist_and_voice_input";
private static final String KEY_DEFAULT_BROWSER = "default_browser";
private static final String KEY_DEFAULT_PHONE_APP = "default_phone_app";
private static final String KEY_DEFAULT_EMERGENCY_APP = "default_emergency_app";
private static final String KEY_SMS_APPLICATION = "default_sms_app";
private static final String KEY_DEFAULT_NOTIFICATION_ASST = "default_notification_asst_app";
private static final String[] PREFERENCE_KEYS = new String[] {
KEY_DEFAULT_HOME, KEY_ASSIST_AND_VOICE_INPUT, KEY_DEFAULT_BROWSER,
KEY_DEFAULT_PHONE_APP, KEY_DEFAULT_EMERGENCY_APP, KEY_SMS_APPLICATION,
KEY_DEFAULT_NOTIFICATION_ASST
};
private DefaultBrowserPreference mDefaultBrowserPreference;
private PackageManager mPm;
private int myUserId;
private static final long DELAY_UPDATE_BROWSER_MILLIS = 500;
private final Handler mHandler = new Handler();
@@ -140,6 +147,7 @@ public class ManageDefaultApps extends ProfileSettingsPreferenceFragment
new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
if (newValue == null) {
return false;
}
@@ -157,35 +165,65 @@ public class ManageDefaultApps extends ProfileSettingsPreferenceFragment
return result;
}
});
final boolean isRestrictedUser = UserManager.get(getActivity())
.getUserInfo(myUserId).isRestricted();
// Restricted users cannot currently read/write SMS.
// Remove SMS Application if the device does not support SMS
if (isRestrictedUser || !DefaultSmsPreference.isAvailable(getActivity())) {
removePreference(KEY_SMS_APPLICATION);
}
updatePreferenceVisibility();
// Update the index.
Index.getInstance(getActivity()).updateFromClassNameResource(
ManageDefaultApps.class.getName(), true, true);
}
if (!DefaultPhonePreference.isAvailable(getActivity())) {
removePreference(KEY_DEFAULT_PHONE_APP);
/**
* Iterate all preferences and hide it if it is unavailable.
*/
private void updatePreferenceVisibility() {
PreferenceScreen preferenceScreen = getPreferenceScreen();
int count = preferenceScreen.getPreferenceCount();
List<String> preferenceKeys = new ArrayList<>();
for (int i = 0; i < count; i++) {
String preferenceKey = preferenceScreen.getPreference(i).getKey();
if (!TextUtils.isEmpty(preferenceKey)) {
preferenceKeys.add(preferenceKey);
}
}
for (String preferenceKey : preferenceKeys) {
boolean isAvailable = getPreferenceAvailability(getContext(), preferenceKey);
if (!isAvailable) {
Preference preference = preferenceScreen.findPreference(preferenceKey);
preferenceScreen.removePreference(preference);
}
}
}
if (!DefaultEmergencyPreference.isAvailable(getActivity())) {
removePreference(KEY_DEFAULT_EMERGENCY_APP);
}
/**
* Get availability of preference from {@link PreferenceAvailabilityProvider}.
*/
private static boolean getPreferenceAvailability(Context context,
String preferenceKey) {
// Consider the preference is unavailable if no corresponding provider is found.
PreferenceAvailabilityProvider provider = getPreferenceAvailabilityProvider(preferenceKey);
return (provider == null) ? false : provider.isAvailable(context);
}
if (!ManageAssist.isAvailable(getActivity())) {
removePreference(KEY_ASSIST_AND_VOICE_INPUT);
}
if (!DefaultNotificationAssistantPreference.isAvailable(getActivity())) {
removePreference(KEY_DEFAULT_NOTIFICATION_ASST);
}
if (DefaultEmergencyPreference.isCapable(getActivity())) {
Index.getInstance(getActivity()).updateFromClassNameResource(
ManageDefaultApps.class.getName(), true, true);
private static PreferenceAvailabilityProvider getPreferenceAvailabilityProvider(
String preferenceKey) {
switch (preferenceKey) {
case KEY_ASSIST_AND_VOICE_INPUT:
return new ManageAssist.AvailabilityProvider();
case KEY_DEFAULT_BROWSER:
return new DefaultBrowserPreference.AvailabilityProvider();
case KEY_DEFAULT_EMERGENCY_APP:
return new DefaultEmergencyPreference.AvailabilityProvider();
case KEY_DEFAULT_HOME:
return new DefaultHomePreference.AvailabilityProvider();
case KEY_DEFAULT_NOTIFICATION_ASST:
return new DefaultNotificationAssistantPreference.AvailabilityProvider();
case KEY_DEFAULT_PHONE_APP:
return new DefaultPhonePreference.AvailabilityProvider();
case KEY_SMS_APPLICATION:
return new DefaultSmsPreference.AvailabilityProvider();
}
Log.w(TAG, "getPreferenceAvailabilityProvider: Cannot find provider for " + preferenceKey);
return null;
}
@Override
@@ -224,19 +262,14 @@ public class ManageDefaultApps extends ProfileSettingsPreferenceFragment
@Override
public List<String> getNonIndexableKeys(Context context) {
final ArrayList<String> result = new ArrayList<String>();
// Remove SMS Application if the device does not support SMS
final boolean isRestrictedUser = UserManager.get(context)
.getUserInfo(UserHandle.myUserId()).isRestricted();
if (!DefaultSmsPreference.isAvailable(context) || isRestrictedUser) {
result.add(KEY_SMS_APPLICATION);
// Iterate all preferences to see which is not available.
final ArrayList<String> result = new ArrayList<>();
for (String key : PREFERENCE_KEYS) {
boolean isAvailable = getPreferenceAvailability(context, key);
if (!isAvailable) {
result.add(key);
}
}
if (!DefaultEmergencyPreference.isAvailable(context)) {
result.add(KEY_DEFAULT_EMERGENCY_APP);
}
return result;
}
};