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

Merge "Make migrate option menu invisible when src volume is not mounted" am: 6db9f21256 am: b084c60686

Browse Source 
am: 4036866211

Change-Id: I25f21e3c176e225db6900d3c93b6a8860e701061
This commit is contained in:
Fan Zhang
2018-12-04 10:15:02 -08:00
committed by android-build-merger
parent 1470ee6262 4036866211
commit d3ad570818
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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());
}
}

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

@@ -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