diff options
Diffstat (limited to 'res/layout-sw600dp')
| -rw-r--r-- | res/layout-sw600dp/accessibility_tutorial_container.xml | 124 | ||||
| -rw-r--r-- | res/layout-sw600dp/crypt_keeper_password_entry.xml | 22 | ||||
| -rw-r--r-- | res/layout-sw600dp/crypt_keeper_progress.xml | 1 |
3 files changed, 7 insertions, 140 deletions
diff --git a/res/layout-sw600dp/accessibility_tutorial_container.xml b/res/layout-sw600dp/accessibility_tutorial_container.xml deleted file mode 100644 index f5da706..0000000 --- a/res/layout-sw600dp/accessibility_tutorial_container.xml +++ /dev/null @@ -1,124 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 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:layout_height="fill_parent" - android:layout_width="fill_parent" - android:orientation="vertical" - android:paddingTop="@dimen/screen_margin_top" - android:paddingLeft="@dimen/screen_margin_sides" - android:paddingRight="@dimen/screen_margin_sides" - android:paddingBottom="@dimen/screen_margin_bottom"> - - <TextView - android:id="@+id/title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:minHeight="@dimen/title_height" - android:layout_marginLeft="@dimen/content_margin_left" - android:textAppearance="@style/AccessibilityTutorialTitle" - android:gravity="bottom" - android:clickable="false" /> - - <View - android:layout_marginTop="8dip" - android:layout_marginBottom="8dip" - android:layout_below="@id/title" - style="@style/AccessibilityTutorialDivider" /> - - <LinearLayout - android:id="@+id/content" - android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_weight="1.0" - android:orientation="vertical"> - - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <View - style="@style/AccessibilityTutorialDivider" /> - - <view - class="com.android.settings.AccessibilityTutorialActivity$TutorialTextView" - android:id="@+id/instructions" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/description_margin_top" - android:layout_marginLeft="@dimen/description_margin_sides" - android:layout_marginRight="@dimen/description_margin_sides" - android:layout_marginBottom="16dip" - android:lineSpacingExtra="5sp" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <View - android:layout_marginBottom="16dip" - style="@style/AccessibilityTutorialDivider" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <Button - android:id="@+id/skip_button" - style="@style/AccessibilityTutorialButton" - android:text="@string/accessibility_tutorial_skip" - android:visibility="gone" /> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:gravity="right"> - - <Button - android:id="@+id/back_button" - style="@style/AccessibilityTutorialButton" - android:text="@string/accessibility_tutorial_back" - android:visibility="gone" /> - - <Button - android:id="@+id/next_button" - style="@style/AccessibilityTutorialButton" - android:text="@string/accessibility_tutorial_next" - android:visibility="gone" /> - - <Button - android:id="@id/finish_button" - style="@style/AccessibilityTutorialButton" - android:text="@string/accessibility_tutorial_finish" - android:visibility="gone" /> - - </LinearLayout> - - </LinearLayout> - - </LinearLayout> - -</LinearLayout>
\ No newline at end of file diff --git a/res/layout-sw600dp/crypt_keeper_password_entry.xml b/res/layout-sw600dp/crypt_keeper_password_entry.xml index ad8205a..1e33230c 100644 --- a/res/layout-sw600dp/crypt_keeper_password_entry.xml +++ b/res/layout-sw600dp/crypt_keeper_password_entry.xml @@ -16,7 +16,8 @@ ** limitations under the License. */ --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" > @@ -25,7 +26,7 @@ <RelativeLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_centerHorizontal="true" + android:layout_gravity="center_horizontal" android:layout_marginTop="318dip" > <ImageView android:id="@+id/encroid" @@ -33,6 +34,7 @@ android:layout_height="wrap_content" android:layout_alignParentTop="true" android:src="@drawable/encroid_resignin" + android:contentDescription="@null" /> <TextView android:id="@+id/passwordLabel" @@ -53,23 +55,11 @@ android:layout_width="320dip" android:layout_toRightOf="@+id/passwordLabel" android:layout_marginTop="26dip" + android:layout_centerVertical="true" android:orientation="horizontal" > <include layout="@layout/crypt_keeper_password_field" /> </LinearLayout> - - <TextView android:id="@+id/status" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_toRightOf="@+id/passwordLabel" - android:layout_below="@+id/passwordEntry" - android:paddingTop="8dip" - android:singleLine="true" - android:textSize="17sp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:drawableLeft="@*android:drawable/ic_lock_idle_lock" - android:visibility="gone" - /> </RelativeLayout> -</RelativeLayout> +</LinearLayout> diff --git a/res/layout-sw600dp/crypt_keeper_progress.xml b/res/layout-sw600dp/crypt_keeper_progress.xml index f958f00..176c9fb 100644 --- a/res/layout-sw600dp/crypt_keeper_progress.xml +++ b/res/layout-sw600dp/crypt_keeper_progress.xml @@ -33,6 +33,7 @@ android:layout_alignParentBottom="true" android:paddingRight="65dip" android:src="@drawable/encroid_waiting" + android:contentDescription="@null" /> <TextView |