diff options
| author | Adam Powell <adamp@google.com> | 2012-11-07 21:06:31 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-07 21:06:31 -0800 |
| commit | e7e210cb4373877785130ff06ad4e6635592eaa8 (patch) | |
| tree | 7acf25839040160413eb0aaab77973ad9698494e /policy | |
| parent | 2635750fa7f835d102c3fd52b18e00d364d9ae42 (diff) | |
| parent | 3fbbbb66b671daf4cd6f28b8ecd512bdd2436358 (diff) | |
| download | frameworks_base-e7e210cb4373877785130ff06ad4e6635592eaa8.zip frameworks_base-e7e210cb4373877785130ff06ad4e6635592eaa8.tar.gz frameworks_base-e7e210cb4373877785130ff06ad4e6635592eaa8.tar.bz2 | |
Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityViewFlipper.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityViewFlipper.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityViewFlipper.java index e21e8fc..aa31b00 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityViewFlipper.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityViewFlipper.java @@ -16,6 +16,9 @@ package com.android.internal.policy.impl.keyguard; +import com.android.internal.R; +import com.android.internal.widget.LockPatternUtils; + import android.content.Context; import android.content.res.TypedArray; import android.graphics.Rect; @@ -23,14 +26,12 @@ import android.util.AttributeSet; import android.util.Log; import android.view.MotionEvent; import android.view.View; +import android.view.ViewDebug; import android.view.ViewGroup; import android.view.WindowManager; import android.widget.FrameLayout; import android.widget.ViewFlipper; -import com.android.internal.R; -import com.android.internal.widget.LockPatternUtils; - /** * 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. @@ -246,7 +247,10 @@ public class KeyguardSecurityViewFlipper extends ViewFlipper implements Keyguard } public static class LayoutParams extends FrameLayout.LayoutParams { + @ViewDebug.ExportedProperty(category = "layout") public int maxWidth; + + @ViewDebug.ExportedProperty(category = "layout") public int maxHeight; public LayoutParams(ViewGroup.LayoutParams other) { |