PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Material fixes for tablets

Browse Source 
Remove wireframe Android from pattern screen
Remove tablet specific password entry - we don't have one for PIN, and
the password one looks awful.

Bug: 15328359
Change-Id: I3d73a346166641ab72ecf520f9fbe2ee1379fe8a
This commit is contained in:
Paul Lawrence
2014-07-17 09:57:13 -07:00
parent b3f69cd104
commit 312927abd7
3 changed files with 8 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
res/layout-sw600dp/crypt_keeper_password_entry.xml
View File

@@ -1,65 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
**
** Copyright 2011, 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.
*/
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<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"
>
<ImageView android:id="@+id/encroid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:src="@drawable/encroid_resignin"
android:contentDescription="@null"
/>
<TextView android:id="@+id/passwordLabel"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_toEndOf="@+id/encroid"
android:layout_centerVertical="true"
android:paddingEnd="17dip"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/crypt_keeper_enter_password"
/>
<!-- Password entry field -->
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="320dip"
android:layout_toEndOf="@+id/passwordLabel"
android:layout_centerVertical="true"
android:orientation="horizontal"
>
<include layout="@layout/crypt_keeper_password_field" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>

21
res/layout-sw600dp/crypt_keeper_pattern_entry.xml
View File

@@ -20,8 +20,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
>
<include layout="@layout/crypt_keeper_status" /> <include layout="@layout/crypt_keeper_status" />
@@ -29,24 +28,14 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="1" android:layout_weight="1"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal">
>
<ImageView android:id="@+id/encroid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:src="@drawable/encroid_resignin"
android:contentDescription="@null"
/>
<!-- Password entry field --> <!-- Password entry field -->
<LinearLayout <LinearLayout
android:layout_height="354dip" android:layout_height="@dimen/crypt_keeper_pattern_size"
android:layout_width="354dip" android:layout_width="@dimen/crypt_keeper_pattern_size"
android:layout_toEndOf="@+id/encroid"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:orientation="horizontal" android:orientation="horizontal">
>
<include layout="@layout/crypt_keeper_pattern_field" /> <include layout="@layout/crypt_keeper_pattern_field" />
</LinearLayout> </LinearLayout>

3
res/values/dimens.xml
View File

@@ -180,4 +180,7 @@
<!-- CryptKeeper edit text ime icon padding --> <!-- CryptKeeper edit text ime icon padding -->
<dimen name="crypt_keeper_edit_text_ime_padding">8dip</dimen> <dimen name="crypt_keeper_edit_text_ime_padding">8dip</dimen>
<!-- CryptKeeper pattern size for tablet -->
<dimen name="crypt_keeper_pattern_size">354dip</dimen>
</resources> </resources>