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

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

Merge "Adjust bubble clock to be easier to read" into qt-r1-dev am: db0fc44b 

am: 2ff6fdbe

Change-Id: Ib8a46b0d848c0447c90a94dfa92367c96b4ee500
parents 0a4d9e54 2ff6fdbe

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

+1 −1
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ 
    <path

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

        android:strokeColor="#000000"

        android:strokeWidth="2"/>

        android:strokeWidth="3"/>

</vector>

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

+1 −1
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ 
    <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="2"/>

        android:strokeWidth="3"/>

</vector>

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

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

        }

        final int length = colorPalette.length;

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

        mLockClock.setTextColor(color);

        mAnalogClock.setClockColors(color, color);

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

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

        mLockClock.setTextColor(primaryColor);

        mAnalogClock.setClockColors(secondaryColor, primaryColor);

    }



    @Override