Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Removing 2nd background clock font display from statusbar and lock screen" into ics-mr1

Browse Source
This commit is contained in:
Peter Ng
2011-10-27 19:17:19 -07:00
committed by Android (Google) Code Review
parent e3a31d0340 ccff48b7cb
commit 81bd76e4b3
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/widget/DigitalClock.java
View File

@@ -168,6 +168,8 @@ public class DigitalClock extends RelativeLayout {
/* The time display consists of two tones. That's why we have two overlapping text views. */ /* The time display consists of two tones. That's why we have two overlapping text views. */
mTimeDisplayBackground = (TextView) findViewById(R.id.timeDisplayBackground); mTimeDisplayBackground = (TextView) findViewById(R.id.timeDisplayBackground);
mTimeDisplayBackground.setTypeface(sBackgroundFont); mTimeDisplayBackground.setTypeface(sBackgroundFont);
mTimeDisplayBackground.setVisibility(View.INVISIBLE);
mTimeDisplayForeground = (TextView) findViewById(R.id.timeDisplayForeground); mTimeDisplayForeground = (TextView) findViewById(R.id.timeDisplayForeground);
mTimeDisplayForeground.setTypeface(sForegroundFont); mTimeDisplayForeground.setTypeface(sForegroundFont);
mAmPm = new AmPm(this, null); mAmPm = new AmPm(this, null);

4
core/res/res/values-sw600dp/colors.xml
View File

@@ -19,8 +19,8 @@
--> -->
<resources> <resources>
<!-- keyguard clock --> <!-- keyguard clock -->
<color name="lockscreen_clock_background">#b3ffffff</color> <color name="lockscreen_clock_background">#ffffffff</color>
<color name="lockscreen_clock_foreground">#7affffff</color> <color name="lockscreen_clock_foreground">#ffffffff</color>
<color name="lockscreen_clock_am_pm">#ffffffff</color> <color name="lockscreen_clock_am_pm">#ffffffff</color>
<color name="lockscreen_owner_info">#ff9a9a9a</color> <color name="lockscreen_owner_info">#ff9a9a9a</color>

6
core/res/res/values/colors.xml
View File

@@ -107,9 +107,9 @@
<color name="keyguard_text_color_decline">#fe0a5a</color> <color name="keyguard_text_color_decline">#fe0a5a</color>
<!-- keyguard clock --> <!-- keyguard clock -->
<color name="lockscreen_clock_background">#e5ffffff</color> <color name="lockscreen_clock_background">#ffffffff</color>
<color name="lockscreen_clock_foreground">#e5ffffff</color> <color name="lockscreen_clock_foreground">#ffffffff</color>
<color name="lockscreen_clock_am_pm">#ff9a9a9a</color> <color name="lockscreen_clock_am_pm">#ffffffff</color>
<color name="lockscreen_owner_info">#ff9a9a9a</color> <color name="lockscreen_owner_info">#ff9a9a9a</color>
<!-- FaceLock --> <!-- FaceLock -->

8
packages/SystemUI/src/com/android/systemui/statusbar/tablet/HoloClock.java
View File

@@ -53,9 +53,9 @@ public class HoloClock extends FrameLayout {
private SimpleDateFormat mClockFormat; private SimpleDateFormat mClockFormat;
private static final String FONT_DIR = "/system/fonts/"; private static final String FONT_DIR = "/system/fonts/";
private static final String CLOCK_FONT = FONT_DIR + "AndroidClock_Solid.ttf"; private static final String CLOCK_FONT = FONT_DIR + "AndroidClock_Solid.ttf";
private static final String CLOCK_FG_FONT = FONT_DIR + "AndroidClock.ttf"; private static final String CLOCK_FG_FONT = FONT_DIR + "AndroidClock.ttf";
private static final String CLOCK_BG_FONT = FONT_DIR + "AndroidClock_Highlight.ttf"; private static final String CLOCK_BG_FONT = FONT_DIR + "AndroidClock_Highlight.ttf";
private static Typeface sBackgroundType, sForegroundType, sSolidType; private static Typeface sBackgroundType, sForegroundType, sSolidType;
private TextView mSolidText, mBgText, mFgText; private TextView mSolidText, mBgText, mFgText;
@@ -84,7 +84,9 @@ public class HoloClock extends FrameLayout {
mBgText = (TextView) findViewById(R.id.time_bg); mBgText = (TextView) findViewById(R.id.time_bg);
if (mBgText != null) { if (mBgText != null) {
mBgText.setTypeface(sBackgroundType); mBgText.setTypeface(sBackgroundType);
mBgText.setVisibility(View.INVISIBLE);
} }
mFgText = (TextView) findViewById(R.id.time_fg); mFgText = (TextView) findViewById(R.id.time_fg);
if (mFgText != null) { if (mFgText != null) {
mFgText.setTypeface(sForegroundType); mFgText.setTypeface(sForegroundType);