Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ff0aa89 authored by Daniel Bateman's avatar Daniel Bateman Committed by Gerrit Code Review
Browse files

Lockscreen: Add clock alignment (1/2) 

Screenshots:
- Left: https://dl.dropbox.com/u/4806199/Screenshot_2012-09-08-20-24-30.png
- Center: https://dl.dropbox.com/u/4806199/Screenshot_2012-09-08-20-24-15.png
- Right: https://dl.dropbox.com/u/4806199/Screenshot_2012-09-08-20-24-23.png

* Portrait only!

Patch-set 2:
    * Fixed boot loop when using security settings
    * Support for sw600dp

Patch-set 3:
    * Update sw600dp

Change-Id: I41aeea50e95b0655c2bc90b56ee506e7baa470e2
parent 6b45718e

core/java/android/provider/Settings.java

+6 −0
Original line number Diff line number Diff line
@@ -2677,6 +2677,12 @@ public final class Settings { 
         */

        public static final String LOCKSCREEN_ALWAYS_SHOW_BATTERY = "lockscreen_always_show_battery";



        /**

         * Where to align the clock on the lockscreen

         * @hide

         */

        public static final String LOCKSCREEN_CLOCK_ALIGN = "lockscreen_clock_align";



        /**

         * Show the pending notification counts as overlays on the status bar

         * @hide

core/res/res/layout-sw600dp/keyguard_screen_status_port.xml

+5 −4
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
<LinearLayout

        xmlns:android="http://schemas.android.com/apk/res/android"

        android:orientation="vertical"

        android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="20dip"

        android:gravity="right"
@@ -140,7 +140,7 @@ 
    </RelativeLayout>



    <com.android.internal.widget.DigitalClock android:id="@+id/time"

        android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="8dip" >
@@ -173,8 +173,9 @@ 
    </com.android.internal.widget.DigitalClock>



    <LinearLayout

        android:id="@+id/date_line"

        android:orientation="horizontal"

        android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_below="@id/time"

        android:layout_marginTop="10dip">
@@ -199,7 +200,7 @@ 


    <TextView

        android:id="@+id/status1"

        android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="10dip"

        android:textSize="16sp"

core/res/res/layout-sw600dp/keyguard_screen_tab_unlock.xml

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 


            <!-- Status -->

            <include layout="@layout/keyguard_screen_status_port"

                android:layout_width="wrap_content"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginLeft="50dip"

                android:layout_marginTop="50dip"

core/res/res/layout/keyguard_screen_password_portrait.xml

+7 −6
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 


    <com.android.internal.widget.DigitalClock android:id="@+id/time"

        android:layout_marginBottom="18dip"

        android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin"

        android:layout_gravity="right">

        android:layout_width="match_parent"

        android:layout_height="wrap_content">



        <!-- Because we can't have multi-tone fonts, we render two TextViews, one on

        top of the other. Hence the redundant layout... -->
@@ -56,9 +56,10 @@ 
    </com.android.internal.widget.DigitalClock>



    <LinearLayout

        android:id="@+id/date_line"

        android:orientation="horizontal"

        android:layout_gravity="right"

        android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin">

        android:layout_width="match_parent"

        android:layout_height="wrap_content">



        <TextView

            android:id="@+id/date"
@@ -86,8 +87,8 @@ 


    <TextView

        android:id="@+id/status1"

        android:layout_gravity="right"

        android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:textAppearance="?android:attr/textAppearanceMedium"

core/res/res/layout/keyguard_screen_tab_unlock.xml

+7 −6
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ 
    <com.android.internal.widget.DigitalClock android:id="@+id/time"

        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">

        android:layout_width="match_parent"

        android:layout_height="wrap_content">



        <!-- Because we can't have multi-tone fonts, we render two TextViews, one on

        top of the other. Hence the redundant layout... -->
@@ -65,9 +65,10 @@ 
    </com.android.internal.widget.DigitalClock>



    <LinearLayout

        android:id="@+id/date_line"

        android:orientation="horizontal"

        android:layout_gravity="right"

        android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin">

        android:layout_width="match_parent"

        android:layout_height="wrap_content">



        <TextView

            android:id="@+id/date"
@@ -95,8 +96,8 @@ 


    <TextView

        android:id="@+id/status1"

        android:layout_gravity="right"

        android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:textAppearance="?android:attr/textAppearanceMedium"