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

Commit 7a529440 authored by Robert Snoeberger's avatar Robert Snoeberger
Browse files

Simplify KeyguardClockSwitch 1/N. 

End goal is to move clock switching logic out of this view class.
To do that, first need to make this class look less like a TextClock.

Bug: 122301289
Test: keyguard tests pass
Change-Id: Iccd7b0d02d1ec756d4e37f3d4ab47d0bcb55e566
parent 1f2ef22c

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

+2 −8
Original line number Diff line number Diff line
@@ -19,15 +19,9 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

  >

  <TextClock

  <include

      android:id="@+id/digital_clock"

      android:layout_width="wrap_content"

      android:layout_height="wrap_content"

      android:letterSpacing="0.03"

      android:singleLine="true"

      style="@style/widget_big"

      android:format12Hour="@string/keyguard_widget_12_hours_format"

      android:format24Hour="@string/keyguard_widget_24_hours_format"

      layout="@layout/text_clock"

  />

  <com.android.keyguard.clock.ImageClock

      android:id="@+id/analog_clock"

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

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

    android:layout_gravity="center_horizontal"

    android:layout_alignParentTop="true">

  <TextClock

  <include

      android:id="@+id/lock_screen_clock"

      android:layout_width="wrap_content"

      android:layout_height="wrap_content"

      android:layout_gravity="center_horizontal"

      android:letterSpacing="0.03"

      android:singleLine="true"

      style="@style/widget_big"

      android:format12Hour="@string/keyguard_widget_12_hours_format"

      android:format24Hour="@string/keyguard_widget_24_hours_format" />

      layout="@layout/text_clock"

  />

</FrameLayout>

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

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

         android:layout_gravity="center_horizontal"

         android:layout_alignParentTop="true">

        <TextClock

        <include

             android:id="@+id/default_clock_view"

             android:layout_width="wrap_content"

             android:layout_height="wrap_content"

             android:layout_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" />

             layout="@layout/text_clock" />

    </FrameLayout>

    <include layout="@layout/keyguard_status_area"

        android:id="@+id/keyguard_status_area"

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

+2 −8
Original line number Diff line number Diff line
@@ -19,15 +19,9 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

  >

  <TextClock

  <include

      android:id="@+id/digital_clock"

      android:layout_width="wrap_content"

      android:layout_height="wrap_content"

      android:letterSpacing="0.03"

      android:singleLine="true"

      style="@style/widget_big"

      android:format12Hour="@string/keyguard_widget_12_hours_format"

      android:format24Hour="@string/keyguard_widget_24_hours_format"

      layout="@layout/text_clock"

  />

  <com.android.keyguard.clock.StretchAnalogClock

      android:id="@+id/analog_clock"

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

0 → 100644
+29 −0
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="wrap_content"

    android:layout_height="wrap_content"

    android:layout_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"

/>