diff options
author | Dianne Hackborn <hackbod@google.com> | 2010-11-05 14:12:11 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2010-11-08 10:46:19 -0800 |
commit | ab36acb39941ce981dddda9f9cf4d2d23a56fd26 (patch) | |
tree | d4bcf4171fa304133b5a6bcae91308667b1bc62d /core/java/android/preference | |
parent | 2cf17ed7d87f8e0fc77de5e22c152018e7553959 (diff) | |
download | frameworks_base-ab36acb39941ce981dddda9f9cf4d2d23a56fd26.zip frameworks_base-ab36acb39941ce981dddda9f9cf4d2d23a56fd26.tar.gz frameworks_base-ab36acb39941ce981dddda9f9cf4d2d23a56fd26.tar.bz2 |
Fixe some stuff.
Addresses these bugs:
3061847 - With no headers, PreferenceActivity crashes
2888426 - minor typo in DevicePolicyManagerService.ActiveAdmin.writeToXml()
3159155 - IllegalStateException:"Can not perform this action after
onSaveInstanceState" while dismissing a DialogFragment
3155995 - PopupWindow.showAtLocation does not respect LayoutParams
Also tweak the new fragment APIs to use abstract classes instead of
interfaces as base classes.
Change-Id: I9c0b4337fe0e304b737b5f7c2762762372bb3020
Diffstat (limited to 'core/java/android/preference')
-rw-r--r-- | core/java/android/preference/PreferenceActivity.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java index c1ee0cf..0ce69ad 100644 --- a/core/java/android/preference/PreferenceActivity.java +++ b/core/java/android/preference/PreferenceActivity.java @@ -216,8 +216,6 @@ public abstract class PreferenceActivity extends ListActivity implements Header mappedHeader = findBestMatchingHeader(mCurHeader, mHeaders); if (mappedHeader != null) { setSelectedHeader(mappedHeader); - } else { - switchToHeader(null); } } } break; |