Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix 5044158: Fix lockscreen layout issues"

Browse Source
This commit is contained in:
Jim Miller
2011-08-09 12:25:05 -07:00
committed by Android (Google) Code Review
parent 06ec66266c c61f888298
commit 0419a2a9b5
4 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/res/res/layout/keyguard_screen_password_landscape.xml
View File

@@ -66,13 +66,15 @@
<TextView
android:id="@+id/date"
android:layout_width="0dip"
android:layout_gravity="fill_horizontal"
android:gravity="right"
android:layout_below="@id/time"
android:layout_marginTop="6dip"
android:singleLine="true"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
android:layout_gravity="right"
/>
<TextView
@@ -88,22 +90,26 @@
<TextView
android:id="@+id/status1"
android:layout_width="0dip"
android:layout_gravity="fill_horizontal"
android:gravity="right"
android:layout_marginTop="4dip"
android:singleLine="true"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
android:drawablePadding="4dip"
android:layout_gravity="right"
/>
<Space android:layout_gravity="fill" />
<TextView
android:id="@+id/carrier"
android:layout_width="0dip"
android:layout_gravity="fill_horizontal"
android:gravity="right"
android:singleLine="true"
android:ellipsize="marquee"
android:layout_gravity="right"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
android:textColor="?android:attr/textColorSecondary"
@@ -144,6 +150,7 @@
android:background="@drawable/lockscreen_password_field_dark"
android:textColor="?android:attr/textColorPrimary"
android:imeOptions="flagNoFullscreen|actionDone"
android:suggestionsEnabled="false"
/>
</LinearLayout>

3
core/res/res/layout/keyguard_screen_password_portrait.xml
View File

@@ -109,7 +109,8 @@
android:background="@drawable/lockscreen_password_field_dark"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="#ffffffff"
android:imeOptions="actionDone"/>
android:imeOptions="actionDone"
android:suggestionsEnabled="false"/>
<!-- Numeric keyboard -->
<com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"

15
core/res/res/layout/keyguard_screen_tab_unlock_land.xml
View File

@@ -64,13 +64,14 @@
<TextView
android:id="@+id/date"
android:layout_below="@id/time"
android:layout_width="0dip"
android:layout_gravity="fill_horizontal"
android:gravity="right"
android:layout_marginTop="6dip"
android:singleLine="true"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
android:layout_gravity="right"
/>
<TextView
@@ -86,22 +87,24 @@
<TextView
android:id="@+id/status1"
android:layout_width="0dip"
android:layout_gravity="fill_horizontal"
android:gravity="right"
android:layout_marginTop="4dip"
android:singleLine="true"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
android:drawablePadding="4dip"
android:layout_gravity="right"
/>
<Space android:layout_gravity="fill" />
<TextView
android:id="@+id/carrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_width="0dip"
android:layout_gravity="fill_horizontal"
android:gravity="right"
android:singleLine="true"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium"

12
core/res/res/layout/keyguard_screen_unlock_landscape.xml
View File

@@ -64,11 +64,13 @@
<TextView
android:id="@+id/date"
android:layout_width="0dip"
android:layout_gravity="fill_horizontal"
android:gravity="right"
android:singleLine="true"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
android:layout_gravity="right"
/>
<TextView
@@ -83,17 +85,21 @@
<TextView
android:id="@+id/status1"
android:layout_width="0dip"
android:layout_gravity="fill_horizontal"
android:gravity="right"
android:singleLine="true"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
android:layout_gravity="right"
/>
<Space android:layout_gravity="fill" />
<TextView android:id="@+id/carrier"
android:layout_gravity="right"
android:layout_width="0dip"
android:layout_gravity="fill_horizontal"
android:gravity="right"
android:singleLine="true"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium"