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

Merge "Update the old Storage view to look better." into oc-dev

Browse Source 
am: 427f976ff4

Change-Id: Ice0e3cb73a4d0b3ea81e83107f3f6084e83b5554
This commit is contained in:
Daniel Nishi
2017-04-17 22:39:52 +00:00
committed by android-build-merger
parent e69e9d74c5 427f976ff4
commit c99803bba4
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
View File

@@ -59,7 +59,6 @@ import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.applications.ManageApplications; import com.android.settings.applications.ManageApplications;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
import com.android.settings.deviceinfo.StorageSettings.MountTask; import com.android.settings.deviceinfo.StorageSettings.MountTask;
import com.android.settingslib.deviceinfo.StorageMeasurement; import com.android.settingslib.deviceinfo.StorageMeasurement;
import com.android.settingslib.deviceinfo.StorageMeasurement.MeasurementDetails; import com.android.settingslib.deviceinfo.StorageMeasurement.MeasurementDetails;
@@ -126,7 +125,6 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
private int mItemPoolIndex; private int mItemPoolIndex;
private Preference mExplore; private Preference mExplore;
private Preference mAutomaticStorageManagement;
private boolean mNeedsUpdate; private boolean mNeedsUpdate;
@@ -185,7 +183,6 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
mCurrentUser = mUserManager.getUserInfo(UserHandle.myUserId()); mCurrentUser = mUserManager.getUserInfo(UserHandle.myUserId());
mExplore = buildAction(R.string.storage_menu_explore); mExplore = buildAction(R.string.storage_menu_explore);
mAutomaticStorageManagement = buildAction(R.string.storage_menu_manage);
mNeedsUpdate = true; mNeedsUpdate = true;
@@ -212,9 +209,6 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
screen.removeAll(); screen.removeAll();
if (getResources().getBoolean(R.bool.config_storage_manager_settings_enabled)) {
addPreference(screen, mAutomaticStorageManagement);
}
addPreference(screen, mSummary); addPreference(screen, mSummary);
List<UserInfo> allUsers = mUserManager.getUsers(); List<UserInfo> allUsers = mUserManager.getUsers();
@@ -331,6 +325,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
private StorageItemPreference buildItem() { private StorageItemPreference buildItem() {
final StorageItemPreference item = new StorageItemPreference(getPrefContext()); final StorageItemPreference item = new StorageItemPreference(getPrefContext());
item.setIcon(R.drawable.empty_icon);
return item; return item;
} }
@@ -511,11 +506,6 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
case R.string.storage_menu_explore: { case R.string.storage_menu_explore: {
intent = mSharedVolume.buildBrowseIntent(); intent = mSharedVolume.buildBrowseIntent();
} break; } break;
case R.string.storage_menu_manage: {
startFragment(this, AutomaticStorageManagerSettings.class.getCanonicalName(),
R.string.automatic_storage_manager_settings, 0, null);
return true;
}
case 0: { case 0: {
UserInfoFragment.show(this, pref.getTitle(), pref.getSummary()); UserInfoFragment.show(this, pref.getTitle(), pref.getSummary());
return true; return true;