Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f37be6a8 authored by Fan Zhang's avatar Fan Zhang
Browse files

Add empty page for App & Notifications

Bug: 31799948
Test: manual
Change-Id: Iaab1a5988af30504d4e34ff4f63ae69e86b70f27
parent 1ec79681
Loading
Loading
Loading
Loading
+12 −0
Original line number Original line Diff line number Diff line
@@ -3069,6 +3069,18 @@
                       android:value="com.android.settings.datausage.DataUsageSummary"/>
                       android:value="com.android.settings.datausage.DataUsageSummary"/>
        </activity-alias>
        </activity-alias>


        <activity android:name=".Settings$AppAndNotificationDashboardActivity"
                  android:label="@string/app_and_notification_dashboard_title"
                  android:icon="@drawable/ic_settings_applications">
            <intent-filter android:priority="8">
                <action android:name="com.android.settings.action.SETTINGS"/>
            </intent-filter>
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                       android:value="com.android.settings.applications.AppAndNotificationDashboardFragment"/>
            <meta-data android:name="com.android.settings.category"
                       android:value="com.android.settings.category.ia.homepage"/>
        </activity>

        <activity-alias android:name="BatteryDashboardAlias"
        <activity-alias android:name="BatteryDashboardAlias"
                        android:targetActivity="Settings$PowerUsageSummaryActivity">
                        android:targetActivity="Settings$PowerUsageSummaryActivity">
            <intent-filter android:priority="7">
            <intent-filter android:priority="7">
+2 −0
Original line number Original line Diff line number Diff line
@@ -5929,6 +5929,8 @@
    <string name="network_dashboard_title">Network &amp; Internet</string>
    <string name="network_dashboard_title">Network &amp; Internet</string>
    <!-- Title for setting tile leading to Connected devices settings [CHAR LIMIT=40]-->
    <!-- Title for setting tile leading to Connected devices settings [CHAR LIMIT=40]-->
    <string name="connected_devices_dashboard_title">Connected devices</string>
    <string name="connected_devices_dashboard_title">Connected devices</string>
    <!-- Title for setting tile leading to Apps & Notification settings [CHAR LIMIT=40]-->
    <string name="app_and_notification_dashboard_title">Apps &amp; notifications</string>
    <!-- Summary text for system preference tile, showing current display language of device [CHAR LIMIT=NONE]-->
    <!-- Summary text for system preference tile, showing current display language of device [CHAR LIMIT=NONE]-->
    <string name="system_dashboard_summary">Language: <xliff:g id="language">%1$s</xliff:g></string>
    <string name="system_dashboard_summary">Language: <xliff:g id="language">%1$s</xliff:g></string>
+20 −0
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  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.
  -->

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

</PreferenceScreen>
 No newline at end of file
+1 −0
Original line number Original line Diff line number Diff line
@@ -166,6 +166,7 @@ public class Settings extends SettingsActivity {
    // Top level categories for new IA
    // Top level categories for new IA
    public static class NetworkDashboardActivity extends SettingsActivity {}
    public static class NetworkDashboardActivity extends SettingsActivity {}
    public static class ConnectedDeviceDashboardActivity extends SettingsActivity {}
    public static class ConnectedDeviceDashboardActivity extends SettingsActivity {}
    public static class AppAndNotificationDashboardActivity extends SettingsActivity {}
    public static class StorageDashboardActivity extends SettingsActivity {}
    public static class StorageDashboardActivity extends SettingsActivity {}
    public static class SystemDashboardActivity extends SettingsActivity {}
    public static class SystemDashboardActivity extends SettingsActivity {}
    public static class SupportDashboardActivity extends SettingsActivity {}
    public static class SupportDashboardActivity extends SettingsActivity {}
+4 −2
Original line number Original line Diff line number Diff line
@@ -61,6 +61,7 @@ import com.android.settings.accounts.AccountSettings;
import com.android.settings.accounts.AccountSyncSettings;
import com.android.settings.accounts.AccountSyncSettings;
import com.android.settings.accounts.ChooseAccountActivity;
import com.android.settings.accounts.ChooseAccountActivity;
import com.android.settings.accounts.ManagedProfileSettings;
import com.android.settings.accounts.ManagedProfileSettings;
import com.android.settings.applications.AppAndNotificationDashboardFragment;
import com.android.settings.applications.AdvancedAppSettings;
import com.android.settings.applications.AdvancedAppSettings;
import com.android.settings.applications.DrawOverlayDetails;
import com.android.settings.applications.DrawOverlayDetails;
import com.android.settings.applications.InstalledAppDetails;
import com.android.settings.applications.InstalledAppDetails;
@@ -272,6 +273,8 @@ public class SettingsActivity extends SettingsDrawerActivity
            // New IA
            // New IA
            // Home page
            // Home page
            Settings.NetworkDashboardActivity.class.getName(),
            Settings.NetworkDashboardActivity.class.getName(),
            Settings.ConnectedDeviceDashboardActivity.class.getName(),
            Settings.AppAndNotificationDashboardActivity.class.getName(),
            "com.android.settings.Settings.BatteryDashboardAlias",
            "com.android.settings.Settings.BatteryDashboardAlias",
            "com.android.settings.Settings.DisplayDashboardAlias",
            "com.android.settings.Settings.DisplayDashboardAlias",
            "com.android.settings.Settings.SoundDashboardAlias",
            "com.android.settings.Settings.SoundDashboardAlias",
@@ -281,8 +284,6 @@ public class SettingsActivity extends SettingsDrawerActivity
            // Home page > Network & Internet
            // Home page > Network & Internet
            "com.android.settings.Settings.WifiDashboardAlias",
            "com.android.settings.Settings.WifiDashboardAlias",
            "com.android.settings.Settings.DataUsageDashboardAlias",
            "com.android.settings.Settings.DataUsageDashboardAlias",
            // Home page > Connected devices
            Settings.ConnectedDeviceDashboardActivity.class.getName(),
            // Home page > System
            // Home page > System
            "com.android.settings.Settings.LanguageAndInputDashboardAlias",
            "com.android.settings.Settings.LanguageAndInputDashboardAlias",
            "com.android.settings.Settings.DateTimeDashboardAlias",
            "com.android.settings.Settings.DateTimeDashboardAlias",
@@ -393,6 +394,7 @@ public class SettingsActivity extends SettingsDrawerActivity
            SystemDashboardFragment.class.getName(),
            SystemDashboardFragment.class.getName(),
            NetworkDashboardFragment.class.getName(),
            NetworkDashboardFragment.class.getName(),
            ConnectedDeviceDashboardFragment.class.getName(),
            ConnectedDeviceDashboardFragment.class.getName(),
            AppAndNotificationDashboardFragment.class.getName(),
    };
    };




Loading