Merge "Integrate keyguard paging hint" into jb-mr1-dev (0a5bc222) · Commits · e / os / android_frameworks_base

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

+2 −12

Original line number	Diff line number	Diff line
		@@ -27,20 +27,10 @@
		android:gravity="center_vertical"
		android:orientation="horizontal">

		<com.android.internal.policy.impl.keyguard.KeyguardWidgetPager
		android:id="@+id/app_widget_container"
		<include layout="@layout/keyguard_widget_region"
		android:layout_width="0dip"
		android:layout_height="230dip"
		android:gravity="center"
		android:layout_weight=".45"
		android:visibility="gone">

		<!-- TODO: Remove this once supported as a widget -->
		<include layout="@layout/keyguard_status_view"/>
		<include layout="@layout/keyguard_transport_control_view"/>

		</com.android.internal.policy.impl.keyguard.KeyguardWidgetPager>

		android:layout_weight=".45"/>

		<com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper
		android:id="@+id/view_flipper"

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

+2 −10

Original line number	Diff line number	Diff line
		@@ -26,18 +26,10 @@
		android:layout_height="match_parent"
		android:orientation="horizontal">

		<com.android.internal.policy.impl.keyguard.KeyguardWidgetPager
		android:id="@+id/app_widget_container"
		<include layout="@layout/keyguard_widget_region"
		android:layout_width="0dip"
		android:layout_height="match_parent"
		android:layout_weight="1"
		android:visibility="gone">

		<!-- TODO: Remove this once supported as a widget -->
		<include layout="@layout/keyguard_status_view"/>
		<include layout="@layout/keyguard_transport_control_view"/>

		</com.android.internal.policy.impl.keyguard.KeyguardWidgetPager>
		android:layout_weight="1"/>

		<FrameLayout
		android:layout_width="0dip"

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

+2 −10

Original line number	Diff line number	Diff line
		@@ -27,18 +27,10 @@
		android:layout_height="match_parent"
		android:gravity="center_horizontal">

		<com.android.internal.policy.impl.keyguard.KeyguardWidgetPager
		android:id="@+id/app_widget_container"
		<include layout="@layout/keyguard_widget_region"
		android:layout_width="match_parent"
		android:layout_height="0dip"
		android:layout_weight="0.4"
		android:visibility="gone">

		<!-- TODO: Remove this once supported as a widget -->
		<include layout="@layout/keyguard_status_view"/>
		<include layout="@layout/keyguard_transport_control_view"/>

		</com.android.internal.policy.impl.keyguard.KeyguardWidgetPager>
		android:layout_weight="0.4"/>

		<com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper
		android:id="@+id/view_flipper"

core/res/res/layout/keyguard_selector_view.xml

+2 −8

Original line number	Diff line number	Diff line
		@@ -26,19 +26,13 @@
		android:layout_height="match_parent"
		android:orientation="vertical">

		<com.android.internal.policy.impl.keyguard.KeyguardWidgetPager
		android:id="@+id/app_widget_container"
		<include layout="@layout/keyguard_widget_region"
		android:layout_width="match_parent"
		android:layout_height="0dip"
		android:layout_weight="0.45"
		android:layout_marginTop="35dip"
		android:layout_marginLeft="33dip"
		android:layout_marginRight="33dip"
		android:visibility="gone">
		<!-- TODO: Remove this when supported as a widget -->
		<include layout="@layout/keyguard_status_view"/>
		<include layout="@layout/keyguard_transport_control_view"/>
		</com.android.internal.policy.impl.keyguard.KeyguardWidgetPager>
		android:layout_marginRight="33dip"/>

		<RelativeLayout
		android:layout_width="wrap_content"

core/res/res/layout/keyguard_widget_region.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 selector widget that allows the user to select an action. -->
		<com.android.internal.policy.impl.keyguard.KeyguardWidgetRegion
		xmlns:prvandroid="http://schemas.android.com/apk/prv/res/android"
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/kg_widget_region"
		android:visibility="gone"
		android:gravity="center"
		android:orientation="vertical">
		<Space
		android:layout_width="match_parent"
		android:layout_height="0dip"
		android:layout_weight="1" />
		<com.android.internal.policy.impl.keyguard.KeyguardWidgetPager
		android:id="@+id/app_widget_container"
		android:layout_width="match_parent"
		android:layout_height="@dimen/kg_widget_container_height">
		<!-- TODO: Remove this when supported as a widget -->
		<include layout="@layout/keyguard_status_view"/>
		<include layout="@layout/keyguard_transport_control_view"/>
		</com.android.internal.policy.impl.keyguard.KeyguardWidgetPager>
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="0dip"
		android:layout_weight="1"
		android:orientation="horizontal">
		<com.android.internal.policy.impl.keyguard.KeyguardGlowStripView
		android:id="@+id/left_strip"
		android:layout_width="0dip"
		android:layout_height="match_parent"
		android:layout_weight="1"
		prvandroid:numDots="5"
		prvandroid:dotSize="7dip"
		prvandroid:leftToRight="false"
		prvandroid:glowDot="@*android:drawable/ic_lockscreen_glowdot" />
		<Space
		android:layout_width="0dip"
		android:layout_height="match_parent"
		android:layout_weight="1"/>
		<com.android.internal.policy.impl.keyguard.KeyguardGlowStripView
		android:id="@+id/right_strip"
		android:layout_width="0dip"
		android:layout_height="match_parent"
		android:layout_weight="1"
		prvandroid:numDots="5"
		prvandroid:dotSize="7dip"
		prvandroid:leftToRight="true"
		prvandroid:glowDot="@*android:drawable/ic_lockscreen_glowdot" />
		</LinearLayout>
		</com.android.internal.policy.impl.keyguard.KeyguardWidgetRegion>
		No newline at end of file