From c6dfd6c8b298cea5499ea25bb0a9c51988b23408 Mon Sep 17 00:00:00 2001
From: Robert Snoeberger <snoeberger@google.com>
Date: Thu, 23 May 2019 14:56:46 -0400
Subject: [PATCH] Adjust bubble clock to be easier to read

- lines thicker by 1 dp
- same color extraction as analog clock face

Fixes: 133188865
Test: visual
Change-Id: Ic44546bbc76d945ba3dc307c6cea25af27fac3db
---
 .../SystemUI/res-keyguard/drawable/bubble_hour_hand.xml    | 2 +-
 .../SystemUI/res-keyguard/drawable/bubble_minute_hand.xml  | 2 +-
 .../com/android/keyguard/clock/BubbleClockController.java  | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/SystemUI/res-keyguard/drawable/bubble_hour_hand.xml b/packages/SystemUI/res-keyguard/drawable/bubble_hour_hand.xml
index 65f7a0e29843a..8c611f61dc231 100644
--- a/packages/SystemUI/res-keyguard/drawable/bubble_hour_hand.xml
+++ b/packages/SystemUI/res-keyguard/drawable/bubble_hour_hand.xml
@@ -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>
diff --git a/packages/SystemUI/res-keyguard/drawable/bubble_minute_hand.xml b/packages/SystemUI/res-keyguard/drawable/bubble_minute_hand.xml
index 95b4b1ad0b9bd..27bc43638f061 100644
--- a/packages/SystemUI/res-keyguard/drawable/bubble_minute_hand.xml
+++ b/packages/SystemUI/res-keyguard/drawable/bubble_minute_hand.xml
@@ -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>
diff --git a/packages/SystemUI/src/com/android/keyguard/clock/BubbleClockController.java b/packages/SystemUI/src/com/android/keyguard/clock/BubbleClockController.java
index 61a6952cacac1..bd1e64a5f1c6a 100644
--- a/packages/SystemUI/src/com/android/keyguard/clock/BubbleClockController.java
+++ b/packages/SystemUI/src/com/android/keyguard/clock/BubbleClockController.java
@@ -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