FWB: Second Clock (1/2)

Dokdo-Project/platform_frameworks_base@6ab5d62#diff-1fa71c270d063a48f921f0760d10c7f3R122

AICPfy:
Bring back to L
Modified for AICP source

Change-Id: Ie04942ae1bb1649d18db51086b46666b56ef1ea0
Signed-off-by: Anik1199 <[email protected]>

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

Author: sjp0728

core/java/android/provider/Settings.java

@@ -4211,8 +4211,13 @@ public static void setShowGTalkServiceStatusForUser(ContentResolver cr, boolean
         public static final String STATUS_BAR_SHOW_TICKER = "status_bar_show_show_ticker";
 
         /**
-         * Heads Up Notifications
-         *
+         * Display second in the Clock
+         * @hide
+         */
+        public static final String CLOCK_USE_SECOND = "clock_use_second";
+
+        /**
+         * Whether the notification light will be allowed when in zen mode during downtime
          * @hide
          */
         public static final String HEADS_UP_NOTIFICATION = "heads_up_enabled";

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

@@ -41,10 +41,13 @@
 import com.android.systemui.cm.UserContentObserver;
 
 import java.text.SimpleDateFormat;
+import java.util.GregorianCalendar;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
+import java.util.Timer;
+import java.util.TimerTask;
 
 import libcore.icu.LocaleData;
 
@@ -93,6 +96,18 @@ public class Clock implements DemoMode {
     private int mClockFontStyle = FONT_NORMAL;
     private boolean mDemoMode;
     private boolean mAttached;
+    protected int mClockDateDisplay = CLOCK_DATE_DISPLAY_GONE;
+    protected int mClockDateStyle = CLOCK_DATE_STYLE_REGULAR;
+    protected int mClockStyle = STYLE_CLOCK_RIGHT;
+    protected int mClockFontStyle = FONT_NORMAL;
+    protected boolean mShowClock;
+    private int mClockAndDateWidth;
+    protected boolean mShowClockSeconds = false;
+
+    private int mAmPmStyle;
+
+    private SettingsObserver mSettingsObserver;
+    private PhoneStatusBar mStatusBar;
 
     class SettingsObserver extends UserContentObserver {
         SettingsObserver(Handler handler) {
@@ -118,12 +133,50 @@ protected void observe() {
                     Settings.System.STATUSBAR_CLOCK_COLOR), false, this, UserHandle.USER_ALL);
             resolver.registerContentObserver(Settings.System.getUriFor(
                     Settings.System.STATUSBAR_CLOCK_FONT_STYLE), false, this, UserHandle.USER_ALL);
+            resolver.registerContentObserver(Settings.System
+                    .getUriFor(Settings.System.STATUS_BAR_CLOCK),
+                    false, this, UserHandle.USER_ALL);
+            resolver.registerContentObserver(Settings.System
+                    .getUriFor(Settings.System.STATUSBAR_CLOCK_AM_PM_STYLE),
+                    false, this, UserHandle.USER_ALL);
+            resolver.registerContentObserver(Settings.System
+                    .getUriFor(Settings.System.STATUSBAR_CLOCK_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);
+            resolver.registerContentObserver(Settings.System
+                    .getUriFor(Settings.System.STATUSBAR_CLOCK_DATE_STYLE), 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.STATUSBAR_CLOCK_FONT_STYLE), false,
+                    mSettingsObserver);
+            resolver.registerContentObserver(Settings.System
+                    .getUriFor(Settings.System.CLOCK_USE_SECOND), false,
+                    mSettingsObserver);
             updateSettings();
         }
 
         @Override
         protected void unobserve() {
             super.unobserve();
+        public void onChange(boolean selfChange) {
+            updateSettings();
+        }
+    }
+
+    private final Handler handler = new Handler();
+    TimerTask second;
+
+    public Clock(Context context) {
+        this(context, null);
+    }
 
             mContext.getContentResolver().unregisterContentObserver(this);
         }
@@ -241,6 +294,18 @@ 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 (mClockDateDisplay != CLOCK_DATE_DISPLAY_GONE) {
+            Date now = new Date();
+
+            String clockDateFormat = Settings.System.getString(getContext().getContentResolver(),
+                    Settings.System.STATUSBAR_CLOCK_DATE_FORMAT);
             if (clockDateFormat == null || clockDateFormat.isEmpty()) {
                 // Set dateString to short uppercase Weekday (Default for AOKP) if empty
                 dateString = DateFormat.format("EEE", now) + " ";
@@ -377,6 +442,50 @@ void updateSettings() {
                 Settings.System.STATUS_BAR_DATE_STYLE, CLOCK_DATE_STYLE_REGULAR,
                 UserHandle.USER_CURRENT));
         updateClock();
+        mClockFontStyle = Settings.System.getInt(resolver,
+                Settings.System.STATUSBAR_CLOCK_FONT_STYLE, FONT_NORMAL);
+
+        mShowClockSeconds = Settings.System.getIntForUser(resolver,
+                Settings.System.CLOCK_USE_SECOND, 0,
+                UserHandle.USER_CURRENT) == 1;
+
+        if (mShowClockSeconds) {
+            second = new TimerTask()
+            {
+                @Override
+                public void run() {
+                    Runnable updater = new Runnable()
+                        {
+                            public void run() {
+                                updateClock();
+                            }
+                        };
+                    handler.post(updater);
+                }
+            };
+            Timer timer = new Timer();
+            timer.schedule(second, 0, 1001);
+        }
+
+        if (mAttached) {
+            setTextColor(clockColor);
+            getFontStyle(mClockFontStyle);
+            updateClockVisibility();
+            updateClock();
+        }
+
+        if (mStatusBar != null) {
+            mStatusBar.setClockAndDateStatus(mClockAndDateWidth, mClockStyle, mShowClock);
+        }
+
+    }
+
+    protected void updateClockVisibility() {
+        if (mClockStyle == STYLE_CLOCK_RIGHT && mShowClock) {
+            setVisibility(View.VISIBLE);
+        } else {
+            setVisibility(View.GONE);
+        }
     }
 
     public void getFontStyle(int font) {