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

Browse Source 
am: b084c60686

Change-Id: Ia3990dc8fa2c73079b997bda0e1656d173c65212
This commit is contained in:
Fan Zhang
2018-12-04 10:10:50 -08:00
committed by android-build-merger
parent 18a275efc3 b084c60686
commit 4036866211
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

@@ -68,7 +68,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

@@ -415,7 +415,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