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

Commit 27cf08f9 authored by Mihai Popa's avatar Mihai Popa
Browse files

[Magnifier-72] Rename Builder#setZoom 

The CL renames the setZoom method for Magnifier.Builder to
setInitialZoom, since the zoom can be changed after the instance is
created using the Magnifier.setZoom method.

Bug: 120609112
Test: atest CtsWidgetTestCases:android.widget.cts.MagnifierTest
Change-Id: Ide2508ab49e3f3660aa089876029e351b4cef603
parent 88938aae

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -55934,10 +55934,10 @@ package android.widget { 
    method @NonNull public android.widget.Magnifier.Builder setCornerRadius(@Px @FloatRange(from=0) float);

    method @NonNull public android.widget.Magnifier.Builder setDefaultSourceToMagnifierOffset(@Px int, @Px int);

    method @NonNull public android.widget.Magnifier.Builder setElevation(@Px @FloatRange(from=0) float);

    method @NonNull public android.widget.Magnifier.Builder setInitialZoom(@FloatRange(from=0.0f) float);

    method @NonNull public android.widget.Magnifier.Builder setOverlay(@Nullable android.graphics.drawable.Drawable);

    method @NonNull public android.widget.Magnifier.Builder setSize(@Px @IntRange(from=0) int, @Px @IntRange(from=0) int);

    method @NonNull public android.widget.Magnifier.Builder setSourceBounds(int, int, int, int);

    method @NonNull public android.widget.Magnifier.Builder setZoom(@FloatRange(from=0.0f) float);

  }















  public class MediaController extends android.widget.FrameLayout {

























core/java/android/widget/Magnifier.java



+6
−4




























Original line number
Diff line number
Diff line








@@ -359,7 +359,7 @@ public final class Magnifier {













    /**















     * @return the initial width of the content magnified and copied to the magnifier, in pixels















     * @see Magnifier.Builder#setSize(int, int)













     * @see Magnifier.Builder#setZoom(float)













     * @see Magnifier.Builder#setInitialZoom(float)















     */















    @Px















    public int getSourceWidth() {









@@ -369,7 +369,7 @@ public final class Magnifier {













    /**















     * @return the initial height of the content magnified and copied to the magnifier, in pixels















     * @see Magnifier.Builder#setSize(int, int)













     * @see Magnifier.Builder#setZoom(float)













     * @see Magnifier.Builder#setInitialZoom(float)















     */















    @Px















    public int getSourceHeight() {









@@ -394,7 +394,7 @@ public final class Magnifier {













     * If the zoom is x and the magnifier window size is (width, height), the original size















     * of the content being magnified will be (width / x, height / x).















     * @return the zoom applied to the content













     * @see Magnifier.Builder#setZoom(float)













     * @see Magnifier.Builder#setInitialZoom(float)















     */















    public float getZoom() {















        return mZoom;










@@ -1196,10 +1196,12 @@ public final class Magnifier {













         * (content_width * zoom, content_height * zoom), which will coincide with the size















         * of the magnifier. A zoom of 1 will translate to no magnification (the content will















         * be just copied to the magnifier with no scaling). The zoom defaults to 1.25.













         * Note that the zoom can also be changed after the instance is built, using the













         * {@link Magnifier#setZoom(float)} method.















         * @param zoom the zoom to be set















         */















        @NonNull













        public Builder setZoom(@FloatRange(from = 0f) float zoom) {













        public Builder setInitialZoom(@FloatRange(from = 0f) float zoom) {















            Preconditions.checkArgumentPositive(zoom, "Zoom should be positive");















            mZoom = zoom;















            return this;