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

Commit 635d9dd8 authored by Andrei Stingaceanu's avatar Andrei Stingaceanu Committed by Android (Google) Code Review
Browse files

Merge "AutoSize TextView - API polish - no RuntimeException in signature" into oc-dev

parents fa9d889d 1b59a21c

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -51495,8 +51495,8 @@ package android.widget { 
    method public void removeTextChangedListener(android.text.TextWatcher);

    method public void setAllCaps(boolean);

    method public final void setAutoLinkMask(int);

    method public void setAutoSizeTextTypeUniformWithConfiguration(int, int, int, int) throws java.lang.IllegalArgumentException;

    method public void setAutoSizeTextTypeUniformWithPresetSizes(int[], int) throws java.lang.IllegalArgumentException;

    method public void setAutoSizeTextTypeUniformWithConfiguration(int, int, int, int);

    method public void setAutoSizeTextTypeUniformWithPresetSizes(int[], int);

    method public void setAutoSizeTextTypeWithDefaults(int);

    method public void setBreakStrategy(int);

    method public void setCompoundDrawablePadding(int);

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -55439,8 +55439,8 @@ package android.widget { 
    method public void removeTextChangedListener(android.text.TextWatcher);

    method public void setAllCaps(boolean);

    method public final void setAutoLinkMask(int);

    method public void setAutoSizeTextTypeUniformWithConfiguration(int, int, int, int) throws java.lang.IllegalArgumentException;

    method public void setAutoSizeTextTypeUniformWithPresetSizes(int[], int) throws java.lang.IllegalArgumentException;

    method public void setAutoSizeTextTypeUniformWithConfiguration(int, int, int, int);

    method public void setAutoSizeTextTypeUniformWithPresetSizes(int[], int);

    method public void setAutoSizeTextTypeWithDefaults(int);

    method public void setBreakStrategy(int);

    method public void setCompoundDrawablePadding(int);

api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -51880,8 +51880,8 @@ package android.widget { 
    method public void removeTextChangedListener(android.text.TextWatcher);

    method public void setAllCaps(boolean);

    method public final void setAutoLinkMask(int);

    method public void setAutoSizeTextTypeUniformWithConfiguration(int, int, int, int) throws java.lang.IllegalArgumentException;

    method public void setAutoSizeTextTypeUniformWithPresetSizes(int[], int) throws java.lang.IllegalArgumentException;

    method public void setAutoSizeTextTypeUniformWithConfiguration(int, int, int, int);

    method public void setAutoSizeTextTypeUniformWithPresetSizes(int[], int);

    method public void setAutoSizeTextTypeWithDefaults(int);

    method public void setBreakStrategy(int);

    method public void setCompoundDrawablePadding(int);

core/java/android/widget/TextView.java

+7 −11
Original line number Diff line number Diff line
@@ -1670,6 +1670,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
     *        {@link TextView#AUTO_SIZE_TEXT_TYPE_NONE} or

     *        {@link TextView#AUTO_SIZE_TEXT_TYPE_UNIFORM}

     *

     * @throws IllegalArgumentException if <code>autoSizeTextType</code> is none of the types above.

     *

     * @attr ref android.R.styleable#TextView_autoSizeTextType

     *

     * @see #getAutoSizeTextType()
@@ -1731,11 +1733,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
     * @see #getAutoSizeStepGranularity()

     * @see #getAutoSizeTextAvailableSizes()

     */

    public void setAutoSizeTextTypeUniformWithConfiguration(

            int autoSizeMinTextSize,

            int autoSizeMaxTextSize,

            int autoSizeStepGranularity,

            int unit) throws IllegalArgumentException {

    public void setAutoSizeTextTypeUniformWithConfiguration(int autoSizeMinTextSize,

            int autoSizeMaxTextSize, int autoSizeStepGranularity, int unit) {

        if (supportsAutoSizeText()) {

            final DisplayMetrics displayMetrics = getResources().getDisplayMetrics();

            final int autoSizeMinTextSizeInPx = (int) TypedValue.applyDimension(
@@ -1772,8 +1771,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
     * @see #getAutoSizeMaxTextSize()

     * @see #getAutoSizeTextAvailableSizes()

     */

    public void setAutoSizeTextTypeUniformWithPresetSizes(@NonNull int[] presetSizes, int unit)

            throws IllegalArgumentException {

    public void setAutoSizeTextTypeUniformWithPresetSizes(@NonNull int[] presetSizes, int unit) {

        if (supportsAutoSizeText()) {

            final int presetSizesLength = presetSizes.length;

            if (presetSizesLength > 0) {
@@ -1897,10 +1895,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
     *

     * @throws IllegalArgumentException if any of the params are invalid

     */

    private void validateAndSetAutoSizeTextTypeUniformConfiguration(

            int autoSizeMinTextSizeInPx,

            int autoSizeMaxTextSizeInPx,

            int autoSizeStepGranularityInPx) throws IllegalArgumentException {

    private void validateAndSetAutoSizeTextTypeUniformConfiguration(int autoSizeMinTextSizeInPx,

            int autoSizeMaxTextSizeInPx, int autoSizeStepGranularityInPx) {

        // First validate.

        if (autoSizeMinTextSizeInPx <= 0) {

            throw new IllegalArgumentException("Minimum auto-size text size ("