Merge "Cherry-pick "action chips in share sheet" from qt-qpr1-dev." (2f764044) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -8710,6 +8710,14 @@ public final class Settings {
		public static final String BACK_GESTURE_INSET_SCALE_RIGHT =
		"back_gesture_inset_scale_right";

		/**
		* Current provider of proximity-based sharing services.
		* Default value in @string/config_defaultNearbySharingComponent.
		* No VALIDATOR as this setting will not be backed up.
		* @hide
		*/
		public static final String NEARBY_SHARING_COMPONENT = "nearby_sharing_component";

		/**
		* Controls whether aware is enabled.
		* @hide

core/java/com/android/internal/app/ChooserActivity.java

+125 −4

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ import android.content.pm.ResolveInfo;
		import android.content.pm.ShortcutInfo;
		import android.content.pm.ShortcutManager;
		import android.content.res.Configuration;
		import android.content.res.Resources;
		import android.database.Cursor;
		import android.database.DataSetObserver;
		import android.graphics.Bitmap;
		@@ -81,6 +82,7 @@ import android.provider.DeviceConfig;
		import android.provider.DocumentsContract;
		import android.provider.Downloads;
		import android.provider.OpenableColumns;
		import android.provider.Settings;
		import android.service.chooser.ChooserTarget;
		import android.service.chooser.ChooserTargetService;
		import android.service.chooser.IChooserTargetResult;
		@@ -101,6 +103,7 @@ import android.view.ViewGroup;
		import android.view.ViewGroup.LayoutParams;
		import android.view.animation.AccelerateInterpolator;
		import android.view.animation.DecelerateInterpolator;
		import android.widget.Button;
		import android.widget.ImageView;
		import android.widget.Space;
		import android.widget.TextView;
		@@ -131,6 +134,7 @@ import java.io.File;
		import java.io.IOException;
		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.net.URISyntaxException;
		import java.text.Collator;
		import java.util.ArrayList;
		import java.util.Collections;
		@@ -166,6 +170,9 @@ public class ChooserActivity extends ResolverActivity implements

		private static final String PREF_NUM_SHEET_EXPANSIONS = "pref_num_sheet_expansions";

		private static final String CHIP_LABEL_METADATA_KEY = "android.service.chooser.chip_label";
		private static final String CHIP_ICON_METADATA_KEY = "android.service.chooser.chip_icon";

		private static final boolean DEBUG = true;

		private static final boolean USE_PREDICTION_MANAGER_FOR_SHARE_ACTIVITIES = true;
		@@ -527,6 +534,15 @@ public class ChooserActivity extends ResolverActivity implements
		mIsSuccessfullySelected = false;
		Intent intent = getIntent();
		Parcelable targetParcelable = intent.getParcelableExtra(Intent.EXTRA_INTENT);
		if (targetParcelable instanceof Uri) {
		try {
		targetParcelable = Intent.parseUri(targetParcelable.toString(),
		Intent.URI_INTENT_SCHEME);
		} catch (URISyntaxException ex) {
		// doesn't parse as an intent; let the next test fail and error out
		}
		}

		if (!(targetParcelable instanceof Intent)) {
		Log.w("ChooserActivity", "Target is not an intent: " + targetParcelable);
		finish();
		@@ -965,6 +981,108 @@ public class ChooserActivity extends ResolverActivity implements
		return displayContentPreview(previewType, targetIntent, getLayoutInflater(), parent);
		}

		private ComponentName getNearbySharingComponent() {
		String nearbyComponent = Settings.Secure.getString(
		getContentResolver(),
		Settings.Secure.NEARBY_SHARING_COMPONENT);
		if (TextUtils.isEmpty(nearbyComponent)) {
		nearbyComponent = getString(R.string.config_defaultNearbySharingComponent);
		}
		if (TextUtils.isEmpty(nearbyComponent)) {
		return null;
		}
		return ComponentName.unflattenFromString(nearbyComponent);
		}

		private TargetInfo getNearbySharingTarget(Intent originalIntent) {
		final ComponentName cn = getNearbySharingComponent();
		if (cn == null) return null;

		final Intent resolveIntent = new Intent();
		resolveIntent.setComponent(cn);
		final ResolveInfo ri = getPackageManager().resolveActivity(
		resolveIntent, PackageManager.GET_META_DATA);
		if (ri == null \|\| ri.activityInfo == null) {
		Log.e(TAG, "Device-specified nearby sharing component (" + cn
		+ ") not available");
		return null;
		}

		// Allow the nearby sharing component to provide a more appropriate icon and label
		// for the chip.
		CharSequence name = null;
		Drawable icon = null;
		final Bundle metaData = ri.activityInfo.metaData;
		if (metaData != null) {
		try {
		final Resources pkgRes = getPackageManager().getResourcesForActivity(cn);
		final int nameResId = metaData.getInt(CHIP_LABEL_METADATA_KEY);
		name = pkgRes.getString(nameResId);
		final int resId = metaData.getInt(CHIP_ICON_METADATA_KEY);
		icon = pkgRes.getDrawable(resId);
		} catch (Resources.NotFoundException ex) {
		} catch (NameNotFoundException ex) {
		}
		}
		if (TextUtils.isEmpty(name)) {
		name = ri.loadLabel(getPackageManager());
		}
		if (icon == null) {
		icon = ri.loadIcon(getPackageManager());
		}

		final DisplayResolveInfo dri = new DisplayResolveInfo(
		originalIntent, ri, name, "", resolveIntent, null);
		dri.setDisplayIcon(icon);
		return dri;
		}

		private Button createActionButton(Drawable icon, CharSequence title, View.OnClickListener r) {
		Button b = (Button) LayoutInflater.from(this).inflate(R.layout.chooser_action_button, null);
		if (icon != null) {
		final int size = getResources()
		.getDimensionPixelSize(R.dimen.chooser_action_button_icon_size);
		icon.setBounds(0, 0, size, size);
		b.setCompoundDrawablesRelative(icon, null, null, null);
		}
		b.setText(title);
		b.setOnClickListener(r);
		return b;
		}

		private Button createCopyButton() {
		final Button b = createActionButton(
		getDrawable(R.drawable.ic_menu_copy_material),
		getString(R.string.copy), this::onCopyButtonClicked);
		b.setId(R.id.chooser_copy_button);
		return b;
		}

		private @Nullable Button createNearbyButton(Intent originalIntent) {
		final TargetInfo ti = getNearbySharingTarget(originalIntent);
		if (ti == null) return null;

		return createActionButton(
		ti.getDisplayIcon(this),
		ti.getDisplayLabel(),
		(View unused) -> {
		safelyStartActivity(ti);
		finish();
		}
		);
		}

		private void addActionButton(ViewGroup parent, Button b) {
		if (b == null) return;
		final ViewGroup.MarginLayoutParams lp = new ViewGroup.MarginLayoutParams(
		LayoutParams.WRAP_CONTENT,
		LayoutParams.WRAP_CONTENT
		);
		final int gap = getResources().getDimensionPixelSize(R.dimen.resolver_icon_margin) / 2;
		lp.setMarginsRelative(gap, 0, gap, 0);
		parent.addView(b, lp);
		}

		private ViewGroup displayContentPreview(@ContentPreviewType int previewType,
		Intent targetIntent, LayoutInflater layoutInflater, ViewGroup parent) {
		ViewGroup layout = null;
		@@ -995,8 +1113,10 @@ public class ChooserActivity extends ResolverActivity implements
		ViewGroup contentPreviewLayout = (ViewGroup) layoutInflater.inflate(
		R.layout.chooser_grid_preview_text, parent, false);

		contentPreviewLayout.findViewById(R.id.copy_button).setOnClickListener(
		this::onCopyButtonClicked);
		final ViewGroup actionRow =
		(ViewGroup) contentPreviewLayout.findViewById(R.id.chooser_action_row);
		addActionButton(actionRow, createCopyButton());
		addActionButton(actionRow, createNearbyButton(targetIntent));

		CharSequence sharingText = targetIntent.getCharSequenceExtra(Intent.EXTRA_TEXT);
		if (sharingText == null) {
		@@ -1154,7 +1274,8 @@ public class ChooserActivity extends ResolverActivity implements

		// TODO(b/120417119): Disable file copy until after moving to sysui,
		// due to permissions issues
		contentPreviewLayout.findViewById(R.id.file_copy_button).setVisibility(View.GONE);
		//((ViewGroup) contentPreviewLayout.findViewById(R.id.chooser_action_row))
		// .addView(createCopyButton());

		String action = targetIntent.getAction();
		if (Intent.ACTION_SEND.equals(action)) {
		@@ -1680,7 +1801,7 @@ public class ChooserActivity extends ResolverActivity implements
		}
		return intentFilter;
		} catch (Exception e) {
		Log.e(TAG, "failed to get target intent filter " + e);
		Log.e(TAG, "failed to get target intent filter", e);
		return null;
		}
		}

core/res/res/drawable/chooser_action_button_bg.xml

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2019 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
		-->
		<ripple xmlns:android="http://schemas.android.com/apk/res/android"
		android:color="@color/lighter_gray">
		<item>
		<inset
		android:insetLeft="0dp"
		android:insetTop="8dp"
		android:insetRight="0dp"
		android:insetBottom="8dp">
		<shape android:shape="rectangle">
		<corners android:radius="16dp"></corners>
		<stroke android:width="1dp"
		android:color="?attr/textColorSecondary" />
		<solid android:color="?attr/colorBackground" />
		</shape>
		</inset>
		</item>
		</ripple>

core/res/res/drawable/ic_content_copy_gm2.xml

deleted100644 → 0

+0 −25

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2019 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.
		-->

		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path
		android:fillColor="?android:attr/textColorSecondary"
		android:pathData="M18,21L4,21L4,7L2,7v14c0,1.1 0.9,2 2,2h14v-2zM21,17L21,3c0,-1.1 -0.9,-2 -2,-2L8,1c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2zM19,17L8,17L8,3h11v14z"/>
		</vector>

core/res/res/drawable/ic_menu_copy_material.xml

+21 −20

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2014 The Android Open Source Project
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2019 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.
		@@ -13,14 +13,15 @@ Copyright (C) 2014 The Android Open Source Project
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0"
		android:viewportWidth="24"
		android:viewportHeight="24"
		android:autoMirrored="true"
		android:tint="?attr/colorControlNormal">
		<path
		android:pathData="M16,1L4,1C2.9,1 2,1.9 2,3l0,14l2,0L4,3l12,0L16,1zM19,5L8,5C6.9,5 6,5.9 6,7l0,14c0,1.1 0.9,2 2,2l11,0c1.1,0 2,-0.9 2,-2L21,7C21,5.9 20.1,5 19,5zM19,21L8,21L8,7l11,0L19,21z"
		android:fillColor="@color/white"/>
		android:fillColor="@color/white"
		android:pathData="M18,21L4,21L4,7L2,7v14c0,1.1 0.9,2 2,2h14v-2zM21,17L21,3c0,-1.1 -0.9,-2 -2,-2L8,1c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2zM19,17L8,17L8,3h11v14z"/>
		</vector>