<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="installed_app_detail_settings_screen"
- app:initialExpandedChildrenCount="6">
+ settings:initialExpandedChildrenCount="6">
<com.android.settings.applications.LayoutPreference
android:key="header_view"
<Preference
android:key="notification_settings"
- android:title="@string/notifications_label" />
+ android:title="@string/notifications_label"
+ settings:controller="com.android.settings.applications.appinfo.AppNotificationPreferenceController" />
<com.android.settings.widget.FixedLineSummaryPreference
android:key="permission_settings"
android:title="@string/permissions_label"
android:summary="@string/summary_placeholder"
- app:summaryLineCount="1" />
+ settings:summaryLineCount="1"
+ settings:controller="com.android.settings.applications.appinfo.AppPermissionPreferenceController" />
<Preference
android:key="storage_settings"
android:title="@string/storage_settings"
- android:summary="@string/summary_placeholder" />
+ android:summary="@string/summary_placeholder"
+ settings:controller="com.android.settings.applications.appinfo.AppStoragePreferenceController" />
<com.android.settings.applications.AppDomainsPreference
android:key="instant_app_launch_supported_domain_urls"
android:title="@string/app_launch_supported_domain_urls_title"
- android:selectable="true" />
+ android:selectable="true"
+ settings:controller="com.android.settings.applications.appinfo.InstantAppDomainsPreferenceController" />
<Preference
android:key="data_settings"
android:title="@string/data_usage_summary_title"
- android:summary="@string/summary_placeholder" />
+ android:summary="@string/summary_placeholder"
+ settings:controller="com.android.settings.applications.appinfo.AppDataUsagePreferenceController" />
<Preference
android:key="time_spent_in_app"
android:title="@string/time_spent_in_app_pref_title"
- app:controller="com.android.settings.applications.appinfo.TimeSpentInAppPreferenceController" />
+ settings:controller="com.android.settings.applications.appinfo.TimeSpentInAppPreferenceController" />
<Preference
android:key="battery"
android:key="preferred_settings"
android:title="@string/launch_by_default"
android:summary="@string/summary_placeholder"
- android:selectable="true" />
+ android:selectable="true"
+ settings:controller="com.android.settings.applications.appinfo.AppOpenByDefaultPreferenceController" />
<Preference
android:key="memory"
<!-- Advanced apps settings -->
<PreferenceCategory
android:key="advanced_app_info"
- android:title="@string/advanced_apps">
+ android:title="@string/advanced_apps"
+ settings:controller="com.android.settings.applications.appinfo.AdvancedAppInfoPreferenceCategoryController">
<Preference
android:key="system_alert_window"
android:title="@string/draw_overlay"
- android:summary="@string/summary_placeholder" />
+ android:summary="@string/summary_placeholder"
+ settings:controller="com.android.settings.applications.appinfo.DrawOverlayDetailPreferenceController" />
<Preference
android:key="write_settings_apps"
android:title="@string/write_settings"
- android:summary="@string/summary_placeholder" />
+ android:summary="@string/summary_placeholder"
+ settings:controller="com.android.settings.applications.appinfo.WriteSystemSettingsPreferenceController" />
<Preference
android:key="picture_in_picture"
android:title="@string/picture_in_picture_app_detail_title"
- android:summary="@string/summary_placeholder" />
+ android:summary="@string/summary_placeholder"
+ settings:controller="com.android.settings.applications.appinfo.PictureInPictureDetailPreferenceController" />
<Preference
android:key="install_other_apps"
android:title="@string/install_other_apps"
- android:summary="@string/summary_placeholder" />
+ android:summary="@string/summary_placeholder"
+ settings:controller="com.android.settings.applications.appinfo.ExternalSourceDetailPreferenceController" />
</PreferenceCategory>
<!-- App installer info -->
<PreferenceCategory
android:key="app_installer"
- android:title="@string/app_install_details_group_title">
+ android:title="@string/app_install_details_group_title"
+ settings:controller="com.android.settings.applications.appinfo.AppInstallerPreferenceCategoryController">
<Preference
android:key="app_info_store"
- android:title="@string/app_install_details_title" />
+ android:title="@string/app_install_details_title"
+ settings:controller="com.android.settings.applications.appinfo.AppInstallerInfoPreferenceController" />
</PreferenceCategory>
<Preference
android:key="app_version"
android:selectable="false"
- android:order="9999" />
+ android:order="9999"
+ settings:controller="com.android.settings.applications.appinfo.AppVersionPreferenceController" />
</PreferenceScreen>
\ No newline at end of file
workControllers.add(new DefaultWorkBrowserPreferenceController(context));
controllers.addAll(workControllers);
controllers.add(new PreferenceCategoryController(
- context, KEY_DEFAULT_WORK_CATEGORY, workControllers));
+ context, KEY_DEFAULT_WORK_CATEGORY).setChildren(workControllers));
controllers.add(new DefaultAssistPreferenceController(context, KEY_ASSIST_VOICE_INPUT,
false /* showSetting */));
controllers.add(new DefaultBrowserPreferenceController(context));
--- /dev/null
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import android.content.Context;
+
+import com.android.settings.widget.PreferenceCategoryController;
+
+public class AdvancedAppInfoPreferenceCategoryController extends PreferenceCategoryController {
+
+ public AdvancedAppInfoPreferenceCategoryController(Context context, String key) {
+ super(context, key);
+ }
+}
import com.android.settings.datausage.DataUsageList;
import com.android.settings.datausage.DataUsageUtils;
import com.android.settingslib.AppItem;
-import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
public class AppDataUsagePreferenceController extends AppInfoPreferenceControllerBase
implements LoaderManager.LoaderCallbacks<ChartData>, LifecycleObserver, OnResume, OnPause {
- private static final String KEY_DATA = "data_settings";
private ChartData mChartData;
private INetworkStatsSession mStatsSession;
- public AppDataUsagePreferenceController(Context context, AppInfoDashboardFragment parent,
- Lifecycle lifecycle) {
- super(context, parent, KEY_DATA);
- if (lifecycle != null) {
- lifecycle.addObserver(this);
- }
+ public AppDataUsagePreferenceController(Context context,String key) {
+ super(context, key);
}
@Override
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.widget.PreferenceCategoryController;
import com.android.settings.wrapper.DevicePolicyManagerWrapper;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.applications.AppUtils;
private static final String TAG = "AppInfoDashboard";
// Menu identifiers
- @VisibleForTesting static final int UNINSTALL_ALL_USERS_MENU = 1;
- @VisibleForTesting static final int UNINSTALL_UPDATES = 2;
+ @VisibleForTesting
+ static final int UNINSTALL_ALL_USERS_MENU = 1;
+ @VisibleForTesting
+ static final int UNINSTALL_UPDATES = 2;
static final int INSTALL_INSTANT_APP_MENU = 3;
// Result code identifiers
private static final int DLG_SPECIAL_DISABLE = DLG_BASE + 3;
static final int DLG_CLEAR_INSTANT_APP = DLG_BASE + 4;
- private static final String KEY_ADVANCED_APP_INFO_CATEGORY = "advanced_app_info";
-
public static final String ARG_PACKAGE_NAME = "package";
public static final String ARG_PACKAGE_UID = "uid";
@Override
public void onAttach(Context context) {
super.onAttach(context);
- use(TimeSpentInAppPreferenceController.class).setPackageName(getPackageName());
+ final String packageName = getPackageName();
+ use(TimeSpentInAppPreferenceController.class).setPackageName(packageName);
+
+ use(AppDataUsagePreferenceController.class).setParentFragment(this);
+ final AppInstallerInfoPreferenceController installer =
+ use(AppInstallerInfoPreferenceController.class);
+ installer.setPackageName(packageName);
+ installer.setParentFragment(this);
+ use(AppInstallerPreferenceCategoryController.class).setChildren(Arrays.asList(installer));
+ use(AppNotificationPreferenceController.class).setParentFragment(this);
+ use(AppOpenByDefaultPreferenceController.class).setParentFragment(this);
+ use(AppPermissionPreferenceController.class).setParentFragment(this);
+ use(AppPermissionPreferenceController.class).setPackageName(packageName);
+ use(AppStoragePreferenceController.class).setParentFragment(this);
+ use(AppVersionPreferenceController.class).setParentFragment(this);
+ use(InstantAppDomainsPreferenceController.class).setParentFragment(this);
+
+ final WriteSystemSettingsPreferenceController writeSystemSettings =
+ use(WriteSystemSettingsPreferenceController.class);
+ writeSystemSettings.setParentFragment(this);
+
+ final DrawOverlayDetailPreferenceController drawOverlay =
+ use(DrawOverlayDetailPreferenceController.class);
+ drawOverlay.setParentFragment(this);
+
+ final PictureInPictureDetailPreferenceController pip =
+ use(PictureInPictureDetailPreferenceController.class);
+ pip.setPackageName(packageName);
+ pip.setParentFragment(this);
+ final ExternalSourceDetailPreferenceController externalSource =
+ use(ExternalSourceDetailPreferenceController.class);
+ externalSource.setPackageName(packageName);
+ externalSource.setParentFragment(this);
+
+ use(AdvancedAppInfoPreferenceCategoryController.class).setChildren(Arrays.asList(
+ writeSystemSettings, drawOverlay, pip, externalSource));
}
@Override
// when app state changes.
controllers.add(
new AppHeaderViewPreferenceController(context, this, packageName, lifecycle));
- controllers.add(new AppStoragePreferenceController(context, this, lifecycle));
- controllers.add(new AppDataUsagePreferenceController(context, this, lifecycle));
- controllers.add(new AppNotificationPreferenceController(context, this));
- controllers.add(new AppOpenByDefaultPreferenceController(context, this));
- controllers.add(new AppPermissionPreferenceController(context, this, packageName));
- controllers.add(new AppVersionPreferenceController(context, this));
- controllers.add(new InstantAppDomainsPreferenceController(context, this));
- final AppInstallerInfoPreferenceController appInstallerInfoPreferenceController =
- new AppInstallerInfoPreferenceController(context, this, packageName);
- controllers.add(appInstallerInfoPreferenceController);
mAppActionButtonPreferenceController =
new AppActionButtonPreferenceController(context, this, packageName);
controllers.add(mAppActionButtonPreferenceController);
controllers.add(new DefaultEmergencyShortcutPreferenceController(context, packageName));
controllers.add(new DefaultSmsShortcutPreferenceController(context, packageName));
- final List<AbstractPreferenceController> advancedAppInfoControllers = new ArrayList<>();
- advancedAppInfoControllers.add(new DrawOverlayDetailPreferenceController(context, this));
- advancedAppInfoControllers.add(new WriteSystemSettingsPreferenceController(context, this));
- advancedAppInfoControllers.add(
- new PictureInPictureDetailPreferenceController(context, this, packageName));
- advancedAppInfoControllers.add(
- new ExternalSourceDetailPreferenceController(context, this, packageName));
- controllers.addAll(advancedAppInfoControllers);
- controllers.add(new PreferenceCategoryController(
- context, KEY_ADVANCED_APP_INFO_CATEGORY, advancedAppInfoControllers));
-
- controllers.add(new AppInstallerPreferenceCategoryController(
- context, Arrays.asList(appInstallerInfoPreferenceController)));
-
return controllers;
}
+ void addToCallbackList(Callback callback) {
+ if (callback != null) {
+ mCallbacks.add(callback);
+ }
+ }
+
ApplicationsState.AppEntry getAppEntry() {
return mAppEntry;
}
public void onPackageSizeChanged(String packageName) {
if (!TextUtils.equals(packageName, mPackageName)) {
Log.d(TAG, "Package change irrelevant, skipping");
- return;
+ return;
}
refreshUi();
}
if (!mInitialized) {
// First time init: are we displaying an uninstalled app?
mInitialized = true;
- mShowUninstalled = (mAppEntry.info.flags&ApplicationInfo.FLAG_INSTALLED) == 0;
+ mShowUninstalled = (mAppEntry.info.flags & ApplicationInfo.FLAG_INSTALLED) == 0;
} else {
// All other times: if the app no longer exists then we want
// to go away.
final ApplicationInfo ainfo = getActivity().getPackageManager().getApplicationInfo(
mAppEntry.info.packageName,
PackageManager.MATCH_DISABLED_COMPONENTS
- | PackageManager.MATCH_ANY_USER);
+ | PackageManager.MATCH_ANY_USER);
if (!mShowUninstalled) {
// If we did not start out with the app uninstalled, then
// it transitioning to the uninstalled state for the current
// user means we should go away as well.
- return (ainfo.flags&ApplicationInfo.FLAG_INSTALLED) != 0;
+ return (ainfo.flags & ApplicationInfo.FLAG_INSTALLED) != 0;
}
} catch (NameNotFoundException e) {
return false;
.setMessage(getActivity().getText(R.string.app_disable_dlg_text))
.setPositiveButton(R.string.app_disable_dlg_positive,
new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- // Disable the app
- mMetricsFeatureProvider.action(getContext(),
- MetricsEvent.ACTION_SETTINGS_DISABLE_APP);
- new DisableChanger(AppInfoDashboardFragment.this, mAppEntry.info,
- PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER)
- .execute((Object)null);
- }
- })
+ public void onClick(DialogInterface dialog, int which) {
+ // Disable the app
+ mMetricsFeatureProvider.action(getContext(),
+ MetricsEvent.ACTION_SETTINGS_DISABLE_APP);
+ new DisableChanger(AppInfoDashboardFragment.this,
+ mAppEntry.info,
+ PackageManager
+ .COMPONENT_ENABLED_STATE_DISABLED_USER)
+ .execute((Object) null);
+ }
+ })
.setNegativeButton(R.string.dlg_cancel, null)
.create();
case DLG_SPECIAL_DISABLE:
.setMessage(getActivity().getText(R.string.app_disable_dlg_text))
.setPositiveButton(R.string.app_disable_dlg_positive,
new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- // Disable the app and ask for uninstall
- mMetricsFeatureProvider.action(getContext(),
- MetricsEvent.ACTION_SETTINGS_DISABLE_APP);
- uninstallPkg(mAppEntry.info.packageName,
- false, true);
- }
- })
+ public void onClick(DialogInterface dialog, int which) {
+ // Disable the app and ask for uninstall
+ mMetricsFeatureProvider.action(getContext(),
+ MetricsEvent.ACTION_SETTINGS_DISABLE_APP);
+ uninstallPkg(mAppEntry.info.packageName,
+ false, true);
+ }
+ })
.setNegativeButton(R.string.dlg_cancel, null)
.create();
case DLG_FORCE_STOP:
private void uninstallPkg(String packageName, boolean allUsers, boolean andDisable) {
stopListeningToPackageRemove();
- // Create new intent to launch Uninstaller activity
- final Uri packageURI = Uri.parse("package:"+packageName);
+ // Create new intent to launch Uninstaller activity
+ final Uri packageURI = Uri.parse("package:" + packageName);
final Intent uninstallIntent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageURI);
uninstallIntent.putExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, allUsers);
mMetricsFeatureProvider.action(
if ((info.flags & ApplicationInfo.FLAG_INSTALLED) != 0) {
count++;
}
- } catch(NameNotFoundException e) {
+ } catch (NameNotFoundException e) {
Log.e(TAG, "Package: " + packageName + " not found for user: " + userInfo.id);
}
}
}
private void setIntentAndFinish(boolean finish, boolean appChanged) {
- if (localLOGV) Log.i(TAG, "appChanged="+appChanged);
+ if (localLOGV) Log.i(TAG, "appChanged=" + appChanged);
final Intent intent = new Intent();
intent.putExtra(ManageApplications.APP_CHG, appChanged);
- final SettingsActivity sa = (SettingsActivity)getActivity();
+ final SettingsActivity sa = (SettingsActivity) getActivity();
sa.finishPreferencePanel(Activity.RESULT_OK, intent);
mFinishing = true;
}
public abstract class AppInfoPreferenceControllerBase extends BasePreferenceController
implements AppInfoDashboardFragment.Callback {
- protected final AppInfoDashboardFragment mParent;
- private final Class<? extends SettingsPreferenceFragment> mDetailFragmenClass;
-
+ protected AppInfoDashboardFragment mParent;
protected Preference mPreference;
- public AppInfoPreferenceControllerBase(Context context, AppInfoDashboardFragment parent,
- String preferenceKey) {
+ private final Class<? extends SettingsPreferenceFragment> mDetailFragmentClass;
+
+ public AppInfoPreferenceControllerBase(Context context, String preferenceKey) {
super(context, preferenceKey);
- mParent = parent;
- mDetailFragmenClass = getDetailFragmentClass();
+ mDetailFragmentClass = getDetailFragmentClass();
}
@Override
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
- if (TextUtils.equals(preference.getKey(), mPreferenceKey) && mDetailFragmenClass != null) {
+ if (TextUtils.equals(preference.getKey(), mPreferenceKey) && mDetailFragmentClass != null) {
AppInfoDashboardFragment.startAppInfoFragment(
- mDetailFragmenClass, -1, getArguments(), mParent, mParent.getAppEntry());
+ mDetailFragmentClass, -1, getArguments(), mParent, mParent.getAppEntry());
return true;
}
return false;
updateState(mPreference);
}
+ public void setParentFragment(AppInfoDashboardFragment parent) {
+ mParent = parent;
+ parent.addToCallbackList(this);
+ }
+
/**
* Gets the fragment class to be launched when the preference is clicked.
* @return the fragment to launch
public class AppInstallerInfoPreferenceController extends AppInfoPreferenceControllerBase {
- private static final String KEY_APP_INSTALLER_INFO = "app_info_store";
+ private String mPackageName;
+ private String mInstallerPackage;
+ private CharSequence mInstallerLabel;
- private final String mPackageName;
- private final String mInstallerPackage;
- private final CharSequence mInstallerLabel;
-
- public AppInstallerInfoPreferenceController(Context context, AppInfoDashboardFragment parent,
- String packageName) {
- super(context, parent, KEY_APP_INSTALLER_INFO);
- mPackageName = packageName;
- mInstallerPackage = AppStoreUtil.getInstallerPackageName(mContext, mPackageName);
- mInstallerLabel = Utils.getApplicationLabel(mContext, mInstallerPackage);
+ public AppInstallerInfoPreferenceController(Context context, String key) {
+ super(context, key);
}
@Override
if (UserManager.get(mContext).isManagedProfile()) {
return DISABLED_FOR_USER;
}
- return mInstallerLabel!= null ? AVAILABLE : DISABLED_FOR_USER;
+ return mInstallerLabel != null ? AVAILABLE : DISABLED_FOR_USER;
}
@Override
}
}
+ public void setPackageName(String packageName) {
+ mPackageName = packageName;
+ mInstallerPackage = AppStoreUtil.getInstallerPackageName(mContext, mPackageName);
+ mInstallerLabel = Utils.getApplicationLabel(mContext, mInstallerPackage);
+ }
}
import android.content.Context;
import com.android.settings.widget.PreferenceCategoryController;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-import java.util.List;
public class AppInstallerPreferenceCategoryController extends PreferenceCategoryController {
- private static final String KEY_APP_INSTALLER_INFO_CATEGORY = "app_installer";
-
- public AppInstallerPreferenceCategoryController(Context context,
- List<AbstractPreferenceController> childrenControllers) {
- super(context, KEY_APP_INSTALLER_INFO_CATEGORY, childrenControllers);
+ public AppInstallerPreferenceCategoryController(Context context, String key) {
+ super(context, key);
}
}
public class AppNotificationPreferenceController extends AppInfoPreferenceControllerBase {
- private static final String KEY_NOTIFICATION = "notification_settings";
private String mChannelId = null;
// Used for updating notification preference.
private final NotificationBackend mBackend = new NotificationBackend();
- public AppNotificationPreferenceController(Context context, AppInfoDashboardFragment parent) {
- super(context, parent, KEY_NOTIFICATION);
+ public AppNotificationPreferenceController(Context context, String key) {
+ super(context, key);
+ }
+
+ @Override
+ public void setParentFragment(AppInfoDashboardFragment parent) {
+ super.setParentFragment(parent);
if (parent != null && parent.getActivity() != null
&& parent.getActivity().getIntent() != null) {
mChannelId = parent.getActivity().getIntent().getStringExtra(EXTRA_FRAGMENT_ARG_KEY);
return bundle;
}
+
private CharSequence getNotificationSummary(ApplicationsState.AppEntry appEntry,
Context context, NotificationBackend backend) {
NotificationBackend.AppRow appRow =
public class AppOpenByDefaultPreferenceController extends AppInfoPreferenceControllerBase {
- private static final String KEY_LAUNCH = "preferred_settings";
-
private IUsbManager mUsbManager;
private PackageManager mPackageManager;
- public AppOpenByDefaultPreferenceController(Context context, AppInfoDashboardFragment parent) {
- super(context, parent, KEY_LAUNCH);
+ public AppOpenByDefaultPreferenceController(Context context, String key) {
+ super(context, key);
mUsbManager = IUsbManager.Stub.asInterface(ServiceManager.getService(Context.USB_SERVICE));
mPackageManager = context.getPackageManager();
}
final ApplicationsState.AppEntry appEntry = mParent.getAppEntry();
if (appEntry == null || appEntry.info == null) {
mPreference.setEnabled(false);
- } else if ((appEntry.info.flags& ApplicationInfo.FLAG_INSTALLED) == 0
- || !appEntry.info.enabled) {
- mPreference.setEnabled(false);
+ } else if ((appEntry.info.flags & ApplicationInfo.FLAG_INSTALLED) == 0
+ || !appEntry.info.enabled) {
+ mPreference.setEnabled(false);
}
}
public class AppPermissionPreferenceController extends AppInfoPreferenceControllerBase {
private static final String TAG = "PermissionPrefControl";
- private static final String KEY_PERMISSION = "permission_settings";
private static final String EXTRA_HIDE_INFO_BUTTON = "hideInfoButton";
- private final String mPackageName;
+ private String mPackageName;
@VisibleForTesting
final PermissionsSummaryHelper.PermissionsResultCallback mPermissionCallback
}
};
- public AppPermissionPreferenceController(Context context, AppInfoDashboardFragment parent,
- String packageName) {
- super(context, parent, KEY_PERMISSION);
- mPackageName = packageName;
+ public AppPermissionPreferenceController(Context context, String key) {
+ super(context, key);
}
@Override
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
- if (KEY_PERMISSION.equals(preference.getKey())) {
+ if (getPreferenceKey().equals(preference.getKey())) {
startManagePermissionsActivity();
return true;
}
return false;
}
+ public void setPackageName(String packageName) {
+ mPackageName = packageName;
+ }
+
private void startManagePermissionsActivity() {
// start new activity to manage app permissions
final Intent intent = new Intent(Intent.ACTION_MANAGE_APP_PERMISSIONS);
Log.w(TAG, "No app can handle android.intent.action.MANAGE_APP_PERMISSIONS");
}
}
-
}
import com.android.settings.applications.AppStorageSettings;
import com.android.settings.applications.FetchPackageStorageAsyncLoader;
import com.android.settingslib.applications.StorageStatsSource;
-import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
implements LoaderManager.LoaderCallbacks<StorageStatsSource.AppStorageStats>,
LifecycleObserver, OnResume, OnPause {
- private static final String KEY_STORAGE = "storage_settings";
private StorageStatsSource.AppStorageStats mLastResult;
- public AppStoragePreferenceController(Context context, AppInfoDashboardFragment parent,
- Lifecycle lifecycle) {
- super(context, parent, KEY_STORAGE);
- if (lifecycle != null) {
- lifecycle.addObserver(this);
- }
+ public AppStoragePreferenceController(Context context, String key) {
+ super(context, key);
}
@Override
package com.android.settings.applications.appinfo;
import android.content.Context;
-import android.support.v7.preference.Preference;
import android.text.BidiFormatter;
import com.android.settings.R;
public class AppVersionPreferenceController extends AppInfoPreferenceControllerBase {
- private static final String KEY_VERSION = "app_version";
-
- public AppVersionPreferenceController(Context context, AppInfoDashboardFragment parent) {
- super(context, parent, KEY_VERSION);
+ public AppVersionPreferenceController(Context context, String key) {
+ super(context, key);
}
@Override
- public void updateState(Preference preference) {
- preference.setSummary(mContext.getString(R.string.version_text,
- BidiFormatter.getInstance().unicodeWrap(mParent.getPackageInfo().versionName)));
+ public CharSequence getSummary() {
+ return mContext.getString(R.string.version_text,
+ BidiFormatter.getInstance().unicodeWrap(mParent.getPackageInfo().versionName));
}
-
}
public class DrawOverlayDetailPreferenceController extends AppInfoPreferenceControllerBase {
- private static final String KEY = "system_alert_window";
-
- public DrawOverlayDetailPreferenceController(Context context, AppInfoDashboardFragment parent) {
- super(context, parent, KEY);
+ public DrawOverlayDetailPreferenceController(Context context, String key) {
+ super(context, key);
}
@Override
public class ExternalSourceDetailPreferenceController extends AppInfoPreferenceControllerBase {
- private static final String KEY = "install_other_apps";
+ private String mPackageName;
- private final String mPackageName;
-
- public ExternalSourceDetailPreferenceController(Context context,
- AppInfoDashboardFragment parent, String packageName) {
- super(context, parent, KEY);
- mPackageName = packageName;
+ public ExternalSourceDetailPreferenceController(Context context, String key) {
+ super(context, key);
}
@Override
return appState.isPotentialAppSource();
}
+ public void setPackageName(String packageName) {
+ mPackageName = packageName;
+ }
}
public class InstantAppDomainsPreferenceController extends AppInfoPreferenceControllerBase {
- private static final String KEY_INSTANT_APP_SUPPORTED_LINKS =
- "instant_app_launch_supported_domain_urls";
-
private PackageManager mPackageManager;
- public InstantAppDomainsPreferenceController(Context context, AppInfoDashboardFragment parent) {
- super(context, parent, KEY_INSTANT_APP_SUPPORTED_LINKS);
+ public InstantAppDomainsPreferenceController(Context context, String key) {
+ super(context, key);
mPackageManager = mContext.getPackageManager();
}
public class PictureInPictureDetailPreferenceController extends AppInfoPreferenceControllerBase {
- private static final String KEY = "picture_in_picture";
private static final String TAG = "PicInPicDetailControl";
private final PackageManager mPackageManager;
- private final String mPackageName;
- public PictureInPictureDetailPreferenceController(Context context,
- AppInfoDashboardFragment parent, String packageName) {
- super(context, parent, KEY);
+ private String mPackageName;
+
+ public PictureInPictureDetailPreferenceController(Context context, String key) {
+ super(context, key);
mPackageManager = context.getPackageManager();
- mPackageName = packageName;
}
@Override
return PictureInPictureDetails.getPreferenceSummary(mContext,
mParent.getPackageInfo().applicationInfo.uid, mPackageName);
}
+
+ public void setPackageName(String packageName) {
+ mPackageName = packageName;
+ }
}
public class WriteSystemSettingsPreferenceController extends AppInfoPreferenceControllerBase {
- private static final String KEY = "write_settings_apps";
-
- public WriteSystemSettingsPreferenceController(Context context,
- AppInfoDashboardFragment parent) {
- super(context, parent, KEY);
+ public WriteSystemSettingsPreferenceController(Context context, String prefKey) {
+ super(context, prefKey);
}
@Override
exposureChangesCategoryControllers.add(new CaCertsManagedProfilePreferenceController(
context));
controllers.addAll(exposureChangesCategoryControllers);
- controllers.add(new PreferenceCategoryController(context, "exposure_changes_category",
- exposureChangesCategoryControllers));
+ controllers.add(new PreferenceCategoryController(context, "exposure_changes_category")
+ .setChildren(exposureChangesCategoryControllers));
controllers.add(new FailedPasswordWipeCurrentUserPreferenceController(context));
controllers.add(new FailedPasswordWipeManagedProfilePreferenceController(context));
return controllers;
controllers.add(virtualKeyboardPreferenceController);
controllers.add(physicalKeyboardPreferenceController);
controllers.add(new PreferenceCategoryController(context,
- KEY_KEYBOARDS_CATEGORY,
+ KEY_KEYBOARDS_CATEGORY).setChildren(
Arrays.asList(virtualKeyboardPreferenceController,
physicalKeyboardPreferenceController)));
final PointerSpeedController pointerController = new PointerSpeedController(context);
controllers.add(pointerController);
controllers.add(new PreferenceCategoryController(context,
- KEY_POINTER_AND_TTS_CATEGORY,
+ KEY_POINTER_AND_TTS_CATEGORY).setChildren(
Arrays.asList(pointerController, ttsPreferenceController)));
// Input Assistance
}
controllers.add(gameControllerPreferenceController);
controllers.add(new PreferenceCategoryController(context,
- KEY_GAME_CONTROLLER_CATEGORY,
+ KEY_GAME_CONTROLLER_CATEGORY).setChildren(
Arrays.asList(gameControllerPreferenceController)));
return controllers;
controllers.add(bootSoundPreferenceController);
controllers.add(emergencyTonePreferenceController);
controllers.add(new PreferenceCategoryController(context,
- "other_sounds_and_vibrations_category",
+ "other_sounds_and_vibrations_category").setChildren(
Arrays.asList(dialPadTonePreferenceController,
screenLockSoundPreferenceController,
chargingSoundPreferenceController,
PREF_KEY_ENCRYPTION_DETAIL_PAGE);
controllers.add(encryptStatusController);
controllers.add(new PreferenceCategoryController(context,
- "encryption_and_credentials_status_category",
+ "encryption_and_credentials_status_category").setChildren(
Arrays.asList(encryptStatusController)));
controllers.add(new CredentialStoragePreferenceController(context));
controllers.add(new UserCredentialsPreferenceController(context));
securityPreferenceControllers.add(new FingerprintStatusPreferenceController(context));
securityPreferenceControllers.add(new LockScreenPreferenceController(context, lifecycle));
securityPreferenceControllers.add(new ChangeScreenLockPreferenceController(context, host));
- controllers.add(new PreferenceCategoryController(context, SECURITY_CATEGORY,
- securityPreferenceControllers));
+ controllers.add(new PreferenceCategoryController(context, SECURITY_CATEGORY)
+ .setChildren(securityPreferenceControllers));
controllers.addAll(securityPreferenceControllers);
final List<AbstractPreferenceController> profileSecurityControllers = new ArrayList<>();
profileSecurityControllers.add(new VisiblePatternProfilePreferenceController(
context, lifecycle));
profileSecurityControllers.add(new FingerprintProfileStatusPreferenceController(context));
- controllers.add(new PreferenceCategoryController(context, WORK_PROFILE_SECURITY_CATEGORY,
- profileSecurityControllers));
+ controllers.add(new PreferenceCategoryController(context, WORK_PROFILE_SECURITY_CATEGORY)
+ .setChildren(profileSecurityControllers));
controllers.addAll(profileSecurityControllers);
return controllers;
import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_KEY;
import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_PLATFORM_DEFINED;
+import android.app.slice.Slice;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import com.android.settings.core.SliderPreferenceController;
import com.android.settings.core.TogglePreferenceController;
-import android.app.slice.Slice;
-
import androidx.slice.core.SliceHints;
/**
import android.content.Context;
-import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.AbstractPreferenceController;
+import java.util.ArrayList;
import java.util.List;
/**
* not-available, this controller will also report not-available, and subsequently will be hidden by
* UI.
*/
-public class PreferenceCategoryController extends AbstractPreferenceController
- implements PreferenceControllerMixin {
+public class PreferenceCategoryController extends BasePreferenceController {
private final String mKey;
private final List<AbstractPreferenceController> mChildren;
- public PreferenceCategoryController(Context context,
- String key, List<AbstractPreferenceController> childrenControllers) {
- super(context);
+ public PreferenceCategoryController(Context context, String key) {
+ super(context, key);
mKey = key;
- mChildren = childrenControllers;
+ mChildren = new ArrayList<>();
}
@Override
- public boolean isAvailable() {
+ public int getAvailabilityStatus() {
if (mChildren == null || mChildren.isEmpty()) {
- return true;
+ return DISABLED_DEPENDENT_SETTING;
}
// Category is available if any child is available
for (AbstractPreferenceController controller : mChildren) {
if (controller.isAvailable()) {
- return true;
+ return AVAILABLE;
}
}
- return false;
+ return DISABLED_DEPENDENT_SETTING;
}
@Override
public String getPreferenceKey() {
return mKey;
}
+
+ public PreferenceCategoryController setChildren(
+ List<AbstractPreferenceController> childrenController) {
+ mChildren.clear();
+ if (childrenController != null) {
+ mChildren.addAll(childrenController);
+ }
+ return this;
+ }
}
com.android.settings.applications.appinfo.AppActionButtonPreferenceController
com.android.settings.applications.appinfo.AppBatteryPreferenceController
-com.android.settings.applications.appinfo.AppDataUsagePreferenceController
com.android.settings.applications.appinfo.AppHeaderViewPreferenceController
-com.android.settings.applications.appinfo.AppInstallerInfoPreferenceController
com.android.settings.applications.appinfo.AppMemoryPreferenceController
-com.android.settings.applications.appinfo.AppNotificationPreferenceController
-com.android.settings.applications.appinfo.AppOpenByDefaultPreferenceController
-com.android.settings.applications.appinfo.AppPermissionPreferenceController
-com.android.settings.applications.appinfo.AppStoragePreferenceController
-com.android.settings.applications.appinfo.AppVersionPreferenceController
-com.android.settings.applications.appinfo.DrawOverlayDetailPreferenceController
-com.android.settings.applications.appinfo.ExternalSourceDetailPreferenceController
com.android.settings.applications.appinfo.InstantAppButtonsPreferenceController
-com.android.settings.applications.appinfo.InstantAppDomainsPreferenceController
-com.android.settings.applications.appinfo.PictureInPictureDetailPreferenceController
-com.android.settings.applications.appinfo.WriteSystemSettingsPreferenceController
com.android.settings.bluetooth.BluetoothDeviceNamePreferenceController
com.android.settings.bluetooth.BluetoothDeviceRenamePreferenceController
com.android.settings.bluetooth.BluetoothSwitchPreferenceController
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application.getApplicationContext());
- mController = spy(
- new AppDataUsagePreferenceController(mContext, mFragment, null /* lifecycle */));
+ mController = spy(new AppDataUsagePreferenceController(mContext, "test_key"));
+ mController.setParentFragment(mFragment);
}
@Test
private boolean preferenceUpdated;
private TestPreferenceController(AppInfoDashboardFragment parent) {
- super(RuntimeEnvironment.application, parent, "TestKey");
+ super(RuntimeEnvironment.application, "TestKey");
+ setParentFragment(parent);
}
@Override
when(mPackageManager.getInstallerPackageName(anyString())).thenReturn(installerPackage);
when(mPackageManager.getApplicationInfo(eq(installerPackage), anyInt()))
.thenReturn(mAppInfo);
- mController = new AppInstallerInfoPreferenceController(mContext, mFragment, "Package1");
+ mController = new AppInstallerInfoPreferenceController(mContext, "test_key");
+ mController.setPackageName("Package1");
+ mController.setParentFragment(mFragment);
}
@Test
when(mUserManager.isManagedProfile()).thenReturn(true);
assertThat(mController.getAvailabilityStatus())
- .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
+ .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
when(mUserManager.isManagedProfile()).thenReturn(false);
assertThat(mController.getAvailabilityStatus())
- .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
+ .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
public void getAvailabilityStatus_hasAppLabel_shouldReturnAvailable() {
when(mUserManager.isManagedProfile()).thenReturn(false);
when(mAppInfo.loadLabel(mPackageManager)).thenReturn("Label1");
- mController = new AppInstallerInfoPreferenceController(mContext, mFragment, "Package1");
+ mController = new AppInstallerInfoPreferenceController(mContext, "test_key");
+ mController.setPackageName("Package1");
+ mController.setParentFragment(mFragment);
assertThat(mController.getAvailabilityStatus())
- .isEqualTo(BasePreferenceController.AVAILABLE);
+ .isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
package com.android.settings.applications.appinfo;
import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mController = spy(new AppNotificationPreferenceController(mContext, mFragment));
+ mController = spy(new AppNotificationPreferenceController(mContext, "test_key"));
+ mController.setParentFragment(mFragment);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
final String key = mController.getPreferenceKey();
when(mPreference.getKey()).thenReturn(key);
when(mFragment.getActivity()).thenReturn(activity);
when(activity.getIntent()).thenReturn(intent);
AppNotificationPreferenceController controller =
- new AppNotificationPreferenceController(mContext, mFragment);
+ new AppNotificationPreferenceController(mContext, "test");
+ controller.setParentFragment(mFragment);
assertThat(controller.getArguments().containsKey(EXTRA_FRAGMENT_ARG_KEY)).isTrue();
assertThat(controller.getArguments().getString(EXTRA_FRAGMENT_ARG_KEY)).isEqualTo("test");
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application.getApplicationContext();
- mController = spy(new AppOpenByDefaultPreferenceController(mContext, mFragment));
+ mController = spy(new AppOpenByDefaultPreferenceController(mContext, "preferred_app"));
+ mController.setParentFragment(mFragment);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
}
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mController = new AppPermissionPreferenceController(mContext, mFragment, "Package1");
+ mController = new AppPermissionPreferenceController(mContext, "permission_settings");
+ mController.setPackageName("package1");
+ mController.setParentFragment(mFragment);
+
when(mScreen.findPreference(any())).thenReturn(mPreference);
final String key = mController.getPreferenceKey();
when(mPreference.getKey()).thenReturn(key);
mController.handlePreferenceTreeClick(mPreference);
- verify(mActivity).startActivityForResult(argThat(intent-> intent != null &&
+ verify(mActivity).startActivityForResult(argThat(intent -> intent != null &&
Intent.ACTION_MANAGE_APP_PERMISSIONS.equals(intent.getAction())), anyInt());
}
}
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application.getApplicationContext();
- mController =
- spy(new AppStoragePreferenceController(mContext, mFragment, null /* lifecycle */));
+ mController = spy(new AppStoragePreferenceController(mContext, "key"));
+ mController.setParentFragment(mFragment);
}
@Test
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mController = new AppVersionPreferenceController(mContext, mFragment);
+ mController = new AppVersionPreferenceController(mContext, "test_key");
+ mController.setParentFragment(mFragment);
}
@Test
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
- mController = spy(new DrawOverlayDetailPreferenceController(mContext, mFragment));
+ mController = spy(new DrawOverlayDetailPreferenceController(mContext, "key"));
+ mController.setParentFragment(mFragment);
final String key = mController.getPreferenceKey();
when(mPreference.getKey()).thenReturn(key);
}
when(mUserManager.isManagedProfile()).thenReturn(true);
assertThat(mController.getAvailabilityStatus())
- .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
+ .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
when(mFragment.getPackageInfo()).thenReturn(new PackageInfo());
assertThat(mController.getAvailabilityStatus())
- .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
+ .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
when(mFragment.getPackageInfo()).thenReturn(info);
assertThat(mController.getAvailabilityStatus())
- .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
+ .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
when(mFragment.getPackageInfo()).thenReturn(info);
assertThat(mController.getAvailabilityStatus())
- .isEqualTo(BasePreferenceController.AVAILABLE);
+ .isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
- mController = spy(
- new ExternalSourceDetailPreferenceController(mContext, mFragment, "Package1"));
+ mController = spy(new ExternalSourceDetailPreferenceController(mContext, "test_key"));
+ mController.setPackageName("Package1");
+ mController.setParentFragment(mFragment);
final String key = mController.getPreferenceKey();
when(mPreference.getKey()).thenReturn(key);
}
when(mUserManager.isManagedProfile()).thenReturn(true);
assertThat(mController.getAvailabilityStatus())
- .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
+ .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
doReturn(false).when(mController).isPotentialAppSource();
assertThat(mController.getAvailabilityStatus())
- .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
+ .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
doReturn(true).when(mController).isPotentialAppSource();
assertThat(mController.getAvailabilityStatus())
- .isEqualTo(BasePreferenceController.AVAILABLE);
+ .isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
private InstantAppDomainsPreferenceController mController;
@Before
- public void setUp() throws PackageManager.NameNotFoundException {
+ public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
when(mContext.getPackageManager()).thenReturn(mPackageManager);
packageInfo.applicationInfo = mAppInfo;
packageInfo.packageName = "Package1";
when(mFragment.getPackageInfo()).thenReturn(packageInfo);
- mController = new InstantAppDomainsPreferenceController(mContext, mFragment);
+ mController = new InstantAppDomainsPreferenceController(mContext, "test_key");
+ mController.setParentFragment(mFragment);
}
@Test
(InstantAppDataProvider) (i -> false));
assertThat(mController.getAvailabilityStatus())
- .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
+ .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
(InstantAppDataProvider) (i -> true));
assertThat(mController.getAvailabilityStatus())
- .isEqualTo(BasePreferenceController.AVAILABLE);
+ .isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
public void updateState_shouldSetPreferenceTitle() {
- final String[] domain = { "Domain1" };
+ final String[] domain = {"Domain1"};
final ArraySet<String> domains = new ArraySet<>();
domains.add(domain[0]);
final List<IntentFilterVerificationInfo> infoList = new ArrayList<>();
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
- mController = spy(
- new PictureInPictureDetailPreferenceController(mContext, mFragment, "Package1"));
+ mController = spy(new PictureInPictureDetailPreferenceController(mContext, "test_key"));
+ mController.setPackageName("Package1");
+ mController.setParentFragment(mFragment);
+
final String key = mController.getPreferenceKey();
when(mPreference.getKey()).thenReturn(key);
}
doReturn(false).when(mController).hasPictureInPictureActivites();
assertThat(mController.getAvailabilityStatus())
- .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
+ .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
doReturn(true).when(mController).hasPictureInPictureActivites();
assertThat(mController.getAvailabilityStatus())
- .isEqualTo(BasePreferenceController.AVAILABLE);
+ .isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
- mController = spy(new WriteSystemSettingsPreferenceController(mContext, mFragment));
+ mController = spy(new WriteSystemSettingsPreferenceController(mContext, "test_key"));
+ mController.setParentFragment(mFragment);
final String key = mController.getPreferenceKey();
when(mPreference.getKey()).thenReturn(key);
}
public void setUp() {
mContext = RuntimeEnvironment.application;
mChildren = new ArrayList<>();
- mController = new PreferenceCategoryController(mContext, "pref_key", mChildren);
+ mController = new PreferenceCategoryController(mContext, "pref_key").setChildren(mChildren);
}
@Test
- public void isAvailable_noChildren_true() {
- assertThat(mController.isAvailable()).isTrue();
+ public void isAvailable_noChildren_false() {
+ assertThat(mController.isAvailable()).isFalse();
}
@Test
final AbstractPreferenceController child = mock(AbstractPreferenceController.class);
when(child.isAvailable()).thenReturn(true);
mChildren.add(child);
+ mController.setChildren(mChildren);
assertThat(mController.isAvailable()).isTrue();
}
final AbstractPreferenceController child = mock(AbstractPreferenceController.class);
when(child.isAvailable()).thenReturn(false);
mChildren.add(child);
+ mController.setChildren(mChildren);
assertThat(mController.isAvailable()).isFalse();
}
OSDN Git Service
