Merge "Redesigned keyguard layout in the no-SIM case. DO NOT MERGE" into froyo (4ea1eea5) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/DigitalClock.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ import android.provider.Settings;
		import android.text.format.DateFormat;
		import android.util.AttributeSet;
		import android.view.View;
		import android.widget.LinearLayout;
		import android.widget.RelativeLayout;
		import android.widget.TextView;

		import java.text.DateFormatSymbols;
		@@ -39,7 +39,7 @@ import java.util.Calendar;
		/**
		* Displays the time
		*/
		public class DigitalClock extends LinearLayout {
		public class DigitalClock extends RelativeLayout {

		private final static String M12 = "h:mm";
		private final static String M24 = "kk:mm";

core/res/res/layout/keyguard_screen_tab_unlock.xml

+13 −11

Original line number	Diff line number	Diff line
		@@ -41,20 +41,21 @@
		android:ellipsize="marquee"
		android:gravity="right\|bottom"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textSize="22sp"
		/>

		<!-- emergency call button shown when sim is missing or PUKd -->
		<Button
		android:id="@+id/emergencyCallButton"
		<!-- "emergency calls only" shown when sim is missing or PUKd -->
		<TextView
		android:id="@+id/emergencyCallText"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentTop="true"
		android:layout_below="@id/carrier"
		android:layout_alignParentRight="true"
		android:layout_marginTop="10dip"
		android:layout_marginTop="0dip"
		android:layout_marginRight="8dip"
		android:drawableLeft="@drawable/ic_emergency"
		style="@style/Widget.Button.Transparent"
		android:drawablePadding="8dip"
		android:text="@string/emergency_calls_only"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="@color/white"
		/>

		<!-- time and date -->
		@@ -64,6 +65,7 @@
		android:layout_below="@id/carrier"
		android:layout_marginTop="52dip"
		android:layout_marginLeft="20dip"
		android:layout_marginBottom="8dip"
		>

		<TextView android:id="@+id/timeDisplay"
		@@ -71,7 +73,6 @@
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:ellipsize="none"
		android:gravity="bottom"
		android:textSize="72sp"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:shadowColor="#C0000000"
		@@ -84,8 +85,9 @@

		<TextView android:id="@+id/am_pm"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:gravity="bottom"
		android:layout_height="wrap_content"
		android:layout_toRightOf="@id/timeDisplay"
		android:layout_alignBaseline="@id/timeDisplay"
		android:singleLine="true"
		android:ellipsize="none"
		android:textSize="22sp"

core/res/res/layout/keyguard_screen_tab_unlock_land.xml

+11 −9

Original line number	Diff line number	Diff line
		@@ -46,18 +46,19 @@
		android:ellipsize="marquee"
		android:gravity="right\|bottom"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textSize="22sp"
		/>

		<!-- emergency call button shown when sim is missing or PUKd -->
		<Button
		android:id="@+id/emergencyCallButton"
		<!-- "emergency calls only" shown when sim is missing or PUKd -->
		<TextView
		android:id="@+id/emergencyCallText"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentTop="true"
		android:layout_marginTop="20dip"
		android:drawableLeft="@drawable/ic_emergency"
		style="@style/Widget.Button.Transparent"
		android:drawablePadding="8dip"
		android:text="@string/emergency_calls_only"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="@color/white"
		/>

		<com.android.internal.widget.DigitalClock android:id="@+id/time"
		@@ -65,12 +66,12 @@
		android:layout_height="wrap_content"
		android:layout_below="@id/carrier"
		android:layout_marginTop="56dip"
		android:layout_marginBottom="8dip"
		>

		<TextView android:id="@+id/timeDisplay"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:gravity="bottom"
		android:singleLine="true"
		android:ellipsize="none"
		android:textSize="72sp"
		@@ -85,8 +86,9 @@

		<TextView android:id="@+id/am_pm"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:gravity="bottom"
		android:layout_height="wrap_content"
		android:layout_toRightOf="@id/timeDisplay"
		android:layout_alignBaseline="@id/timeDisplay"
		android:singleLine="true"
		android:ellipsize="none"
		android:textSize="22sp"

core/res/res/layout/keyguard_screen_unlock_landscape.xml

+5 −3

Original line number	Diff line number	Diff line
		@@ -58,18 +58,19 @@
		android:ellipsize="marquee"
		android:gravity="right\|bottom"
		/>

		<com.android.internal.widget.DigitalClock android:id="@+id/time"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentTop="true"
		android:layout_alignParentLeft="true"
		android:layout_marginTop="8dip"
		android:layout_marginBottom="8dip"
		>

		<TextView android:id="@+id/timeDisplay"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:gravity="bottom"
		android:singleLine="true"
		android:ellipsize="none"
		android:textSize="72sp"
		@@ -84,8 +85,9 @@

		<TextView android:id="@+id/am_pm"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:gravity="bottom"
		android:layout_height="wrap_content"
		android:layout_toRightOf="@id/timeDisplay"
		android:layout_alignBaseline="@id/timeDisplay"
		android:singleLine="true"
		android:ellipsize="none"
		android:textSize="22sp"

core/res/res/layout/keyguard_screen_unlock_portrait.xml

+4 −3

Original line number	Diff line number	Diff line
		@@ -55,12 +55,12 @@
		android:layout_alignParentTop="true"
		android:layout_marginTop="15dip"
		android:layout_marginLeft="20dip"
		android:layout_marginBottom="8dip"
		>

		<TextView android:id="@+id/timeDisplay"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:gravity="bottom"
		android:singleLine="true"
		android:ellipsize="none"
		android:textSize="56sp"
		@@ -74,8 +74,9 @@

		<TextView android:id="@+id/am_pm"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:gravity="bottom"
		android:layout_height="wrap_content"
		android:layout_toRightOf="@id/timeDisplay"
		android:layout_alignBaseline="@id/timeDisplay"
		android:singleLine="true"
		android:ellipsize="none"
		android:textSize="18sp"