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

Commit 74c1d58d authored by Robert Snoeberger's avatar Robert Snoeberger Committed by android-build-merger
Browse files

Merge "Update Bubble clock face" into qt-dev 

am: bd873544

Change-Id: I93c8f9ca84fd209389be2de5aeaa2dab1c9c97cc
parents 247eb29c bd873544

packages/SystemUI/res-keyguard/drawable/bubble_hour_hand.xml

+7 −6
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:height="350dp"

    android:width="350dp"

    android:viewportHeight="254.66145"

    android:viewportWidth="254.66145">

    android:height="340dp"

    android:width="340dp"

    android:viewportHeight="340"

    android:viewportWidth="340">

    <path

        android:fillColor="#000000"

        android:pathData="M127.331,40.481m-10.914,0a10.914,10.914 0,1 1,21.828 0a10.914,10.914 0,1 1,-21.828 0"/>

        android:pathData="M170,40m-39,0a39,39 0,1 1,78 0a39,39 0,1 1,-78 0"

        android:strokeColor="#000000"

        android:strokeWidth="2"/>

</vector>

packages/SystemUI/res-keyguard/drawable/bubble_minute_hand.xml

+6 −7
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:height="350dp"

    android:width="350dp"

    android:viewportHeight="254.66145"

    android:viewportWidth="254.66145" >

    android:height="340dp"

    android:width="340dp"

    android:viewportHeight="340"

    android:viewportWidth="340">

    <path

        android:pathData="M170,1L170,1A39,39 0,0 1,209 40L209,130A39,39 0,0 1,170 169L170,169A39,39 0,0 1,131 130L131,40A39,39 0,0 1,170 1z"

        android:strokeColor="#000000"

        android:strokeWidth="5"

        android:pathData="M125.923,29.692L128.739,29.692A27.108,30.579 0,0 1,155.847 60.271L155.847,125.268A27.108,30.579 0,0 1,128.739 155.847L125.923,155.847A27.108,30.579 0,0 1,98.815 125.268L98.815,60.271A27.108,30.579 0,0 1,125.923 29.692z"/>

        android:strokeWidth="2"/>

</vector>

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

+4 −4
Original line number Diff line number Diff line
@@ -26,15 +26,15 @@ 
  >

    <ImageView

        android:id="@+id/minute_hand"

        android:layout_width="350dp"

        android:layout_height="350dp"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:src="@drawable/bubble_minute_hand"

        android:tint="@color/bubbleMinuteHandColor"

    />

    <ImageView

        android:id="@+id/hour_hand"

        android:layout_width="350dp"

        android:layout_height="350dp"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:src="@drawable/bubble_hour_hand"

        android:tint="@color/bubbleHourHandColor"

    />

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

+3 −3
Original line number Diff line number Diff line
@@ -167,9 +167,9 @@ public class BubbleClockController implements ClockPlugin { 
            return;

        }

        final int length = colorPalette.length;

        mLockClock.setTextColor(colorPalette[Math.max(0, length - 3)]);

        mAnalogClock.setClockColors(colorPalette[Math.max(0, length - 6)],

                colorPalette[Math.max(0, length - 3)]);

        final int color = colorPalette[Math.max(0, length - 3)];

        mLockClock.setTextColor(color);

        mAnalogClock.setClockColors(color, color);

    }



    @Override