Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 203b3530 authored by Oren Blasberg's avatar Oren Blasberg Committed by Android (Google) Code Review
Browse files

Merge "WallpaperManager: support custom default cropper." into nyc-dev

parents df5bf614 60598ea0

core/java/android/app/WallpaperManager.java

+3 −1
Original line number Diff line number Diff line
@@ -767,7 +767,9 @@ public class WallpaperManager { 
        }



        // fallback crop activity

        cropAndSetWallpaperIntent.setPackage("com.android.wallpapercropper");

        final String cropperPackage = mContext.getString(

                com.android.internal.R.string.config_wallpaperCropperPackage);

        cropAndSetWallpaperIntent.setPackage(cropperPackage);

        List<ResolveInfo> cropAppList = packageManager.queryIntentActivities(

                cropAndSetWallpaperIntent, 0);

        if (cropAppList.size() > 0) {

core/res/res/values/config.xml

+5 −0
Original line number Diff line number Diff line
@@ -2474,4 +2474,9 @@ 
         much in the way of user data.

    -->

    <bool name="config_strongAuthRequiredOnBoot">true</bool>



    <!-- Wallpaper cropper package. Used as the default cropper if the active launcher doesn't

         handle wallpaper cropping.

    -->

    <string name="config_wallpaperCropperPackage" translatable="false">com.android.wallpapercropper</string>

</resources>

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -2541,4 +2541,7 @@ 
  <java-symbol type="string" name="carrier_app_notification_title" />

  <java-symbol type="string" name="carrier_app_notification_text" />

  <java-symbol type="string" name="negative_duration" />



  <!-- WallpaperManager config -->

  <java-symbol type="string" name="config_wallpaperCropperPackage" />

</resources>