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

Commit d74ade6b authored by Mangesh Ghiware's avatar Mangesh Ghiware Committed by Android Git Automerger
Browse files

am 58b6f484: On K+, intent out to Wallpaper manager for crop and set wallpaper. 

* commit '58b6f484':
  On K+, intent out to Wallpaper manager for crop and set wallpaper.
parents f59ad590 58b6f484

src/com/android/gallery3d/app/Wallpaper.java

+15 −7
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.gallery3d.app; 


import android.annotation.TargetApi;

import android.app.Activity;

import android.app.WallpaperManager;

import android.content.Intent;

import android.graphics.Point;

import android.net.Uri;
@@ -95,12 +96,18 @@ public class Wallpaper extends Activity { 
                // fall-through

            }

            case STATE_PHOTO_PICKED: {

                Intent cropAndSetWallpaperIntent;

                if ("KeyLimePie".equals(Build.VERSION.CODENAME)

                        || Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {

                    WallpaperManager wpm = WallpaperManager.getInstance(getApplicationContext());

                    cropAndSetWallpaperIntent = wpm.getCropAndSetWallpaperIntent(mPickedItem);

                } else {

                    int width = getWallpaperDesiredMinimumWidth();

                    int height = getWallpaperDesiredMinimumHeight();

                    Point size = getDefaultDisplaySize(new Point());

                    float spotlightX = (float) size.x / width;

                    float spotlightY = (float) size.y / height;

                Intent request = new Intent(CropActivity.CROP_ACTION)

                    cropAndSetWallpaperIntent = new Intent(CropActivity.CROP_ACTION)

                        .setDataAndType(mPickedItem, IMAGE_TYPE)

                        .addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT)

                        .putExtra(CropExtras.KEY_OUTPUT_X, width)
@@ -112,7 +119,8 @@ public class Wallpaper extends Activity { 
                        .putExtra(CropExtras.KEY_SCALE, true)

                        .putExtra(CropExtras.KEY_SCALE_UP_IF_NEEDED, true)

                        .putExtra(CropExtras.KEY_SET_AS_WALLPAPER, true);

                startActivity(request);

                }

                startActivity(cropAndSetWallpaperIntent);

                finish();

            }

        }