Snap for 8505378 from fe37d3615ecd70351980752da30fcafda49c0163 to mainline-go-adservices-releaseaml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-mainline-go-adservices-release

Change-Id: If8896cb45ed8300605970822bc0d90aacb5bb670

10 files changed, 3 insertions, 48 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 96e780bbe..b9cf2a7f1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -219,11 +219,6 @@
                 android:configChanges="keyboardHidden|orientation|screenSize"
                 android:exported="true"
                 android:theme="@style/android:Theme.Translucent.NoTitleBar">
-            <intent-filter android:label="@string/camera_setas_wallpaper">
-                <action android:name="android.intent.action.ATTACH_DATA" />
-                <data android:mimeType="image/*" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
             <intent-filter android:label="@string/app_name">
                 <action android:name="android.intent.action.SET_WALLPAPER" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/res/menu/gallery_multiselect.xml b/res/menu/gallery_multiselect.xml
index d9365c1b7..c9441abb7 100644
--- a/res/menu/gallery_multiselect.xml
+++ b/res/menu/gallery_multiselect.xml
@@ -26,8 +26,4 @@
             android:title="@string/mute_action"
             android:visible="false"
             android:showAsAction="never" />
-    <item android:id="@+id/menu_set_as"
-            android:title="@string/set_as"
-            android:visible="false"
-            android:showAsAction="never" />
-</menu>
\ No newline at end of file
+</menu>
diff --git a/res/menu/operation.xml b/res/menu/operation.xml
index d1791e22f..a7922365f 100644
--- a/res/menu/operation.xml
+++ b/res/menu/operation.xml
@@ -57,10 +57,6 @@
             android:title="@string/crop_action"
             android:showAsAction="never"
             android:visible="false" />
-    <item android:id="@+id/action_setas"
-            android:title="@string/set_image"
-            android:showAsAction="never"
-            android:visible="false" />
     <item android:id="@+id/action_details"
             android:icon="@drawable/ic_menu_info_details"
             android:title="@string/details"
diff --git a/res/menu/photo.xml b/res/menu/photo.xml
index bcd452e28..f23bc9647 100644
--- a/res/menu/photo.xml
+++ b/res/menu/photo.xml
@@ -66,9 +66,6 @@
     <item android:id="@+id/action_mute"
             android:title="@string/mute_action"
             android:showAsAction="never" />
-    <item android:id="@+id/action_setas"
-            android:title="@string/set_image"
-            android:showAsAction="never" />
     <item android:id="@+id/action_details"
             android:title="@string/details"
             android:showAsAction="never" />
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 915fdab5a..f2d568ec4 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -1090,7 +1090,6 @@ public abstract class PhotoPage extends ActivityState implements
             case R.id.action_delete:
                 confirmMsg = mActivity.getResources().getQuantityString(
                         R.plurals.delete_selection, 1);
-            case R.id.action_setas:
             case R.id.action_rotate_ccw:
             case R.id.action_rotate_cw:
             case R.id.action_show_on_map:
diff --git a/src/com/android/gallery3d/app/Wallpaper.java b/src/com/android/gallery3d/app/Wallpaper.java
index 2022f5a4a..93595fba5 100644
--- a/src/com/android/gallery3d/app/Wallpaper.java
+++ b/src/com/android/gallery3d/app/Wallpaper.java
@@ -131,7 +131,7 @@ public class Wallpaper extends Activity {
                     .putExtra(CropExtras.KEY_SPOTLIGHT_Y, spotlightY)
                     .putExtra(CropExtras.KEY_SCALE, true)
                     .putExtra(CropExtras.KEY_SCALE_UP_IF_NEEDED, true)
-                    .putExtra(CropExtras.KEY_SET_AS_WALLPAPER, true);
+                    .putExtra(CropExtras.KEY_SET_AS_WALLPAPER, false);
                 startActivity(cropAndSetWallpaperIntent);
                 finish();
             }
