Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Crash when enabling show_operator_name_in_statusbar_bool" am: 247d2b12f2

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

Change-Id: Ia0cca013817b2b4e71ac3de16f63585e41e9cde6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Evan Laird
2023-05-04 17:53:28 +00:00
committed by Automerger Merge Worker
parent b9bf672193 247d2b12f2
commit a4dc4b4710
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/layout/status_bar.xml
View File

@@ -78,7 +78,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" />

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

@@ -662,9 +662,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()) {

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

@@ -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();
}
/** */