SystemUI: add back date style option (1/2)

* 0 - Regular style
* 1 - Lowercase
* 2 - Uppercase

Change-Id: Ia7773b9754f8c2cb843b9377e4f8dd25f68d7a69
Signed-off-by: randomlyjobless&bored <[email protected]>

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java

Author: tristan202

core/java/android/provider/Settings.java

@@ -3517,7 +3517,7 @@ public static void setShowGTalkServiceStatusForUser(ContentResolver cr, boolean
          * @hide
          */
         public static final String STATUS_BAR_AM_PM = "status_bar_am_pm";
-        
+
         /**
          * Shows custom date before clock time
          * 0 - No Date
@@ -3527,12 +3527,21 @@ public static void setShowGTalkServiceStatusForUser(ContentResolver cr, boolean
          */
         public static final String STATUS_BAR_DATE = "status_bar_date";
 
+        /**
+         * Sets the date string style
+         * 0 - Regular style
+         * 1 - Lowercase
+         * 2 - Uppercase
+         * @hide
+         */
+        public static final String STATUS_BAR_DATE_STYLE = "status_bar_date_style";
+
         /**
          * Stores the java DateFormat string for the date
          * @hide
          */
         public static final String STATUS_BAR_DATE_FORMAT = "status_bar_date_format";
-        
+
         /**
          * Display style of the status bar battery information
          * 0: Display the battery an icon in portrait mode
@@ -3544,23 +3553,15 @@ public static void setShowGTalkServiceStatusForUser(ContentResolver cr, boolean
          * @hide
          */
         public static final String STATUS_BAR_BATTERY_STYLE = "status_bar_battery_style";
-        
+
         /**
          * Sets the date string style
          * 0 - Regular style
          * 1 - Lowercase
          * 2 - Uppercase
          * @hide
          */
-        public static final String STATUS_BAR_DATE_STYLE = "status_bar_date_style";
 
-        /**
-         * Status bar battery %
-         * 0: Hide the battery percentage
-         * 1: Display the battery percentage inside the icon
-         * 2: Display the battery percentage next to the icon
-         * @hide
-         */
         public static final String STATUS_BAR_SHOW_BATTERY_PERCENT = "status_bar_show_battery_percent";
 
         /**

packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java

@@ -242,11 +242,19 @@ private final CharSequence getSmallTime() {
                     Settings.System.STATUS_BAR_DATE_FORMAT);
 
             if (clockDateFormat == null || clockDateFormat.isEmpty()) {
+                // Set dateString to short uppercase Weekday (Default for AOKP) if empty
                 dateString = DateFormat.format("EEE", now) + " ";
             } else {
                 dateString = DateFormat.format(clockDateFormat, now) + " ";
             }
-            result = dateString.toString().toLowerCase() + result;
+            if (mClockDateStyle == CLOCK_DATE_STYLE_LOWERCASE) {
+                // When Date style is small, convert date to uppercase
+                result = dateString.toString().toLowerCase() + result;
+            } else if (mClockDateStyle == CLOCK_DATE_STYLE_UPPERCASE) {
+                result = dateString.toString().toUpperCase() + result;
+            } else {
+                result = dateString.toString() + result;
+            }
         }
 
         SpannableStringBuilder formatted = new SpannableStringBuilder(result);
@@ -341,7 +349,6 @@ void updateSettings() {
         mAmPmStyle = (Settings.System.getIntForUser(resolver,
                 Settings.System.STATUS_BAR_AM_PM, 2, UserHandle.USER_CURRENT));
         mClockFormatString = "";
-
         mClockDateDisplay = (Settings.System.getIntForUser(resolver,
                 Settings.System.STATUS_BAR_DATE,
                 CLOCK_DATE_DISPLAY_GONE, UserHandle.USER_CURRENT));
@@ -363,9 +370,12 @@ void updateSettings() {
 
         getFontStyle(mClockFontStyle);
         mClockView.setTextColor(clockColor);
-        mClockDateDisplay = Settings.System.getInt(resolver,
+        mClockDateDisplay = (Settings.System.getIntForUser(resolver,
                 Settings.System.STATUS_BAR_DATE,
-                CLOCK_DATE_DISPLAY_GONE);
+                CLOCK_DATE_DISPLAY_GONE, UserHandle.USER_CURRENT));
+        mClockDateStyle = (Settings.System.getIntForUser(resolver,
+                Settings.System.STATUS_BAR_DATE_STYLE, CLOCK_DATE_STYLE_REGULAR,
+                UserHandle.USER_CURRENT));
         updateClock();
     }