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

Commit 166363d8 authored by Todd Kennedy's avatar Todd Kennedy
Browse files

Revert "Fix the icon overlay after density change" 

This reverts commit 252efd70.

Reason for revert: breaks git_pi-dev-plus-aosp build

Change-Id: Icbccc53a6b860fab17fefcfe54a72b80957482e4
parent 252efd70

packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java

+1 −2
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    private static final int COLORED_DIVIDER_ALPHA = 0x7B;

    private static final int MENU_VIEW_INDEX = 0;

    private static final String TAG = "ExpandableNotifRow";

    public static final float DEFAULT_HEADER_VISIBLE_AMOUNT = 1.0f;



    /**

     * Listener for when {@link ExpandableNotificationRow} is laid out.
@@ -158,7 +157,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    private boolean mSensitiveHiddenInGeneral;

    private boolean mShowingPublicInitialized;

    private boolean mHideSensitiveForIntrinsicHeight;

    private float mHeaderVisibleAmount = DEFAULT_HEADER_VISIBLE_AMOUNT;

    private float mHeaderVisibleAmount = 1.0f;



    /**

     * Is this notification expanded by the system. The expansion state can be overridden by the

packages/SystemUI/src/com/android/systemui/statusbar/HeadsUpStatusBarView.java

+0 −41
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ import android.content.res.Configuration; 
import android.content.res.Resources;

import android.graphics.Point;

import android.graphics.Rect;

import android.os.Bundle;

import android.os.Parcelable;

import android.util.AttributeSet;

import android.view.Display;

import android.view.DisplayCutout;
@@ -40,12 +38,6 @@ import java.util.List; 
 * The view in the statusBar that contains part of the heads-up information

 */

public class HeadsUpStatusBarView extends AlphaOptimizedLinearLayout {

    private static final String HEADS_UP_STATUS_BAR_VIEW_SUPER_PARCELABLE =

            "heads_up_status_bar_view_super_parcelable";

    private static final String FIRST_LAYOUT = "first_layout";

    private static final String PUBLIC_MODE = "public_mode";

    private static final String VISIBILITY = "visibility";

    private static final String ALPHA = "alpha";

    private int mAbsoluteStartPadding;

    private int mEndMargin;

    private View mIconPlaceholder;
@@ -115,39 +107,6 @@ public class HeadsUpStatusBarView extends AlphaOptimizedLinearLayout { 
        updateMaxWidth();

    }



    @Override

    public Bundle onSaveInstanceState() {

        Bundle bundle = new Bundle();

        bundle.putParcelable(HEADS_UP_STATUS_BAR_VIEW_SUPER_PARCELABLE,

                super.onSaveInstanceState());

        bundle.putBoolean(FIRST_LAYOUT, mFirstLayout);

        bundle.putBoolean(PUBLIC_MODE, mPublicMode);

        bundle.putInt(VISIBILITY, getVisibility());

        bundle.putFloat(ALPHA, getAlpha());



        return bundle;

    }



    @Override

    public void onRestoreInstanceState(Parcelable state) {

        if (state == null || !(state instanceof Bundle)) {

            super.onRestoreInstanceState(state);

            return;

        }



        Bundle bundle = (Bundle) state;

        Parcelable superState = bundle.getParcelable(HEADS_UP_STATUS_BAR_VIEW_SUPER_PARCELABLE);

        super.onRestoreInstanceState(superState);

        mFirstLayout = bundle.getBoolean(FIRST_LAYOUT, true);

        mPublicMode = bundle.getBoolean(PUBLIC_MODE, false);

        if (bundle.containsKey(VISIBILITY)) {

            setVisibility(bundle.getInt(VISIBILITY));

        }

        if (bundle.containsKey(ALPHA)) {

            setAlpha(bundle.getFloat(ALPHA));

        }

    }



    @VisibleForTesting

