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

Merge changes I5d575dcd,Ib277941d

Browse Source 
* changes:
  Tidy PhoneStatusBarView
  Remove StatusBar#getStatusBarView
This commit is contained in:
TreeHugger Robot
2021-12-13 16:52:23 +00:00
committed by Android (Google) Code Review
parent 09caa60741 18ea2952c9
commit 9e699657d8
2 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
View File

@@ -38,7 +38,6 @@ import com.android.systemui.Dependency;
import com.android.systemui.R;
import com.android.systemui.plugins.DarkIconDispatcher;
import com.android.systemui.plugins.DarkIconDispatcher.DarkReceiver;
import com.android.systemui.statusbar.window.StatusBarWindowView;
import com.android.systemui.util.leak.RotationUtils;
import java.util.Objects;
@@ -76,6 +75,7 @@ public class PhoneStatusBarView extends FrameLayout {
@Override
public void onFinishInflate() {
super.onFinishInflate();
mBattery = findViewById(R.id.battery);
mClock = findViewById(R.id.clock);
mCutoutSpace = findViewById(R.id.cutout_space_view);

35
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
View File

@@ -341,7 +341,7 @@ public class StatusBar extends CoreStartable implements
mStatusBarWindowState = state;
mStatusBarWindowHidden = state == WINDOW_STATE_HIDDEN;
mStatusBarHideIconsForBouncerManager.setStatusBarWindowHidden(mStatusBarWindowHidden);
if (getStatusBarView() != null) {
if (mStatusBarView != null) {
// Should #updateHideIconsForBouncer always be called, regardless of whether we have a
// status bar view? If so, we can make #updateHideIconsForBouncer private.
mStatusBarHideIconsForBouncerManager.updateHideIconsForBouncer(/* animate= */ false);
@@ -1124,23 +1124,18 @@ public class StatusBar extends CoreStartable implements
// Set up CollapsedStatusBarFragment and PhoneStatusBarView
StatusBarInitializer initializer = mStatusBarComponent.getStatusBarInitializer();
initializer.setStatusBarViewUpdatedListener(
new StatusBarInitializer.OnStatusBarViewUpdatedListener() {
@Override
public void onStatusBarViewUpdated(
@NonNull PhoneStatusBarView statusBarView,
@NonNull PhoneStatusBarViewController statusBarViewController) {
mStatusBarView = statusBarView;
mPhoneStatusBarViewController = statusBarViewController;
mNotificationShadeWindowViewController.setStatusBarView(mStatusBarView);
// Ensure we re-propagate panel expansion values to the panel controller and
// any listeners it may have, such as PanelBar. This will also ensure we
// re-display the notification panel if necessary (for example, if
// a heads-up notification was being displayed and should continue being
// displayed).
mNotificationPanelViewController.updatePanelExpansionAndVisibility();
setBouncerShowingForStatusBarComponents(mBouncerShowing);
checkBarModes();
}
(statusBarView, statusBarViewController) -> {
mStatusBarView = statusBarView;
mPhoneStatusBarViewController = statusBarViewController;
mNotificationShadeWindowViewController.setStatusBarView(mStatusBarView);
// Ensure we re-propagate panel expansion values to the panel controller and
// any listeners it may have, such as PanelBar. This will also ensure we
// re-display the notification panel if necessary (for example, if
// a heads-up notification was being displayed and should continue being
// displayed).
mNotificationPanelViewController.updatePanelExpansionAndVisibility();
setBouncerShowingForStatusBarComponents(mBouncerShowing);
checkBarModes();
});
initializer.initializeStatusBar(mStatusBarComponent);
@@ -1578,10 +1573,6 @@ public class StatusBar extends CoreStartable implements
Trace.endSection();
}
protected PhoneStatusBarView getStatusBarView() {
return mStatusBarView;
}
public NotificationShadeWindowView getNotificationShadeWindowView() {
return mNotificationShadeWindowView;
}