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

Merge "Keyguard padding fixes"

Browse Source
This commit is contained in:
Peter Ng
2011-09-19 19:01:58 -07:00
committed by Android (Google) Code Review
parent 284ccdcdc1 7da27adf6c
commit cb61187783
10 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/layout/keyguard_screen_glogin_unlock.xml
View File

@@ -119,7 +119,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:drawableLeft="@drawable/ic_emergency"
android:drawablePadding="8dip"
android:drawablePadding="4dip"
android:text="@android:string/lockscreen_emergency_call"
/>

2
core/res/res/layout/keyguard_screen_lock.xml
View File

@@ -211,7 +211,7 @@
android:layout_marginTop="5dip"
android:layout_gravity="center_horizontal"
android:drawableLeft="@drawable/ic_emergency"
android:drawablePadding="8dip"
android:drawablePadding="4dip"
android:text="@android:string/lockscreen_emergency_call"
/>

2
core/res/res/layout/keyguard_screen_sim_pin_landscape.xml
View File

@@ -113,7 +113,7 @@
android:layout_marginLeft="8dip"
android:textSize="18sp"
android:drawableLeft="@drawable/ic_emergency"
android:drawablePadding="8dip"
android:drawablePadding="4dip"
/>
</LinearLayout>

2
core/res/res/layout/keyguard_screen_sim_pin_portrait.xml
View File

@@ -111,7 +111,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@android:drawable/ic_emergency"
android:drawablePadding="8dip"
android:drawablePadding="4dip"
android:text="@android:string/lockscreen_emergency_call"
/>
</LinearLayout>

2
core/res/res/layout/keyguard_screen_sim_puk_landscape.xml
View File

@@ -175,7 +175,7 @@
android:layout_marginLeft="8dip"
android:textSize="18sp"
android:drawableLeft="@drawable/ic_emergency"
android:drawablePadding="8dip"
android:drawablePadding="4dip"
/>
</LinearLayout>

2
core/res/res/layout/keyguard_screen_sim_puk_portrait.xml
View File

@@ -177,7 +177,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@android:drawable/ic_emergency"
android:drawablePadding="8dip"
android:drawablePadding="4dip"
android:text="@android:string/lockscreen_emergency_call"
/>
</LinearLayout>

5
core/res/res/layout/keyguard_screen_tab_unlock.xml
View File

@@ -29,7 +29,8 @@
android:gravity="center_horizontal">
<com.android.internal.widget.DigitalClock android:id="@+id/time"
android:layout_marginBottom="18dip"
android:layout_marginTop="@dimen/keyguard_lockscreen_status_line_clockfont_top_margin"
android:layout_marginBottom="12dip"
android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin"
android:layout_gravity="right">
@@ -149,7 +150,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="8dip"
android:layout_marginBottom="12dip"
android:gravity="center_horizontal"
android:singleLine="true"
android:ellipsize="marquee"

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

@@ -104,6 +104,7 @@
android:id="@+id/carrier"
android:layout_width="0dip"
android:layout_gravity="fill_horizontal"
android:layout_marginBottom="12dip"
android:gravity="right"
android:singleLine="true"
android:ellipsize="marquee"

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

@@ -28,7 +28,8 @@
android:gravity="center_horizontal">
<com.android.internal.widget.DigitalClock android:id="@+id/time"
android:layout_marginBottom="18dip"
android:layout_marginTop="@dimen/keyguard_lockscreen_status_line_clockfont_top_margin"
android:layout_marginBottom="12dip"
android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin"
android:layout_gravity="right">

5
core/res/res/values/dimens.xml
View File

@@ -158,7 +158,10 @@
<dimen name="keyguard_lockscreen_status_line_font_size">14sp</dimen>
<!-- Size of right margin on Unsecure unlock LockScreen -->
<dimen name="keyguard_lockscreen_status_line_font_right_margin">45dip</dimen>
<dimen name="keyguard_lockscreen_status_line_font_right_margin">42dip</dimen>
<!-- Size of top margin on Clock font to edge on unlock LockScreen -->
<dimen name="keyguard_lockscreen_status_line_clockfont_top_margin">24dip</dimen>
<!-- Minimum popup width for selecting an activity in ActivityChooserDialog/ActivityChooserView. -->
<dimen name="activity_chooser_popup_min_width">200dip</dimen>