Fix UI to mocks (4fd2e5f3) · Commits · e / os / android_packages_apps_Settings

res/layout-sw600dp/crypt_keeper_pattern_entry.xml

+14 −16

Original line number	Diff line number	Diff line
		@@ -18,26 +18,24 @@
		-->

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="match_parent">
		android:layout_height="match_parent"
		android:orientation="vertical"
		android:layout_marginTop="@dimen/crypt_keeper_pattern_top_margin">

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

		<RelativeLayout
		android:layout_width="wrap_content"
		android:layout_height="0dip"
		android:layout_weight="1"
		android:layout_gravity="center_horizontal">

		<!-- Password entry field -->
		<LinearLayout
		android:layout_height="@dimen/crypt_keeper_pattern_size"
		android:layout_width="@dimen/crypt_keeper_pattern_size"
		android:layout_centerVertical="true"
		android:orientation="horizontal">
		android:layout_height="@dimen/crypt_keeper_pattern_size"
		android:orientation="horizontal"
		android:layout_gravity="center_horizontal"
		android:layout_marginTop="@dimen/crypt_keeper_pattern_separator">

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

		</LinearLayout>

		</RelativeLayout>
		<include layout="@layout/crypt_keeper_emergency_button" />

		</LinearLayout>

res/layout/crypt_keeper_emergency_button.xml

0 → 100644

+33 −0

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

		<!-- Emergency call button.
		Text is set by CryptKeeper.updateEmergencyCallButtonState() -->
		<Button
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/emergencyCallButton"
		android:layout_width="wrap_content"
		android:layout_height="0dp"
		android:layout_gravity="center_horizontal"
		android:textSize="14sp"
		android:fontFamily="sans-serif"
		android:textColor="#FFFFFF"
		android:layout_weight="1"
		android:gravity="bottom"
		style="?android:attr/borderlessButtonStyle" />

res/layout/crypt_keeper_password_entry.xml

+10 −23

Original line number	Diff line number	Diff line
		@@ -20,36 +20,23 @@
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">
		android:orientation="vertical"
		android:layout_marginTop="@dimen/crypt_keeper_password_top_margin">

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

		<LinearLayout
		android:layout_height="0dp"
		android:layout_width="match_parent"
		android:layout_weight="1"
		android:layout_marginStart="@dimen/crypt_keeper_edit_text_margin"
		android:layout_marginEnd="@dimen/crypt_keeper_edit_text_margin"
		android:orientation="vertical"
		android:gravity="center_vertical">

		<LinearLayout
		android:background="@color/crypt_keeper_password_background"
		android:layout_width="match_parent"
		android:layout_width="@dimen/crypt_keeper_password_width"
		android:layout_height="wrap_content"
		android:orientation="horizontal">
		android:orientation="horizontal"
		android:layout_marginTop="16dip"
		android:layout_gravity="center_horizontal"
		android:background="@color/crypt_keeper_password_background">

		<include layout="@layout/crypt_keeper_password_field" />
		</LinearLayout>

		</LinearLayout>

		<!-- Emergency call button.
		Text is set by CryptKeeper.updateEmergencyCallButtonState() -->
		<Button android:id="@+id/emergencyCallButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		android:layout_marginTop="@dimen/crypt_keeper_emergency_call_space_above"
		style="?android:attr/borderlessButtonStyle" />
		<include layout="@layout/crypt_keeper_emergency_button" />

		</LinearLayout>

res/layout/crypt_keeper_pattern_entry.xml

+8 −21

Original line number	Diff line number	Diff line
		@@ -20,35 +20,22 @@
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">
		android:orientation="vertical"
		android:layout_marginTop="@dimen/crypt_keeper_pattern_top_margin">

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

		<LinearLayout
		android:layout_height="0dp"
		android:layout_width="match_parent"
		android:layout_weight="1"
		android:orientation="vertical"
		android:gravity="center_vertical">

		<LinearLayout
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		android:layout_marginStart="@dimen/crypt_keeper_edit_text_margin"
		android:layout_marginEnd="@dimen/crypt_keeper_edit_text_margin"
		android:layout_marginStart="@dimen/crypt_keeper_pattern_margin"
		android:layout_marginEnd="@dimen/crypt_keeper_pattern_margin"
		android:orientation="horizontal">

		<include layout="@layout/crypt_keeper_pattern_field" />
		</LinearLayout>

		</LinearLayout>

		<!-- Emergency call button.
		Text and icon are set by CryptKeeper.updateEmergencyCallButtonState() -->
		<Button android:id="@+id/emergencyCallButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:layout_marginTop="@dimen/crypt_keeper_emergency_call_space_above"
		style="?android:attr/borderlessButtonStyle" />
		<include layout="@layout/crypt_keeper_emergency_button" />

		</LinearLayout>

res/layout/crypt_keeper_pin_entry.xml

+10 −23

Original line number	Diff line number	Diff line
		@@ -20,36 +20,23 @@
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">
		android:orientation="vertical"
		android:layout_marginTop="@dimen/crypt_keeper_password_top_margin">

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

		<LinearLayout
		android:layout_height="0dp"
		android:layout_width="match_parent"
		android:layout_weight="1"
		android:layout_marginStart="@dimen/crypt_keeper_edit_text_margin"
		android:layout_marginEnd="@dimen/crypt_keeper_edit_text_margin"
		android:orientation="vertical"
		android:gravity="center_vertical">

		<LinearLayout
		android:background="@color/crypt_keeper_password_background"
		android:layout_width="match_parent"
		android:layout_width="@dimen/crypt_keeper_password_width"
		android:layout_height="wrap_content"
		android:orientation="horizontal">
		android:layout_marginTop="16dip"
		android:orientation="horizontal"
		android:layout_gravity="center_horizontal"
		android:background="@color/crypt_keeper_password_background">

		<include layout="@layout/crypt_keeper_pin_field" />
		</LinearLayout>

		</LinearLayout>

		<!-- Emergency call button.
		Text is set by CryptKeeper.updateEmergencyCallButtonState() -->
		<Button android:id="@+id/emergencyCallButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		android:layout_marginTop="@dimen/crypt_keeper_emergency_call_space_above"
		style="?android:attr/borderlessButtonStyle" />
		<include layout="@layout/crypt_keeper_emergency_button" />

		</LinearLayout>