Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef79efdc authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 868edfde: am e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev 

* commit '868edfde':
  Fiddle with keyguard glowpad layouts
parents 8c5ebad0 868edfde

core/res/res/layout/keyguard_glow_pad_container.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,5 +22,5 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="bottom|center_horizontal"

        android:layout_marginBottom="-80dp"/>

        android:layout_marginBottom="-60dp"/>

</merge>
 
 No newline at end of file

core/res/res/layout/keyguard_selector_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    android:id="@+id/keyguard_selector_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_maxWidth="@dimen/keyguard_security_width"

    android:layout_maxWidth="420dp"

    android:layout_maxHeight="@dimen/keyguard_security_height"

    android:clipChildren="false"

    android:clipToPadding="false"

policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityViewFlipper.java

+7 −3
Original line number Diff line number Diff line
@@ -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) {