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

Commit 9cd1d187 authored by Robert Snoeberger's avatar Robert Snoeberger
Browse files

Bold time in "At a Glance" of custom clocks 

Bug: 129348218
Test: manual - checked that time is bold
Change-Id: I8c3cdc68735746669dcc516e42607aceac818740
parent 2c09b3be

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

+12 −2
Original line number Diff line number Diff line
@@ -20,9 +20,19 @@ 
    android:layout_height="wrap_content"

    android:layout_gravity="center_horizontal"

    android:layout_alignParentTop="true">

  <include

  <TextClock

      android:id="@+id/lock_screen_clock"

      layout="@layout/text_clock"

      android:layout_width="match_parent"

      android:layout_height="wrap_content"

      android:layout_gravity="center_horizontal"

      android:gravity="center_horizontal"

      android:letterSpacing="0.03"

      android:textColor="?attr/wallpaperTextColor"

      android:singleLine="true"

      style="@style/widget_small_bold"

      android:format12Hour="@string/keyguard_widget_12_hours_format"

      android:format24Hour="@string/keyguard_widget_24_hours_format"

      android:elegantTextHeight="false"

  />

</FrameLayout>

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

+13 −2
Original line number Diff line number Diff line
@@ -30,9 +30,20 @@ 
         android:layout_height="wrap_content"

         android:layout_gravity="center_horizontal"

         android:layout_alignParentTop="true">

        <include

        <TextClock

             android:id="@+id/default_clock_view"

             layout="@layout/text_clock" />

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

             android:layout_gravity="center_horizontal"

             android:gravity="center_horizontal"

             android:letterSpacing="0.03"

             android:textColor="?attr/wallpaperTextColor"

             android:singleLine="true"

             style="@style/widget_big"

             android:format12Hour="@string/keyguard_widget_12_hours_format"

             android:format24Hour="@string/keyguard_widget_24_hours_format"

             android:elegantTextHeight="false"

        />

        <TextClock

             android:id="@+id/default_clock_view_bold"

             android:layout_width="match_parent"

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

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2019 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



      http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->

<TextClock

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_gravity="center_horizontal"

    android:gravity="center_horizontal"

    android:letterSpacing="0.03"

    android:textColor="?attr/wallpaperTextColor"

    android:singleLine="true"

    style="@style/widget_big"

    android:format12Hour="@string/keyguard_widget_12_hours_format"

    android:format24Hour="@string/keyguard_widget_24_hours_format"

    android:elegantTextHeight="false"

/>

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

+7 −0
Original line number Diff line number Diff line
@@ -73,6 +73,13 @@ 
        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

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

    </style>

    <style name="widget_small_bold">

        <item name="android:textStyle">bold</item>

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

        <item name="android:paddingBottom">@dimen/bottom_text_spacing_digital</item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

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

    </style>



    <style name="BouncerSecurityContainer">

        <item name="android:layout_gravity">center_horizontal|bottom</item>

packages/SystemUI/src/com/android/keyguard/clock/AnalogClockController.java

+0 −4
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.graphics.Bitmap; 
import android.graphics.BitmapFactory;

import android.graphics.Color;

import android.graphics.Paint.Style;

import android.util.TypedValue;

import android.view.LayoutInflater;

import android.view.View;

import android.widget.TextClock;
@@ -96,11 +95,8 @@ public class AnalogClockController implements ClockPlugin { 


        mView = mLayoutInflater.inflate(R.layout.digital_clock, null);

        mLockClock = mView.findViewById(R.id.lock_screen_clock);

        final int textSize = mResources.getDimensionPixelSize(R.dimen.widget_title_font_size);

        mLockClock.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);

    }





    @Override

    public void onDestroyView() {

        mBigClockView = null;