Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3ad5708 authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Merge "Make migrate option menu invisible when src volume is not mounted" am:... 

Merge "Make migrate option menu invisible when src volume is not mounted" am: 6db9f212 am: b084c606
am: 40368662

Change-Id: I25f21e3c176e225db6900d3c93b6a8860e701061
parents 1470ee62 40368662

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

+2 −1
Original line number Diff line number Diff line
@@ -67,7 +67,8 @@ public class PrivateVolumeOptionMenuController implements LifecycleObserver, OnC 
        if (migrate != null) {

            migrate.setVisible((privateVol != null)

                    && (privateVol.getType() == VolumeInfo.TYPE_PRIVATE)

                    && !Objects.equals(mVolumeInfo, privateVol));

                    && !Objects.equals(mVolumeInfo, privateVol)

                    && privateVol.isMountedWritable());

        }

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -416,7 +416,8 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { 
                .getPrimaryStorageCurrentVolume();

        migrate.setVisible((privateVol != null)

                && (privateVol.getType() == VolumeInfo.TYPE_PRIVATE)

                && !Objects.equals(mVolume, privateVol));

                && !Objects.equals(mVolume, privateVol)

                && privateVol.isMountedWritable());

    }



    @Override

tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java

+13 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ public class PrivateVolumeOptionMenuControllerTest { 
        MockitoAnnotations.initMocks(this);



        when(mVolumeInfo.getType()).thenReturn(VolumeInfo.TYPE_PRIVATE);

        when(mVolumeInfo.isMountedWritable()).thenReturn(true);

        when(mPrimaryInfo.getType()).thenReturn(VolumeInfo.TYPE_PRIVATE);

        when(mMenu.findItem(anyInt())).thenReturn(mMigrateMenuItem);

        when(mMigrateMenuItem.getItemId()).thenReturn(100);
@@ -82,6 +83,7 @@ public class PrivateVolumeOptionMenuControllerTest { 
    @Test

    public void testMigrateDataIsNotVisibleNormally() {

        when(mPm.getPrimaryStorageCurrentVolume()).thenReturn(mPrimaryInfo);

        when(mPrimaryInfo.isMountedWritable()).thenReturn(true);



        mController.onCreateOptionsMenu(mMenu, mMenuInflater);

        mController.onPrepareOptionsMenu(mMenu);
@@ -99,6 +101,17 @@ public class PrivateVolumeOptionMenuControllerTest { 
        verify(mMigrateMenuItem).setVisible(true);

    }



    @Test

    public void testMigrateDataIsNotVisibleWhenExternalVolumeIsNotMounted() {

        when(mPm.getPrimaryStorageCurrentVolume()).thenReturn(mVolumeInfo);

        when(mVolumeInfo.isMountedWritable()).thenReturn(false);



        mController.onCreateOptionsMenu(mMenu, mMenuInflater);

        mController.onPrepareOptionsMenu(mMenu);



        verify(mMigrateMenuItem).setVisible(false);

    }



    @Test

    public void testMigrateDataGoesToMigrateWizard() {

        when(mPm.getPrimaryStorageCurrentVolume()).thenReturn(mVolumeInfo);