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

Commit 79977724 authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Automerger Merge Worker
Browse files

DefaultClockProvider implementation using AnimatableClockView am: 9158a60b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19430369



Change-Id: I231f711efee75cc888dd2880d667ad434af68898
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4898a353 9158a60b

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -4347,6 +4347,9 @@ 
    <!-- Name of a font family to use for medium body text. -->

    <string name="config_bodyFontFamilyMedium" translatable="false">sans-serif-medium</string>



    <!-- Name of the font family to use in the default lockscreen clock -->

    <string name="config_clockFontFamily" translatable="false">monospace</string>



    <!-- Size of icon shown beside a preference locked by admin -->

    <dimen name="config_restrictedIconSize">@dimen/restricted_icon_size_material</dimen>

packages/SystemUI/res-keyguard/font/clock.xml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
** Should include all numeric glyphs in all supported locales.

** Recommended: font with variable width to support AOD => LS animations

-->

<!-- TODO: Remove when clock migration complete -->

<font-family xmlns:android="http://schemas.android.com/apk/res/android">

    <font android:typeface="monospace"/>

</font-family>
 
 No newline at end of file

packages/SystemUI/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -666,6 +666,7 @@ 
    <!-- With the large clock, move up slightly from the center -->

    <dimen name="keyguard_large_clock_top_margin">-60dp</dimen>



    <!-- TODO: Remove during migration -->

    <!-- Default line spacing multiplier between hours and minutes of the keyguard clock -->

    <item name="keyguard_clock_line_spacing_scale" type="dimen" format="float">.7</item>

    <!-- Burmese line spacing multiplier between hours and minutes of the keyguard clock -->
@@ -890,6 +891,7 @@ 
    <dimen name="burn_in_prevention_offset_y_clock">42dp</dimen>



    <!-- Clock maximum font size (dp is intentional, to prevent any further scaling) -->

     <!-- TODO: Remove when clock migration complete -->

    <dimen name="large_clock_text_size">150dp</dimen>

    <dimen name="clock_text_size">86dp</dimen>

packages/SystemUI/shared/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ android_library { 
        "dagger2",

        "jsr330",

    ],

    resource_dirs: [

        "res",

    ],

    java_version: "1.8",

    min_sdk_version: "current",

    plugins: ["dagger2-compiler"],

packages/SystemUI/shared/res/drawable/clock_default_thumbnail.xml

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

<!--

  ~ Copyright (C) 2022 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

  -->

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

    android:shape="rectangle">

    <solid android:color="#FFFF00FF" />

</shape>