Merge branch '3415-a14-taskbar_height' into 'a14' (bd93ce66) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/launcher3/taskbar/TaskbarView.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import static com.android.launcher3.config.FeatureFlags.enableTaskbarPinning;
		import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR;

		import android.content.Context;
		import android.content.res.Configuration;
		import android.content.res.Resources;
		import android.graphics.Canvas;
		import android.graphics.Rect;
		@@ -117,13 +116,6 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
		this(context, attrs, defStyleAttr, 0);
		}

		@Override
		protected void onConfigurationChanged(Configuration newConfig) {
		super.onConfigurationChanged(newConfig);

		onDeviceProfileChanged(mActivityContext.getDeviceProfile());
		}

		public TaskbarView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr,
		int defStyleRes) {
		super(context, attrs, defStyleAttr, defStyleRes);

+1 −1

Original line number	Diff line number	Diff line
		@@ -649,7 +649,7 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
		setter.setFloat(mTaskbarNavButtonTranslationYForInAppDisplay, VALUE, offsetY, interpolator);

		int collapsedHeight = mActivity.getDefaultTaskbarWindowSize();
		int expandedHeight = Math.max(collapsedHeight, taskbarDp.taskbarHeight + offsetY);
		int expandedHeight = Math.max(collapsedHeight, taskbarDp.taskbarHeight);
		setter.addOnFrameListener(anim -> mActivity.setTaskbarWindowSize(
		anim.getAnimatedFraction() > 0 ? expandedHeight : collapsedHeight));