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

resolved conflicts for merge of 8eade69d to master

Browse Source 
Change-Id: Id2a2269b506c2ffa06dcfd3a02b32eced5e7632b
This commit is contained in:
Zoltan Szatmary-Ban
2015-07-08 16:05:49 +01:00
parent 918286ff60 8eade69d74
commit df57fa52ab
2 changed files with 206 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/deviceinfo/StorageItemPreference.java
View File

@@ -26,28 +26,15 @@ import android.widget.ProgressBar;
import com.android.settings.R;
public class StorageItemPreference extends Preference {
public final int userHandle;
public int userHandle;
private ProgressBar progressBar;
private static final int PROGRESS_MAX = 100;
private int progress = -1;
public StorageItemPreference(Context context, int titleRes) {
this(context, context.getText(titleRes), UserHandle.USER_NULL);
setLayoutResource(R.layout.storage_item);
}
public StorageItemPreference(Context context, CharSequence title, int userHandle) {
public StorageItemPreference(Context context) {
super(context);
setTitle(title);
setSummary(R.string.memory_calculating_size);
this.userHandle = userHandle;
}
public void setLoading() {
setSummary(R.string.memory_calculating_size);
setLayoutResource(R.layout.storage_item);
}
public void setStorageSize(long size, long total) {