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

Commit 648e555b authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Lockscreen changes font on Overlay change 

Change-Id: I96ed7f3a0ce8bd9fb8ce8c05280a2950d0efac5f
Test: Manual (using HotDogOverlay)
Bug: 121124205
parent 964d112c

packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java

+10 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.animation.LayoutTransition; 
import android.animation.ObjectAnimator;

import android.animation.PropertyValuesHolder;

import android.annotation.ColorInt;

import android.annotation.StyleRes;

import android.app.PendingIntent;

import android.content.Context;

import android.graphics.Color;
@@ -444,9 +445,11 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe 
    static class KeyguardSliceButton extends Button implements

            ConfigurationController.ConfigurationListener {



        @StyleRes

        private static int sStyleId = R.style.TextAppearance_Keyguard_Secondary;



        public KeyguardSliceButton(Context context) {

            super(context, null /* attrs */, 0 /* styleAttr */,

                    com.android.keyguard.R.style.TextAppearance_Keyguard_Secondary);

            super(context, null /* attrs */, 0 /* styleAttr */, sStyleId);

            onDensityOrFontScaleChanged();

            setEllipsize(TruncateAt.END);

        }
@@ -468,6 +471,11 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe 
            updatePadding();

        }



        @Override

        public void onOverlayChanged() {

            setTextAppearance(sStyleId);

        }



        @Override

        public void setText(CharSequence text, BufferType type) {

            super.setText(text, type);

packages/SystemUI/src/com/android/systemui/BatteryMeterView.java

+11 −0
Original line number Diff line number Diff line
@@ -325,6 +325,17 @@ public class BatteryMeterView extends LinearLayout implements 
                .inflate(R.layout.battery_percentage_view, null);

    }



    /**

     * Updates percent view by removing old one and reinflating if necessary

     */

    public void updatePercentView() {

        if (mBatteryPercentView != null) {

            removeView(mBatteryPercentView);

            mBatteryPercentView = null;

        }

        updateShowPercent();

    }



    private void updatePercentText() {

        if (mBatteryPercentView != null) {

            mBatteryPercentView.setText(

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java

+8 −0
Original line number Diff line number Diff line
@@ -466,6 +466,14 @@ public class KeyguardStatusBarView extends RelativeLayout 
                .onDensityOrFontScaleChanged();

    }



    @Override

    public void onOverlayChanged() {

        mCarrierLabel.setTextAppearance(

                Utils.getThemeAttr(mContext, com.android.internal.R.attr.textAppearanceSmall));

        onThemeChanged();

        mBatteryView.updatePercentView();

    }



    private void updateIconsAndTextColors() {

        @ColorInt int textColor = Utils.getColorAttrDefaultColor(mContext,

                R.attr.wallpaperTextColor);

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+4 −0
Original line number Diff line number Diff line
@@ -1164,6 +1164,10 @@ public class StatusBar extends SystemUI implements DemoMode, 
        if (mBrightnessMirrorController != null) {

            mBrightnessMirrorController.onOverlayChanged();

        }

        // We need the new R.id.keyguard_indication_area before recreating

        // mKeyguardIndicationController

        mNotificationPanel.onThemeChanged();

        onThemeChanged();

    }



    @Override