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

Commit 50b65675 authored by Martijn Coenen's avatar Martijn Coenen Committed by Android (Google) Code Review
Browse files

Merge "Revert "Migrate AnimatableClockView to SystemUISharedLib""

parents bdeee157 b821a9ae

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

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
        android:layout_alignParentStart="true"

        android:layout_alignParentTop="true"

        android:paddingStart="@dimen/clock_padding_start">

        <com.android.systemui.shared.clocks.AnimatableClockView

        <com.android.keyguard.AnimatableClockView

            android:id="@+id/animatable_clock_view"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"
@@ -53,7 +53,7 @@ 
        android:layout_height="wrap_content"

        android:layout_below="@id/keyguard_slice_view"

        android:visibility="gone">

        <com.android.systemui.shared.clocks.AnimatableClockView

        <com.android.keyguard.AnimatableClockView

            android:id="@+id/animatable_clock_view_large"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

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

+6 −0
Original line number Diff line number Diff line
@@ -41,4 +41,10 @@ 
    <attr name="passwordStyle" format="reference" />



    <attr name="numPadKeyStyle" format="reference" />



    <declare-styleable name="AnimatableClockView">

        <attr name="dozeWeight" format="integer" />

        <attr name="lockScreenWeight" format="integer" />

        <attr name="chargeAnimationDelay" format="integer" />

    </declare-styleable>

</resources>

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

+6 −0
Original line number Diff line number Diff line
@@ -23,5 +23,11 @@ 
    <!-- Skeleton string format for displaying the date shorter. -->

    <string name="abbrev_month_day_no_year">MMMd</string>



    <!-- Skeleton string format for displaying the time in 12-hour format. -->

    <string name="clock_12hr_format">hm</string>



    <!-- Skeleton string format for displaying the time in 24-hour format. -->

    <string name="clock_24hr_format">Hm</string>



    <string name="num_pad_key_ratio">1</string>

</resources>

packages/SystemUI/shared/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ android_library { 
    ],

    static_libs: [

        "PluginCoreLib",

        "SystemUIAnimationLib",

        "SystemUIUnfoldLib",

        "androidx.dynamicanimation_dynamicanimation",

        "androidx.concurrent_concurrent-futures",

packages/SystemUI/shared/res/values/attrs.xml

deleted100644 → 0
+0 −28
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.

-->



<!-- Formatting note: terminate all comments with a period, to avoid breaking

     the documentation output. To suppress comment lines from the documentation

     output, insert an eat-comment element after the comment lines.

-->



<resources>

    <declare-styleable name="AnimatableClockView">

        <attr name="dozeWeight" format="integer" />

        <attr name="lockScreenWeight" format="integer" />

        <attr name="chargeAnimationDelay" format="integer" />

    </declare-styleable>

</resources>