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

Merge "Update StorageSettings to use StorageDashbordFragment."

Browse Source
This commit is contained in:
Daniel Nishi
2017-01-13 22:06:45 +00:00
committed by Android (Google) Code Review
parent 89b4f938ca 769d16ed65
commit 8a2ff52e61
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -3121,7 +3121,7 @@
<meta-data android:name="com.android.settings.category" <meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.homepage" /> android:value="com.android.settings.category.ia.homepage" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.deviceinfo.StorageDashboardFragment" /> android:value="com.android.settings.deviceinfo.StorageSettings" />
<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>

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

@@ -62,7 +62,8 @@ public class StorageDashboardFragment extends DashboardFragment {
// Initialize the storage sizes that we can quickly calc. // Initialize the storage sizes that we can quickly calc.
StorageManager sm = context.getSystemService(StorageManager.class); StorageManager sm = context.getSystemService(StorageManager.class);
mVolume = sm.findVolumeById(VolumeInfo.ID_PRIVATE_INTERNAL); String volumeId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID);
mVolume = sm.findVolumeById(volumeId);
if (!isVolumeValid()) { if (!isVolumeValid()) {
getActivity().finish(); getActivity().finish();
return; return;

7
src/com/android/settings/deviceinfo/StorageSettings.java
View File

@@ -235,9 +235,8 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
// Only showing primary internal storage, so just shortcut // Only showing primary internal storage, so just shortcut
final Bundle args = new Bundle(); final Bundle args = new Bundle();
args.putString(VolumeInfo.EXTRA_VOLUME_ID, VolumeInfo.ID_PRIVATE_INTERNAL); args.putString(VolumeInfo.EXTRA_VOLUME_ID, VolumeInfo.ID_PRIVATE_INTERNAL);
PrivateVolumeSettings.setVolumeSize(args, sTotalInternalStorage);
Intent intent = Utils.onBuildStartFragmentIntent(getActivity(), Intent intent = Utils.onBuildStartFragmentIntent(getActivity(),
PrivateVolumeSettings.class.getName(), args, null, R.string.apps_storage, null, StorageDashboardFragment.class.getName(), args, null, R.string.apps_storage, null,
false); false);
intent.putExtra(SettingsDrawerActivity.EXTRA_SHOW_MENU, true); intent.putExtra(SettingsDrawerActivity.EXTRA_SHOW_MENU, true);
getActivity().startActivity(intent); getActivity().startActivity(intent);
@@ -280,9 +279,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
if (vol.getType() == VolumeInfo.TYPE_PRIVATE) { if (vol.getType() == VolumeInfo.TYPE_PRIVATE) {
final Bundle args = new Bundle(); final Bundle args = new Bundle();
args.putString(VolumeInfo.EXTRA_VOLUME_ID, vol.getId()); args.putString(VolumeInfo.EXTRA_VOLUME_ID, vol.getId());
PrivateVolumeSettings.setVolumeSize(args, PrivateStorageInfo.getTotalSize(vol, startFragment(this, StorageDashboardFragment.class.getCanonicalName(),
sTotalInternalStorage));
startFragment(this, PrivateVolumeSettings.class.getCanonicalName(),
-1, 0, args); -1, 0, args);
return true; return true;