diff options
| author | Vikram Aggarwal <viki@google.com> | 2012-05-02 15:08:38 -0700 |
|---|---|---|
| committer | Vikram Aggarwal <viki@google.com> | 2012-05-02 15:23:37 -0700 |
| commit | c85f0408297737464ae51728dd6272ce03ee7a9b (patch) | |
| tree | 6fdb5b4bc5dfb3492821789d6a7944e517de8ed8 /res/layout-sw600dp-land | |
| parent | 9593b743cb625e88b97b2674c5f528bb07f96011 (diff) | |
| download | packages_apps_Settings-c85f0408297737464ae51728dd6272ce03ee7a9b.tar.gz packages_apps_Settings-c85f0408297737464ae51728dd6272ce03ee7a9b.tar.bz2 packages_apps_Settings-c85f0408297737464ae51728dd6272ce03ee7a9b.zip | |
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
Diffstat (limited to 'res/layout-sw600dp-land')
| -rw-r--r-- | res/layout-sw600dp-land/crypt_keeper_password_entry.xml | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml index 8898b7610..d94b2f4a1 100644 --- 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" |