PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Launch StorageDashboardFragment instead of StorageSettings" into sc-dev

Browse Source
This commit is contained in:
Arc Wang
2021-03-26 07:36:07 +00:00
committed by Android (Google) Code Review
parent f7586147f8 fadbe5b070
commit fd9c0c7e90
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -1971,7 +1971,7 @@
<category android:name="com.android.settings.SHORTCUT" /> <category android:name="com.android.settings.SHORTCUT" />
</intent-filter> </intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS" <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" <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" /> android:value="true" />
</activity> </activity>

2
res/xml/top_level_settings.xml
View File

@@ -78,7 +78,7 @@
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:icon="@drawable/ic_homepage_storage" android:icon="@drawable/ic_homepage_storage"
android:order="-60" android:order="-60"
android:fragment="com.android.settings.deviceinfo.StorageSettings" android:fragment="com.android.settings.deviceinfo.StorageDashboardFragment"
settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"/> settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"/>
<Preference <Preference

2
res/xml/top_level_settings_grouped.xml
View File

@@ -59,7 +59,7 @@
settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"/> settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"/>
<com.android.settings.homepage.HomepagePreference <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:icon="@drawable/ic_homepage_storage_v2"
android:key="top_level_storage" android:key="top_level_storage"
android:order="-100" android:order="-100"

4
src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java
View File

@@ -33,7 +33,7 @@ import androidx.slice.builders.SliceAction;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SubSettings; import com.android.settings.SubSettings;
import com.android.settings.Utils; 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.CustomSliceRegistry;
import com.android.settings.slices.CustomSliceable; import com.android.settings.slices.CustomSliceable;
import com.android.settings.slices.SliceBuilderUtils; import com.android.settings.slices.SliceBuilderUtils;
@@ -107,7 +107,7 @@ public class LowStorageSlice implements CustomSliceable {
.toString(); .toString();
return SliceBuilderUtils.buildSearchResultPageIntent(mContext, return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
StorageSettings.class.getName(), "" /* key */, StorageDashboardFragment.class.getName(), "" /* key */,
screenTitle, screenTitle,
SettingsEnums.SLICE) SettingsEnums.SLICE)
.setClassName(mContext.getPackageName(), SubSettings.class.getName()) .setClassName(mContext.getPackageName(), SubSettings.class.getName())