Disable managed services special access screens...
... on low ram devices. - Remove them from the 'Special app access' screen - Display an error message if an app intents directly to them Bug: 35219985 Test: visual, and runtest --path ManagedAccessSettingsLowRamTest.java, when the device is in low ram mode and when it's not. Change-Id: Ied919cb248ae56683a00e3492c4737dfd00449ac
This commit is contained in:
@@ -98,6 +98,7 @@ public class Settings extends SettingsActivity {
|
||||
public static class DreamSettingsActivity extends SettingsActivity { /* empty */ }
|
||||
public static class NotificationStationActivity extends SettingsActivity { /* empty */ }
|
||||
public static class UserSettingsActivity extends SettingsActivity { /* empty */ }
|
||||
public static class SpecialAccessSettingsActivity extends SettingsActivity { /* empty */ }
|
||||
public static class NotificationAccessSettingsActivity extends SettingsActivity { /* empty */ }
|
||||
public static class VrListenersSettingsActivity extends SettingsActivity { /* empty */ }
|
||||
public static class PictureInPictureSettingsActivity extends SettingsActivity { /* empty */ }
|
||||
|
@@ -14,8 +14,11 @@
|
||||
|
||||
package com.android.settings.applications;
|
||||
|
||||
import android.app.ActivityManager;
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
import android.provider.SearchIndexableResource;
|
||||
import android.support.v7.preference.Preference;
|
||||
|
||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
@@ -31,6 +34,9 @@ public class SpecialAccessSettings extends DashboardFragment {
|
||||
|
||||
private static final String TAG = "SpecialAccessSettings";
|
||||
|
||||
private static final String[] DISABLED_FEATURES_LOW_RAM =
|
||||
new String[] {"notification_access", "zen_access", "enabled_vr_listeners"};
|
||||
|
||||
@Override
|
||||
protected String getLogTag() {
|
||||
return TAG;
|
||||
@@ -41,6 +47,20 @@ public class SpecialAccessSettings extends DashboardFragment {
|
||||
return R.xml.special_access;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle icicle) {
|
||||
super.onCreate(icicle);
|
||||
|
||||
if (ActivityManager.isLowRamDeviceStatic()) {
|
||||
for (String disabledFeature : DISABLED_FEATURES_LOW_RAM) {
|
||||
Preference pref = findPreference(disabledFeature);
|
||||
if (pref != null) {
|
||||
removePreference(disabledFeature);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<PreferenceController> getPreferenceControllers(Context context) {
|
||||
return null;
|
||||
|
@@ -53,6 +53,7 @@ import com.android.settings.applications.PictureInPictureDetails;
|
||||
import com.android.settings.applications.PictureInPictureSettings;
|
||||
import com.android.settings.applications.ProcessStatsSummary;
|
||||
import com.android.settings.applications.ProcessStatsUi;
|
||||
import com.android.settings.applications.SpecialAccessSettings;
|
||||
import com.android.settings.applications.UsageAccessDetails;
|
||||
import com.android.settings.applications.VrListenerSettings;
|
||||
import com.android.settings.applications.WriteSettingsDetails;
|
||||
@@ -189,6 +190,7 @@ public class SettingsGateway {
|
||||
DataUsageSummary.class.getName(),
|
||||
DreamSettings.class.getName(),
|
||||
UserSettings.class.getName(),
|
||||
SpecialAccessSettings.class.getName(),
|
||||
NotificationAccessSettings.class.getName(),
|
||||
ZenAccessSettings.class.getName(),
|
||||
PrintSettingsFragment.class.getName(),
|
||||
|
@@ -16,21 +16,18 @@
|
||||
|
||||
package com.android.settings.notification;
|
||||
|
||||
import android.app.ActivityManager;
|
||||
import android.app.AlertDialog;
|
||||
import android.app.Dialog;
|
||||
import android.app.Fragment;
|
||||
import android.app.NotificationManager;
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.os.AsyncTask;
|
||||
import android.os.Bundle;
|
||||
import android.provider.Settings;
|
||||
import android.service.notification.NotificationListenerService;
|
||||
import android.util.Log;
|
||||
|
||||
import com.android.internal.annotations.VisibleForTesting;
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
|
||||
|
@@ -92,19 +92,25 @@ public class ZenAccessSettings extends EmptyTextSettings {
|
||||
@Override
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
reloadList();
|
||||
getContentResolver().registerContentObserver(
|
||||
Secure.getUriFor(Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES), false,
|
||||
mObserver);
|
||||
getContentResolver().registerContentObserver(
|
||||
Secure.getUriFor(Secure.ENABLED_NOTIFICATION_LISTENERS), false,
|
||||
mObserver);
|
||||
if (!ActivityManager.isLowRamDeviceStatic()) {
|
||||
reloadList();
|
||||
getContentResolver().registerContentObserver(
|
||||
Secure.getUriFor(Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES), false,
|
||||
mObserver);
|
||||
getContentResolver().registerContentObserver(
|
||||
Secure.getUriFor(Secure.ENABLED_NOTIFICATION_LISTENERS), false,
|
||||
mObserver);
|
||||
} else {
|
||||
setEmptyText(R.string.disabled_low_ram_device);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPause() {
|
||||
super.onPause();
|
||||
getContentResolver().unregisterContentObserver(mObserver);
|
||||
if (!ActivityManager.isLowRamDeviceStatic()) {
|
||||
getContentResolver().unregisterContentObserver(mObserver);
|
||||
}
|
||||
}
|
||||
|
||||
private void reloadList() {
|
||||
|
@@ -17,6 +17,7 @@
|
||||
package com.android.settings.utils;
|
||||
|
||||
import android.annotation.Nullable;
|
||||
import android.app.ActivityManager;
|
||||
import android.app.AlertDialog;
|
||||
import android.app.Dialog;
|
||||
import android.app.Fragment;
|
||||
@@ -91,8 +92,12 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings {
|
||||
@Override
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
mServiceListing.reload();
|
||||
mServiceListing.setListening(true);
|
||||
if (!ActivityManager.isLowRamDeviceStatic()) {
|
||||
mServiceListing.reload();
|
||||
mServiceListing.setListening(true);
|
||||
} else {
|
||||
setEmptyText(R.string.disabled_low_ram_device);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -230,7 +235,6 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings {
|
||||
public static class Config {
|
||||
public String tag;
|
||||
public String setting;
|
||||
public String secondarySetting;
|
||||
public String intentAction;
|
||||
public String permission;
|
||||
public String noun;
|
||||
|
Reference in New Issue
Block a user