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

Merge "Add page id enum for storage settings"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-11-27 06:10:59 +00:00
committed by Android (Google) Code Review
parent 2687db5de2 d132199429
commit 41a77adafb
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/dashboard/profileselector/ProfileSelectStorageFragment.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.dashboard.profileselector; package com.android.settings.dashboard.profileselector;
import android.app.Activity; import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserHandle; import android.os.UserHandle;
@@ -42,6 +41,7 @@ import com.android.settings.deviceinfo.storage.StorageEntry;
import com.android.settings.deviceinfo.storage.StorageSelectionPreferenceController; import com.android.settings.deviceinfo.storage.StorageSelectionPreferenceController;
import com.android.settings.deviceinfo.storage.StorageUsageProgressBarPreferenceController; import com.android.settings.deviceinfo.storage.StorageUsageProgressBarPreferenceController;
import com.android.settings.deviceinfo.storage.StorageUtils; import com.android.settings.deviceinfo.storage.StorageUtils;
import com.android.settingslib.core.instrumentation.Instrumentable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -323,7 +323,7 @@ public class ProfileSelectStorageFragment extends ProfileSelectFragment {
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
return SettingsEnums.SETTINGS_STORAGE_CATEGORY; return Instrumentable.METRICS_CATEGORY_UNKNOWN;
} }
@Override @Override

3
src/com/android/settings/deviceinfo/StorageCategoryFragment.java
View File

@@ -229,7 +229,8 @@ public class StorageCategoryFragment extends DashboardFragment
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
return SettingsEnums.SETTINGS_STORAGE_CATEGORY; return mIsWorkProfile ? SettingsEnums.SETTINGS_STORAGE_CATEGORY_WORK :
SettingsEnums.SETTINGS_STORAGE_CATEGORY;
} }
@Override @Override