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

Follow storage refactoring in system.

Browse Source 
Also add entry point for SystemUI unmounting, and require permissions
when launching into those flows.

Bug: 19993667
Change-Id: I703d2e5f118848a2e2e96ce1d7f970e5705a288a
This commit is contained in:
Jeff Sharkey
2015-04-14 16:44:34 -07:00
parent e29dae683e
commit 2949a4ab4d
16 changed files with 104 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/deviceinfo/StorageWizardBase.java
View File

@@ -37,9 +37,6 @@ import com.android.setupwizardlib.view.NavigationBar.NavigationBarListener;
import java.text.NumberFormat;
public abstract class StorageWizardBase extends Activity implements NavigationBarListener {
protected static final String EXTRA_DISK_ID = "disk_id";
protected static final String EXTRA_VOLUME_ID = "volume_id";
protected StorageManager mStorage;
protected VolumeInfo mVolume;
@@ -51,16 +48,16 @@ public abstract class StorageWizardBase extends Activity implements NavigationBa
mStorage = getSystemService(StorageManager.class);
final String volumeId = getIntent().getStringExtra(EXTRA_VOLUME_ID);
final String volumeId = getIntent().getStringExtra(VolumeInfo.EXTRA_VOLUME_ID);
if (!TextUtils.isEmpty(volumeId)) {
mVolume = mStorage.findVolumeById(volumeId);
}
final String diskId = getIntent().getStringExtra(EXTRA_DISK_ID);
final String diskId = getIntent().getStringExtra(DiskInfo.EXTRA_DISK_ID);
if (!TextUtils.isEmpty(diskId)) {
mDisk = mStorage.findDiskById(diskId);
} else {
mDisk = mStorage.findDiskByVolumeId(volumeId);
mDisk = mStorage.findDiskById(mVolume.diskId);
}
setTheme(R.style.SuwThemeMaterial_Light);