Merge "Use outlines on bubble clock for burn in mitigation"
diff --git a/packages/SystemUI/res-keyguard/drawable/bubble_hour_hand.xml b/packages/SystemUI/res-keyguard/drawable/bubble_hour_hand.xml
index d3c3a51..a2404b0 100644
--- a/packages/SystemUI/res-keyguard/drawable/bubble_hour_hand.xml
+++ b/packages/SystemUI/res-keyguard/drawable/bubble_hour_hand.xml
@@ -1,9 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="200dp"
- android:width="200dp"
- android:viewportHeight="100"
- android:viewportWidth="100">
+ android:height="350dp"
+ android:width="350dp"
+ android:viewportHeight="254.66145"
+ android:viewportWidth="254.66145">
<path
android:fillColor="#000000"
- android:pathData="M50.082,14.199m-13.985,0a13.985,13.985 0,1 1,27.97 0a13.985,13.985 0,1 1,-27.97 0"/>
+ 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"/>
</vector>
diff --git a/packages/SystemUI/res-keyguard/drawable/bubble_minute_hand.xml b/packages/SystemUI/res-keyguard/drawable/bubble_minute_hand.xml
index a4417fb..be10b5d 100644
--- a/packages/SystemUI/res-keyguard/drawable/bubble_minute_hand.xml
+++ b/packages/SystemUI/res-keyguard/drawable/bubble_minute_hand.xml
@@ -1,9 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="200dp"
- android:width="200dp"
- android:viewportHeight="100"
- android:viewportWidth="100" >
+ android:height="350dp"
+ android:width="350dp"
+ android:viewportHeight="254.66145"
+ android:viewportWidth="254.66145" >
<path
- android:fillColor="#000000"
- android:pathData="M50.082,0.025L50.082,0.025A13.985,15.63 0,0 1,64.067 15.656L64.067,49.029A13.985,15.63 0,0 1,50.082 64.659L50.082,64.659A13.985,15.63 0,0 1,36.097 49.029L36.097,15.656A13.985,15.63 0,0 1,50.082 0.025z"/>
+ 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"/>
</vector>
+
diff --git a/packages/SystemUI/res-keyguard/layout/bubble_clock.xml b/packages/SystemUI/res-keyguard/layout/bubble_clock.xml
index c8dc8e4..0bc1319 100644
--- a/packages/SystemUI/res-keyguard/layout/bubble_clock.xml
+++ b/packages/SystemUI/res-keyguard/layout/bubble_clock.xml
@@ -42,15 +42,15 @@
>
<ImageView
android:id="@+id/minute_hand"
- android:layout_width="300dp"
- android:layout_height="300dp"
+ android:layout_width="350dp"
+ android:layout_height="350dp"
android:src="@drawable/bubble_minute_hand"
android:tint="@color/bubbleMinuteHandColor"
/>
<ImageView
android:id="@+id/hour_hand"
- android:layout_width="300dp"
- android:layout_height="300dp"
+ android:layout_width="350dp"
+ android:layout_height="350dp"
android:src="@drawable/bubble_hour_hand"
android:tint="@color/bubbleHourHandColor"
/>