diff --git a/src/com/android/gallery3d/filtershow/crop/CropExtras.java b/src/com/android/gallery3d/filtershow/crop/CropExtras.java
index 60fe9af53..d6c47b14b 100644
--- a/src/com/android/gallery3d/filtershow/crop/CropExtras.java
+++ b/src/com/android/gallery3d/filtershow/crop/CropExtras.java
@@ -92,7 +92,7 @@ public class CropExtras {
     }
 
     public boolean getSetAsWallpaper() {
-        return mSetAsWallpaper;
+        return false;
     }
 
     public boolean getReturnData() {
diff --git a/src/com/android/gallery3d/ui/MenuExecutor.java b/src/com/android/gallery3d/ui/MenuExecutor.java
index 22b3b575a..e998f6a77 100644
--- a/src/com/android/gallery3d/ui/MenuExecutor.java
+++ b/src/com/android/gallery3d/ui/MenuExecutor.java
@@ -172,7 +172,6 @@ public class MenuExecutor {
         boolean supportTrim = (supported & MediaObject.SUPPORT_TRIM) != 0;
         boolean supportMute = (supported & MediaObject.SUPPORT_MUTE) != 0;
         boolean supportShare = (supported & MediaObject.SUPPORT_SHARE) != 0;
-        boolean supportSetAs = (supported & MediaObject.SUPPORT_SETAS) != 0;
         boolean supportShowOnMap = (supported & MediaObject.SUPPORT_SHOW_ON_MAP) != 0;
         boolean supportCache = (supported & MediaObject.SUPPORT_CACHE) != 0;
         boolean supportEdit = (supported & MediaObject.SUPPORT_EDIT) != 0;
@@ -189,7 +188,6 @@ public class MenuExecutor {
         // Hide panorama until call to updateMenuForPanorama corrects it
         setMenuItemVisible(menu, R.id.action_share_panorama, false);
         setMenuItemVisible(menu, R.id.action_share, supportShare);
-        setMenuItemVisible(menu, R.id.action_setas, supportSetAs);
         setMenuItemVisible(menu, R.id.action_show_on_map, supportShowOnMap);
         setMenuItemVisible(menu, R.id.action_edit, supportEdit);
         // setMenuItemVisible(menu, R.id.action_simple_edit, supportEdit);
@@ -250,15 +248,6 @@ public class MenuExecutor {
                 ((Activity) mActivity).startActivity(Intent.createChooser(intent, null));
                 return;
             }
-            case R.id.action_setas: {
-                Intent intent = getIntentBySingleSelectedPath(Intent.ACTION_ATTACH_DATA)
-                        .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-                intent.putExtra("mimeType", intent.getType());
-                Activity activity = mActivity;
-                activity.startActivity(Intent.createChooser(
-                        intent, activity.getString(R.string.set_as)));
-                return;
-            }
             case R.id.action_delete:
                 title = R.string.delete;
                 break;
diff --git a/src/com/android/photos/MultiChoiceManager.java b/src/com/android/photos/MultiChoiceManager.java
index 49519ca63..e53746a88 100644
--- a/src/com/android/photos/MultiChoiceManager.java
+++ b/src/com/android/photos/MultiChoiceManager.java
@@ -137,7 +137,6 @@ public class MultiChoiceManager implements MultiChoiceModeListener,
         MenuItem cropItem = menu.findItem(R.id.menu_crop);
         MenuItem trimItem = menu.findItem(R.id.menu_trim);
         MenuItem muteItem = menu.findItem(R.id.menu_mute);
-        MenuItem setAsItem = menu.findItem(R.id.menu_set_as);
 
         editItem.setVisible((supportedOperations & MediaObject.SUPPORT_EDIT) > 0);
         deleteItem.setVisible((supportedOperations & MediaObject.SUPPORT_DELETE) > 0);
@@ -145,7 +144,6 @@ public class MultiChoiceManager implements MultiChoiceModeListener,
         cropItem.setVisible((supportedOperations & MediaObject.SUPPORT_CROP) > 0);
         trimItem.setVisible((supportedOperations & MediaObject.SUPPORT_TRIM) > 0);
         muteItem.setVisible((supportedOperations & MediaObject.SUPPORT_MUTE) > 0);
-        setAsItem.setVisible((supportedOperations & MediaObject.SUPPORT_SETAS) > 0);
     }
 
     @Override
@@ -217,7 +215,6 @@ public class MultiChoiceManager implements MultiChoiceModeListener,
             case R.id.menu_crop:
             case R.id.menu_trim:
             case R.id.menu_mute:
-            case R.id.menu_set_as:
                 singleItemAction(getSelectedItem(), actionItemId);
                 mode.finish();
                 return true;
@@ -256,14 +253,6 @@ public class MultiChoiceManager implements MultiChoiceModeListener,
                 muteVideo.muteInBackground();
                 */
                 return;
-            case R.id.menu_set_as:
-                intent.setDataAndType(uri, mime)
-                      .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                      .setAction(Intent.ACTION_ATTACH_DATA)
-                      .putExtra("mimeType", mime);
-                mContext.startActivity(Intent.createChooser(
-                        intent, mContext.getString(R.string.set_as)));
-                return;
             default:
                 return;
         }
diff --git a/src/com/android/photos/SelectionManager.java b/src/com/android/photos/SelectionManager.java
index 9bfb9be75..98b827bb3 100644
--- a/src/com/android/photos/SelectionManager.java
+++ b/src/com/android/photos/SelectionManager.java
@@ -90,9 +90,6 @@ public class SelectionManager {
         if ((itemSupportedOperations & MediaObject.SUPPORT_CROP) > 0) {
             mSelectedCroppableCount += increment;
         }
-        if ((itemSupportedOperations & MediaObject.SUPPORT_SETAS) > 0) {
-            mSelectedSetableCount += increment;
-        }
         if ((itemSupportedOperations & MediaObject.SUPPORT_TRIM) > 0) {
             mSelectedTrimmableCount += increment;
         }
@@ -147,9 +144,6 @@ public class SelectionManager {
             if (mSelectedEditableCount == 1) {
                 supported |= MediaObject.SUPPORT_EDIT;
             }
-            if (mSelectedSetableCount == 1) {
-                supported |= MediaObject.SUPPORT_SETAS;
-            }
             if (mSelectedTrimmableCount == 1) {
                 supported |= MediaObject.SUPPORT_TRIM;
             }