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

Merge "Missing resources for lock screen." into kraken

Browse Source
This commit is contained in:
Daniel Sandler
2010-04-14 12:15:04 -07:00
committed by Android (Google) Code Review
parent 5db9adfd40 aa9b5b8171
commit a976eccf6b
2 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,20 +41,21 @@
android:ellipsize="marquee" android:ellipsize="marquee"
android:gravity="right|bottom" android:gravity="right|bottom"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="22sp"
/> />
<!-- emergency call button shown when sim is missing or PUKd --> <!-- "emergency calls only" shown when sim is missing or PUKd -->
<Button <TextView
android:id="@+id/emergencyCallButton" android:id="@+id/emergencyCallText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_below="@id/carrier"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginTop="10dip" android:layout_marginTop="0dip"
android:layout_marginRight="8dip" android:layout_marginRight="8dip"
android:drawableLeft="@drawable/ic_emergency" android:text="@string/emergency_calls_only"
style="@style/Widget.Button.Transparent" android:textAppearance="?android:attr/textAppearanceSmall"
android:drawablePadding="8dip" android:textColor="@color/white"
/> />
<!-- time and date --> <!-- time and date -->
@@ -64,6 +65,7 @@
android:layout_below="@id/carrier" android:layout_below="@id/carrier"
android:layout_marginTop="52dip" android:layout_marginTop="52dip"
android:layout_marginLeft="20dip" android:layout_marginLeft="20dip"
android:layout_marginBottom="8dip"
> >
<TextView android:id="@+id/timeDisplay" <TextView android:id="@+id/timeDisplay"
@@ -71,7 +73,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:ellipsize="none" android:ellipsize="none"
android:gravity="bottom"
android:textSize="72sp" android:textSize="72sp"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:shadowColor="#C0000000" android:shadowColor="#C0000000"
@@ -84,8 +85,9 @@
<TextView android:id="@+id/am_pm" <TextView android:id="@+id/am_pm"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:gravity="bottom" android:layout_toRightOf="@id/timeDisplay"
android:layout_alignBaseline="@id/timeDisplay"
android:singleLine="true" android:singleLine="true"
android:ellipsize="none" android:ellipsize="none"
android:textSize="22sp" android:textSize="22sp"

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

@@ -46,18 +46,19 @@
android:ellipsize="marquee" android:ellipsize="marquee"
android:gravity="right|bottom" android:gravity="right|bottom"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="22sp"
/> />
<!-- emergency call button shown when sim is missing or PUKd --> <!-- "emergency calls only" shown when sim is missing or PUKd -->
<Button <TextView
android:id="@+id/emergencyCallButton" android:id="@+id/emergencyCallText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginTop="20dip" android:layout_marginTop="20dip"
android:drawableLeft="@drawable/ic_emergency" android:text="@string/emergency_calls_only"
style="@style/Widget.Button.Transparent" android:textAppearance="?android:attr/textAppearanceSmall"
android:drawablePadding="8dip" android:textColor="@color/white"
/> />
<com.android.internal.widget.DigitalClock android:id="@+id/time" <com.android.internal.widget.DigitalClock android:id="@+id/time"
@@ -65,12 +66,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/carrier" android:layout_below="@id/carrier"
android:layout_marginTop="56dip" android:layout_marginTop="56dip"
android:layout_marginBottom="8dip"
> >
<TextView android:id="@+id/timeDisplay" <TextView android:id="@+id/timeDisplay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="bottom"
android:singleLine="true" android:singleLine="true"
android:ellipsize="none" android:ellipsize="none"
android:textSize="72sp" android:textSize="72sp"
@@ -85,8 +86,9 @@
<TextView android:id="@+id/am_pm" <TextView android:id="@+id/am_pm"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:gravity="bottom" android:layout_toRightOf="@id/timeDisplay"
android:layout_alignBaseline="@id/timeDisplay"
android:singleLine="true" android:singleLine="true"
android:ellipsize="none" android:ellipsize="none"
android:textSize="22sp" android:textSize="22sp"