Merge "Added Face Unlock to tablet lockscreen layouts" (4c1920c9) · Commits · e / os / android_frameworks_base

core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml

+12 −2

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@
		</RelativeLayout>

		<!-- right side: password -->
		<LinearLayout
		<RelativeLayout
		android:layout_width="0dip"
		android:layout_weight="1"
		android:layout_height="match_parent"
		@@ -72,6 +72,7 @@

		<LinearLayout
		android:orientation="vertical"
		android:layout_centerInParent="true"
		android:layout_width="330dip"
		android:layout_height="wrap_content">

		@@ -152,6 +153,15 @@

		</LinearLayout>

		</LinearLayout>
		<!-- Area to overlay FaceLock -->
		<View android:id="@+id/faceLockAreaView"
		android:visibility="invisible"
		android:layout_width="512dip"
		android:layout_height="512dip"
		android:layout_centerInParent="true"
		android:background="@color/facelock_color_background"
		/>

		</RelativeLayout>

		</LinearLayout>

core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml

+83 −66

Original line number	Diff line number	Diff line
		@@ -61,10 +61,16 @@
		</RelativeLayout>

		<!-- bottom: password -->
		<LinearLayout
		<RelativeLayout
		android:layout_width="match_parent"
		android:layout_height="0dip"
		android:layout_weight="1"
		android:gravity="center">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_centerInParent="true"
		android:orientation="vertical"
		android:gravity="center">

		@@ -137,8 +143,7 @@
		/>

		<!-- emergency call button -->
		<Button
		android:id="@+id/emergencyCallButton"
		<Button android:id="@+id/emergencyCallButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:drawableLeft="@drawable/ic_emergency"
		@@ -149,4 +154,16 @@
		/>

		</LinearLayout>

		<!-- Area to overlay FaceLock -->
		<View android:id="@+id/faceLockAreaView"
		android:visibility="invisible"
		android:layout_width="512dip"
		android:layout_height="512dip"
		android:layout_centerInParent="true"
		android:background="@color/facelock_color_background"
		/>

		</RelativeLayout>

		</LinearLayout>

core/res/res/layout-sw600dp/keyguard_screen_unlock_landscape.xml

+54 −37

Original line number	Diff line number	Diff line
		@@ -72,6 +72,12 @@
		android:layout_height="match_parent"
		android:gravity="center_vertical\|center_horizontal">

		<RelativeLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_centerInParent="true"
		android:gravity="center_vertical\|center_horizontal">

		<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
		android:layout_width="354dip"
		android:layout_height="354dip"
		@@ -80,15 +86,15 @@

		<!-- Emergency and forgot pattern buttons. -->
		<LinearLayout
		android:orientation="horizontal"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:layout_below="@id/lockPattern"
		android:layout_alignLeft="@id/lockPattern"
		android:layout_alignRight="@id/lockPattern"
		android:layout_marginTop="28dip"
		android:gravity="center"
		style="?android:attr/buttonBarStyle"
		android:gravity="center"
		android:weightSum="2">

		<Button android:id="@+id/forgotPatternButton"
		@@ -117,4 +123,15 @@

		</RelativeLayout>

		<!-- Area to overlay FaceLock -->
		<View android:id="@+id/faceLockAreaView"
		android:visibility="invisible"
		android:layout_width="512dip"
		android:layout_height="512dip"
		android:layout_centerInParent="true"
		android:background="@color/facelock_color_background"
		/>

		</RelativeLayout>

		</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

core/res/res/layout-sw600dp/keyguard_screen_unlock_portrait.xml

+54 −35

Original line number	Diff line number	Diff line
		@@ -62,23 +62,32 @@
		</RelativeLayout>

		<!-- bottom: lock pattern, emergency dialer and forgot pattern button -->
		<LinearLayout
		<RelativeLayout
		android:layout_weight="1"
		android:layout_width="match_parent"
		android:layout_height="0dip"
		android:orientation="vertical"
		android:gravity="center">

		<RelativeLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_centerInParent="true"
		android:gravity="center">

		<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
		android:layout_width="354dip"
		android:layout_height="354dip"
		android:layout_marginTop="50dip"/>
		android:layout_marginTop="50dip"
		/>

		<!-- Emergency and forgot pattern buttons. -->
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:layout_below="@id/lockPattern"
		android:layout_alignLeft="@id/lockPattern"
		android:layout_alignRight="@id/lockPattern"
		style="?android:attr/buttonBarStyle"
		android:gravity="center"
		android:weightSum="2">
		@@ -107,7 +116,17 @@

		</LinearLayout>

		</LinearLayout>
		</RelativeLayout>

		</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
		<!-- Area to overlay FaceLock -->
		<View android:id="@+id/faceLockAreaView"
		android:visibility="invisible"
		android:layout_width="512dip"
		android:layout_height="512dip"
		android:layout_centerInParent="true"
		android:background="@color/facelock_color_background"
		/>

		</RelativeLayout>

		</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>