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

Merge "DO NOT MERGE Set background drawable on status_bar_container" into qt-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-21 16:26:03 +00:00
committed by Android (Google) Code Review
parent 8161bd3ab6 b85c9eaa24
commit ea06aa5003
6 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,6 @@
android:layout_width="match_parent"
android:layout_height="@dimen/status_bar_height"
android:id="@+id/status_bar"
android:background="@drawable/system_bar_background"
android:orientation="vertical"
android:focusable="false"
android:descendantFocusability="afterDescendants"

3
packages/SystemUI/res/layout/super_status_bar.xml
View File

@@ -54,7 +54,8 @@
<FrameLayout
android:id="@+id/status_bar_container"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:background="@drawable/system_bar_background" />
<include layout="@layout/status_bar_expanded"
android:layout_width="match_parent"

22
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarTransitions.java
View File

@@ -29,23 +29,21 @@ public final class PhoneStatusBarTransitions extends BarTransitions {
private static final float ICON_ALPHA_WHEN_LIGHTS_OUT_BATTERY_CLOCK = 0.5f;
private static final float ICON_ALPHA_WHEN_LIGHTS_OUT_NON_BATTERY_CLOCK = 0;
private final PhoneStatusBarView mView;
private final float mIconAlphaWhenOpaque;
private View mLeftSide, mStatusIcons, mBattery, mClock;
private View mLeftSide, mStatusIcons, mBattery;
private Animator mCurrentAnimation;
public PhoneStatusBarTransitions(PhoneStatusBarView view) {
super(view, R.drawable.status_background);
mView = view;
final Resources res = mView.getContext().getResources();
/**
* @param backgroundView view to apply the background drawable
*/
public PhoneStatusBarTransitions(PhoneStatusBarView statusBarView, View backgroundView) {
super(backgroundView, R.drawable.status_background);
final Resources res = statusBarView.getContext().getResources();
mIconAlphaWhenOpaque = res.getFraction(R.dimen.status_bar_icon_drawing_alpha, 1, 1);
}
public void init() {
mLeftSide = mView.findViewById(R.id.status_bar_left_side);
mStatusIcons = mView.findViewById(R.id.statusIcons);
mBattery = mView.findViewById(R.id.battery);
mLeftSide = statusBarView.findViewById(R.id.status_bar_left_side);
mStatusIcons = statusBarView.findViewById(R.id.statusIcons);
mBattery = statusBarView.findViewById(R.id.battery);
applyModeBackground(-1, getMode(), false /*animate*/);
applyMode(getMode(), false /*animate*/);
}

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

@@ -59,7 +59,6 @@ public class PhoneStatusBarView extends PanelBar {
StatusBar mBar;
boolean mIsFullyOpenedPanel = false;
private final PhoneStatusBarTransitions mBarTransitions;
private ScrimController mScrimController;
private float mMinFraction;
private Runnable mHideExpandedRunnable = new Runnable() {
@@ -87,14 +86,9 @@ public class PhoneStatusBarView extends PanelBar {
public PhoneStatusBarView(Context context, AttributeSet attrs) {
super(context, attrs);
mBarTransitions = new PhoneStatusBarTransitions(this);
mCommandQueue = getComponent(context, CommandQueue.class);
}
public BarTransitions getBarTransitions() {
return mBarTransitions;
}
public void setBar(StatusBar bar) {
mBar = bar;
}
@@ -105,7 +99,6 @@ public class PhoneStatusBarView extends PanelBar {
@Override
public void onFinishInflate() {
mBarTransitions.init();
mBattery = findViewById(R.id.battery);
mCutoutSpace = findViewById(R.id.cutout_space_view);
mCenterIconSpace = findViewById(R.id.centered_icon_area);

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

@@ -2238,7 +2238,7 @@ public class StatusBar extends SystemUI implements DemoMode,
}
protected BarTransitions getStatusBarTransitions() {
return mStatusBarView.getBarTransitions();
return mStatusBarWindow.getBarTransitions();
}
protected @TransitionMode int computeBarMode(int oldVis, int newVis) {
@@ -2288,8 +2288,8 @@ public class StatusBar extends SystemUI implements DemoMode,
}
private void finishBarAnimations() {
if (mStatusBarView != null) {
mStatusBarView.getBarTransitions().finishAnimations();
if (mStatusBarWindow != null && mStatusBarWindow.getBarTransitions() != null) {
mStatusBarWindow.getBarTransitions().finishAnimations();
}
mNavigationBarController.finishBarAnimations(mDisplayId);
}
@@ -2367,8 +2367,8 @@ public class StatusBar extends SystemUI implements DemoMode,
Settings.Global.ZEN_MODE_OFF)));
pw.print(" mWallpaperSupported= "); pw.println(mWallpaperSupported);
if (mStatusBarView != null) {
dumpBarTransitions(pw, "mStatusBarView", mStatusBarView.getBarTransitions());
if (mStatusBarWindow != null) {
dumpBarTransitions(pw, "mStatusBarWindow", mStatusBarWindow.getBarTransitions());
}
pw.println(" StatusBarWindowView: ");
if (mStatusBarWindow != null) {
@@ -3012,8 +3012,8 @@ public class StatusBar extends SystemUI implements DemoMode,
-1;
if (barMode != -1) {
boolean animate = true;
if (mStatusBarView != null) {
mStatusBarView.getBarTransitions().transitionTo(barMode, animate);
if (mStatusBarWindow != null && mStatusBarWindow.getBarTransitions() != null) {
mStatusBarWindow.getBarTransitions().transitionTo(barMode, animate);
}
mNavigationBarController.transitionTo(mDisplayId, barMode, animate);
}

9
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
View File

@@ -65,8 +65,6 @@ import com.android.systemui.R;
import com.android.systemui.plugins.FalsingManager;
import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.statusbar.DragDownHelper;
import com.android.systemui.statusbar.StatusBarState;
import com.android.systemui.statusbar.notification.DynamicPrivacyController;
import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout;
import com.android.systemui.statusbar.phone.ScrimController.ScrimVisibility;
import com.android.systemui.tuner.TunerService;
@@ -91,6 +89,7 @@ public class StatusBarWindowView extends FrameLayout {
private View mBrightnessMirror;
private LockIcon mLockIcon;
private PhoneStatusBarView mStatusBarView;
private PhoneStatusBarTransitions mBarTransitions;
private int mRightInset = 0;
private int mLeftInset = 0;
@@ -282,6 +281,12 @@ public class StatusBarWindowView extends FrameLayout {
public void setStatusBarView(PhoneStatusBarView statusBarView) {
mStatusBarView = statusBarView;
mBarTransitions = new PhoneStatusBarTransitions(statusBarView,
findViewById(R.id.status_bar_container));
}
public PhoneStatusBarTransitions getBarTransitions() {
return mBarTransitions;
}
public void setService(StatusBar service) {