Update storage wizard to latest UX mocks.
Mostly shuffling around strings and layouts. Slow device warning is now a full-screen activity, and format warning is now a dialog. Bug: 76097999 Test: atest com.android.settings.ui.StorageWizardTest Change-Id: Ifd74e3b1389f0cc9590f6a6a2cd49671f3bbc746
This commit is contained in:
@@ -18,7 +18,6 @@ package com.android.settings.deviceinfo;
|
||||
|
||||
import android.app.ActivityManager;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.res.Resources;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
@@ -223,19 +222,12 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment {
|
||||
|
||||
@Override
|
||||
public boolean onPreferenceTreeClick(Preference pref) {
|
||||
final Context context = getActivity();
|
||||
if (pref == mMount) {
|
||||
new MountTask(context, mVolume).execute();
|
||||
new MountTask(getActivity(), mVolume).execute();
|
||||
} else if (pref == mFormatPublic) {
|
||||
final Intent intent = new Intent(context, StorageWizardFormatConfirm.class);
|
||||
intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
|
||||
intent.putExtra(StorageWizardFormatConfirm.EXTRA_FORMAT_PRIVATE, false);
|
||||
startActivity(intent);
|
||||
StorageWizardFormatConfirm.showPublic(getActivity(), mDisk.getId());
|
||||
} else if (pref == mFormatPrivate) {
|
||||
final Intent intent = new Intent(context, StorageWizardFormatConfirm.class);
|
||||
intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
|
||||
intent.putExtra(StorageWizardFormatConfirm.EXTRA_FORMAT_PRIVATE, true);
|
||||
startActivity(intent);
|
||||
StorageWizardFormatConfirm.showPrivate(getActivity(), mDisk.getId());
|
||||
}
|
||||
|
||||
return super.onPreferenceTreeClick(pref);
|
||||
|
Reference in New Issue
Block a user