From 051dccf6fc7f88cfb4bb462cfc4e8b28b5a4142b Mon Sep 17 00:00:00 2001
From: Daniel Sandler <dsandler@google.com>
Date: Thu, 18 Nov 2010 13:54:18 -0500
Subject: [PATCH] Hello, HoloClock.

Bug: 3203162
Change-Id: I3c4fb47eb4fd7f6de966055e0d0a5de77b0c4eac
---
 .../SystemUI/assets/fonts/AndroidClock.ttf    | Bin 0 -> 2336 bytes
 .../SystemUI/assets/fonts/AndroidClock2.ttf   | Bin 0 -> 2212 bytes
 .../SystemUI/res/layout-xlarge/status_bar.xml |  29 +--
 .../sysbar_panel_notifications.xml            |  24 ++-
 .../systemui/statusbar/tablet/HoloClock.java  | 169 ++++++++++++++++++
 5 files changed, 205 insertions(+), 17 deletions(-)
 create mode 100644 packages/SystemUI/assets/fonts/AndroidClock.ttf
 create mode 100644 packages/SystemUI/assets/fonts/AndroidClock2.ttf
 create mode 100644 packages/SystemUI/src/com/android/systemui/statusbar/tablet/HoloClock.java

diff --git a/packages/SystemUI/assets/fonts/AndroidClock.ttf b/packages/SystemUI/assets/fonts/AndroidClock.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..39451831c1a04c6eff79e4768ad28e512c11b027
GIT binary patch
literal 2336
zcmdT`U2IcT9RHnj+jV1O+CUk~hxewC0dZYFsKccgpfF<$NCq0h3n}Zp?ZvHK+KW(p
z(U@p7Bqlx>B|hjI55~yilPo?NC(Z|>KA5n<LNr;3C=cj^($?QOy<G}X-aTjMp8xmf
zIX!~_uo|zxz~Qm6qX&=O_;4T46Cictb4P}g&)+%m8z7Dme_>)OH@)Gp^>yOQT>B<o
z@=RE=1{jZ%A1LIi)6FI=q5CfJ?!sivdGp(a7s)>i$PbEkE`MkDH(~M?xSlAI5d6iM
zpslsUw-l$mvr!{3Mf_9ZyC%yMxxi0>81>`CH&5lxPU8rkCVv-kvy_{%Gk?v!4FrFs
z{qLsBRS#S6F<sA+{}fbiTtnaY#7;bv`2)QM;|8vTvd^sS7Bz3n3&gu26_tZJnsVGY
zs!(}bTT)<q^lM5#)~Recl%~+MJz%^FlfR2Q2%=lQB~>)%Tf107LQq;F*wWOp>eC*F
zodbF7K^&uo+1!QWIuad|k`R+%#M}?EDo2qQ!^j&)9=wzcRg^!qHu~9Qh%r;*0hrta
zoC+Uh4}o~I+5Ewmgy>ocfQgZ-R_9Q9_YETu><V@Ftm^GseIMt4i|VtE9eR#o92LBS
zi}(^Z@Tb@;GU5<3ld3;r2fJn<gxDp4;mk}ZfLqB+UBQLSj3Ei)lA*{!MV<+DiMyE@
zmi1OL6}G~Isc_U1J<D@*@<QFQB(I)S{o^T((qb>I4}?S3V0eVWmVEuxsm6gqL0oPe
zkWssF(Q(8vyOGs5R_MOZQ;&U5g;U{tK}PF~>}uN{@8TM3AQG}7oYCE4ByFXwyo|bT
zW53*5ze>Zi^+g)4IW@<r*@Bl{9fb~kF|bL5lnJG(r+mXrr(LDicv8%@)J0;aGC&je
z=&zzN=9{(#)2WC>Mfz1fRhZY@g{4kk{VG-!XWQ9eUY@UC6|-*3*M27F$LVy|Y!zCX
zx@J@lGs=0n)%VocFJ`&MmUQ7*z;m5GyS2|yB$^&!S<c^dm+RMM^ws6huU}^##!4Ml
zBa8?Y8Jdc2Fg?P*2px&E6=~IjiKS9Zt>uuRo@<pPxwB?pt2HjxY8`#nF$=a?7j(o5
z5|Fobp7q5QBjO9y@3Twx(#u+R8uQ{aeeSS^^$c<43oPd$$GK*!!m|>ewC^;Y#d|(1
z(1(T(ON7J*A2zUEobllR`ov`)4&q^P(}%mzCnNMJ0zI_<uC9uL1=izdpDxiadVScy
zxKQU&$po-oeB{GHnBr?6?jrqfWO=`A<lym}=P%Sr)cDP!NV<zE=`Oh?(#BCH*CyQ~
zy{u_x$n_{|VoXy!y;o46oQWiVrQ_VUQNrV##wdn49bZ=ME!h|?I+QL^&%<^gTd{MV
zoi|U`%xtmZRy{XYGRMm&?TS||m&`M+S2V}UC2y=;DcEK*7B{yQJ#Tt+c-SG;QPfz~
ziIr@R#`e-~UguNhp2Z~nPJl1w-cr8emh)M@fyBn?ynxeW=O~PEyKs6kN8mxJjWWHq
z`7(>qY2IYICK5<vh~EUiNtPqQg?mFEHB}&Gw-tyvY9`V{iNsJco}lP|S=Yh0b@+dS
z?o5>-v^o>lu2lWiG$~+LsxC_xk0)aBc$}2BWu?*?_kCsYU!mq}4FBH-?>*0<#2T#S
o?OcZep2<h>C^qoT+oTl)-#TSQDD0~rWACf|N+`D2+V{=>14JX4j{pDw

