FP2-1655: Lock Screen Clock - Adapt layout for corrected dpi
The lock screen clock must react correctly to non-standard
pixel density settings.
Change-Id: Ifb43c8502097507797feab198f2d5b62d6a31a05
diff --git a/packages/Keyguard/res/layout/clock_widget_battery.xml b/packages/Keyguard/res/layout/clock_widget_battery.xml
index 5d7a9f0..95e4b24 100644
--- a/packages/Keyguard/res/layout/clock_widget_battery.xml
+++ b/packages/Keyguard/res/layout/clock_widget_battery.xml
@@ -2,9 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/main_container"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="?android:attr/selectableItemBackground"
- android:orientation="vertical">
+ android:layout_height="match_parent">
<TextView
android:id="@+id/battery_description"
@@ -14,7 +12,6 @@
android:layout_alignParentStart="true"
android:layout_marginLeft="31.3dp"
android:gravity="left"
- android:singleLine="true"
android:text="@string/battery_charge_will_last_until" />
<RelativeLayout
@@ -40,7 +37,6 @@
android:layout_marginLeft="26dp"
android:layout_marginTop="10dp"
android:gravity="left"
- android:singleLine="true"
android:includeFontPadding="false"
android:text="@string/charged"
android:textAllCaps="true"
@@ -54,7 +50,6 @@
android:layout_marginLeft="26dp"
android:layout_marginTop="-7dp"
android:gravity="left"
- android:singleLine="true"
android:textAllCaps="true"
android:visibility="gone" />
@@ -104,7 +99,6 @@
android:layout_gravity="top|left"
android:gravity="left"
android:text="@string/tomorrow"
- android:singleLine="true"
android:textAllCaps="true"
android:visibility="invisible" />
@@ -117,7 +111,6 @@
android:layout_gravity="bottom|left"
android:layout_marginLeft="-3dp"
android:layout_marginTop="-10dp"
- android:singleLine="true"
android:gravity="left" />
</LinearLayout>
</LinearLayout>
@@ -131,7 +124,6 @@
android:layout_marginLeft="58dp"
android:layout_marginTop="100dp"
android:gravity="left"
- android:singleLine="true"
android:includeFontPadding="false"
android:text="@string/unplug_your_charger"
android:visibility="gone" />
@@ -139,14 +131,19 @@
<TextView
android:id="@+id/last_longer_button"
style="@style/text_condensed_bold_italic_18sp"
- android:layout_width="200dp"
- android:layout_height="32dp"
- android:layout_gravity="right"
- android:layout_marginLeft="158dp"
- android:layout_marginTop="122dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
android:background="@drawable/button_states_blue"
- android:gravity="center"
+ android:ellipsize="end"
+ android:layout_marginTop="136.9dp"
+ android:paddingTop="4dp"
+ android:paddingBottom="4dp"
+ android:paddingLeft="6dp"
+ android:paddingRight="6dp"
+ android:includeFontPadding="false"
android:singleLine="true"
android:text="@string/make_it_last_longer" />
</RelativeLayout>
+
diff --git a/packages/Keyguard/res/layout/clock_widget_main.xml b/packages/Keyguard/res/layout/clock_widget_main.xml
index d6183a4..b78531e 100644
--- a/packages/Keyguard/res/layout/clock_widget_main.xml
+++ b/packages/Keyguard/res/layout/clock_widget_main.xml
@@ -1,22 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="180dp"
- android:background="?android:attr/selectableItemBackground"
- android:orientation="vertical">
+ android:layout_height="match_parent">
<TextView
android:id="@+id/alarm_text"
style="@style/text_regular_18sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
+ android:layout_marginLeft="30.7dp"
android:drawableLeft="@drawable/clock"
android:drawablePadding="8.7dp"
android:gravity="left"
android:textAllCaps="true"
- android:visibility="invisible"
- android:layout_marginLeft="30.7dp"
- android:layout_alignParentStart="true"/>
+ android:visibility="invisible" />
<LinearLayout
android:id="@+id/hour_container"
@@ -40,38 +38,41 @@
style="@style/text_thin_34sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginLeft="7dp"
android:gravity="left"
android:includeFontPadding="false"
- android:layout_marginLeft="7dp" />
+ android:singleLine="true" />
</LinearLayout>
- <LinearLayout
+ <RelativeLayout
android:layout_width="match_parent"
- android:layout_height="86.67dp"
+ android:layout_height="56.3dp"
android:layout_marginLeft="31.33dp"
- android:layout_marginTop="100dp"
- android:orientation="horizontal"
- android:gravity="center_vertical">
+ android:layout_marginTop="113.8dp">
<TextClock
style="@style/text_regular_bold_48sp"
- android:layout_width="55.3dp"
- android:layout_height="56.3dp"
+ android:id="@+id/day_of_month"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
android:format12Hour="@string/day_number_format"
android:format24Hour="@string/day_number_format"
- android:includeFontPadding="false"
- android:gravity="center"/>
+ android:includeFontPadding="false"/>
<RelativeLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:layout_marginLeft="6.67dp">
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_toRightOf="@id/day_of_month"
+ android:layout_marginLeft="6.67dp"
+ android:orientation="vertical">
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="18dp"
+ android:id="@+id/month_year"
android:orientation="horizontal">
<TextClock
@@ -82,7 +83,7 @@
android:format24Hour="@string/month_format"
android:gravity="left"
android:includeFontPadding="false"
- android:textAllCaps="true"/>
+ android:textAllCaps="true" />
<TextClock
style="@style/text_light_16sp"
@@ -91,38 +92,60 @@
android:format12Hour="@string/year_format"
android:format24Hour="@string/year_format"
android:gravity="left"
- android:textAllCaps="true"
android:includeFontPadding="false"
- android:paddingLeft="8dp" />
+ android:paddingLeft="8dp"
+ android:textAllCaps="true" />
</LinearLayout>
+
<TextClock
style="@style/text_regular_bold_22sp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="36dp"
+ android:layout_below="@id/month_year"
+ android:layout_marginTop="-2.7dp"
android:format12Hour="@string/day_name_format"
android:format24Hour="@string/day_name_format"
android:gravity="left"
+ android:includeFontPadding="false"
android:singleLine="true"
- android:textAllCaps="true"
- android:includeFontPadding="false" />
+ android:textAllCaps="true" />
</RelativeLayout>
+ </RelativeLayout>
- <FrameLayout
- android:id="@+id/clock_edit_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="-65dp"
- android:layout_marginTop="9dp">
- <TextView
- style="@style/text_condensed_bold_italic_18sp"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/button_states_blue"
- android:gravity="left"
- android:padding="5dp"
- android:singleLine="true"
- android:text="@string/edit" />
- </FrameLayout>
- </LinearLayout>
+ <TextView
+ android:id="@+id/clock_edit_button"
+ style="@style/text_condensed_bold_italic_18sp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:background="@drawable/button_states_blue"
+ android:ellipsize="end"
+ android:layout_marginTop="136.9dp"
+ android:paddingTop="4dp"
+ android:paddingBottom="4dp"
+ android:paddingLeft="6dp"
+ android:paddingRight="6dp"
+ android:includeFontPadding="false"
+ android:singleLine="true"
+ android:text="@string/edit" />
+
+ <!-- GUIDELINES -->
+ <!--<LinearLayout
+ android:layout_height="1dp"
+ android:layout_width="match_parent"
+ android:background="@android:color/holo_green_light"
+ android:layout_alignTop="@id/clock_edit_button"
+ android:orientation="horizontal"/>
+ <LinearLayout
+ android:layout_height="1dp"
+ android:layout_width="match_parent"
+ android:background="@android:color/holo_green_light"
+ android:layout_alignBaseline="@id/clock_edit_button"
+ android:orientation="horizontal"/>
+ <LinearLayout
+ android:layout_height="1dp"
+ android:layout_width="match_parent"
+ android:background="@android:color/holo_green_light"
+ android:layout_alignBottom="@id/clock_edit_button"
+ android:orientation="horizontal"/>-->
</RelativeLayout>
diff --git a/packages/Keyguard/res/layout/clock_widget_peace_of_mind.xml b/packages/Keyguard/res/layout/clock_widget_peace_of_mind.xml
index bce228c..3e73136 100644
--- a/packages/Keyguard/res/layout/clock_widget_peace_of_mind.xml
+++ b/packages/Keyguard/res/layout/clock_widget_peace_of_mind.xml
@@ -1,19 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="?android:attr/selectableItemBackground"
- android:orientation="vertical">
+ android:layout_height="match_parent">
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="?android:attr/selectableItemBackground"
+ android:orientation="vertical">
<TextView
style="@style/text_light_20sp"
android:layout_marginTop="-5dp"
- android:layout_width="match_parent"
+ android:layout_width="154dp"
android:layout_height="wrap_content"
android:lineSpacingMultiplier="0.9"
+ android:lines="2"
android:gravity="left"
- android:maxLines="2"
- android:paddingLeft="112dp"
+ android:layout_marginLeft="112dp"
android:text="@string/you_been_in_peace_for" />
<LinearLayout
@@ -39,18 +42,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="left"
- android:singleLine="true"
android:text="@string/minutes" />
</LinearLayout>
<TextView
style="@style/text_light_14sp"
- android:layout_width="match_parent"
+ android:layout_width="116dp"
android:layout_height="wrap_content"
android:gravity="left"
- android:paddingLeft="112dp"
+ android:layout_marginLeft="112dp"
+ android:lines="2"
android:lineSpacingMultiplier="0.9"
- android:maxLines="2"
android:text="@string/your_record_peace_of_mind" />
<LinearLayout
@@ -76,24 +78,27 @@
android:layout_height="wrap_content"
android:gravity="left"
android:paddingRight="8dp"
- android:singleLine="true"
android:text="@string/minutes" />
- <TextView
- android:id="@+id/peace_share_button"
- style="@style/text_condensed_bold_italic_18sp"
- android:layout_width="wrap_content"
- android:layout_height="32dp"
- android:background="@drawable/button_states_blue"
- android:drawablePadding="8dp"
- android:drawableRight="@drawable/share_icon"
- android:gravity="left"
- android:padding="5dp"
- android:singleLine="true"
- android:layout_marginLeft="28dp"
- android:text="@string/share" />
-
</LinearLayout>
-
</LinearLayout>
+<TextView
+ android:id="@+id/peace_share_button"
+ style="@style/text_condensed_bold_italic_18sp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:background="@drawable/button_states_blue"
+ android:ellipsize="end"
+ android:layout_marginTop="136.9dp"
+ android:paddingTop="4dp"
+ android:paddingBottom="4dp"
+ android:paddingLeft="6dp"
+ android:paddingRight="6dp"
+ android:includeFontPadding="false"
+ android:singleLine="true"
+ android:drawablePadding="8dp"
+ android:drawableRight="@drawable/share_icon"
+ android:text="@string/share" />
+</RelativeLayout>
diff --git a/packages/Keyguard/res/layout/clock_widget_yours_since.xml b/packages/Keyguard/res/layout/clock_widget_yours_since.xml
index 8604aa8..6fa42f7 100644
--- a/packages/Keyguard/res/layout/clock_widget_yours_since.xml
+++ b/packages/Keyguard/res/layout/clock_widget_yours_since.xml
@@ -105,29 +105,22 @@
</LinearLayout>
- <FrameLayout
+<TextView
android:id="@+id/yours_since_share_button"
- android:layout_width="84.67dp"
- android:layout_height="32dp"
+ style="@style/text_condensed_bold_italic_18sp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
android:background="@drawable/button_states_blue"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:layout_marginTop="121.45dp"
- android:layout_alignParentRight="true">
- <TextView
- style="@style/text_condensed_bold_italic_18sp"
- android:textSize="17.67dp"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="left"
- android:singleLine="true"
- android:layout_gravity="center_vertical"
- android:text="@string/share"
- />
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical|right"
- android:src="@drawable/share_icon"/>
- </FrameLayout>
+ android:ellipsize="end"
+ android:layout_marginTop="136.9dp"
+ android:paddingTop="4dp"
+ android:paddingBottom="4dp"
+ android:paddingLeft="6dp"
+ android:paddingRight="6dp"
+ android:includeFontPadding="false"
+ android:singleLine="true"
+ android:drawablePadding="8dp"
+ android:drawableRight="@drawable/share_icon"
+ android:text="@string/share" />
</RelativeLayout>
diff --git a/packages/Keyguard/res/layout/widget_main.xml b/packages/Keyguard/res/layout/widget_main.xml
index 483bc7d..d8ff0d6 100644
--- a/packages/Keyguard/res/layout/widget_main.xml
+++ b/packages/Keyguard/res/layout/widget_main.xml
@@ -1,19 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="180dp">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="182dp">
+
+ <LinearLayout
+ android:layout_width="360dp"
+ android:layout_height="180dp"
+ android:layout_centerInParent="true">
- <include layout="@layout/clock_widget_main"
- android:id="@+id/clock_widget_main"
- android:visibility="gone"/>
- <include layout="@layout/clock_widget_battery"
- android:id="@+id/clock_widget_battery"
- android:visibility="gone"/>
- <include layout="@layout/clock_widget_peace_of_mind"
- android:id="@+id/clock_widget_peace_of_mind"
- android:visibility="gone"/>
- <include layout="@layout/clock_widget_yours_since"
- android:id="@+id/clock_widget_yours_since"
- android:visibility="gone"/>
-
-</LinearLayout>
+ <include layout="@layout/clock_widget_main"
+ android:id="@+id/clock_widget_main"
+ android:visibility="gone"/>
+ <include layout="@layout/clock_widget_battery"
+ android:id="@+id/clock_widget_battery"
+ android:visibility="gone"/>
+ <include layout="@layout/clock_widget_peace_of_mind"
+ android:id="@+id/clock_widget_peace_of_mind"
+ android:visibility="gone"/>
+ <include layout="@layout/clock_widget_yours_since"
+ android:id="@+id/clock_widget_yours_since"
+ android:visibility="gone"/>
+
+ </LinearLayout>
+
+</RelativeLayout>