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

Commit 77a1dfa2 authored by Jorge Ruesga's avatar Jorge Ruesga Committed by Gerrit Code Review
Browse files

Merge "keyguard: force marquee effect for carrier text" into cm-11.0

parents 81676a93 7b9d4aa3
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -33,15 +33,15 @@
    <!-- Used only for Multi Sim case -->
    <ViewStub android:id="@+id/stub_msim_carrier_text"
        android:inflatedId="@+id/msim_keyguard_carrier_area"
        android:layout_width="fill_parent"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout="@layout/msim_keyguard_carrier_area" />

    <com.android.keyguard.CarrierText
        android:id="@+id/carrier_text"
        android:layout_width="wrap_content"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:ellipsize="marquee"
        android:gravity="center"
        android:textAppearance="?android:attr/textAppearanceMedium"
        android:textSize="@dimen/kg_status_line_font_size"
        android:textColor="?android:attr/textColorSecondary" />
+8 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ package com.android.keyguard;
import android.content.Context;
import android.text.method.SingleLineTransformationMethod;
import android.text.TextUtils;
import android.text.TextUtils.TruncateAt;
import android.util.AttributeSet;
import android.view.View;
import android.widget.TextView;
@@ -84,6 +85,13 @@ public class CarrierText extends TextView {
    public CarrierText(Context context, AttributeSet attrs) {
        super(context, attrs);
        mLockPatternUtils = new LockPatternUtils(mContext);

        // Force marquee effect
        setSelected(true);
        setEllipsize(TruncateAt.MARQUEE);
        setMarqueeRepeatLimit(-1);
        setSingleLine(true);

        boolean useAllCaps = mContext.getResources().getBoolean(R.bool.kg_use_all_caps);
        setTransformationMethod(new CarrierTextTransformationMethod(mContext, useAllCaps));
    }