Update Bubble clock face
This is part of the response to burn in testing.
Fixes: 130422138
Test: mp sysuig and checked clock in picker app
Change-Id: I97816379c160801e67ffb7b9fbb340d2d98e1255
diff --git a/packages/SystemUI/res-keyguard/drawable/bubble_hour_hand.xml b/packages/SystemUI/res-keyguard/drawable/bubble_hour_hand.xml
index a2404b0..65f7a0e 100644
--- a/packages/SystemUI/res-keyguard/drawable/bubble_hour_hand.xml
+++ b/packages/SystemUI/res-keyguard/drawable/bubble_hour_hand.xml
@@ -1,9 +1,10 @@
<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>
diff --git a/packages/SystemUI/res-keyguard/drawable/bubble_minute_hand.xml b/packages/SystemUI/res-keyguard/drawable/bubble_minute_hand.xml
index be10b5d..95b4b1a 100644
--- a/packages/SystemUI/res-keyguard/drawable/bubble_minute_hand.xml
+++ b/packages/SystemUI/res-keyguard/drawable/bubble_minute_hand.xml
@@ -1,11 +1,10 @@
<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>
-
diff --git a/packages/SystemUI/res-keyguard/layout/bubble_clock.xml b/packages/SystemUI/res-keyguard/layout/bubble_clock.xml
index b44faa9..a6ad254 100644
--- a/packages/SystemUI/res-keyguard/layout/bubble_clock.xml
+++ b/packages/SystemUI/res-keyguard/layout/bubble_clock.xml
@@ -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"
/>
diff --git a/packages/SystemUI/src/com/android/keyguard/clock/BubbleClockController.java b/packages/SystemUI/src/com/android/keyguard/clock/BubbleClockController.java
index cadfb79..fbbf64c 100644
--- a/packages/SystemUI/src/com/android/keyguard/clock/BubbleClockController.java
+++ b/packages/SystemUI/src/com/android/keyguard/clock/BubbleClockController.java
@@ -167,9 +167,9 @@
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
