Merge remote-tracking branch 'goog/jb-mr1-lockscreen-dev' into jb-mr1-dev (5c12bc58) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/policy/IFaceLockInterface.aidl

+0 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ interface IFaceLockInterface {
		void startUi(IBinder containingWindowToken, int x, int y, int width, int height,
		boolean useLiveliness);
		void stopUi();
		void makeInvisible();
		void registerCallback(IFaceLockCallback cb);
		void unregisterCallback(IFaceLockCallback cb);
		}

core/java/com/android/internal/widget/FaceUnlockView.java

0 → 100644

+69 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.internal.widget;

		import android.content.Context;
		import android.util.AttributeSet;
		import android.util.Log;
		import android.view.View;
		import android.widget.RelativeLayout;

		public class FaceUnlockView extends RelativeLayout {
		private static final String TAG = "FaceUnlockView";

		public FaceUnlockView(Context context) {
		this(context, null);
		}

		public FaceUnlockView(Context context, AttributeSet attrs) {
		super(context, attrs);
		}

		private int resolveMeasured(int measureSpec, int desired)
		{
		int result = 0;
		int specSize = MeasureSpec.getSize(measureSpec);
		switch (MeasureSpec.getMode(measureSpec)) {
		case MeasureSpec.UNSPECIFIED:
		result = desired;
		break;
		case MeasureSpec.AT_MOST:
		result = Math.max(specSize, desired);
		break;
		case MeasureSpec.EXACTLY:
		default:
		result = specSize;
		}
		return result;
		}

		@Override
		protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
		final int minimumWidth = getSuggestedMinimumWidth();
		final int minimumHeight = getSuggestedMinimumHeight();
		int viewWidth = resolveMeasured(widthMeasureSpec, minimumWidth);
		int viewHeight = resolveMeasured(heightMeasureSpec, minimumHeight);

		final int chosenSize = Math.min(viewWidth, viewHeight);
		final int newWidthMeasureSpec =
		MeasureSpec.makeMeasureSpec(chosenSize, MeasureSpec.AT_MOST);
		final int newHeightMeasureSpec =
		MeasureSpec.makeMeasureSpec(chosenSize, MeasureSpec.AT_MOST);

		super.onMeasure(newWidthMeasureSpec, newHeightMeasureSpec);
		}
		}

core/res/res/layout-land/keyguard_host_view.xml

+4 −4

Original line number	Diff line number	Diff line
		@@ -50,14 +50,14 @@

		<com.android.internal.policy.impl.keyguard.KeyguardSecurityContainer
		android:id="@+id/keyguard_security_container"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_width="@dimen/keyguard_security_width"
		android:layout_height="@dimen/keyguard_security_height"
		androidprv:layout_childType="challenge"
		androidprv:layout_centerWithinArea="0.55">
		<com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper
		android:id="@+id/view_flipper"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:paddingLeft="@dimen/keyguard_security_view_margin"

core/res/res/layout-port/keyguard_host_view.xml

+4 −4

Original line number	Diff line number	Diff line
		@@ -51,8 +51,8 @@

		<com.android.internal.policy.impl.keyguard.KeyguardSecurityContainer
		android:id="@+id/keyguard_security_container"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_width="@dimen/keyguard_security_width"
		android:layout_height="@dimen/keyguard_security_height"
		androidprv:layout_childType="challenge"
		android:layout_marginLeft="@dimen/kg_edge_swipe_region_size"
		android:layout_marginRight="@dimen/kg_edge_swipe_region_size"
		@@ -60,8 +60,8 @@
		android:gravity="bottom\|center_horizontal">
		<com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper
		android:id="@+id/view_flipper"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:paddingLeft="@dimen/keyguard_security_view_margin"

core/res/res/layout/keyguard_face_unlock_view.xml

+3 −4

Original line number	Diff line number	Diff line
		@@ -30,10 +30,10 @@
		android:layout_height="wrap_content"
		/>

		<RelativeLayout
		<com.android.internal.widget.FaceUnlockView
		android:id="@+id/face_unlock_area_view"
		android:layout_width="match_parent"
		android:layout_height="@*android:dimen/face_unlock_height"
		android:layout_height="0dp"
		android:background="@*android:drawable/intro_bg"
		android:gravity="center"
		android:layout_weight="1">
		@@ -55,8 +55,7 @@
		android:background="#00000000"
		android:src="@*android:drawable/ic_facial_backup"
		/>

		</RelativeLayout>
		</com.android.internal.widget.FaceUnlockView>

		<include layout="@layout/keyguard_emergency_carrier_area"
		android:id="@+id/keyguard_selector_fade_container"