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

am 8e350e80: am b48e56c9: am 959a7380: am 178c4099: Merge "Handle monkey crash" into mnc-dev

Browse Source 
* commit '8e350e80343dbfd8aafce275a25fff7124f3e9ce':
  Handle monkey crash
This commit is contained in:
Jason Monk
2015-07-20 21:38:07 +00:00
committed by Android Git Automerger
parent 99e8985959 8e350e8034
commit 97c68c181d
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/xml/app_storage_settings.xml
View File

@@ -18,6 +18,7 @@
android:title="@string/application_info_label">
<com.android.settings.applications.SpacePreference
android:key="storage_space"
android:layout_height="8dp" />
<Preference

4
src/com/android/settings/applications/AppStorageSettings.java
View File

@@ -71,6 +71,7 @@ public class AppStorageSettings extends AppInfoWithHeader
private static final String KEY_STORAGE_USED = "storage_used";
private static final String KEY_CHANGE_STORAGE = "change_storage_button";
private static final String KEY_STORAGE_SPACE = "storage_space";
private static final String KEY_STORAGE_CATEGORY = "storage_category";
private static final String KEY_TOTAL_SIZE = "total_size";
@@ -182,7 +183,7 @@ public class AppStorageSettings extends AppInfoWithHeader
} else {
showDialogInner(DLG_CLEAR_DATA, 0);
}
} else if (v == mChangeStorageButton) {
} else if (v == mChangeStorageButton && mDialogBuilder != null) {
mDialogBuilder.show();
}
}
@@ -350,6 +351,7 @@ public class AppStorageSettings extends AppInfoWithHeader
} else {
removePreference(KEY_STORAGE_USED);
removePreference(KEY_CHANGE_STORAGE);
removePreference(KEY_STORAGE_SPACE);
}
}