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

Commit 2a0464fd authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6227223 from 33c8124f to qt-qpr3-release

Change-Id: Ic71ae695937046a25550e7d0d21576ea401bd618
parents fd38eea7 33c8124f
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -486,6 +486,15 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
        // CarFacetButtonController was reset therefore we need to re-add the status bar elements
        // to the controller.
        mCarFacetButtonController.addAllFacetButtons(mStatusBarWindow);

        // Upon restarting the Navigation Bar, CarFacetButtonController should immediately apply the
        // selection state that reflects the current task stack.
        try {
            mCarFacetButtonController.taskChanged(
                    ActivityTaskManager.getService().getAllStackInfos());
        } catch (Exception e) {
            Log.e(TAG, "Getting StackInfo from activity manager failed", e);
        }
    }

    private void addTemperatureViewToController(View v) {
+0 −1
Original line number Diff line number Diff line
@@ -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"
+2 −1
Original line number Diff line number Diff line
@@ -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"
+10 −12
Original line number Diff line number Diff line
@@ -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*/);
    }
+0 −7
Original line number Diff line number Diff line
@@ -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);
Loading