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

Commit 3a9c1fcf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I53d2205b,I2dc43001 into sc-dev 

* changes:
  Smartspace - Update fonts/margins
  AOD/LS - Move clock to start
parents bcd8ea64 268bc20b

packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
        android:id="@+id/new_lockscreen_clock_view"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentEnd="true"

        android:layout_alignParentStart="true"

        android:layout_alignParentTop="true"

        android:visibility="gone">

        <com.android.keyguard.AnimatableClockView
@@ -73,7 +73,7 @@ 
            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"

            android:gravity="center_horizontal"

            android:textSize="100dp"

            android:textSize="60dp"

            android:fontFamily="@font/clock"

            android:typeface="monospace"

            android:elegantTextHeight="false"

packages/SystemUI/res-keyguard/values/dimens.xml

+6 −7
Original line number Diff line number Diff line
@@ -47,26 +47,25 @@ 
    <dimen name="eca_overlap">-10dip</dimen>



    <!-- Slice header -->

    <dimen name="widget_title_font_size">24dp</dimen>

    <dimen name="header_subtitle_padding">12dp</dimen>

    <dimen name="widget_title_font_size">20dp</dimen>

    <dimen name="widget_title_line_height">24dp</dimen>

    <dimen name="header_icon_size">16dp</dimen>

    <!-- Slice subtitle -->

    <dimen name="widget_label_font_size">18dp</dimen>

    <dimen name="widget_label_font_size">16dp</dimen>

    <dimen name="widget_label_line_height">20dp</dimen>

    <!-- Clock without header -->

    <dimen name="widget_big_font_size">54dp</dimen>

    <dimen name="bottom_text_spacing_digital">0dp</dimen>

    <dimen name="title_clock_padding">4dp</dimen>

    <!-- Clock with header -->

    <dimen name="widget_small_font_size">@dimen/widget_title_font_size</dimen>

    <dimen name="widget_vertical_padding">17dp</dimen>

    <dimen name="widget_vertical_padding">5dp</dimen>

    <dimen name="widget_vertical_padding_with_header">25dp</dimen>

    <dimen name="widget_vertical_padding_clock">12dp</dimen>

    <!-- Subtitle paddings -->

    <dimen name="widget_horizontal_padding">8dp</dimen>

    <dimen name="widget_icon_size">20dp</dimen>

    <dimen name="widget_icon_size">18dp</dimen>

    <dimen name="widget_icon_padding">8dp</dimen>

    <dimen name="subtitle_clock_padding">0dp</dimen>

    <dimen name="header_row_font_size">14dp</dimen>

    <!-- Notification shelf padding when dark -->

    <dimen name="widget_bottom_separator_padding">-6dp</dimen>

packages/SystemUI/res-keyguard/values/styles.xml

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ 


    <style name="TextAppearance.Keyguard">

        <item name="android:textSize">@dimen/widget_title_font_size</item>

        <item name="android:lineHeight">@dimen/widget_title_line_height</item>

        <item name="android:gravity">center</item>

        <item name="android:ellipsize">end</item>

        <item name="android:maxLines">2</item>
@@ -133,6 +134,7 @@ 
        <item name="android:layout_height">wrap_content</item>

        <item name="android:lines">1</item>

        <item name="android:textSize">@dimen/widget_label_font_size</item>

        <item name="android:lineHeight">@dimen/widget_label_line_height</item>

    </style>



    <style name="TextAppearance.Keyguard.BottomArea">

packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java

+0 −7
Original line number Diff line number Diff line
@@ -21,9 +21,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.graphics.Color;

import android.graphics.Paint;

import android.icu.text.NumberFormat;

import android.util.MathUtils;



import com.android.settingslib.Utils;

import com.android.systemui.R;
@@ -94,11 +92,6 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie 
        mStatusBarStateController.removeCallback(mStatusBarStateListener);

    }



    float getClockTextTopPadding() {

        Paint.FontMetrics fm = mView.getPaint().getFontMetrics();

        return MathUtils.abs(fm.ascent - fm.top);

    }



    /**

     * Updates the time for the view.

     */

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java

+1 −6
Original line number Diff line number Diff line
@@ -179,20 +179,15 @@ public class KeyguardClockSwitch extends RelativeLayout { 
            setPaddingRelative(startEndPadding, 0, startEndPadding, 0);

            mSmallClockFrame.setVisibility(GONE);

            mNewLockscreenClockFrame.setVisibility(VISIBLE);



            statusAreaLP.removeRule(RelativeLayout.BELOW);

            statusAreaLP.addRule(RelativeLayout.BELOW, R.id.new_lockscreen_clock_view);

            statusAreaLP.addRule(RelativeLayout.ALIGN_PARENT_START);

            statusAreaLP.addRule(RelativeLayout.START_OF, R.id.new_lockscreen_clock_view);

            statusAreaLP.width = 0;

        } else {

            setPaddingRelative(0, 0, 0, 0);

            mSmallClockFrame.setVisibility(VISIBLE);

            mNewLockscreenClockFrame.setVisibility(GONE);



            statusAreaLP.removeRule(RelativeLayout.ALIGN_PARENT_START);

            statusAreaLP.removeRule(RelativeLayout.START_OF);

            statusAreaLP.addRule(RelativeLayout.BELOW, R.id.clock_view);

            statusAreaLP.width = ViewGroup.LayoutParams.MATCH_PARENT;

        }



        requestLayout();