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

am 04df8b77: Iteration on multi-user storage UI.

Browse Source 
* commit '04df8b77a40c06488a954a22cc5be638179b7747':
  Iteration on multi-user storage UI.
This commit is contained in:
Jeff Sharkey
2012-09-07 13:26:56 -07:00
committed by Android Git Automerger
parent e8d2ae5f17 04df8b77a4
commit 20ec00d3e8
5 changed files with 111 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -1965,6 +1965,9 @@
<!-- Storage setting. Summary for PTP checkbox [CHAR LIMIT=NONE]-->
<string name="usb_label_installer_cd">"Install file-transfer tools"</string>
<!-- Section header above list of other users storage [CHAR LIMIT=32] -->
<string name="storage_other_users">Other users</string>
<!-- Phone info screen, section titles: -->
<string name="battery_status_title">Battery status</string>
<!-- Phone info screen, section titles: -->

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

@@ -101,8 +101,7 @@ public class Memory extends SettingsPreferenceFragment {
private void addCategoryForVolume(StorageVolume volume) {
final StorageVolumePreferenceCategory category = new StorageVolumePreferenceCategory(
getActivity(), volume, mStorageManager);
// TODO: if primary emulated storage, then insert split items
getActivity(), volume);
mCategories.add(category);
getPreferenceScreen().addPreference(category);
category.init();

23
src/com/android/settings/deviceinfo/PercentageBarChart.java
View File

@@ -16,8 +16,6 @@
package com.android.settings.deviceinfo;
import com.android.settings.R;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Canvas;
@@ -26,10 +24,13 @@ import android.graphics.Paint;
import android.util.AttributeSet;
import android.view.View;
import com.android.settings.R;
import java.util.Collection;
/**
*
* Draws a horizontal bar chart with colored slices, each represented by
* {@link Entry}.
*/
public class PercentageBarChart extends View {
private final Paint mEmptyPaint = new Paint();
@@ -38,14 +39,21 @@ public class PercentageBarChart extends View {
private int mMinTickWidth = 1;
public static class Entry {
public static class Entry implements Comparable<Entry> {
public final int order;
public final float percentage;
public final Paint paint;
protected Entry(float percentage, Paint paint) {
protected Entry(int order, float percentage, Paint paint) {
this.order = order;
this.percentage = percentage;
this.paint = paint;
}
@Override
public int compareTo(Entry another) {
return order - another.order;
}
}
public PercentageBarChart(Context context, AttributeSet attrs) {
@@ -139,12 +147,11 @@ public class PercentageBarChart extends View {
* @param percentage the total width that
* @param color the color to draw the entry
*/
public static Entry createEntry(float percentage, int color) {
public static Entry createEntry(int order, float percentage, int color) {
final Paint p = new Paint();
p.setColor(color);
p.setStyle(Paint.Style.FILL);
return new Entry(percentage, p);
return new Entry(order, percentage, p);
}
public void setEntries(Collection<Entry> entries) {

137
src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
View File

@@ -43,6 +43,7 @@ import com.android.settings.deviceinfo.StorageMeasurement.MeasurementReceiver;
import com.google.android.collect.Lists;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -65,10 +66,14 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory
private Preference mFormatPreference;
private Preference mStorageLow;
private final Resources mResources;
private final StorageVolume mVolume;
private final StorageVolume mStorageVolume;
private final boolean mIsEmulated;
private final boolean mIsPrimary;
private final Resources mResources;
private final StorageManager mStorageManager;
private final UserManager mUserManager;
/** Measurement for local user. */
private StorageMeasurement mLocalMeasure;
@@ -76,7 +81,6 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory
private List<StorageMeasurement> mAllMeasures = Lists.newArrayList();
private boolean mAllowFormat;
private final boolean mMeasureUsers;
private boolean mUsbConnected;
private String mUsbFunction;
@@ -166,15 +170,17 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory
}
};
public StorageVolumePreferenceCategory(
Context context, StorageVolume volume, StorageManager storageManager) {
public StorageVolumePreferenceCategory(Context context, StorageVolume volume) {
super(context);
mVolume = volume;
mIsPrimary = volume != null ? volume.isPrimary() : false;
mIsEmulated = volume != null ? volume.isEmulated() : false;
mResources = context.getResources();
mStorageVolume = volume;
mStorageManager = storageManager;
final boolean isPrimary = volume != null ? volume.isPrimary() : false;
mStorageManager = (StorageManager) context.getSystemService(Context.STORAGE_SERVICE);
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
setTitle(volume != null ? volume.getDescription(context)
: context.getText(R.string.internal_storage));
@@ -183,13 +189,11 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory
mAllMeasures.add(mLocalMeasure);
// Cannot format emulated storage
mAllowFormat = mStorageVolume != null && !mStorageVolume.isEmulated();
mAllowFormat = mVolume != null && !mVolume.isEmulated();
// For now we are disabling reformatting secondary external storage
// until some interoperability problems with MTP are fixed
if (!isPrimary) mAllowFormat = false;
// Measure other users when showing primary emulated storage
mMeasureUsers = (mStorageVolume != null && mStorageVolume.isEmulated()) && isPrimary;
if (!mIsPrimary) mAllowFormat = false;
}
private void addStorageItem(String key, int titleRes, int colorRes) {
@@ -203,22 +207,6 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory
public void init() {
final Context context = getContext();
mUsageBarPreference = new UsageBarPreference(context);
mUsageBarPreference.setOrder(ORDER_USAGE_BAR);
addPreference(mUsageBarPreference);
addStorageItem(KEY_TOTAL_SIZE, R.string.memory_size, 0);
addStorageItem(KEY_APPLICATIONS, R.string.memory_apps_usage, R.color.memory_apps_usage);
addStorageItem(KEY_DCIM, R.string.memory_dcim_usage, R.color.memory_dcim);
addStorageItem(KEY_MUSIC, R.string.memory_music_usage, R.color.memory_music);
addStorageItem(KEY_DOWNLOADS, R.string.memory_downloads_usage, R.color.memory_downloads);
addStorageItem(KEY_MISC, R.string.memory_media_misc_usage, R.color.memory_misc);
addStorageItem(KEY_AVAILABLE, R.string.memory_available, R.color.memory_avail);
if (mMeasureUsers) {
final UserManager userManager = (UserManager) context.getSystemService(
Context.USER_SERVICE);
final UserInfo currentUser;
try {
currentUser = ActivityManagerNative.getDefault().getCurrentUser();
@@ -226,18 +214,36 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory
throw new RuntimeException("Failed to get current user");
}
int count = 0;
for (UserInfo info : userManager.getUsers()) {
// Only measure other users
if (info.id == currentUser.id) {
continue;
final List<UserInfo> otherUsers = getUsersExcluding(currentUser);
final boolean measureUsers = mIsEmulated && mIsPrimary && otherUsers.size() > 0;
mUsageBarPreference = new UsageBarPreference(context);
mUsageBarPreference.setOrder(ORDER_USAGE_BAR);
addPreference(mUsageBarPreference);
addStorageItem(KEY_TOTAL_SIZE, R.string.memory_size, 0);
addStorageItem(KEY_AVAILABLE, R.string.memory_available, R.color.memory_avail);
if (measureUsers) {
addPreference(new PreferenceHeader(context, currentUser.name));
}
addStorageItem(KEY_APPLICATIONS, R.string.memory_apps_usage, R.color.memory_apps_usage);
addStorageItem(KEY_DCIM, R.string.memory_dcim_usage, R.color.memory_dcim);
addStorageItem(KEY_MUSIC, R.string.memory_music_usage, R.color.memory_music);
addStorageItem(KEY_DOWNLOADS, R.string.memory_downloads_usage, R.color.memory_downloads);
addStorageItem(KEY_MISC, R.string.memory_media_misc_usage, R.color.memory_misc);
if (measureUsers) {
addPreference(new PreferenceHeader(context, R.string.storage_other_users));
int count = 0;
for (UserInfo info : otherUsers) {
final UserHandle user = new UserHandle(info.id);
final String key = buildUserKey(user);
final StorageMeasurement measure = StorageMeasurement.getInstance(
context, mStorageVolume, user);
context, mVolume, user);
measure.setIncludeAppCodeSize(false);
mAllMeasures.add(measure);
@@ -276,14 +282,14 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory
}
public StorageVolume getStorageVolume() {
return mStorageVolume;
return mVolume;
}
private void updatePreferencesFromState() {
mMountTogglePreference.setEnabled(true);
String state = mStorageVolume != null
? mStorageManager.getVolumeState(mStorageVolume.getPath())
String state = mVolume != null
? mStorageManager.getVolumeState(mVolume.getPath())
: Environment.MEDIA_MOUNTED;
String readOnly = "";
@@ -295,7 +301,7 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory
}
}
if ((mStorageVolume == null || !mStorageVolume.isRemovable())
if ((mVolume == null || !mVolume.isRemovable())
&& !Environment.MEDIA_UNMOUNTED.equals(state)) {
// This device has built-in storage that is not removable.
// There is no reason for the user to unmount it.
@@ -354,7 +360,7 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory
final long usedSize = totalSize - availSize;
mUsageBarPreference.clear();
mUsageBarPreference.addEntry(usedSize / (float) totalSize, android.graphics.Color.GRAY);
mUsageBarPreference.addEntry(0, usedSize / (float) totalSize, android.graphics.Color.GRAY);
mUsageBarPreference.commit();
mShowingApprox = true;
@@ -373,7 +379,8 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory
if (mLocalMeasure.isExternalSDCard()) {
// TODO FIXME: external SD card will not report any size. Show used space in bar graph
final long usedSize = totalSize - availSize;
mUsageBarPreference.addEntry(usedSize / (float) totalSize, android.graphics.Color.GRAY);
mUsageBarPreference.addEntry(
0, usedSize / (float) totalSize, android.graphics.Color.GRAY);
}
updatePreference(appsSize, totalSize, KEY_APPLICATIONS);
@@ -415,13 +422,15 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory
updatePreference(size, totalSize, category, true);
}
private void updatePreference(long size, long totalSize, String category, boolean showBar) {
private void updatePreference(long size, long totalSize, String category, boolean addBar) {
final StorageItemPreference pref = (StorageItemPreference) findPreference(category);
if (pref != null) {
if (size > 0) {
pref.setSummary(formatSize(size));
if (showBar) {
mUsageBarPreference.addEntry(size / (float) totalSize, pref.getColor());
if (addBar) {
final int order = pref.getOrder();
mUsageBarPreference.addEntry(order, size / (float) totalSize, pref.getColor());
}
} else {
removePreference(pref);
@@ -497,7 +506,7 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory
if (pref == mFormatPreference) {
intent = new Intent(Intent.ACTION_VIEW);
intent.setClass(getContext(), com.android.settings.MediaFormat.class);
intent.putExtra(StorageVolume.EXTRA_STORAGE_VOLUME, mStorageVolume);
intent.putExtra(StorageVolume.EXTRA_STORAGE_VOLUME, mVolume);
} else if (KEY_APPLICATIONS.equals(key)) {
intent = new Intent(Intent.ACTION_MANAGE_PACKAGE_STORAGE);
intent.setClass(getContext(),
@@ -517,10 +526,42 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory
Context context = getContext().getApplicationContext();
if (mLocalMeasure.getMiscSize() > 0) {
intent = new Intent(context, MiscFilesHandler.class);
intent.putExtra(StorageVolume.EXTRA_STORAGE_VOLUME, mStorageVolume);
intent.putExtra(StorageVolume.EXTRA_STORAGE_VOLUME, mVolume);
}
}
return intent;
}
public static class PreferenceHeader extends Preference {
public PreferenceHeader(Context context, int titleRes) {
super(context, null, com.android.internal.R.attr.preferenceCategoryStyle);
setTitle(titleRes);
}
public PreferenceHeader(Context context, CharSequence title) {
super(context, null, com.android.internal.R.attr.preferenceCategoryStyle);
setTitle(title);
}
@Override
public boolean isEnabled() {
return false;
}
}
/**
* Return list of other users, excluding the current user.
*/
private List<UserInfo> getUsersExcluding(UserInfo excluding) {
final List<UserInfo> users = mUserManager.getUsers();
final Iterator<UserInfo> i = users.iterator();
while (i.hasNext()) {
if (i.next().id == excluding.id) {
i.remove();
}
}
return users;
}
}

11
src/com/android/settings/deviceinfo/UsageBarPreference.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.deviceinfo;
import com.android.settings.R;
import com.google.common.collect.Lists;
import android.content.Context;
import android.preference.Preference;
@@ -25,6 +26,8 @@ import android.view.View;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
/**
* Creates a percentage bar chart inside a preference.
@@ -32,7 +35,7 @@ import java.util.Collection;
public class UsageBarPreference extends Preference {
private PercentageBarChart mChart = null;
private final Collection<PercentageBarChart.Entry> mEntries = new ArrayList<PercentageBarChart.Entry>();
private final List<PercentageBarChart.Entry> mEntries = Lists.newArrayList();
public UsageBarPreference(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
@@ -49,8 +52,9 @@ public class UsageBarPreference extends Preference {
setLayoutResource(R.layout.preference_memoryusage);
}
public void addEntry(float percentage, int color) {
mEntries.add(PercentageBarChart.createEntry(percentage, color));
public void addEntry(int order, float percentage, int color) {
mEntries.add(PercentageBarChart.createEntry(order, percentage, color));
Collections.sort(mEntries);
}
@Override
@@ -58,7 +62,6 @@ public class UsageBarPreference extends Preference {
super.onBindView(view);
mChart = (PercentageBarChart) view.findViewById(R.id.percentage_bar_chart);
mChart.setEntries(mEntries);
}