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

Commit eaaaf039 authored by Evan Laird's avatar Evan Laird Committed by Automerger Merge Worker
Browse files

Merge "[Carrier text] add debug location to logs" into udc-dev am: 04f4e549... 

Merge "[Carrier text] add debug location to logs" into udc-dev am: 04f4e549 am: 7ced4fcd am: 0fe2ae31

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23143158



Change-Id: I9ed0e72d08be867c117e8f0d651f8af9055c4b95
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 91038078 0fe2ae31

packages/SystemUI/res-keyguard/layout/keyguard_emergency_carrier_area.xml

+2 −1
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ 
        android:ellipsize="marquee"

        android:visibility="gone"

        android:gravity="center"

        androidprv:allCaps="@bool/kg_use_all_caps" />

        androidprv:allCaps="@bool/kg_use_all_caps"

        androidprv:debugLocation="Emergency" />



    <com.android.keyguard.EmergencyButton

        android:id="@+id/emergency_call_button"

packages/SystemUI/res/layout/keyguard_status_bar.xml

+2 −1
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ 
        android:textColor="?attr/wallpaperTextColorSecondary"

        android:singleLine="true"

        systemui:showMissingSim="true"

        systemui:showAirplaneMode="true" />

        systemui:showAirplaneMode="true"

        systemui:debugLocation="Keyguard" />



</com.android.systemui.statusbar.phone.KeyguardStatusBarView>

packages/SystemUI/res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ 
        <attr name="allCaps" format="boolean" />

        <attr name="showMissingSim" format="boolean" />

        <attr name="showAirplaneMode" format="boolean" />

        <attr name="debugLocation" format="string" />

    </declare-styleable>



    <declare-styleable name="IlluminationDrawable">

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

+7 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ public class CarrierText extends TextView { 


    private final boolean mShowAirplaneMode;



    private final String mDebugLocation;



    public CarrierText(Context context) {

        this(context, null);

    }
@@ -46,6 +48,7 @@ public class CarrierText extends TextView { 
            useAllCaps = a.getBoolean(R.styleable.CarrierText_allCaps, false);

            mShowAirplaneMode = a.getBoolean(R.styleable.CarrierText_showAirplaneMode, false);

            mShowMissingSim = a.getBoolean(R.styleable.CarrierText_showMissingSim, false);

            mDebugLocation = a.getString(R.styleable.CarrierText_debugLocation);

        } finally {

            a.recycle();

        }
@@ -70,6 +73,10 @@ public class CarrierText extends TextView { 
        return mShowMissingSim;

    }



    public String getDebugLocation() {

        return mDebugLocation;

    }



    private static class CarrierTextTransformationMethod extends SingleLineTransformationMethod {

        private final Locale mLocale;

        private final boolean mAllCaps;

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

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ public class CarrierTextController extends ViewController<CarrierText> { 
        mCarrierTextManager = carrierTextManagerBuilder

                .setShowAirplaneMode(mView.getShowAirplaneMode())

                .setShowMissingSim(mView.getShowMissingSim())

                .setDebugLocationString(mView.getDebugLocation())

                .build();

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

    }