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

Commit 3404ce3b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Fix the carrier text font size in Keyguard status bar."

parents e513d1a7 79fbdfa4

packages/Keyguard/res/layout/keyguard_carrier_text_view.xml

+6 −4
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
        android:textDirection = "locale"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:textColor="?android:attr/textColorSecondary"

        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

        android:textSize="@dimen/kg_status_line_font_size"

        android:visibility="gone" />



    <TextView
@@ -61,7 +61,7 @@ 
        android:textDirection = "locale"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:textColor="?android:attr/textColorSecondary"

        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

        android:textSize="@dimen/kg_status_line_font_size"

        android:visibility="gone" />



    <TextView
@@ -69,6 +69,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:visibility="gone" />



    <TextView
@@ -85,7 +86,7 @@ 
        android:textDirection = "locale"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:textColor="?android:attr/textColorSecondary"

        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

        android:textSize="@dimen/kg_status_line_font_size"

        android:visibility="gone" />



    <TextView
@@ -93,6 +94,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:visibility="gone" />



    <TextView
@@ -109,6 +111,6 @@ 
        android:textDirection = "locale"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:textColor="?android:attr/textColorSecondary"

        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

        android:textSize="@dimen/kg_status_line_font_size"

        android:visibility="gone" />

</merge>

packages/Keyguard/src/com/android/keyguard/CarrierText.java

+17 −0
Original line number Diff line number Diff line
@@ -17,11 +17,13 @@ 
package com.android.keyguard;



import android.content.Context;

import android.content.res.Configuration;

import android.content.res.TypedArray;

import android.text.method.SingleLineTransformationMethod;

import android.text.TextUtils;

import android.telephony.TelephonyManager;

import android.util.AttributeSet;

import android.util.TypedValue;

import android.view.Gravity;

import android.view.LayoutInflater;

import android.view.View;
@@ -161,6 +163,21 @@ public class CarrierText extends LinearLayout { 
        }

    }



    @Override

    protected void onConfigurationChanged(Configuration newConfig) {

        super.onConfigurationChanged(newConfig);

        final int[] carrierTextViewId = { R.id.airplane_mode, R.id.carrier1, R.id.carrier2,

                R.id.carrier3, R.id.carrier_divider1, R.id.carrier_divider2 };

        for (int i = 0; i < carrierTextViewId.length; i++) {

            TextView carrierTextView = (TextView)findViewById(carrierTextViewId[i]);

            if (carrierTextView != null) {

                carrierTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX,

                        getResources().getDimensionPixelSize(

                                com.android.internal.R.dimen.text_size_small_material));

           }

       }

   }



    @Override

    protected void onFinishInflate() {

        super.onFinishInflate();