From f37be6a859c2d5c12c1e485795699762d53bd5f1 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Thu, 20 Oct 2016 12:47:52 -0700 Subject: [PATCH] Add empty page for App & Notifications Bug: 31799948 Test: manual Change-Id: Iaab1a5988af30504d4e34ff4f63ae69e86b70f27 --- AndroidManifest.xml | 12 +++++ res/values/strings.xml | 2 + res/xml/app_and_notification.xml | 20 ++++++++ src/com/android/settings/Settings.java | 1 + src/com/android/settings/SettingsActivity.java | 6 ++- .../AppAndNotificationDashboardFragment.java | 56 ++++++++++++++++++++++ .../settings/core/InstrumentedFragment.java | 1 + 7 files changed, 96 insertions(+), 2 deletions(-) create mode 100644 res/xml/app_and_notification.xml create mode 100644 src/com/android/settings/applications/AppAndNotificationDashboardFragment.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 966e0757f4..5721c743bf 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -3069,6 +3069,18 @@ android:value="com.android.settings.datausage.DataUsageSummary"/> + + + + + + + + diff --git a/res/values/strings.xml b/res/values/strings.xml index 8e6336f695..c5e45c03b1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5929,6 +5929,8 @@ Network & Internet Connected devices + + Apps & notifications Language: %1$s diff --git a/res/xml/app_and_notification.xml b/res/xml/app_and_notification.xml new file mode 100644 index 0000000000..5da902f96c --- /dev/null +++ b/res/xml/app_and_notification.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 91db7fa0f1..bfecbbf17d 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -166,6 +166,7 @@ public class Settings extends SettingsActivity { // Top level categories for new IA public static class NetworkDashboardActivity extends SettingsActivity {} public static class ConnectedDeviceDashboardActivity extends SettingsActivity {} + public static class AppAndNotificationDashboardActivity extends SettingsActivity {} public static class StorageDashboardActivity extends SettingsActivity {} public static class SystemDashboardActivity extends SettingsActivity {} public static class SupportDashboardActivity extends SettingsActivity {} diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index b434777499..5452f91650 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -61,6 +61,7 @@ import com.android.settings.accounts.AccountSettings; import com.android.settings.accounts.AccountSyncSettings; import com.android.settings.accounts.ChooseAccountActivity; import com.android.settings.accounts.ManagedProfileSettings; +import com.android.settings.applications.AppAndNotificationDashboardFragment; import com.android.settings.applications.AdvancedAppSettings; import com.android.settings.applications.DrawOverlayDetails; import com.android.settings.applications.InstalledAppDetails; @@ -272,6 +273,8 @@ public class SettingsActivity extends SettingsDrawerActivity // New IA // Home page Settings.NetworkDashboardActivity.class.getName(), + Settings.ConnectedDeviceDashboardActivity.class.getName(), + Settings.AppAndNotificationDashboardActivity.class.getName(), "com.android.settings.Settings.BatteryDashboardAlias", "com.android.settings.Settings.DisplayDashboardAlias", "com.android.settings.Settings.SoundDashboardAlias", @@ -281,8 +284,6 @@ public class SettingsActivity extends SettingsDrawerActivity // Home page > Network & Internet "com.android.settings.Settings.WifiDashboardAlias", "com.android.settings.Settings.DataUsageDashboardAlias", - // Home page > Connected devices - Settings.ConnectedDeviceDashboardActivity.class.getName(), // Home page > System "com.android.settings.Settings.LanguageAndInputDashboardAlias", "com.android.settings.Settings.DateTimeDashboardAlias", @@ -393,6 +394,7 @@ public class SettingsActivity extends SettingsDrawerActivity SystemDashboardFragment.class.getName(), NetworkDashboardFragment.class.getName(), ConnectedDeviceDashboardFragment.class.getName(), + AppAndNotificationDashboardFragment.class.getName(), }; diff --git a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java new file mode 100644 index 0000000000..8630541f86 --- /dev/null +++ b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2016 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; + +import android.content.Context; + +import com.android.settings.R; +import com.android.settings.core.PreferenceController; +import com.android.settings.dashboard.DashboardFragment; +import com.android.settingslib.drawer.CategoryKey; + +import java.util.List; + +public class AppAndNotificationDashboardFragment extends DashboardFragment { + + private static final String TAG = "AppAndNotifDashboard"; + + @Override + public int getMetricsCategory() { + return APP_AND_NOTIFICATION_CATEGORY_FRAGMENT; + } + + @Override + protected String getCategoryKey() { + return CategoryKey.CATEGORY_APPS; + } + + @Override + protected String getLogTag() { + return TAG; + } + + @Override + protected int getPreferenceScreenResId() { + return R.xml.app_and_notification; + } + + @Override + protected List getPreferenceControllers(Context context) { + return null; + } +} diff --git a/src/com/android/settings/core/InstrumentedFragment.java b/src/com/android/settings/core/InstrumentedFragment.java index 7297953b4a..ca683e3c05 100644 --- a/src/com/android/settings/core/InstrumentedFragment.java +++ b/src/com/android/settings/core/InstrumentedFragment.java @@ -39,6 +39,7 @@ public abstract class InstrumentedFragment extends ObservablePreferenceFragment protected final int STORAGE_CATEGORY_FRAGMENT = PLACEHOLDER_METRIC + 2; protected final int NETWORK_CATEGORY_FRAGMENT = PLACEHOLDER_METRIC + 3; protected final int CONNECTED_DEVICE_CATEGORY_FRAGMENT = PLACEHOLDER_METRIC + 4; + protected final int APP_AND_NOTIFICATION_CATEGORY_FRAGMENT = PLACEHOLDER_METRIC + 5; public InstrumentedFragment() { // Mixin that logs visibility change for activity. -- 2.11.0