summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorSiva Velusamy <vsiva@google.com>2015-05-05 15:07:00 -0700
committerSiva Velusamy <vsiva@google.com>2015-05-07 18:44:21 -0700
commit94a6d15ede149189bba9e5f474ed853c98230e75 (patch)
treeedc5a5211a7b69e091a13ddc3c60dcf88d9a5ea6 /packages
parent0d857b9028f2702ce439e13feccde8182d40e1e5 (diff)
downloadframeworks_base-94a6d15ede149189bba9e5f474ed853c98230e75.zip
frameworks_base-94a6d15ede149189bba9e5f474ed853c98230e75.tar.gz
frameworks_base-94a6d15ede149189bba9e5f474ed853c98230e75.tar.bz2
Use new hierarchy viewer protocol in all View subclasses
A previous CL introduced a new way of encoding view properties for use by heirarchy viewer. This CL updates all views using the old @ExportedProperty annotation to use this new method. The older mechanism will be removed in a subsequent CL. Change-Id: I6cc23b90cd9da1c6ce89b4caffe54874db203452
Diffstat (limited to 'packages')
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardSecurityViewFlipper.java13
1 files changed, 13 insertions, 0 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityViewFlipper.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityViewFlipper.java
index b5eda90..1c4b963 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityViewFlipper.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityViewFlipper.java
@@ -16,6 +16,7 @@
package com.android.keyguard;
+import android.annotation.NonNull;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Rect;
@@ -25,12 +26,15 @@ import android.view.MotionEvent;
import android.view.View;
import android.view.ViewDebug;
import android.view.ViewGroup;
+import android.view.ViewHierarchyEncoder;
import android.view.WindowManager;
import android.widget.FrameLayout;
import android.widget.ViewFlipper;
import com.android.internal.widget.LockPatternUtils;
+import java.lang.Override;
+
/**
* Subclass of the current view flipper that allows us to overload dispatchTouchEvent() so
* we can emulate {@link WindowManager.LayoutParams#FLAG_SLIPPERY} within a view hierarchy.
@@ -268,5 +272,14 @@ public class KeyguardSecurityViewFlipper extends ViewFlipper implements Keyguard
R.styleable.KeyguardSecurityViewFlipper_Layout_layout_maxHeight, 0);
a.recycle();
}
+
+ /** @hide */
+ @Override
+ protected void encodeProperties(@NonNull ViewHierarchyEncoder encoder) {
+ super.encodeProperties(encoder);
+
+ encoder.addProperty("layout:maxWidth", maxWidth);
+ encoder.addProperty("layout:maxHeight", maxHeight);
+ }
}
}