From cdacd1df9ae2f405abc17545db2876c7df191730 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Thu, 20 Oct 2016 17:15:50 -0700 Subject: [PATCH] Add initial preferences to App&Notification screen. Bug: 31799948 Test: manual Change-Id: I93f9d6562f51d37fcd78bada2f7c37d6b16daabb --- AndroidManifest.xml | 37 ++++++++++ res/xml/advanced_apps.xml | 6 +- res/xml/app_and_notification.xml | 12 +++- .../android/settings/SettingsActivity.java | 3 +- .../applications/AdvancedAppSettings.java | 72 ++++++------------- .../settings/dashboard/DashboardFragment.java | 5 -- 6 files changed, 76 insertions(+), 59 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5721c743bfc..c987ec04a20 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -3327,6 +3327,43 @@ android:value="com.android.settings.category.ia.device" /> + + + + + + + + + + + + + + + + + + + + + + + + + + - + settings:keywords="@string/keywords_app_permissions"> + + diff --git a/res/xml/app_and_notification.xml b/res/xml/app_and_notification.xml index 5da902f96c9..4aa109e4e8c 100644 --- a/res/xml/app_and_notification.xml +++ b/res/xml/app_and_notification.xml @@ -15,6 +15,16 @@ limitations under the License. --> - + + + + + \ No newline at end of file diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 5452f916506..11f8105cbb7 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -281,6 +281,8 @@ public class SettingsActivity extends SettingsDrawerActivity "com.android.settings.Settings.SecurityDashboardAlias", Settings.SystemDashboardActivity.class.getName(), Settings.SupportDashboardActivity.class.getName(), + // Home page > Apps & Notifications + "com.android.settings.Settings.ManageApplicationsDashboardAlias", // Home page > Network & Internet "com.android.settings.Settings.WifiDashboardAlias", "com.android.settings.Settings.DataUsageDashboardAlias", @@ -289,7 +291,6 @@ public class SettingsActivity extends SettingsDrawerActivity "com.android.settings.Settings.DateTimeDashboardAlias", "com.android.settings.Settings.AccessibilityDashboardAlias", "com.android.settings.Settings.AboutDeviceDashboardAlias", - }; private static final String[] ENTRY_FRAGMENTS = { diff --git a/src/com/android/settings/applications/AdvancedAppSettings.java b/src/com/android/settings/applications/AdvancedAppSettings.java index db9d8dec5e8..59c1fbec7e9 100644 --- a/src/com/android/settings/applications/AdvancedAppSettings.java +++ b/src/com/android/settings/applications/AdvancedAppSettings.java @@ -15,57 +15,48 @@ */ package com.android.settings.applications; -import android.content.BroadcastReceiver; import android.content.Context; -import android.content.Intent; -import android.os.AsyncTask; import android.os.Bundle; import android.provider.SearchIndexableResource; -import android.support.v7.preference.Preference; + import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; -import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; -import com.android.settings.applications.PermissionsSummaryHelper.PermissionsResultCallback; +import com.android.settings.core.PreferenceController; +import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public class AdvancedAppSettings extends SettingsPreferenceFragment implements - Indexable { +public class AdvancedAppSettings extends DashboardFragment { static final String TAG = "AdvancedAppSettings"; - private static final String KEY_APP_PERM = "manage_perms"; - private static final String KEY_APP_DOMAIN_URLS = "domain_urls"; - private static final String KEY_HIGH_POWER_APPS = "high_power_apps"; - private static final String KEY_SYSTEM_ALERT_WINDOW = "system_alert_window"; - private static final String KEY_WRITE_SETTINGS_APPS = "write_settings_apps"; - - private Preference mAppPermsPreference; - private Preference mAppDomainURLsPreference; - private Preference mHighPowerPreference; - private Preference mSystemAlertWindowPreference; - private Preference mWriteSettingsPreference; - - private BroadcastReceiver mPermissionReceiver; - @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); - addPreferencesFromResource(R.xml.advanced_apps); + } - Preference permissions = getPreferenceScreen().findPreference(KEY_APP_PERM); - permissions.setIntent(new Intent(Intent.ACTION_MANAGE_PERMISSIONS)); + @Override + protected String getCategoryKey() { + return ""; + } - mAppPermsPreference = findPreference(KEY_APP_PERM); - mAppDomainURLsPreference = findPreference(KEY_APP_DOMAIN_URLS); - mHighPowerPreference = findPreference(KEY_HIGH_POWER_APPS); - mSystemAlertWindowPreference = findPreference(KEY_SYSTEM_ALERT_WINDOW); - mWriteSettingsPreference = findPreference(KEY_WRITE_SETTINGS_APPS); + @Override + protected String getLogTag() { + return TAG; + } + + @Override + protected int getPreferenceScreenResId() { + return R.xml.advanced_apps; + } + + @Override + protected List getPreferenceControllers(Context context) { + return null; } @Override @@ -73,25 +64,6 @@ public class AdvancedAppSettings extends SettingsPreferenceFragment implements return MetricsEvent.APPLICATIONS_ADVANCED; } - private final PermissionsResultCallback mPermissionCallback = new PermissionsResultCallback() { - @Override - public void onAppWithPermissionsCountsResult(int standardGrantedPermissionAppCount, - int standardUsedPermissionAppCount) { - if (getActivity() == null) { - return; - } - mPermissionReceiver = null; - if (standardUsedPermissionAppCount != 0) { - mAppPermsPreference.setSummary(getContext().getString( - R.string.app_permissions_summary, - standardGrantedPermissionAppCount, - standardUsedPermissionAppCount)); - } else { - mAppPermsPreference.setSummary(null); - } - } - }; - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java index 9ab8cf4b6e7..37bc4478418 100644 --- a/src/com/android/settings/dashboard/DashboardFragment.java +++ b/src/com/android/settings/dashboard/DashboardFragment.java @@ -277,11 +277,6 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment displayResourceTiles(); refreshDashboardTiles(TAG); - - if (!mProgressiveDisclosureMixin.isCollapsed() - && mProgressiveDisclosureMixin.shouldCollapse(getPreferenceScreen())) { - mProgressiveDisclosureMixin.collapse(getPreferenceScreen()); - } } /**