diff options
| author | Vikram Aggarwal <viki@google.com> | 2012-05-02 16:19:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-02 16:19:10 -0700 |
| commit | 277cf8cc5b1481ff59a760f712f3892229023329 (patch) | |
| tree | 294190bb96dfb02b962849799876eaa53c3b60f8 | |
| parent | a3c3bf1dee34940ade909306486a9bb12c75b8b7 (diff) | |
| parent | c85f0408297737464ae51728dd6272ce03ee7a9b (diff) | |
| download | packages_apps_settings-277cf8cc5b1481ff59a760f712f3892229023329.zip packages_apps_settings-277cf8cc5b1481ff59a760f712f3892229023329.tar.gz packages_apps_settings-277cf8cc5b1481ff59a760f712f3892229023329.tar.bz2 | |
Merge "Include the clock in landscape on Xoom" into jb-dev
| -rw-r--r-- | res/layout-sw600dp-land/crypt_keeper_password_entry.xml | 19 | ||||
| -rw-r--r-- | res/layout-sw600dp/crypt_keeper_password_entry.xml | 13 | ||||
| -rw-r--r-- | res/layout/crypt_keeper_status.xml | 10 |
3 files changed, 6 insertions, 36 deletions
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 --- 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 --- 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 --- 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" |