commit b58dc454fc20cf88edd7feba247d62c67bc920a1
author Maurice Lam <yukl@google.com> Thu May 19 18:42:53 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 19 18:42:53 2016 +0000
tree 160739502b4a82983708ebfd7490b71f4de5b150
parent 7b4bd4243b0760d8edf7fc16428caeb1b0ac8f8d
parent 78700b330fcf8e82f6d965a96a4ce77b54a14397

Merge "[SuwLib] Tune layout to match specs" into ub-setupwizard-ceridwen

library/eclair-mr1/src/com/android/setupwizardlib/items/SwitchItem.java

diff --git a/library/eclair-mr1/src/com/android/setupwizardlib/items/SwitchItem.java b/library/eclair-mr1/src/com/android/setupwizardlib/items/SwitchItem.java
index aaeaf34..bbb2520 100644
--- a/library/eclair-mr1/src/com/android/setupwizardlib/items/SwitchItem.java
+++ b/library/eclair-mr1/src/com/android/setupwizardlib/items/SwitchItem.java
@@ -93,6 +93,7 @@
 
     @Override
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        mChecked = isChecked;
         if (mListener != null) {
             mListener.onCheckedChange(this, isChecked);
         }

library/proguard.flags

diff --git a/library/proguard.flags b/library/proguard.flags
new file mode 100644
index 0000000..c3a49d5
--- /dev/null
+++ b/library/proguard.flags
@@ -0,0 +1,8 @@
+#########################################
+## Keep rules
+#########################################
+
+# Allow inflating ItemHierarchies from XML
+-keep public class * extends com.android.setupwizardlib.items.ItemHierarchy {
+    public <init>(android.content.Context, android.util.AttributeSet);
+}