Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81bd76e4 authored by Peter Ng's avatar Peter Ng Committed by Android (Google) Code Review
Browse files

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

parents e3a31d03 ccff48b7

core/java/com/android/internal/widget/DigitalClock.java

+2 −0
Original line number Diff line number Diff line
@@ -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. */

        mTimeDisplayBackground = (TextView) findViewById(R.id.timeDisplayBackground);

        mTimeDisplayBackground.setTypeface(sBackgroundFont);

        mTimeDisplayBackground.setVisibility(View.INVISIBLE);



        mTimeDisplayForeground = (TextView) findViewById(R.id.timeDisplayForeground);

        mTimeDisplayForeground.setTypeface(sForegroundFont);

        mAmPm = new AmPm(this, null);

core/res/res/values-sw600dp/colors.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
-->

<resources>

    <!-- keyguard clock -->

    <color name="lockscreen_clock_background">#b3ffffff</color>

    <color name="lockscreen_clock_foreground">#7affffff</color>

    <color name="lockscreen_clock_background">#ffffffff</color>

    <color name="lockscreen_clock_foreground">#ffffffff</color>

    <color name="lockscreen_clock_am_pm">#ffffffff</color>

    <color name="lockscreen_owner_info">#ff9a9a9a</color>

core/res/res/values/colors.xml

+3 −3
Original line number Diff line number Diff line
@@ -107,9 +107,9 @@ 
    <color name="keyguard_text_color_decline">#fe0a5a</color>



    <!-- keyguard clock -->

    <color name="lockscreen_clock_background">#e5ffffff</color>

    <color name="lockscreen_clock_foreground">#e5ffffff</color>

    <color name="lockscreen_clock_am_pm">#ff9a9a9a</color>

    <color name="lockscreen_clock_background">#ffffffff</color>

    <color name="lockscreen_clock_foreground">#ffffffff</color>

    <color name="lockscreen_clock_am_pm">#ffffffff</color>

    <color name="lockscreen_owner_info">#ff9a9a9a</color>



    <!-- FaceLock -->

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

+5 −3
Original line number Diff line number Diff line
@@ -84,7 +84,9 @@ public class HoloClock extends FrameLayout { 
        mBgText = (TextView) findViewById(R.id.time_bg);

        if (mBgText != null) {

            mBgText.setTypeface(sBackgroundType);

            mBgText.setVisibility(View.INVISIBLE);

        }



        mFgText = (TextView) findViewById(R.id.time_fg);

        if (mFgText != null) {

            mFgText.setTypeface(sForegroundType);