am d6523da1: Merge latest prototype changes into the framework (52c55cd0) · Commits · e / os / android_frameworks_base

core/res/res/layout-land/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"

		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"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:dragHandle="@drawable/security_handle">

		<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>

		<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">
		<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>
		</com.android.internal.policy.impl.keyguard.SlidingChallengeLayout>
		</com.android.internal.policy.impl.keyguard.KeyguardHostView>

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

+32 −35

Original line number	Diff line number	Diff line
		@@ -21,34 +21,33 @@
		and the security view. -->
		<com.android.internal.policy.impl.keyguard.KeyguardHostView
		xmlns:android="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="vertical">

		<include layout="@layout/keyguard_widget_pager"
		<com.android.internal.policy.impl.keyguard.SlidingChallengeLayout
		android:id="@+id/sliding_layout"
		android:layout_width="match_parent"
		android:layout_height="match_parent" />

		<SlidingDrawer
		android:id="@+id/drawer"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"

		android:handle="@+id/handle"
		android:content="@+id/keyguard_security_container">
		android:layout_height="match_parent"
		android:dragHandle="@drawable/security_handle">

		<ImageView
		android:id="@id/handle"
		android:layout_width="88dip"
		android:layout_height="44dip"
		android:src="@drawable/security_handle" />
		<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>

		<com.android.internal.policy.impl.keyguard.KeyguardSecurityContainer
		android:id="@id/keyguard_security_container"
		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">
		<com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper
		@@ -64,8 +63,6 @@
		android:gravity="center">
		</com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper>
		</com.android.internal.policy.impl.keyguard.KeyguardSecurityContainer>

		</SlidingDrawer>

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

core/res/res/layout/keyguard_add_widget.xml

+2 −4

Original line number	Diff line number	Diff line
		@@ -20,14 +20,12 @@
		<!-- This is a view that shows general status information in Keyguard. -->
		<com.android.internal.policy.impl.keyguard.KeyguardWidgetFrame
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/keyguard_status_view"
		android:id="@+id/keyguard_add_widget"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:gravity="center_horizontal">

		<ImageView
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:src="@drawable/add_widget" />

		</com.android.internal.policy.impl.keyguard.KeyguardWidgetFrame>
		No newline at end of file

core/res/res/layout/keyguard_camera_widget.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		<!-- This is a view that shows general status information in Keyguard. -->
		<com.android.internal.policy.impl.keyguard.KeyguardWidgetFrame
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/keyguard_status_view"
		android:id="@+id/keyguard_camera_widget"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:gravity="center_horizontal">

core/res/res/layout/keyguard_status_view.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@

		<LinearLayout android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:layout_gravity="center_horizontal\|top"
		android:orientation="vertical">
		<com.android.internal.policy.impl.keyguard.ClockView
		android:id="@+id/clock_view"