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

Commit 2038c769 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "LockScreen Weather : Align City/Condition/Time text" into ics

parents 80e5d65e dcd9f511

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

+7 −0
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ 
                android:textSize="14sp"

                android:textStyle="bold"

                android:layout_alignParentRight="true"

                android:gravity="right"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textColor="?android:attr/textColorPrimary"/>



            <TextView
@@ -79,6 +82,9 @@ 
                android:layout_height="wrap_content"

                android:layout_below="@id/weather_city"

                android:layout_alignParentRight="true"

                android:gravity="right"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textSize="12sp"

                android:textColor="?android:attr/textColorPrimary" />
@@ -88,6 +94,7 @@ 
                android:layout_height="wrap_content"

                android:layout_below="@id/weather_condition"

                android:layout_alignParentRight="true"

                android:gravity="right"

                android:textSize="6sp"

                android:textColor="?android:attr/textColorSecondary" />

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

+7 −0
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ 
                android:textSize="14sp"

                android:textStyle="bold"

                android:layout_alignParentRight="true"

                android:gravity="right"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textColor="?android:attr/textColorPrimary"/>



            <TextView
@@ -81,6 +84,9 @@ 
                android:layout_height="wrap_content"

                android:layout_below="@id/weather_city"

                android:layout_alignParentRight="true"

                android:gravity="right"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textSize="12sp"

                android:textColor="?android:attr/textColorPrimary" />
@@ -90,6 +96,7 @@ 
                android:layout_height="wrap_content"

                android:layout_below="@id/weather_condition"

                android:layout_alignParentRight="true"

                android:gravity="right"

                android:textSize="6sp"

                android:textColor="?android:attr/textColorSecondary" />

core/res/res/layout/keyguard_screen_tab_unlock.xml

+7 −0
Original line number Diff line number Diff line
@@ -136,6 +136,9 @@ 
                android:textSize="14sp"

                android:textStyle="bold"

                android:layout_alignParentRight="true"

                android:gravity="right"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textColor="?android:attr/textColorPrimary"/>



            <TextView
@@ -144,6 +147,9 @@ 
                android:layout_height="wrap_content"

                android:layout_below="@id/weather_city"

                android:layout_alignParentRight="true"

                android:gravity="right"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textSize="12sp"

                android:textColor="?android:attr/textColorPrimary" />
@@ -151,6 +157,7 @@ 
                android:id="@+id/update_time"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:gravity="right"

                android:layout_below="@id/weather_condition"

                android:layout_alignParentRight="true"

                android:textSize="6sp"

core/res/res/layout/keyguard_screen_tab_unlock_land.xml

+7 −0
Original line number Diff line number Diff line
@@ -133,6 +133,9 @@ 
                android:textSize="14sp"

                android:textStyle="bold"

                android:layout_alignParentRight="true"

                android:gravity="right"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textColor="?android:attr/textColorPrimary"/>



            <TextView
@@ -141,6 +144,9 @@ 
                android:layout_height="wrap_content"

                android:layout_below="@id/weather_city"

                android:layout_alignParentRight="true"

                android:gravity="right"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textSize="12sp"

                android:textColor="?android:attr/textColorPrimary" />
@@ -150,6 +156,7 @@ 
                android:layout_height="wrap_content"

                android:layout_below="@id/weather_condition"

                android:layout_alignParentRight="true"

                android:gravity="right"

                android:textSize="6sp"

                android:textColor="?android:attr/textColorSecondary" />

policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ class KeyguardStatusViewManager implements OnClickListener { 


        // Required to get Marquee to work.

        final View scrollableViews[] = { mCarrierView, mDateView, mStatus1View, mOwnerInfoView,

                mAlarmStatusView, mCalendarEventDetails };

                mAlarmStatusView, mCalendarEventDetails, mWeatherCity, mWeatherCondition };

        for (View v : scrollableViews) {

            if (v != null) {

                v.setSelected(true);