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

Merge "Initial screens for Storage Access."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-16 19:14:58 +00:00
committed by Android (Google) Code Review
parent 80fa91891e 7a0ad2b30f
commit a35adb12f0
9 changed files with 250 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
View File

@@ -23,6 +23,7 @@ import com.android.settings.applications.AppStateInstallAppsBridge;
import com.android.settings.applications.AppStateNotificationBridge;
import com.android.settings.applications.AppStateOverlayBridge;
import com.android.settings.applications.AppStatePowerBridge;
import com.android.settings.applications.AppStateStorageAccessBridge;
import com.android.settings.applications.AppStateUsageBridge;
import com.android.settings.applications.AppStateWriteSettingsBridge;
import com.android.settingslib.applications.ApplicationsState;
@@ -65,14 +66,15 @@ public class AppFilterRegistry {
public static final int FILTER_APPS_WITH_OVERLAY = 10;
public static final int FILTER_APPS_WRITE_SETTINGS = 11;
public static final int FILTER_APPS_INSTALL_SOURCES = 12;
// Next id: 13
public static final int FILTER_APP_HAS_STORAGE_ACCESS = 13;
// Next id: 14
private static AppFilterRegistry sRegistry;
private final AppFilterItem[] mFilters;
private AppFilterRegistry() {
mFilters = new AppFilterItem[13];
mFilters = new AppFilterItem[14];
// High power whitelist, on
mFilters[FILTER_APPS_POWER_WHITELIST] = new AppFilterItem(
@@ -155,6 +157,12 @@ public class AppFilterRegistry {
AppStateInstallAppsBridge.FILTER_APP_SOURCES,
FILTER_APPS_INSTALL_SOURCES,
R.string.filter_install_sources_apps);
// Apps that interacted with storage access permissions (A.K.A. Scoped Directory Access)
mFilters[FILTER_APP_HAS_STORAGE_ACCESS] = new AppFilterItem(
AppStateStorageAccessBridge.FILTER_APP_HAS_STORAGE_ACCESS,
FILTER_APP_HAS_STORAGE_ACCESS,
R.string.filter_install_sources_apps);
}
public static AppFilterRegistry getInstance() {
@@ -177,6 +185,8 @@ public class AppFilterRegistry {
return FILTER_APPS_WRITE_SETTINGS;
case ManageApplications.LIST_TYPE_MANAGE_SOURCES:
return FILTER_APPS_INSTALL_SOURCES;
case ManageApplications.LIST_TYPE_STORAGE_ACCESS:
return FILTER_APP_HAS_STORAGE_ACCESS;
default:
return FILTER_APPS_ALL;
}

17
src/com/android/settings/applications/manageapplications/ManageApplications.java
View File

@@ -84,6 +84,7 @@ import com.android.settings.applications.AppStateInstallAppsBridge;
import com.android.settings.applications.AppStateNotificationBridge;
import com.android.settings.applications.AppStateOverlayBridge;
import com.android.settings.applications.AppStatePowerBridge;
import com.android.settings.applications.AppStateStorageAccessBridge;
import com.android.settings.applications.AppStateUsageBridge;
import com.android.settings.applications.AppStateUsageBridge.UsageState;
import com.android.settings.applications.AppStateWriteSettingsBridge;
@@ -92,6 +93,7 @@ import com.android.settings.applications.DefaultAppSettings;
import com.android.settings.applications.InstalledAppCounter;
import com.android.settings.applications.InstalledAppDetails;
import com.android.settings.applications.NotificationApps;
import com.android.settings.applications.StorageAccessDetails;
import com.android.settings.applications.UsageAccessDetails;
import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
import com.android.settings.applications.appinfo.DrawOverlayDetails;
@@ -204,6 +206,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment
public static final int LIST_TYPE_GAMES = 9;
public static final int LIST_TYPE_MOVIES = 10;
public static final int LIST_TYPE_PHOTOGRAPHY = 11;
public static final int LIST_TYPE_STORAGE_ACCESS = 12;
// List types that should show instant apps.
public static final Set<Integer> LIST_TYPES_WITH_INSTANT = new ArraySet<>(Arrays.asList(
@@ -279,6 +282,9 @@ public class ManageApplications extends InstrumentedPreferenceFragment
mListType = LIST_TYPE_PHOTOGRAPHY;
mSortOrder = R.id.sort_order_size;
mStorageType = args.getInt(EXTRA_STORAGE_TYPE, STORAGE_TYPE_DEFAULT);
} else if (className.equals(Settings.StorageAccessSettingsActivity.class.getName())) {
mListType = LIST_TYPE_STORAGE_ACCESS;
screenTitle = R.string.storage_access;
} else {
mListType = LIST_TYPE_MAIN;
}
@@ -443,6 +449,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment
return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
case LIST_TYPE_MANAGE_SOURCES:
return MetricsEvent.MANAGE_EXTERNAL_SOURCES;
case LIST_TYPE_STORAGE_ACCESS:
return MetricsEvent.STORAGE_ACCESS;
default:
return MetricsEvent.VIEW_UNKNOWN;
}
@@ -537,6 +545,10 @@ public class ManageApplications extends InstrumentedPreferenceFragment
case LIST_TYPE_PHOTOGRAPHY:
startAppInfoFragment(AppStorageSettings.class, R.string.storage_photos_videos);
break;
case LIST_TYPE_STORAGE_ACCESS:
startAppInfoFragment(StorageAccessDetails.class, R.string.storage_access);
break;
// TODO: Figure out if there is a way where we can spin up the profile's settings
// process ahead of time, to avoid a long load of data when user clicks on a managed
// app. Maybe when they load the list of apps that contains managed profile apps.
@@ -840,6 +852,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment
mExtraInfoBridge = new AppStateWriteSettingsBridge(mContext, mState, this);
} else if (mManageApplications.mListType == LIST_TYPE_MANAGE_SOURCES) {
mExtraInfoBridge = new AppStateInstallAppsBridge(mContext, mState, this);
} else if (mManageApplications.mListType == LIST_TYPE_STORAGE_ACCESS) {
mExtraInfoBridge = new AppStateStorageAccessBridge(mState, this);
} else {
mExtraInfoBridge = null;
}
@@ -1241,6 +1255,9 @@ public class ManageApplications extends InstrumentedPreferenceFragment
case LIST_TYPE_MANAGE_SOURCES:
holder.setSummary(ExternalSourcesDetails.getPreferenceSummary(mContext, entry));
break;
case LIST_TYPE_STORAGE_ACCESS:
holder.setSummary(null);
break;
default:
holder.updateSizeText(entry, mManageApplications.mInvalidSizeStr, mWhichSize);
break;