literal 0
HcmV?d00001

diff --git a/packages/SystemUI/assets/fonts/AndroidClock2.ttf b/packages/SystemUI/assets/fonts/AndroidClock2.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..fa0221ebafb0295670887dd3d20d5f40db099039
GIT binary patch
literal 2212
zcmdT_O>9(E6#njg^M^q7S%x2}`o^IxqD<e+FqTXz0Y>XW8XKsDuqi{|o0(VInP%qE
zGCPck7{l5h+^}Q;#5SyiuoMv%CYrdg&}!5W5~Pc|von78&1;QKV@O<iZ|*zieCOQr
zbAR520I(5fp<%GUe`w&?&lg_-A|Dd%c;`q@>fOZ?zXReJ<)b6x`HAf>Ze61MfaBoE
zq-!81>wxwu^?_o(HqmU-6C!6RM~Y+h!qu)TkEtJ|{oRtCw-#UjCQjWf$7>}5!C$oz
z>NZi{Q5tv8#I^7!<u54j9jlDwwGXt-oNrQoVLX3k0z=4Azn8L6&X3!713!EY1UqOG
zo2b-W?7(G)-cS8LsM<JgU(RhCe!A}utk;+~<#6us3XK7BL0+I7fmA3P=Xl6*ZAgi7
z!Skfp<<{mQZFm*|4^lIQhwVqgLxg-R77;{5ek5-YIp3mU9!WuKi4fPxZz|7~HduJm
z!hV>@YDRM}j(eGSIVlq{24+k;z>0@pi5}7;u(TucT#G8+lS9k0vSCy4)adZ5>7%3~
zcd!P7G{COpEcXyFo6Y8Tz9mFxB>|}HS5}Iw*VMdKO$!7=;mEqD)^FIjO7p)Jy|a#8
zUf;*_H3$o5a2^+N72o1FcC|7wuGKE?nuahE(*iwxGvNRprKUr{*}fS~lEt*9;GlwM
z!Xfcz-wc=aQ7Wy+^zO7CkBM~;Zrzd>mI^V+t0x&pozl4H6YY9jkEQkSouYhcbX3M0
zIdQCUsjy-vZno@t)6sZmCLOhkMHzSI*mzZ?Jg0nlHW463eK$u~o^u>0Ggtp<s-99C
zv?``xRw9$umD$og`dhju-kNP(_v{LP=hm6o5>+v2x8xQJbA|fc{rhY9YY*$`PKLcx
zEQ%YBBja}C()>JY5Hf@>eSZ+WOf2;9p~%g@$EzDyS%&~`>qh7_kA}N5Is<k_<C)&>
z-e_DdWcD~qKNizzy1rRY?U`yEoU2bx)>Bt(X0p02J*;=?@r+z>8gI~^>nLv8jqCF&
zXP}KcyL`6a#-~0n&@MLkJTJ0H_`C*FeB$!~+ARM!f_O%D`FIHJa#-EGz&iT>n4`rD
zbm14Dm)IZ-pVx3gWPCn=F7dU`2Vuy7&xg<@d--3i!bTo0zZMLfM4jIpO2i%1h&$Al
zi5*6TTAR2_yy9U~)Vj1a(C;CxN2@5(&OnNPHIsBFEnM~qWYNQ3@NE@s*(T_*K<hH+
zxp*1KRqecMTgJ({kt<c5n(O4t#^K6IyXw{|Wn;>5OGbaC?DkixMcYUvOk-!sbtket
zJq4l#g(hl+MA>%f>;U~*j8tK^7Hb<LH-b|b#v#^L_iEztJy5o)701f)1vxc*C||d$
z1P7?KIPWyZDcF{Cn)Kg_&9dMp3utgT3?z}kZhn*ernp>54*avUtg%LFM%GAXb|;g&
zQ)ZGgo-E|rH6Ha=pvEd&yJ~uAsJ&C&;3IBVYYvy)G?NL_G>QC|a6G;0HDGJL&yv?_
vZ3G3a+OY{yY{nLB#Wp;L?R<Bh_a+FwH_D4p(pTRnK2!8|IB~B<4_^BVzG!W^

literal 0
HcmV?d00001

diff --git a/packages/SystemUI/res/layout-xlarge/status_bar.xml b/packages/SystemUI/res/layout-xlarge/status_bar.xml
index b8b8bddd41865..d4a61362fe775 100644
--- a/packages/SystemUI/res/layout-xlarge/status_bar.xml
+++ b/packages/SystemUI/res/layout-xlarge/status_bar.xml
@@ -57,20 +57,25 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 >
-                <!-- paddingLeft: 24 dips = 32dp (total space to icon) - 8dp in the icon.
-                TODO: Make sure the font has a small enough leading that we don't need this
-                negative margin business. -->
-                <com.android.systemui.statusbar.policy.Clock
-                    style="@*android:style/TextAppearance.StatusBar.Icon"
+                <com.android.systemui.statusbar.tablet.HoloClock
                     android:id="@+id/clock"
                     android:layout_width="wrap_content"
-                    android:layout_height="65dp"
-                    android:layout_marginTop="-17dp"
-                    android:singleLine="true"
-                    android:textSize="60sp"
-                    android:paddingLeft="24dip"
-                    android:textColor="#2e2e2e"
-                    />
+                    android:layout_height="match_parent"
+                    >
+                    <TextView android:id="@+id/time_bg"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:singleLine="true"
+                        android:textSize="72dip"
+                        android:textColor="#1f1f1f" />
+                    <TextView android:id="@+id/time_fg"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:singleLine="true"
+                        android:textSize="72dip"
+                        android:textColor="#2e2e2e" />
+                </com.android.systemui.statusbar.tablet.HoloClock>
+
                 <LinearLayout
                     android:layout_width="48dip"
                     android:layout_height="match_parent"
diff --git a/packages/SystemUI/res/layout-xlarge/sysbar_panel_notifications.xml b/packages/SystemUI/res/layout-xlarge/sysbar_panel_notifications.xml
index 186aa64cfaa1d..b23cc7b86b304 100644
--- a/packages/SystemUI/res/layout-xlarge/sysbar_panel_notifications.xml
+++ b/packages/SystemUI/res/layout-xlarge/sysbar_panel_notifications.xml
@@ -40,15 +40,29 @@
         android:layout_alignParentRight="true"
         >
 
-        <com.android.systemui.statusbar.policy.Clock
+        <com.android.systemui.statusbar.tablet.HoloClock
             android:id="@+id/clock"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:layout_alignParentTop="true"
-            android:layout_marginRight="48dp"
-            android:textSize="70sp"
-            android:gravity="right"
-            />
+            android:layout_marginRight="40dip"
+            android:layout_marginBottom="4dip"
+            >
+            <TextView android:id="@+id/time_bg"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:singleLine="true"
+                android:textSize="90dip"
+                android:textColor="#999999" />
+            <TextView android:id="@+id/time_fg"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:singleLine="true"
+                android:textSize="90dip"
+                android:textColor="#666666" />
+        </com.android.systemui.statusbar.tablet.HoloClock>
 
         <com.android.systemui.statusbar.policy.DateView
             android:id="@+id/date"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/HoloClock.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/HoloClock.java
new file mode 100644
index 0000000000000..3b76434acc7e5
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/HoloClock.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.tablet;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.AssetManager;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.format.DateFormat;
+import android.text.style.CharacterStyle;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.RelativeSizeSpan;
+import android.text.style.RelativeSizeSpan;
+import android.text.style.StyleSpan;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.TimeZone;
+
+import com.android.systemui.R;
+
+public class HoloClock extends FrameLayout {
+    private boolean mAttached;
+    private Calendar mCalendar;
+    private String mClockFormatString;
+    private SimpleDateFormat mClockFormat;
+
+    private static Typeface sBackgroundType, sForegroundType;
+    private TextView mBgText, mFgText;
+
+    public HoloClock(Context context) {
+        this(context, null);
+    }
+
+    public HoloClock(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public HoloClock(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+
+        if (sBackgroundType == null) {
+            AssetManager assets = getContext().getAssets();
+
+            sBackgroundType = Typeface.createFromAsset(assets,
+                "fonts/AndroidClock.ttf");
+            sForegroundType = Typeface.createFromAsset(assets,
+                "fonts/AndroidClock2.ttf");
+        }
+        mBgText = (TextView) findViewById(R.id.time_bg);
+        if (mBgText != null) {
+            mBgText.setTypeface(sBackgroundType);
+        }
+        mFgText = (TextView) findViewById(R.id.time_fg);
+        if (mFgText != null) {
+            mFgText.setTypeface(sForegroundType);
+        }
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        if (!mAttached) {
+            mAttached = true;
+            IntentFilter filter = new IntentFilter();
+
+            filter.addAction(Intent.ACTION_TIME_TICK);
+            filter.addAction(Intent.ACTION_TIME_CHANGED);
+            filter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
+            filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED);
+
+            getContext().registerReceiver(mIntentReceiver, filter, null, getHandler());
+        }
+
+        // NOTE: It's safe to do these after registering the receiver since the receiver always runs
+        // in the main thread, therefore the receiver can't run before this method returns.
+
+        // The time zone may have changed while the receiver wasn't registered, so update the Time
+        mCalendar = Calendar.getInstance(TimeZone.getDefault());
+
+        // Make sure we update to the current time
+        updateClock();
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        if (mAttached) {
+            getContext().unregisterReceiver(mIntentReceiver);
+            mAttached = false;
+        }
+    }
+
+    private final BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (action.equals(Intent.ACTION_TIMEZONE_CHANGED)) {
+                String tz = intent.getStringExtra("time-zone");
+                mCalendar = Calendar.getInstance(TimeZone.getTimeZone(tz));
+                if (mClockFormat != null) {
+                    mClockFormat.setTimeZone(mCalendar.getTimeZone());
+                }
+            }
+            updateClock();
+        }
+    };
+
+    final void updateClock() {
+        mCalendar.setTimeInMillis(System.currentTimeMillis());
+        CharSequence txt = getTimeText();
+        mBgText.setText(txt);
+        mFgText.setText(txt);
+    }
+
+    private final CharSequence getTimeText() {
+        Context context = getContext();
+        int res = DateFormat.is24HourFormat(context)
+            ? com.android.internal.R.string.twenty_four_hour_time_format
+            : com.android.internal.R.string.twelve_hour_time_format;
+
+        SimpleDateFormat sdf;
+        String format = context.getString(res);
+        if (!format.equals(mClockFormatString)) {
+            // we don't want AM/PM showing up in our statusbar, even in 12h mode
+            format = format.replaceAll("a", "").trim();
+            mClockFormat = sdf = new SimpleDateFormat(format);
+            mClockFormatString = format;
+        } else {
+            sdf = mClockFormat;
+        }
+        String result = sdf.format(mCalendar.getTime());
+        return result;
+    }
+}
+