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

Commit fadbe5b0 authored by Arc Wang's avatar Arc Wang
Browse files

Launch StorageDashboardFragment instead of StorageSettings 

Since users can use StorageDashboardFragment to choose storages,
it's not necessary to choose storages in StorageSettings.

Bug: 174964885
Test: make RunSettingsRoboTests ROBOTEST_FILTER=LowStorageSliceTest
      manual
      Launch Storage Settings.
Change-Id: Ida61052c4294899099914d62da24ca2937a894a0
parent 11ad3be0

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -1972,7 +1972,7 @@ 
                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

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

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

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

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

                android:value="true" />

        </activity>

res/xml/top_level_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ 
        android:summary="@string/summary_placeholder"

        android:icon="@drawable/ic_homepage_storage"

        android:order="-60"

        android:fragment="com.android.settings.deviceinfo.StorageSettings"

        android:fragment="com.android.settings.deviceinfo.StorageDashboardFragment"

        settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"/>



    <Preference

res/xml/top_level_settings_grouped.xml

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
        settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"/>



    <com.android.settings.homepage.HomepagePreference

        android:fragment="com.android.settings.deviceinfo.StorageSettings"

        android:fragment="com.android.settings.deviceinfo.StorageDashboardFragment"

        android:icon="@drawable/ic_homepage_storage_v2"

        android:key="top_level_storage"

        android:order="-100"

src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import androidx.slice.builders.SliceAction; 
import com.android.settings.R;

import com.android.settings.SubSettings;

import com.android.settings.Utils;

import com.android.settings.deviceinfo.StorageSettings;

import com.android.settings.deviceinfo.StorageDashboardFragment;

import com.android.settings.slices.CustomSliceRegistry;

import com.android.settings.slices.CustomSliceable;

import com.android.settings.slices.SliceBuilderUtils;
@@ -107,7 +107,7 @@ public class LowStorageSlice implements CustomSliceable { 
                .toString();



        return SliceBuilderUtils.buildSearchResultPageIntent(mContext,

                StorageSettings.class.getName(), "" /* key */,

                StorageDashboardFragment.class.getName(), "" /* key */,

                screenTitle,

                SettingsEnums.SLICE)

                .setClassName(mContext.getPackageName(), SubSettings.class.getName())