summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorConley Owens <cco3@android.com>2014-01-06 23:51:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-06 23:51:24 +0000
commitd8a6c59d3df483536c3b3b538297cb0ef5336976 (patch)
tree49331011f82e614c6c01fe449cd893e756d92fc4 /core
parent344389f731169869c5239cf95684330a569bfe07 (diff)
parent5b44325fff247558ca36d83930b877dc44e5e219 (diff)
downloadframeworks_base-d8a6c59d3df483536c3b3b538297cb0ef5336976.zip
frameworks_base-d8a6c59d3df483536c3b3b538297cb0ef5336976.tar.gz
frameworks_base-d8a6c59d3df483536c3b3b538297cb0ef5336976.tar.bz2
am 5b44325f: am 849ab14d: am 7f16047b: am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config"
* commit '5b44325fff247558ca36d83930b877dc44e5e219': CompoundButton: Let text can be changed by config
Diffstat (limited to 'core')
-rw-r--r--core/java/android/widget/CompoundButton.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/widget/CompoundButton.java b/core/java/android/widget/CompoundButton.java
index bdb5046..b22088c 100644
--- a/core/java/android/widget/CompoundButton.java
+++ b/core/java/android/widget/CompoundButton.java
@@ -366,8 +366,6 @@ public abstract class CompoundButton extends Button implements Checkable {
@Override
public Parcelable onSaveInstanceState() {
- // Force our ancestor class to save its state
- setFreezesText(true);
Parcelable superState = super.onSaveInstanceState();
SavedState ss = new SavedState(superState);