From b6ca909ed7c61682ae0ddd97f8d96ed61239018a Mon Sep 17 00:00:00 2001 From: Mihai Popa Date: Mon, 24 Sep 2018 21:14:50 +0100 Subject: [PATCH] [Magnifier-62] Deprecate constructor The CL deprecates the old constructor for Magnifier instances in favor of the usage of builder Magnifier#Builder. Bug: 116116502 Test: atest CtsWidgetTestCases:android.widget.cts.MagnifierTest Change-Id: I3daa9f066c77144e9d5c62bc666ecd37041f4bbb --- api/current.txt | 2 +- core/java/android/widget/Editor.java | 3 ++- core/java/android/widget/Magnifier.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/api/current.txt b/api/current.txt index c07ea98ebda50..fbd381868687d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -52964,7 +52964,7 @@ package android.widget { } public final class Magnifier { - ctor public Magnifier(android.view.View); + ctor public deprecated Magnifier(android.view.View); method public void dismiss(); method public float getCornerRadius(); method public int getDefaultHorizontalSourceToMagnifierOffset(); diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index 3025edb94cba6..558a67af976e3 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -379,7 +379,8 @@ public class Editor { com.android.internal.R.bool.config_enableHapticTextHandle); if (FLAG_USE_MAGNIFIER) { - mMagnifierAnimator = new MagnifierMotionAnimator(new Magnifier(mTextView)); + final Magnifier magnifier = new Magnifier.Builder(mTextView).build(); + mMagnifierAnimator = new MagnifierMotionAnimator(magnifier); } } diff --git a/core/java/android/widget/Magnifier.java b/core/java/android/widget/Magnifier.java index 8e2786d51a430..16ddd0fc82471 100644 --- a/core/java/android/widget/Magnifier.java +++ b/core/java/android/widget/Magnifier.java @@ -119,8 +119,9 @@ public final class Magnifier { * * @param view the view for which this magnifier is attached * - * @see Builder + * @deprecated Please use {@link Builder} instead */ + @Deprecated public Magnifier(@NonNull View view) { this(new Builder(view)); }