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

Merge "Fix a bug where options menu was not showing." into oc-dev

Browse Source
This commit is contained in:
Daniel Nishi
2017-04-17 22:25:52 +00:00
committed by Android (Google) Code Review
parent 3a156f5509 e6740f740e
commit 4f2f6bcad9
3 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@
package com.android.settings.deviceinfo;
import android.app.Activity;
import android.app.LoaderManager;
import android.content.Context;
import android.content.Intent;
@@ -78,16 +79,15 @@ public class StorageDashboardFragment extends DashboardFragment
super.onCreate(icicle);
// Initialize the storage sizes that we can quickly calc.
final Context context = getActivity();
StorageManager sm = context.getSystemService(StorageManager.class);
final Activity activity = getActivity();
StorageManager sm = activity.getSystemService(StorageManager.class);
mVolume = Utils.maybeInitializeVolume(sm, getArguments());
if (mVolume == null) {
getActivity().finish();
activity.finish();
return;
}
mOptionMenuController = new PrivateVolumeOptionMenuController(
context, mVolume, new PackageManagerWrapperImpl(context.getPackageManager()));
initializeOptionsMenu(activity);
final long sharedDataSize = mVolume.getPath().getTotalSpace();
long totalSize = sm.getPrimaryStorageSize();
@@ -114,6 +114,15 @@ public class StorageDashboardFragment extends DashboardFragment
}
}
@VisibleForTesting
void initializeOptionsMenu(Activity activity) {
mOptionMenuController = new PrivateVolumeOptionMenuController(
activity, mVolume, new PackageManagerWrapperImpl(activity.getPackageManager()));
getLifecycle().addObserver(mOptionMenuController);
setHasOptionsMenu(true);
activity.invalidateOptionsMenu();
}
@Override
public void onResume() {
super.onResume();
@@ -156,7 +165,6 @@ public class StorageDashboardFragment extends DashboardFragment
new AutomaticStorageManagementSwitchPreferenceController(
context, mMetricsFeatureProvider, getFragmentManager());
getLifecycle().addObserver(asmController);
getLifecycle().addObserver(mOptionMenuController);
controllers.add(asmController);
return controllers;
}