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

Commit 25d9e5c6 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge "[SB] Don't crop Burmese characters in status bar clock." into main

parents 74fac640 fc07f78b
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -94,7 +94,8 @@
                    <com.android.systemui.statusbar.policy.Clock
                        android:id="@+id/clock"
                        android:layout_width="wrap_content"
                        android:layout_height="@dimen/status_bar_system_icons_height"
                        android:layout_height="wrap_content"
                        android:minHeight="@dimen/status_bar_system_icons_height"
                        android:layout_gravity="center_vertical"
                        android:textAppearance="@style/TextAppearance.StatusBar.Default.Clock"
                        android:singleLine="true"
+0 −11
Original line number Diff line number Diff line
@@ -38,11 +38,9 @@ import android.text.format.DateFormat;
import android.text.style.CharacterStyle;
import android.text.style.RelativeSizeSpan;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.ContextThemeWrapper;
import android.view.Display;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;

import com.android.settingslib.Utils;
@@ -386,15 +384,6 @@ public class Clock extends TextView implements
                mContext.getResources().getDimensionPixelSize(
                        R.dimen.status_bar_clock_end_padding),
                0);

        float fontHeight = getPaint().getFontMetricsInt(null);
        setLineHeight(TypedValue.COMPLEX_UNIT_PX, fontHeight);

        ViewGroup.LayoutParams lp = getLayoutParams();
        if (lp != null) {
            lp.height = (int) Math.ceil(fontHeight);
            setLayoutParams(lp);
        }
    }

    private void updateShowSeconds() {