summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorConley Owens <cco3@android.com>2014-01-06 15:38:05 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-06 15:38:05 -0800
commit73a6702eeaabdeb7b405ec504413d41716ef3508 (patch)
tree3688c003b57b122b8a93eb1a14dc76f3cd1b66b3 /core/java
parentd7d0749805b6ae8bb345731ac9dd960f6b5aa5dd (diff)
parent4440a8244ea4fdd7c63083bcd7d4b179e851c17a (diff)
am 4440a824: Merge "CompoundButton: Let text can be changed by config"
* commit '4440a8244ea4fdd7c63083bcd7d4b179e851c17a': CompoundButton: Let text can be changed by config
Diffstat (limited to 'core/java')
-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 082ff3d46906..abddc9019095 100644
--- a/core/java/android/widget/CompoundButton.java
+++ b/core/java/android/widget/CompoundButton.java
@@ -363,8 +363,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);