    public HeadsUpStatusBarView(Context context, View iconPlaceholder, TextView textView) {

        this(context);

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHeaderViewWrapper.java

+0 −5
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.systemui.statusbar.notification;



import static com.android.systemui.statusbar.ExpandableNotificationRow

        .DEFAULT_HEADER_VISIBLE_AMOUNT;

import static com.android.systemui.statusbar.notification.TransformState.TRANSFORM_Y;



import android.app.Notification;
@@ -125,9 +123,6 @@ public class NotificationHeaderViewWrapper extends NotificationViewWrapper { 


        // Reinspect the notification.

        resolveHeaderViews();

        if (row.getHeaderVisibleAmount() != DEFAULT_HEADER_VISIBLE_AMOUNT) {

            setHeaderVisibleAmount(row.getHeaderVisibleAmount());

        }

        updateTransformedTypes();

        addRemainingTransformTypes();

        updateCropToPaddingForImageViews();

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

+2 −7
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ import android.annotation.Nullable; 
import android.app.Fragment;

import android.app.StatusBarManager;

import android.os.Bundle;

import android.os.Parcelable;

import android.util.SparseArray;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;
@@ -91,8 +89,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
        super.onViewCreated(view, savedInstanceState);

        mStatusBar = (PhoneStatusBarView) view;

        if (savedInstanceState != null && savedInstanceState.containsKey(EXTRA_PANEL_STATE)) {

            mStatusBar.restoreHierarchyState(

                    savedInstanceState.getSparseParcelableArray(EXTRA_PANEL_STATE));

            mStatusBar.go(savedInstanceState.getInt(EXTRA_PANEL_STATE));

        }

        mDarkIconManager = new DarkIconManager(view.findViewById(R.id.statusIcons));

        mDarkIconManager.setShouldLog(true);
@@ -108,9 +105,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
    @Override

    public void onSaveInstanceState(Bundle outState) {

        super.onSaveInstanceState(outState);

        SparseArray<Parcelable> states = new SparseArray<>();

        mStatusBar.saveHierarchyState(states);

        outState.putSparseParcelableArray(EXTRA_PANEL_STATE, states);

        outState.putInt(EXTRA_PANEL_STATE, mStatusBar.getState());

    }



    @Override

packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceController.java

+3 −29
Original line number Diff line number Diff line
@@ -54,12 +54,9 @@ public class HeadsUpAppearanceController implements OnHeadsUpChangedListener, 
            mSetTrackingHeadsUp = this::setTrackingHeadsUp;

    private final Runnable mUpdatePanelTranslation = this::updatePanelTranslation;

    private final BiConsumer<Float, Float> mSetExpandedHeight = this::setExpandedHeight;

    @VisibleForTesting

    float mExpandedHeight;

    @VisibleForTesting

    boolean mIsExpanded;

    @VisibleForTesting

    float mExpandFraction;

    private float mExpandedHeight;

    private boolean mIsExpanded;

    private float mExpandFraction;

    private ExpandableNotificationRow mTrackedChild;

    private boolean mShown;

    private final View.OnLayoutChangeListener mStackScrollLayoutChangeListener =
@@ -103,20 +100,6 @@ public class HeadsUpAppearanceController implements OnHeadsUpChangedListener, 
        mClockView = clockView;

        mDarkIconDispatcher = Dependency.get(DarkIconDispatcher.class);

        mDarkIconDispatcher.addDarkReceiver(this);



        mHeadsUpStatusBarView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {

            @Override

            public void onLayoutChange(View v, int left, int top, int right, int bottom,

                    int oldLeft, int oldTop, int oldRight, int oldBottom) {

                if (shouldBeVisible()) {

                    updateTopEntry();



                    // trigger scroller to notify the latest panel translation

                    mStackScroller.requestLayout();

                }

                mHeadsUpStatusBarView.removeOnLayoutChangeListener(this);

            }

        });

    }
@@ -318,13 +301,4 @@ public class HeadsUpAppearanceController implements OnHeadsUpChangedListener, 
        mHeadsUpStatusBarView.setPublicMode(publicMode);

        updateTopEntry();

    }



    void readFrom(HeadsUpAppearanceController oldController) {

        if (oldController != null) {

            mTrackedChild = oldController.mTrackedChild;

            mExpandedHeight = oldController.mExpandedHeight;

            mIsExpanded = oldController.mIsExpanded;

            mExpandFraction = oldController.mExpandFraction;

        }

    }

}