Fixes to CryptKeeper layout for phones
- prevents crash when trying to show error state
- makes progress screen not look horribly broken
Bug: 5174783
Bug: 4671153
Change-Id: Ia72830e2fdb72f174b3ed01b6fc14be7152d1932
diff --git a/res/layout-land/crypt_keeper_progress.xml b/res/layout-land/crypt_keeper_progress.xml
new file mode 100644
index 0000000..62fb297
--- /dev/null
+++ b/res/layout-land/crypt_keeper_progress.xml
@@ -0,0 +1,85 @@
+<?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_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="16dip"
+ android:orientation="vertical"
+>
+
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:minHeight="48dip"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:textSize="30dip"
+ android:textColor="#ff99cc00"
+ android:text="@string/crypt_keeper_setup_title"
+ android:gravity="bottom"
+ />
+
+ <!-- Divider -->
+ <RelativeLayout
+ android:id="@+id/top_divider"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ >
+ <ProgressBar
+ android:id="@+id/progress_bar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="?android:attr/progressBarStyleHorizontal"
+ />
+ </RelativeLayout>
+
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ android:orientation="horizontal"
+ >
+ <TextView
+ android:id="@+id/status"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+
+ <ImageView
+ android:id="@+id/encroid"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/encroid_waiting"
+ />
+
+ <Button
+ android:id="@+id/factory_reset"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="32dip"
+ android:text="@string/master_clear_button_text"
+ android:visibility="gone"
+ />
+ </LinearLayout>
+
+</LinearLayout>
+
diff --git a/res/layout/crypt_keeper_password_entry.xml b/res/layout/crypt_keeper_password_entry.xml
index 60dcf6a..a7799fc 100644
--- a/res/layout/crypt_keeper_password_entry.xml
+++ b/res/layout/crypt_keeper_password_entry.xml
@@ -34,12 +34,12 @@
<EditText android:id="@+id/passwordEntry"
android:layout_height="wrap_content"
android:layout_width="match_parent"
+ android:layout_marginLeft="8dip"
+ android:layout_marginRight="8dip"
android:singleLine="true"
- android:textStyle="normal"
android:inputType="textPassword"
- android:textSize="24sp"
+ android:textSize="18sp"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="#ffffffff"
/>
<!-- Emergency call button.
@@ -47,8 +47,8 @@
<Button android:id="@+id/emergencyCallButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="left"
- android:layout_marginTop="10dip"
+ android:layout_gravity="center"
+ android:layout_marginTop="16dip"
style="@*android:style/Widget.Button.Transparent"
android:textSize="14sp"
android:drawablePadding="6dip"
diff --git a/res/layout/crypt_keeper_progress.xml b/res/layout/crypt_keeper_progress.xml
index f8e3a1a..9677c3d 100644
--- a/res/layout/crypt_keeper_progress.xml
+++ b/res/layout/crypt_keeper_progress.xml
@@ -18,20 +18,17 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingTop="60dip"
- android:paddingLeft="128dip"
- android:paddingRight="128dip"
- android:paddingBottom="0dip"
+ android:padding="16dip"
android:orientation="vertical"
>
<TextView
+ android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="48dip"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
- android:layout_marginLeft="16dip"
android:textSize="30dip"
android:textColor="#ff99cc00"
android:text="@string/crypt_keeper_setup_title"
@@ -51,14 +48,32 @@
style="?android:attr/progressBarStyleHorizontal"
/>
</RelativeLayout>
-
-
+
+
<TextView
android:id="@+id/status"
+ android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ />
+
+ <ImageView
+ android:id="@+id/encroid"
+ android:layout_width="wrap_content"
android:layout_height="0dip"
android:layout_weight="1"
- android:layout_marginLeft="16dip"
+ android:layout_gravity="bottom|right"
+ android:src="@drawable/encroid_waiting"
+ />
+
+ <Button
+ android:id="@+id/factory_reset"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="32dip"
+ android:layout_gravity="center"
+ android:text="@string/master_clear_button_text"
+ android:visibility="gone"
/>
</LinearLayout>
diff --git a/res/layout/crypt_keeper_status.xml b/res/layout/crypt_keeper_status.xml
index d106c69..b830b57 100644
--- a/res/layout/crypt_keeper_status.xml
+++ b/res/layout/crypt_keeper_status.xml
@@ -91,7 +91,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dip"
- android:textSize="22sp"
+ android:layout_marginLeft="8dip"
+ android:layout_marginRight="8dip"
+ android:textSize="18sp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/enter_password"
android:drawableLeft="@*android:drawable/ic_lock_idle_lock"
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 2dd4a71..297288b 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -327,7 +327,9 @@
tv.setText(R.string.crypt_keeper_failed_summary);
View view = findViewById(R.id.bottom_divider);
- view.setVisibility(View.VISIBLE);
+ if (view != null) {
+ view.setVisibility(View.VISIBLE);
+ }
}
private void updateProgress() {