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

Commit 94167411 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Drop Type clock face." into qt-dev am: fe6b8f69 am: 7771243d"

parents 15b92ea8 9f505923

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

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

  -->

<com.android.keyguard.clock.ClockLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

  >

  <include layout="@layout/typographic_clock" />

</com.android.keyguard.clock.ClockLayout>

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

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

  -->

<com.android.keyguard.clock.TypographicClock

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

    android:id="@+id/type_clock"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingStart="50dp"

    android:textAlignment="viewStart"

    style="@style/widget_big"

    android:textSize="40dp"

    />

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

+0 −100
Original line number Diff line number Diff line
@@ -405,106 +405,6 @@ number">%d</xliff:g> remaining attempt before SIM becomes permanently unusable. 
number">%d</xliff:g> remaining attempts before SIM becomes permanently unusable. Contact carrier for details.</item>

    </plurals>



    <!-- Time displayed on typographic clock face, which displays the time in words.

             Example:



                 It's

                 Four

                 Twenty

                 Nine



         This string requires two arguments: the first in the hours of the time and

         the second is the minutes of the time. The hours string is obtained from

         string-array type_clock_hours below and the minutes string is obtained

         from string-array type_clock_minutes below.



    [CHAR LIMIT=8] -->

    <plurals name="type_clock_header">

        <item quantity="one"><annotation name="color">It\u2019s</annotation>\n^1\n^2</item>

        <item quantity="few"><annotation name="color">It\u2019s</annotation>\n^1\n^2</item>

        <item quantity="other"><annotation name="color">It\u2019s</annotation>\n^1\n^2</item>

    </plurals>



    <!-- Hour displayed in words on the typographic clock face. [CHAR LIMIT=12] -->

    <string-array name="type_clock_hours">

        <item>Twelve</item>

        <item>One</item>

        <item>Two</item>

        <item>Three</item>

        <item>Four</item>

        <item>Five</item>

        <item>Six</item>

        <item>Seven</item>

        <item>Eight</item>

        <item>Nine</item>

        <item>Ten</item>

        <item>Eleven</item>

    </string-array>



    <!-- Minutes displayed in words on the typographic clock face. [CHAR LIMIT=20] -->

    <string-array name="type_clock_minutes">

        <item>O\u2019Clock</item>

        <item>Oh One</item>

        <item>Oh Two</item>

        <item>Oh Three</item>

        <item>Oh Four</item>

        <item>Oh Five</item>

        <item>Oh Six</item>

        <item>Oh Seven</item>

        <item>Oh Eight</item>

        <item>Oh Nine</item>

        <item>Ten</item>

        <item>Eleven</item>

        <item>Twelve</item>

        <item>Thirteen</item>

        <item>Fourteen</item>

        <item>Fifteen</item>

        <item>Sixteen</item>

        <item>Seventeen</item>

        <item>Eighteen</item>

        <item>Nineteen</item>

        <item>Twenty</item>

        <item>Twenty\nOne</item>

        <item>Twenty\nTwo</item>

        <item>Twenty\nThree</item>

        <item>Twenty\nFour</item>

        <item>Twenty\nFive</item>

        <item>Twenty\nSix</item>

        <item>Twenty\nSeven</item>

        <item>Twenty\nEight</item>

        <item>Twenty\nNine</item>

        <item>Thirty</item>

        <item>Thirty\nOne</item>

        <item>Thirty\nTwo</item>

        <item>Thirty\nThree</item>

        <item>Thirty\nFour</item>

        <item>Thirty\nFive</item>

        <item>Thirty\nSix</item>

        <item>Thirty\nSeven</item>

        <item>Thirty\nEight</item>

        <item>Thirty\nNine</item>

        <item>Forty</item>

        <item>Forty\nOne</item>

        <item>Forty\nTwo</item>

        <item>Forty\nThree</item>

        <item>Forty\nFour</item>

        <item>Forty\nFive</item>

        <item>Forty\nSix</item>

        <item>Forty\nSeven</item>

        <item>Forty\nEight</item>

        <item>Forty\nNine</item>

        <item>Fifty</item>

        <item>Fifty\nOne</item>

        <item>Fifty\nTwo</item>

        <item>Fifty\nThree</item>

        <item>Fifty\nFour</item>

        <item>Fifty\nFive</item>

        <item>Fifty\nSix</item>

        <item>Fifty\nSeven</item>

        <item>Fifty\nEight</item>

        <item>Fifty\nNine</item>

    </string-array>



    <!-- Title for default clock face that will appear in the picker app next to a preview image of

         the clock face. [CHAR LIMIT=8] -->

    <string name="clock_title_default" translatable="false">Default</string>

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

+0 −8
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ public class ClockLayout extends FrameLayout { 
     */

    private View mDigitalClock;

    private View mAnalogClock;

    private View mTypeClock;



    /**

     * Pixel shifting amplitidues used to prevent screen burn-in.
@@ -62,7 +61,6 @@ public class ClockLayout extends FrameLayout { 
        super.onFinishInflate();

        mDigitalClock = findViewById(R.id.digital_clock);

        mAnalogClock = findViewById(R.id.analog_clock);

        mTypeClock = findViewById(R.id.type_clock);



        // Get pixel shifting X, Y amplitudes from resources.

        Resources resources = getResources();
@@ -95,11 +93,5 @@ public class ClockLayout extends FrameLayout { 
            mAnalogClock.setY(Math.max(0f, 0.5f * (getHeight() - mAnalogClock.getHeight()))

                    + offsetY);

        }



        // Put the typographic clock part way down the screen.

        if (mTypeClock != null) {

            mTypeClock.setX(offsetX);

            mTypeClock.setY(0.2f * getHeight() + offsetY);

        }

    }

}

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

+0 −1
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ public final class ClockManager { 
        addBuiltinClock(() -> new BubbleClockController(res, layoutInflater, colorExtractor));

        addBuiltinClock(() -> new StretchAnalogClockController(res, layoutInflater,

                colorExtractor));

        addBuiltinClock(() -> new TypeClockController(res, layoutInflater, colorExtractor));



        // Store the size of the display for generation of clock preview.

        DisplayMetrics dm = res.getDisplayMetrics();