Change base fragment to InstrumentedFragment

- Modify PrivateVolumeForget, PrivateVolumeFormat, PrivateVolumeUnmount
- Add ShadowStorageManager
- Add test cases

Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo

Change-Id: I6883dd12cec00abbc3099bf31d285e6fe455eba6

src/com/android/settings/deviceinfo/PrivateVolumeForget.java

@@ -18,13 +18,13 @@ package com.android.settings.deviceinfo;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.app.Fragment;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.storage.StorageManager;
 import android.os.storage.VolumeRecord;
+import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -35,11 +35,13 @@ import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.search.actionbar.SearchMenuController;
 
-public class PrivateVolumeForget extends SettingsPreferenceFragment {
-    private static final String TAG_FORGET_CONFIRM = "forget_confirm";
+public class PrivateVolumeForget extends InstrumentedFragment {
+    @VisibleForTesting
+    static final String TAG_FORGET_CONFIRM = "forget_confirm";
 
     private VolumeRecord mRecord;
 
@@ -48,6 +50,13 @@ public class PrivateVolumeForget extends SettingsPreferenceFragment {
         return MetricsEvent.DEVICEINFO_STORAGE;
     }
 
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        setHasOptionsMenu(true);
+        SearchMenuController.init(this /* host */);
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
@@ -116,12 +125,12 @@ public class PrivateVolumeForget extends SettingsPreferenceFragment {
 
             builder.setPositiveButton(R.string.storage_menu_forget,
                     new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    storage.forgetVolume(fsUuid);
-                    getActivity().finish();
-                }
-            });
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            storage.forgetVolume(fsUuid);
+                            getActivity().finish();
+                        }
+                    });
             builder.setNegativeButton(R.string.cancel, null);
 
             return builder.create();

src/com/android/settings/deviceinfo/PrivateVolumeFormat.java

@@ -17,7 +17,6 @@
 package com.android.settings.deviceinfo;
 
 import static android.os.storage.DiskInfo.EXTRA_DISK_ID;
-
 import static com.android.settings.deviceinfo.StorageWizardBase.EXTRA_FORMAT_FORGET_UUID;
 import static com.android.settings.deviceinfo.StorageWizardBase.EXTRA_FORMAT_PRIVATE;
 
@@ -36,9 +35,9 @@ import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.core.InstrumentedPreferenceFragment;
+import com.android.settings.core.InstrumentedFragment;
 
-public class PrivateVolumeFormat extends InstrumentedPreferenceFragment {
+public class PrivateVolumeFormat extends InstrumentedFragment {
     private VolumeInfo mVolume;
     private DiskInfo mDisk;
 

src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java

@@ -30,10 +30,11 @@ import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.deviceinfo.StorageSettings.UnmountTask;
+import com.android.settings.search.actionbar.SearchMenuController;
 
-public class PrivateVolumeUnmount extends SettingsPreferenceFragment {
+public class PrivateVolumeUnmount extends InstrumentedFragment {
     private VolumeInfo mVolume;
     private DiskInfo mDisk;
 
@@ -42,6 +43,13 @@ public class PrivateVolumeUnmount extends SettingsPreferenceFragment {
         return MetricsEvent.DEVICEINFO_STORAGE;
     }
 
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        setHasOptionsMenu(true);
+        SearchMenuController.init(this /* host */);
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {