Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update Bubble clock face" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-19 04:58:01 +00:00
committed by Android (Google) Code Review
parent aaf62b991f 79c886b169
commit bd873544af
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/res-keyguard/drawable/bubble_hour_hand.xml
View File

@@ -1,9 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="350dp" android:height="340dp"
android:width="350dp" android:width="340dp"
android:viewportHeight="254.66145" android:viewportHeight="340"
android:viewportWidth="254.66145"> android:viewportWidth="340">
<path <path
android:fillColor="#000000" android:pathData="M170,40m-39,0a39,39 0,1 1,78 0a39,39 0,1 1,-78 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"/> android:strokeColor="#000000"
android:strokeWidth="2"/>
</vector> </vector>

13
packages/SystemUI/res-keyguard/drawable/bubble_minute_hand.xml
View File

@@ -1,11 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="350dp" android:height="340dp"
android:width="350dp" android:width="340dp"
android:viewportHeight="254.66145" android:viewportHeight="340"
android:viewportWidth="254.66145" > android:viewportWidth="340">
<path <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:strokeColor="#000000"
android:strokeWidth="5" android:strokeWidth="2"/>
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> </vector>

8
packages/SystemUI/res-keyguard/layout/bubble_clock.xml
View File

@@ -26,15 +26,15 @@
> >
<ImageView <ImageView
android:id="@+id/minute_hand" android:id="@+id/minute_hand"
android:layout_width="350dp" android:layout_width="wrap_content"
android:layout_height="350dp" android:layout_height="wrap_content"
android:src="@drawable/bubble_minute_hand" android:src="@drawable/bubble_minute_hand"
android:tint="@color/bubbleMinuteHandColor" android:tint="@color/bubbleMinuteHandColor"
/> />
<ImageView <ImageView
android:id="@+id/hour_hand" android:id="@+id/hour_hand"
android:layout_width="350dp" android:layout_width="wrap_content"
android:layout_height="350dp" android:layout_height="wrap_content"
android:src="@drawable/bubble_hour_hand" android:src="@drawable/bubble_hour_hand"
android:tint="@color/bubbleHourHandColor" android:tint="@color/bubbleHourHandColor"
/> />

6
packages/SystemUI/src/com/android/keyguard/clock/BubbleClockController.java
View File

@@ -167,9 +167,9 @@ public class BubbleClockController implements ClockPlugin {
return; return;
} }
final int length = colorPalette.length; final int length = colorPalette.length;
mLockClock.setTextColor(colorPalette[Math.max(0, length - 3)]); final int color = colorPalette[Math.max(0, length - 3)];
mAnalogClock.setClockColors(colorPalette[Math.max(0, length - 6)], mLockClock.setTextColor(color);
colorPalette[Math.max(0, length - 3)]); mAnalogClock.setClockColors(color, color);
} }
@Override @Override