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

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

Merge "Crash when enabling show_operator_name_in_statusbar_bool" am:... 

Merge "Crash when enabling show_operator_name_in_statusbar_bool" am: 247d2b12 am: a4dc4b47 am: 4181f26c

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



Change-Id: I63cb4ade7c9ae45689209e4dd048ebf8e8440190
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 458d9088 4181f26c

packages/SystemUI/res/layout/status_bar.xml

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ 
                    android:layout_width="match_parent"

                    android:clipChildren="false">

                    <ViewStub

                        android:id="@+id/operator_name"

                        android:id="@+id/operator_name_stub"

                        android:layout_width="wrap_content"

                        android:layout_height="match_parent"

                        android:layout="@layout/operator_name" />

packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -685,9 +685,9 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
    private void initOperatorName() {

        int subId = SubscriptionManager.getDefaultDataSubscriptionId();

        if (mCarrierConfigTracker.getShowOperatorNameInStatusBarConfig(subId)) {

            ViewStub stub = mStatusBar.findViewById(R.id.operator_name);

            View view = mStatusBar.findViewById(R.id.operator_name);

            mOperatorNameViewController =

                    mOperatorNameViewControllerFactory.create((OperatorNameView) stub.inflate());

                    mOperatorNameViewControllerFactory.create((OperatorNameView) view);

            mOperatorNameViewController.init();

            // This view should not be visible on lock-screen

            if (mKeyguardStateController.isShowing()) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/dagger/StatusBarFragmentModule.java

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.statusbar.phone.fragment.dagger;



import android.view.View;

import android.view.ViewStub;



import com.android.systemui.R;

import com.android.systemui.battery.BatteryMeterView;
@@ -95,7 +96,7 @@ public interface StatusBarFragmentModule { 
    @StatusBarFragmentScope

    @Named(OPERATOR_NAME_VIEW)

    static View provideOperatorNameView(@RootView PhoneStatusBarView view) {

        return view.findViewById(R.id.operator_name);

        return ((ViewStub) view.findViewById(R.id.operator_name_stub)).inflate();

    }



    /** */