Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 277cf8cc authored by Vikram Aggarwal's avatar Vikram Aggarwal Committed by Android (Google) Code Review
Browse files

Merge "Include the clock in landscape on Xoom" into jb-dev

parents a3c3bf1d c85f0408

res/layout-sw600dp-land/crypt_keeper_password_entry.xml

+6 −13
Original line number Diff line number Diff line
@@ -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"

res/layout-sw600dp/crypt_keeper_password_entry.xml

+0 −13
Original line number Diff line number Diff line
@@ -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>

res/layout/crypt_keeper_status.xml

+0 −10
Original line number Diff line number Diff line
@@ -62,16 +62,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"