Include the clock in landscape on Xoom

1. R.id.status was defined twice and was used inconsistently in code:
   (visibility set to enabled, but only on portrait...) This code removes
   the bad view.

2. The TextView date was never used, either by another layout or by
   code. Deleting this view too.

3. Including a standard status layout on smallest-width-600px, which includes
   a clock and a status message on Xoom.

Fix b/6061076

Change-Id: Ibb492e89f6a4a38ac6a22398ec9c14bbe3fb7e3d

diff --git a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
index 8898b76..d94b2f4 100644 (file)
--- a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
+++ b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
@@ -16,11 +16,16 @@
 ** limitations under the License.
 */
 -->
+<!-- Layout containing two panes and a keyboard entry. -->
 <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" />
+
+    <!-- The right pane contains the encdroid image, a string, and an edit field. -->
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="0dip"
@@ -56,20 +61,8 @@
             <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>
-
+<!-- And this is the keyboard. -->
     <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

diff --git a/res/layout-sw600dp/crypt_keeper_password_entry.xml b/res/layout-sw600dp/crypt_keeper_password_entry.xml
index ad8205a..fe6edaf 100644 (file)
--- a/res/layout-sw600dp/crypt_keeper_password_entry.xml
+++ b/res/layout-sw600dp/crypt_keeper_password_entry.xml
@@ -57,19 +57,6 @@
         >
             <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>

diff --git a/res/layout/crypt_keeper_status.xml b/res/layout/crypt_keeper_status.xml
index 5144e75..d94e66d 100644 (file)
--- a/res/layout/crypt_keeper_status.xml
+++ b/res/layout/crypt_keeper_status.xml
@@ -63,16 +63,6 @@
     </com.android.internal.widget.DigitalClock>
 
     <TextView
-        android:id="@+id/date"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/time"
-        android:layout_marginTop="10dip"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textSize="22sp"
-        />
-
-    <TextView
         android:id="@+id/status"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"