diff options
| author | Jason Monk <jmonk@google.com> | 2015-07-20 21:08:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-20 21:08:04 +0000 |
| commit | b48e56c9b232710c2de0fa852d7230e9b0a191d7 (patch) | |
| tree | 42d6957d26d63b34816a6031156973dc86dfa4e9 /src/com/android/settings/applications | |
| parent | 7cce6d0c529bf9d3820b1fc4d8b5ad364a74a478 (diff) | |
| parent | 959a7380f15ea95ccba6d7d6ae30fee8f312bb84 (diff) | |
| download | packages_apps_Settings-b48e56c9b232710c2de0fa852d7230e9b0a191d7.zip packages_apps_Settings-b48e56c9b232710c2de0fa852d7230e9b0a191d7.tar.gz packages_apps_Settings-b48e56c9b232710c2de0fa852d7230e9b0a191d7.tar.bz2 | |
am 959a7380: am 178c4099: Merge "Handle monkey crash" into mnc-dev
* commit '959a7380f15ea95ccba6d7d6ae30fee8f312bb84':
Handle monkey crash
Diffstat (limited to 'src/com/android/settings/applications')
| -rw-r--r-- | src/com/android/settings/applications/AppStorageSettings.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java index 38440cb..b10669c 100644 --- a/src/com/android/settings/applications/AppStorageSettings.java +++ b/src/com/android/settings/applications/AppStorageSettings.java @@ -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); } } |