Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev

        final Display d = wm.getDefaultDisplay();

        final Point size = new Point();

        d.getSize(size);

        mDesiredMinWidth = size.x;

        mDesiredMinWidth = Math.min(size.x, size.y);

        mDesiredMinHeight = (double) wpm.getDesiredMinimumHeight();

        if (mDesiredMinHeight <= 0) {

            mDesiredMinHeight = size.y;

        }

                        // We accept any wallpaper that is at least as wide as our preference

                        // (i.e. wide enough to fill the screen), and is within a comfortable

                        // factor of the target height, to avoid significant clipping/scaling/

                        // letterboxing.

                        // letterboxing.  At this point we know that mDesiredMinWidth is the

                        // smallest dimension, regardless of current orientation, so we can

                        // safely require that the candidate's width and height both exceed

                        // that hard minimum.

                        final double heightRatio = mDesiredMinHeight / options.outHeight;

                        if (options.outWidth < mDesiredMinWidth

                                || options.outHeight < mDesiredMinWidth

                                || heightRatio >= MAX_HEIGHT_RATIO

                                || heightRatio <= MIN_HEIGHT_RATIO) {

                            // Not wide enough for the screen, or too short/tall to be a good fit