Merge "Fix the icon overlay after density change" into pi-dev (0cc0d229) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -108,6 +108,7 @@ 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.
		@@ -157,7 +158,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		private boolean mSensitiveHiddenInGeneral;
		private boolean mShowingPublicInitialized;
		private boolean mHideSensitiveForIntrinsicHeight;
		private float mHeaderVisibleAmount = 1.0f;
		private float mHeaderVisibleAmount = DEFAULT_HEADER_VISIBLE_AMOUNT;

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

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

+41 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,8 @@ 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;
		@@ -38,6 +40,12 @@ 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;
		@@ -107,6 +115,39 @@ 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

+5 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		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;
		@@ -123,6 +125,9 @@ 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

+7 −2

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@ 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;
		@@ -89,7 +91,8 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		super.onViewCreated(view, savedInstanceState);
		mStatusBar = (PhoneStatusBarView) view;
		if (savedInstanceState != null && savedInstanceState.containsKey(EXTRA_PANEL_STATE)) {
		mStatusBar.go(savedInstanceState.getInt(EXTRA_PANEL_STATE));
		mStatusBar.restoreHierarchyState(
		savedInstanceState.getSparseParcelableArray(EXTRA_PANEL_STATE));
		}
		mDarkIconManager = new DarkIconManager(view.findViewById(R.id.statusIcons));
		mDarkIconManager.setShouldLog(true);
		@@ -105,7 +108,9 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		@Override
		public void onSaveInstanceState(Bundle outState) {
		super.onSaveInstanceState(outState);
		outState.putInt(EXTRA_PANEL_STATE, mStatusBar.getState());
		SparseArray<Parcelable> states = new SparseArray<>();
		mStatusBar.saveHierarchyState(states);
		outState.putSparseParcelableArray(EXTRA_PANEL_STATE, states);
		}

		@Override

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

+29 −3

Original line number	Diff line number	Diff line
		@@ -54,9 +54,12 @@ public class HeadsUpAppearanceController implements OnHeadsUpChangedListener,
		mSetTrackingHeadsUp = this::setTrackingHeadsUp;
		private final Runnable mUpdatePanelTranslation = this::updatePanelTranslation;
		private final BiConsumer<Float, Float> mSetExpandedHeight = this::setExpandedHeight;
		private float mExpandedHeight;
		private boolean mIsExpanded;
		private float mExpandFraction;
		@VisibleForTesting
		float mExpandedHeight;
		@VisibleForTesting
		boolean mIsExpanded;
		@VisibleForTesting
		float mExpandFraction;
		private ExpandableNotificationRow mTrackedChild;
		private boolean mShown;
		private final View.OnLayoutChangeListener mStackScrollLayoutChangeListener =
		@@ -100,6 +103,20 @@ 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);
		}
		});
		}


		@@ -301,4 +318,13 @@ 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;
		}
		}
		}