Merge latest prototype changes into keyguard (19a52670) · Commits · e / os / android_frameworks_base

core/res/res/anim/keyguard_security_fade_in.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -15,8 +15,8 @@
		-->

		<alpha xmlns:android="http://schemas.android.com/apk/res/android"
		android:interpolator="@interpolator/decelerate_quad"
		android:interpolator="@android:interpolator/decelerate_quad"
		android:fromAlpha="0.0" android:toAlpha="1.0"
		android:duration="@integer/kg_security_fade_duration" />
		android:duration="@*android:integer/kg_security_fade_duration" />

core/res/res/anim/keyguard_security_fade_out.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -14,8 +14,8 @@
		limitations under the License.
		-->
		<alpha xmlns:android="http://schemas.android.com/apk/res/android"
		android:interpolator="@interpolator/accelerate_quad"
		android:interpolator="@android:interpolator/accelerate_quad"
		android:fromAlpha="1.0"
		android:toAlpha="0.0"
		android:duration="@integer/kg_security_fade_duration"
		android:duration="@*android:integer/kg_security_fade_duration"
		/>

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

+17 −17

Original line number	Diff line number	Diff line
		@@ -21,35 +21,32 @@
		and the security view. -->
		<com.android.internal.policy.impl.keyguard.KeyguardHostView
		xmlns:android="http://schemas.android.com/apk/res/android"

		xmlns:androidprv="http://schemas.android.com/apk/res/android"
		android:id="@+id/keyguard_host_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:gravity="center_horizontal"
		android:orientation="horizontal">

		<com.android.internal.policy.impl.keyguard.SlidingChallengeLayout
		android:id="@+id/sliding_layout"
		<com.android.internal.policy.impl.keyguard.MultiPaneChallengeLayout
		android:id="@+id/multi_pane_challenge"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:dragHandle="@drawable/security_handle">
		android:clipChildren="false">

		<FrameLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent">
		<include layout="@layout/keyguard_widget_pager"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="center"/>
		</FrameLayout>
		androidprv:layout_centerWithinArea="0.55"
		androidprv:layout_childType="widget"
		androidprv:layout_maxWidth="480dp"
		androidprv:layout_maxHeight="480dp" />

		<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_isChallenge="true"
		android:gravity="bottom\|center_horizontal"
		android:background="@drawable/security_frame">
		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"
		@@ -63,6 +60,9 @@
		android:gravity="center">
		</com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper>
		</com.android.internal.policy.impl.keyguard.KeyguardSecurityContainer>
		</com.android.internal.policy.impl.keyguard.SlidingChallengeLayout>

		<include layout="@layout/keyguard_multi_user_selector"/>

		</com.android.internal.policy.impl.keyguard.MultiPaneChallengeLayout>
		</com.android.internal.policy.impl.keyguard.KeyguardHostView>

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@
		and the security view. -->
		<com.android.internal.policy.impl.keyguard.KeyguardHostView
		xmlns:android="http://schemas.android.com/apk/res/android"

		xmlns:androidprv="http://schemas.android.com/apk/res/android"
		android:id="@+id/keyguard_host_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		@@ -32,7 +32,7 @@
		android:id="@+id/sliding_layout"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:dragHandle="@drawable/security_handle">
		androidprv:dragHandle="@drawable/security_handle">

		<FrameLayout
		android:layout_width="match_parent"
		@@ -47,7 +47,7 @@
		android:id="@+id/keyguard_security_container"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_isChallenge="true"
		androidprv:layout_isChallenge="true"
		android:gravity="bottom\|center_horizontal"
		android:background="@drawable/security_frame">
		<com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper

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

0 → 100644

+68 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		**
		** Copyright 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.
		*/
		-->

		<!-- This is the host view that generally contains two sub views: the widget view
		and the security view. -->
		<com.android.internal.policy.impl.keyguard.KeyguardHostView
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/res/android"
		android:id="@+id/keyguard_host_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="horizontal">

		<com.android.internal.policy.impl.keyguard.MultiPaneChallengeLayout
		android:id="@+id/multi_pane_challenge"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:clipChildren="false"
		android:orientation="vertical">

		<include layout="@layout/keyguard_widget_pager"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		androidprv:layout_centerWithinArea="0.55"
		androidprv:layout_childType="widget"
		androidprv:layout_maxWidth="480dp"
		androidprv:layout_maxHeight="480dp" />

		<com.android.internal.policy.impl.keyguard.KeyguardSecurityContainer
		android:id="@+id/keyguard_security_container"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		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:clipChildren="false"
		android:clipToPadding="false"
		android:paddingLeft="@dimen/keyguard_security_view_margin"
		android:paddingTop="@dimen/keyguard_security_view_margin"
		android:paddingRight="@dimen/keyguard_security_view_margin"
		android:paddingBottom="@dimen/keyguard_security_view_margin"
		android:gravity="center">
		</com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper>
		</com.android.internal.policy.impl.keyguard.KeyguardSecurityContainer>

		<include layout="@layout/keyguard_multi_user_selector"/>

		</com.android.internal.policy.impl.keyguard.MultiPaneChallengeLayout>
		</com.android.internal.policy.impl.keyguard.KeyguardHostView>