am a61c803e: am 7f3026c3: am bb9d6b90: Merge "Refresh after clearing, tweak... (600cfe2f) · Commits · e / os / android_packages_apps_Settings

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

+10 −5

Original line number	Diff line number	Diff line
		@@ -192,8 +192,8 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
		for (int userIndex = 0; userIndex < userCount; ++userIndex) {
		final UserInfo userInfo = allUsers.get(userIndex);
		if (isProfileOf(mCurrentUser, userInfo)) {
		PreferenceCategory details = addCategory(screen,
		showHeaders ? userInfo.name : null);
		final PreferenceGroup details = showHeaders ?
		addCategory(screen, userInfo.name) : screen;
		addDetailItems(details, showShared, userInfo.id);
		++addedUserCount;
		}
		@@ -201,7 +201,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {

		// Add rest of users
		if (userCount - addedUserCount > 0) {
		PreferenceCategory otherUsers = addCategory(screen,
		PreferenceGroup otherUsers = addCategory(screen,
		getText(R.string.storage_other_users));
		for (int userIndex = 0; userIndex < userCount; ++userIndex) {
		final UserInfo userInfo = allUsers.get(userIndex);
		@@ -253,7 +253,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
		return category;
		}

		private void addDetailItems(PreferenceCategory category, boolean showShared, int userId) {
		private void addDetailItems(PreferenceGroup category, boolean showShared, int userId) {
		final int[] itemsToAdd = (showShared ? ITEMS_SHOW_SHARED : ITEMS_NO_SHOW_SHARED);
		for (int i = 0; i < itemsToAdd.length; ++i) {
		addItem(category, itemsToAdd[i], null, userId);
		@@ -719,8 +719,13 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
		public void onRemoveCompleted(final String packageName, final boolean succeeded) {
		synchronized (this) {
		if (--mRemaining == 0) {
		mTarget.getActivity().runOnUiThread(new Runnable() {
		@Override
		public void run() {
		mTarget.update();
		}
		});
		}
		}
		}
		}

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -176,6 +176,10 @@ public abstract class StorageWizardBase extends Activity {
		}
		}

		protected void setKeepScreenOn(boolean keepScreenOn) {
		getSetupWizardLayout().setKeepScreenOn(keepScreenOn);
		}

		public void onNavigateNext() {
		throw new UnsupportedOperationException();
		}

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

+13 −7

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import android.content.Intent;
		import android.content.pm.IPackageMoveObserver;
		import android.os.AsyncTask;
		import android.os.Bundle;
		import android.os.RemoteException;
		import android.os.storage.DiskInfo;
		import android.os.storage.StorageManager;
		import android.os.storage.VolumeInfo;
		@@ -55,6 +54,7 @@ public class StorageWizardFormatProgress extends StorageWizardBase {
		return;
		}
		setContentView(R.layout.storage_wizard_progress);
		setKeepScreenOn(true);

		mFormatPrivate = getIntent().getBooleanExtra(
		StorageWizardFormatConfirm.EXTRA_FORMAT_PRIVATE, false);
		@@ -144,16 +144,22 @@ public class StorageWizardFormatProgress extends StorageWizardBase {
		return;
		}

		if (activity.mFormatPrivate) {
		final float pct = (float) mInternalBench / (float) mPrivateBench;
		Log.d(TAG, "New volume is " + pct + "x the speed of internal");

		// TODO: refine this warning threshold
		if (mPrivateBench > 2000000000) {
		// To help set user expectations around device performance, we
		// warn if the adopted media is 0.25x the speed of internal
		// storage or slower.
		if (Float.isNaN(pct) \|\| pct < 0.25) {
		final SlowWarningFragment dialog = new SlowWarningFragment();
		dialog.show(activity.getFragmentManager(), TAG_SLOW_WARNING);
		} else {
		activity.onFormatFinished();
		}
		} else {
		activity.onFormatFinished();
		}
		}
		}