PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 946f34d1: am 277cf8cc: Merge "Include the clock in landscape on Xoom" into jb-dev

Browse Source 
* commit '946f34d189d8d927f6d571da215e27ac4f59b046':
  Include the clock in landscape on Xoom
This commit is contained in:
Vikram Aggarwal
2012-05-02 16:25:16 -07:00
committed by Android Git Automerger
parent 905c5bd334 946f34d189
commit 7c16872a37
3 changed files with 6 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
res/layout-sw600dp-land/crypt_keeper_password_entry.xml
View File

@@ -16,11 +16,16 @@
** limitations under the License. ** limitations under the License.
*/ */
--> -->
<!-- Layout containing two panes and a keyboard entry. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="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 <RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dip" android:layout_height="0dip"
@@ -56,20 +61,8 @@
<include layout="@layout/crypt_keeper_password_field" /> <include layout="@layout/crypt_keeper_password_field" />
</LinearLayout> </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>
<!-- And this is the keyboard. -->
<com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard" <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

13
res/layout-sw600dp/crypt_keeper_password_entry.xml
View File

@@ -57,19 +57,6 @@
> >
<include layout="@layout/crypt_keeper_password_field" /> <include layout="@layout/crypt_keeper_password_field" />
</LinearLayout> </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>
</RelativeLayout> </RelativeLayout>

10
res/layout/crypt_keeper_status.xml
View File

@@ -62,16 +62,6 @@
</com.android.internal.widget.DigitalClock> </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 <TextView
android:id="@+id/status" android:id="@+id/status"
android:layout_width="wrap_content" android:layout_width="wrap_content"