Clock Font: Adding more styles

Change-Id: I7ff863fba0c33409f6cad28df5bf3003db2aae0f
AxxionKat · Aug 11, 2014 · 744a2ec · 744a2ec
1 parent e7cbd25
commit 744a2ec
Showing 1 changed file with 10 additions and 14 deletions.
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
@@ -84,8 +84,10 @@ public class Clock extends TextView implements DemoMode, OnClickListener, OnLong
     public static final int STYLE_CLOCK_CENTER  = 1;
 
     public static final int FONT_BOLD = 0;
-    public static final int FONT_LIGHT = 1;
-    public static final int FONT_NORMAL = 2;
+    public static final int FONT_CONDENSED = 1;
+    public static final int FONT_LIGHT = 2;
+    public static final int FONT_LIGHT_ITALIC = 3;
+    public static final int FONT_NORMAL = 4;
 
     protected int mClockDateDisplay = CLOCK_DATE_DISPLAY_GONE;
     protected int mClockDateStyle = CLOCK_DATE_STYLE_UPPERCASE;
@@ -116,9 +118,6 @@ void observe() {
             resolver.registerContentObserver(Settings.System
                     .getUriFor(Settings.System.STATUSBAR_CLOCK_FONT_STYLE),
                     false, this, UserHandle.USER_ALL);
-            resolver.registerContentObserver(Settings.System
-                    .getUriFor(Settings.System.STATUSBAR_CLOCK_COLOR),
-                    false, this, UserHandle.USER_ALL);
             resolver.registerContentObserver(Settings.System
                     .getUriFor(Settings.System.STATUSBAR_CLOCK_DATE_DISPLAY),
                     false, this, UserHandle.USER_ALL);
@@ -128,15 +127,6 @@ void observe() {
             resolver.registerContentObserver(Settings.System
                     .getUriFor(Settings.System.STATUSBAR_CLOCK_DATE_FORMAT),
                     false, this, UserHandle.USER_ALL);
-            resolver.registerContentObserver(Settings.System
-                    .getUriFor(Settings.System.CUSTOM_SYSTEM_ICON_COLOR),
-                    false, this, UserHandle.USER_ALL);
-            resolver.registerContentObserver(Settings.System
-                    .getUriFor(Settings.System.STATUSBAR_CLOCK_DATE_FORMAT), false,
-                    this, UserHandle.USER_ALL);
-            resolver.registerContentObserver(Settings.System
-                    .getUriFor(Settings.System.SYSTEM_ICON_COLOR),
-                    false, this, UserHandle.USER_ALL);
             updateSettings();
         }
 
@@ -406,9 +396,15 @@ public void getFontStyle(int font) {
             case FONT_BOLD:
                 setTypeface(Typeface.create("sans-serif", Typeface.BOLD));
                 break;
+            case FONT_CONDENSED:
+                setTypeface(Typeface.create("sans-serif-condensed", Typeface.NORMAL));
+                break;
             case FONT_LIGHT:
                 setTypeface(Typeface.create("sans-serif-light", Typeface.NORMAL));
                 break;
+            case FONT_LIGHT_ITALIC:
+                setTypeface(Typeface.create("sans-serif-light", Typeface.ITALIC));
+                break;
             case FONT_NORMAL:
             default:
                 setTypeface(Typeface.create("sans-serif", Typeface.NORMAL));