FW_Base - Fix clock seconds display with am/pm

Instead of just adding seconds to the resulting timestamp,
replace within the dateformat itself the minutes together
with the seconds.

Change-Id: Ibdc6f085e43d468398d398e39fcb5efa448169b6
Signed-off-by: W4TCH0UT <[email protected]>

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

Author: tobitege

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

@@ -204,6 +204,14 @@ private final CharSequence getSmallTime() {
 
         SimpleDateFormat sdf;
         String format = is24 ? d.timeFormat24 : d.timeFormat12;
+
+        // replace seconds directly in format, not in result
+        if (Settings.System.getInt(mContext.getContentResolver(),
+                Settings.System.CLOCK_USE_SECOND, 0) == 1) {
+            String temp = format;
+            format = temp.replaceFirst("mm","mm:ss");
+        }
+
         if (!format.equals(mClockFormatString)) {
             /*
              * Search for an unquoted "a" in the format string, so we can
@@ -249,21 +257,14 @@ private final CharSequence getSmallTime() {
             String clockDateFormat = Settings.System.getString(mContext.getContentResolver(),
                     Settings.System.STATUS_BAR_DATE_FORMAT);
 
-        mShowClockSeconds = Settings.System.getInt(mContext.getContentResolver(),
-                Settings.System.CLOCK_USE_SECOND, 0) == 1;
-        if (mShowClockSeconds) {
-            String temp = result;
-            result = String.format("%s:%02d", temp, new GregorianCalendar().get(Calendar.SECOND));
-        }
-
             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) + " ";
             }
             if (mClockDateStyle == CLOCK_DATE_STYLE_LOWERCASE) {
-                // When Date style is small, convert date to uppercase
+                // When Date style is small, convert date to lowercase
                 result = dateString.toString().toLowerCase() + result;
             } else if (mClockDateStyle == CLOCK_DATE_STYLE_UPPERCASE) {
                 result = dateString.toString().toUpperCase() + result;