summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorLifu Tang <lifu@google.com>2014-08-19 04:24:09 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-19 02:08:36 +0000
commit081a9162c959f9cbd0cbd76674501cdb47d516a7 (patch)
treeae539847219b41cb3a29aeeb87d07e1958ccef0c /src/com/android
parent31584ec3e99ded3dd96de06bcb1aa8e4dc408cce (diff)
parentb18e2423667b132d8de428fdbdb32572a1befe62 (diff)
downloadpackages_apps_Settings-081a9162c959f9cbd0cbd76674501cdb47d516a7.tar.gz
packages_apps_Settings-081a9162c959f9cbd0cbd76674501cdb47d516a7.tar.bz2
packages_apps_Settings-081a9162c959f9cbd0cbd76674501cdb47d516a7.zip
Merge "Set switch to the correct enabling state" into lmp-dev
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/settings/widget/SwitchBar.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java
index e24d83fc6..c15ac41f7 100644
--- a/src/com/android/settings/widget/SwitchBar.java
+++ b/src/com/android/settings/widget/SwitchBar.java
@@ -124,7 +124,7 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC
public void setEnabled(boolean enabled) {
super.setEnabled(enabled);
mTextView.setEnabled(enabled);
- mSwitch.setEnabled(false);
+ mSwitch.setEnabled(enabled);
}
public final ToggleSwitch getSwitch() {