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

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

Add storage dashborad page. 

Refactor shared dashboard page display logic between storage and
system page.

Bug: 31800690
Test: RunSettingsRoboTests

Change-Id: I7eb86f590b79ab871bdb383fb2f5326790beb193
parent 27991718

AndroidManifest.xml

+29 −1
Original line number Diff line number Diff line
@@ -3035,7 +3035,7 @@ 
        <!-- Alias for battery settings in new IA. Remove and merge metadata into TargetActivity -->

        <activity-alias android:name="BatteryDashboardAlias"

                        android:targetActivity="Settings$PowerUsageSummaryActivity">

            <intent-filter android:priority="10">

            <intent-filter android:priority="7">

                <action android:name="com.android.settings.action.SETTINGS"/>

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -3044,6 +3044,34 @@ 
                       android:value="com.android.settings.category.ia.homepage"/>

        </activity-alias>



        <activity android:name=".Settings$StorageDashboardActivity"

                  android:label="@string/storage_settings"

                  android:icon="@drawable/ic_settings_storage">

            <intent-filter android:priority="5">

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.ia.homepage" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.deviceinfo.StorageDashboardFragment" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true" />

        </activity>



        <activity-alias android:name="InternalStorageDashboardAlias"

                        android:targetActivity="Settings$StorageSettingsActivity"

                        android:label="@string/storage_internal_title">

            <intent-filter android:priority="5">

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.ia.storage" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.deviceinfo.StorageSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true" />

        </activity-alias>



        <activity android:name=".Settings$SystemDashboardActivity"

                  android:label="@string/header_category_system"

                  android:icon="@drawable/ic_settings_about">

res/xml/storage_dashboard_fragment.xml

0 → 100644
+23 −0
Original line number 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">

    <com.android.settings.dashboard.DashboardTilePreference

        android:key="pref_manage_storage"

        android:title="@string/storage_menu_manage"

        android:fragment="com.android.settings.deletionhelper.AutomaticStorageManagerSettings">

    </com.android.settings.dashboard.DashboardTilePreference>

</PreferenceScreen>
 
 No newline at end of file

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ public class Settings extends SettingsActivity { 
    public static class SystemSettings extends SettingsActivity { /* empty */ }



    // Top level categories for new IA

    public static class StorageDashboardActivity extends SettingsActivity {}

    public static class SystemDashboardActivity extends SettingsActivity {}

    public static class SupportDashboardActivity extends SettingsActivity {}

src/com/android/settings/SettingsActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ import com.android.settings.deviceinfo.PrivateVolumeSettings; 
import com.android.settings.deviceinfo.PublicVolumeSettings;

import com.android.settings.deviceinfo.SimStatus;

import com.android.settings.deviceinfo.Status;

import com.android.settings.deviceinfo.StorageDashboardFragment;

import com.android.settings.deviceinfo.StorageSettings;

import com.android.settings.display.NightDisplaySettings;

import com.android.settings.fuelgauge.BatterySaverSettings;
@@ -377,6 +378,7 @@ public class SettingsActivity extends SettingsDrawerActivity 
            ManageDomainUrls.class.getName(),

            AutomaticStorageManagerSettings.class.getName(),

            SupportFragment.class.getName(),

            StorageDashboardFragment.class.getName(),

            SystemDashboardFragment.class.getName(),

    };

src/com/android/settings/core/InstrumentedFragment.java

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ public abstract class InstrumentedFragment extends ObservablePreferenceFragment 
    // metrics placeholder value. Only use this for development.

    protected final int PLACEHOLDER_METRIC = 10000;

    protected final int SYSTEM_CATEGORY_FRAGMENT = PLACEHOLDER_METRIC + 1;

    protected final int STORAGE_CATEGORY_FRAGMENT = PLACEHOLDER_METRIC + 2;



    public InstrumentedFragment() {

        // Mixin that logs visibility change for activity.