Merge "Remove screenshot_shelf_ui2 flag (now rolled out)" into main (caccc8f2) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -590,13 +590,6 @@ flag {
		}
		}

		flag {
		name: "screenshot_shelf_ui2"
		namespace: "systemui"
		description: "Use new shelf UI flow for screenshots"
		bug: "329659738"
		}

		flag {
		name: "run_fingerprint_detect_on_dismissible_keyguard"
		namespace: "systemui"

packages/SystemUI/res/layout/clipboard_overlay.xml

+23 −9

Original line number	Diff line number	Diff line
		@@ -24,18 +24,29 @@
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:contentDescription="@string/clipboard_overlay_window_name">
		<ImageView
		<!-- Min edge spacing guideline off of which the preview and actions can be anchored (without
		this we'd need to express margins as the sum of two different dimens). -->
		<androidx.constraintlayout.widget.Guideline
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:id="@+id/min_edge_guideline"
		app:layout_constraintGuide_begin="@dimen/overlay_action_container_minimum_edge_spacing"
		android:orientation="vertical"/>
		<!-- Negative horizontal margin because this container background must render beyond the thing
		it's constrained by (the actions themselves). -->
		<FrameLayout
		android:id="@+id/actions_container_background"
		android:visibility="gone"
		android:layout_height="0dp"
		android:layout_width="0dp"
		android:elevation="4dp"
		android:background="@drawable/action_chip_container_background"
		android:layout_marginStart="@dimen/overlay_action_container_margin_horizontal"
		android:background="@drawable/shelf_action_chip_container_background"
		android:layout_marginStart="@dimen/negative_overlay_action_container_minimum_edge_spacing"
		android:layout_marginEnd="@dimen/negative_overlay_action_container_minimum_edge_spacing"
		android:layout_marginBottom="@dimen/overlay_action_container_margin_bottom"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toTopOf="@+id/actions_container"
		app:layout_constraintEnd_toEndOf="@+id/actions_container"
		app:layout_constraintStart_toStartOf="@id/min_edge_guideline"
		app:layout_constraintTop_toTopOf="@id/actions_container"
		app:layout_constraintEnd_toEndOf="@id/actions_container"
		app:layout_constraintBottom_toBottomOf="parent"/>
		<HorizontalScrollView
		android:id="@+id/actions_container"
		@@ -56,10 +67,13 @@
		android:id="@+id/actions"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingStart="@dimen/shelf_action_chip_margin_start"
		android:showDividers="middle"
		android:divider="@drawable/shelf_action_chip_divider"
		android:animateLayoutChanges="true">
		<include layout="@layout/overlay_action_chip"
		<include layout="@layout/shelf_action_chip"
		android:id="@+id/share_chip"/>
		<include layout="@layout/overlay_action_chip"
		<include layout="@layout/shelf_action_chip"
		android:id="@+id/remote_copy_chip"/>
		</LinearLayout>
		</HorizontalScrollView>
		@@ -73,7 +87,7 @@
		android:layout_marginBottom="@dimen/overlay_preview_container_margin"
		android:elevation="7dp"
		android:background="@drawable/overlay_border"
		app:layout_constraintStart_toStartOf="@id/actions_container_background"
		app:layout_constraintStart_toStartOf="@id/min_edge_guideline"
		app:layout_constraintTop_toTopOf="@id/clipboard_preview"
		app:layout_constraintEnd_toEndOf="@id/clipboard_preview"
		app:layout_constraintBottom_toBottomOf="@id/actions_container_background"/>

packages/SystemUI/res/layout/clipboard_overlay2.xml

deleted100644 → 0

+0 −202

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2021 The Android Open Source Project
		~
		~ Licensed under the Apache License, Version 2.0 (the "License");
		~ you may not use this file except in compliance with the License.
		~ You may obtain a copy of the License at
		~
		~ http://www.apache.org/licenses/LICENSE-2.0
		~
		~ Unless required by applicable law or agreed to in writing, software
		~ distributed under the License is distributed on an "AS IS" BASIS,
		~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		~ See the License for the specific language governing permissions and
		~ limitations under the License.
		-->
		<com.android.systemui.clipboardoverlay.ClipboardOverlayView
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		android:id="@+id/clipboard_ui"
		android:theme="@style/FloatingOverlay"
		android:alpha="0"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:contentDescription="@string/clipboard_overlay_window_name">
		<!-- Min edge spacing guideline off of which the preview and actions can be anchored (without
		this we'd need to express margins as the sum of two different dimens). -->
		<androidx.constraintlayout.widget.Guideline
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:id="@+id/min_edge_guideline"
		app:layout_constraintGuide_begin="@dimen/overlay_action_container_minimum_edge_spacing"
		android:orientation="vertical"/>
		<!-- Negative horizontal margin because this container background must render beyond the thing
		it's constrained by (the actions themselves). -->
		<FrameLayout
		android:id="@+id/actions_container_background"
		android:visibility="gone"
		android:layout_height="0dp"
		android:layout_width="0dp"
		android:elevation="4dp"
		android:background="@drawable/shelf_action_chip_container_background"
		android:layout_marginStart="@dimen/negative_overlay_action_container_minimum_edge_spacing"
		android:layout_marginEnd="@dimen/negative_overlay_action_container_minimum_edge_spacing"
		android:layout_marginBottom="@dimen/overlay_action_container_margin_bottom"
		app:layout_constraintStart_toStartOf="@id/min_edge_guideline"
		app:layout_constraintTop_toTopOf="@id/actions_container"
		app:layout_constraintEnd_toEndOf="@id/actions_container"
		app:layout_constraintBottom_toBottomOf="parent"/>
		<HorizontalScrollView
		android:id="@+id/actions_container"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_marginEnd="@dimen/overlay_action_container_margin_horizontal"
		android:paddingEnd="@dimen/overlay_action_container_padding_end"
		android:paddingVertical="@dimen/overlay_action_container_padding_vertical"
		android:elevation="4dp"
		android:scrollbars="none"
		app:layout_constraintHorizontal_bias="0"
		app:layout_constraintWidth_percent="1.0"
		app:layout_constraintWidth_max="wrap"
		app:layout_constraintStart_toEndOf="@+id/preview_border"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintBottom_toBottomOf="@id/actions_container_background">
		<LinearLayout
		android:id="@+id/actions"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingStart="@dimen/shelf_action_chip_margin_start"
		android:showDividers="middle"
		android:divider="@drawable/shelf_action_chip_divider"
		android:animateLayoutChanges="true">
		<include layout="@layout/shelf_action_chip"
		android:id="@+id/share_chip"/>
		<include layout="@layout/shelf_action_chip"
		android:id="@+id/remote_copy_chip"/>
		</LinearLayout>
		</HorizontalScrollView>
		<View
		android:id="@+id/preview_border"
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:layout_marginStart="@dimen/overlay_preview_container_margin"
		android:layout_marginTop="@dimen/overlay_border_width_neg"
		android:layout_marginEnd="@dimen/overlay_border_width_neg"
		android:layout_marginBottom="@dimen/overlay_preview_container_margin"
		android:elevation="7dp"
		android:background="@drawable/overlay_border"
		app:layout_constraintStart_toStartOf="@id/min_edge_guideline"
		app:layout_constraintTop_toTopOf="@id/clipboard_preview"
		app:layout_constraintEnd_toEndOf="@id/clipboard_preview"
		app:layout_constraintBottom_toBottomOf="@id/actions_container_background"/>
		<FrameLayout
		android:id="@+id/clipboard_preview"
		android:layout_width="@dimen/clipboard_preview_size"
		android:layout_height="wrap_content"
		android:layout_marginStart="@dimen/overlay_border_width"
		android:layout_marginBottom="@dimen/overlay_border_width"
		android:layout_gravity="center"
		android:elevation="7dp"
		android:background="@drawable/overlay_preview_background"
		android:clipChildren="true"
		android:clipToOutline="true"
		android:clipToPadding="true"
		app:layout_constraintStart_toStartOf="@id/preview_border"
		app:layout_constraintBottom_toBottomOf="@id/preview_border">
		<TextView android:id="@+id/text_preview"
		android:textFontWeight="500"
		android:padding="8dp"
		android:gravity="center\|start"
		android:ellipsize="end"
		android:autoSizeTextType="uniform"
		android:autoSizeMinTextSize="@dimen/clipboard_overlay_min_font"
		android:autoSizeMaxTextSize="@dimen/clipboard_overlay_max_font"
		android:textColor="?attr/overlayButtonTextColor"
		android:textColorLink="?attr/overlayButtonTextColor"
		android:background="?androidprv:attr/colorAccentSecondary"
		android:layout_width="@dimen/clipboard_preview_size"
		android:layout_height="@dimen/clipboard_preview_size"/>
		<ImageView
		android:id="@+id/image_preview"
		android:scaleType="fitCenter"
		android:adjustViewBounds="true"
		android:contentDescription="@string/clipboard_image_preview"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"/>
		<TextView
		android:id="@+id/hidden_preview"
		android:visibility="gone"
		android:textFontWeight="500"
		android:padding="8dp"
		android:gravity="center"
		android:textSize="14sp"
		android:textColor="?attr/overlayButtonTextColor"
		android:background="?androidprv:attr/colorAccentSecondary"
		android:layout_width="@dimen/clipboard_preview_size"
		android:layout_height="@dimen/clipboard_preview_size"/>
		</FrameLayout>
		<LinearLayout
		android:id="@+id/minimized_preview"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:visibility="gone"
		android:elevation="7dp"
		android:padding="8dp"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		android:layout_marginStart="@dimen/overlay_action_container_margin_horizontal"
		android:layout_marginBottom="@dimen/overlay_action_container_margin_bottom"
		android:background="@drawable/clipboard_minimized_background">
		<ImageView
		android:src="@drawable/ic_content_paste"
		android:tint="?attr/overlayButtonTextColor"
		android:layout_width="24dp"
		android:layout_height="24dp"/>
		<ImageView
		android:src="@*android:drawable/ic_chevron_end"
		android:tint="?attr/overlayButtonTextColor"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:paddingEnd="-8dp"
		android:paddingStart="-4dp"/>
		</LinearLayout>
		<androidx.constraintlayout.widget.Barrier
		android:id="@+id/clipboard_content_top"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		app:barrierDirection="top"
		app:constraint_referenced_ids="clipboard_preview,minimized_preview"/>
		<androidx.constraintlayout.widget.Barrier
		android:id="@+id/clipboard_content_end"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		app:barrierDirection="end"
		app:constraint_referenced_ids="clipboard_preview,minimized_preview"/>
		<FrameLayout
		android:id="@+id/dismiss_button"
		android:layout_width="@dimen/overlay_dismiss_button_tappable_size"
		android:layout_height="@dimen/overlay_dismiss_button_tappable_size"
		android:elevation="10dp"
		android:visibility="gone"
		android:alpha="0"
		app:layout_constraintStart_toEndOf="@id/clipboard_content_end"
		app:layout_constraintEnd_toEndOf="@id/clipboard_content_end"
		app:layout_constraintTop_toTopOf="@id/clipboard_content_top"
		app:layout_constraintBottom_toTopOf="@id/clipboard_content_top"
		android:contentDescription="@string/clipboard_dismiss_description">
		<ImageView
		android:id="@+id/dismiss_image"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_margin="@dimen/overlay_dismiss_button_margin"
		android:background="@drawable/circular_background"
		android:backgroundTint="?androidprv:attr/materialColorPrimaryFixedDim"
		android:tint="?androidprv:attr/materialColorOnPrimaryFixed"
		android:padding="4dp"
		android:src="@drawable/ic_close"/>
		</FrameLayout>
		</com.android.systemui.clipboardoverlay.ClipboardOverlayView>
		No newline at end of file

packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayView.java

+34 −72

Original line number	Diff line number	Diff line
		@@ -18,8 +18,6 @@ package com.android.systemui.clipboardoverlay;

		import static android.content.res.Configuration.ORIENTATION_PORTRAIT;

		import static com.android.systemui.Flags.screenshotShelfUi2;

		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.AnimatorSet;
		@@ -61,7 +59,6 @@ import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
		import com.android.systemui.res.R;
		import com.android.systemui.screenshot.DraggableConstraintLayout;
		import com.android.systemui.screenshot.FloatingWindowUtil;
		import com.android.systemui.screenshot.OverlayActionChip;
		import com.android.systemui.screenshot.ui.binder.ActionButtonViewBinder;
		import com.android.systemui.screenshot.ui.viewmodel.ActionButtonAppearance;
		import com.android.systemui.screenshot.ui.viewmodel.ActionButtonViewModel;
		@@ -152,7 +149,6 @@ public class ClipboardOverlayView extends DraggableConstraintLayout {
		}

		private void bindDefaultActionChips() {
		if (screenshotShelfUi2()) {
		mActionButtonViewBinder.bind(mRemoteCopyChip,
		ActionButtonViewModel.Companion.withNextId(
		new ActionButtonAppearance(
		@@ -188,30 +184,12 @@ public class ClipboardOverlayView extends DraggableConstraintLayout {
		return null;
		}
		}));
		} else {
		mShareChip.setAlpha(1);
		mRemoteCopyChip.setAlpha(1);

		((ImageView) mRemoteCopyChip.findViewById(R.id.overlay_action_chip_icon)).setImageIcon(
		Icon.createWithResource(mContext, R.drawable.ic_baseline_devices_24));
		((ImageView) mShareChip.findViewById(R.id.overlay_action_chip_icon)).setImageIcon(
		Icon.createWithResource(mContext, R.drawable.ic_screenshot_share));

		mShareChip.setContentDescription(
		mContext.getString(com.android.internal.R.string.share));
		mRemoteCopyChip.setContentDescription(
		mContext.getString(R.string.clipboard_send_nearby_description));
		}
		}

		@Override
		public void setCallbacks(SwipeDismissCallbacks callbacks) {
		super.setCallbacks(callbacks);
		ClipboardOverlayCallbacks clipboardCallbacks = (ClipboardOverlayCallbacks) callbacks;
		if (!screenshotShelfUi2()) {
		mShareChip.setOnClickListener(v -> clipboardCallbacks.onShareButtonTapped());
		mRemoteCopyChip.setOnClickListener(v -> clipboardCallbacks.onRemoteCopyButtonTapped());
		}
		mDismissButton.setOnClickListener(v -> clipboardCallbacks.onDismissButtonTapped());
		mClipboardPreview.setOnClickListener(v -> clipboardCallbacks.onPreviewTapped());
		mMinimizedPreview.setOnClickListener(v -> clipboardCallbacks.onMinimizedViewTapped());
		@@ -495,12 +473,7 @@ public class ClipboardOverlayView extends DraggableConstraintLayout {

		void setActionChip(RemoteAction action, Runnable onFinish) {
		mActionContainerBackground.setVisibility(View.VISIBLE);
		View chip;
		if (screenshotShelfUi2()) {
		chip = constructShelfActionChip(action, onFinish);
		} else {
		chip = constructActionChip(action, onFinish);
		}
		View chip = constructShelfActionChip(action, onFinish);
		mActionContainer.addView(chip);
		mActionChips.add(chip);
		}
		@@ -534,17 +507,6 @@ public class ClipboardOverlayView extends DraggableConstraintLayout {
		return chip;
		}

		private OverlayActionChip constructActionChip(RemoteAction action, Runnable onFinish) {
		OverlayActionChip chip = (OverlayActionChip) LayoutInflater.from(mContext).inflate(
		R.layout.overlay_action_chip, mActionContainer, false);
		chip.setText(action.getTitle());
		chip.setContentDescription(action.getTitle());
		chip.setIcon(action.getIcon(), false);
		chip.setPendingIntent(action.getActionIntent(), onFinish);
		chip.setAlpha(1);
		return chip;
		}

		private static void updateTextSize(CharSequence text, TextView textView) {
		Paint paint = new Paint(textView.getPaint());
		Resources res = textView.getResources();

packages/SystemUI/src/com/android/systemui/clipboardoverlay/dagger/ClipboardOverlayModule.java

+2 −9

Original line number	Diff line number	Diff line
		@@ -18,8 +18,6 @@ package com.android.systemui.clipboardoverlay.dagger;

		import static android.view.WindowManager.LayoutParams.TYPE_SCREENSHOT;

		import static com.android.systemui.Flags.screenshotShelfUi2;

		import static java.lang.annotation.RetentionPolicy.RUNTIME;

		import android.content.Context;
		@@ -59,14 +57,9 @@ public interface ClipboardOverlayModule {
		*/
		@Provides
		static ClipboardOverlayView provideClipboardOverlayView(@OverlayWindowContext Context context) {
		if (screenshotShelfUi2()) {
		return (ClipboardOverlayView) LayoutInflater.from(context).inflate(
		R.layout.clipboard_overlay2, null);
		} else {
		return (ClipboardOverlayView) LayoutInflater.from(context).inflate(
		R.layout.clipboard_overlay, null);
		}
		}

		@Qualifier
		@Documented