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

Commit d5cb3f35 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I8b68efc1,Ic99ea27c into main 

* changes:
  Move fix_line_height_for_locale to 24Q3.aconfig
  Move some exported flags into 24Q3.aconfig
parents 73d26ac6 30ad8993

core/java/android/text/ClientFlags.java

+0 −7
Original line number Diff line number Diff line
@@ -34,13 +34,6 @@ public class ClientFlags { 
        return TextFlags.isFeatureEnabled(Flags.FLAG_NO_BREAK_NO_HYPHENATION_SPAN);

    }



    /**

     * @see Flags#fixLineHeightForLocale()

     */

    public static boolean fixLineHeightForLocale() {

        return TextFlags.isFeatureEnabled(Flags.FLAG_FIX_LINE_HEIGHT_FOR_LOCALE);

    }



    /**

     * @see Flags#fixMisalignedContextMenu()

     */

core/java/android/text/TextFlags.java

+0 −2
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ public final class TextFlags { 
     */

    public static final String[] TEXT_ACONFIGS_FLAGS = {

            Flags.FLAG_NO_BREAK_NO_HYPHENATION_SPAN,

            Flags.FLAG_FIX_LINE_HEIGHT_FOR_LOCALE,

            Flags.FLAG_FIX_MISALIGNED_CONTEXT_MENU,

    };
@@ -67,7 +66,6 @@ public final class TextFlags { 
     */

    public static final boolean[] TEXT_ACONFIG_DEFAULT_VALUE = {

            Flags.noBreakNoHyphenationSpan(),

            Flags.fixLineHeightForLocale(),

            Flags.fixMisalignedContextMenu(),

    };

core/java/android/text/flags/24Q3.aconfig

0 → 100644
+36 −0
Original line number Diff line number Diff line 
package: "com.android.text.flags"

container: "system"



# This aconfig file contains released flags in 24Q3 those cannot be removed.



flag {

  name: "use_bounds_for_width"

  is_exported: true

  namespace: "text"

  description: "Feature flag for preventing horizontal clipping."

  bug: "63938206"

}



flag {

  name: "word_style_auto"

  is_exported: true

  namespace: "text"

  description: "A feature flag that implements line break word style auto."

  bug: "280005585"

}



flag {

  name: "letter_spacing_justification"

  is_exported: true

  namespace: "text"

  description: "A feature flag that implement inter character justification."

  bug: "283193133"

}



flag {

  name: "fix_line_height_for_locale"

  is_exported: true

  namespace: "text"

  description: "Feature flag that preserve the line height of the TextView and EditText even if the the locale is different from Latin"

  bug: "303326708"

}

core/java/android/text/flags/flags.aconfig

+0 −32
Original line number Diff line number Diff line
@@ -11,14 +11,6 @@ flag { 
  bug: "281769620"

}



flag {

  name: "fix_line_height_for_locale"

  is_exported: true

  namespace: "text"

  description: "Feature flag that preserve the line height of the TextView and EditText even if the the locale is different from Latin"

  bug: "303326708"

}



flag {

  name: "no_break_no_hyphenation_span"

  is_exported: true
@@ -50,30 +42,6 @@ flag { 
  }

}



flag {

  name: "use_bounds_for_width"

  is_exported: true

  namespace: "text"

  description: "Feature flag for preventing horizontal clipping."

  bug: "63938206"

}



flag {

  name: "word_style_auto"

  is_exported: true

  namespace: "text"

  description: "A feature flag that implements line break word style auto."

  bug: "280005585"

}



flag {

  name: "letter_spacing_justification"

  is_exported: true

  namespace: "text"

  description: "A feature flag that implement inter character justification."

  bug: "283193133"

}



flag {

  name: "escape_clears_focus"

  namespace: "text"

core/tests/coretests/src/android/text/TextLineLetterSpacingTest.kt

+0 −4
Original line number Diff line number Diff line
@@ -17,11 +17,9 @@ 
package android.text



import android.graphics.Paint

import android.platform.test.annotations.RequiresFlagsEnabled

import android.platform.test.flag.junit.DeviceFlagsValueProvider

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.text.flags.Flags.FLAG_LETTER_SPACING_JUSTIFICATION

import com.google.common.truth.Truth.assertThat

import org.junit.Rule

import org.junit.Test
@@ -40,7 +38,6 @@ class TextLineLetterSpacingTest { 
    @JvmField

    val mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule()



    @RequiresFlagsEnabled(FLAG_LETTER_SPACING_JUSTIFICATION)

    @Test

    fun calculateRunFlagTest() {

        // Only one Bidi run
@@ -84,7 +81,6 @@ class TextLineLetterSpacingTest { 
                .isEqualTo(LEFT_EDGE)

    }



    @RequiresFlagsEnabled(FLAG_LETTER_SPACING_JUSTIFICATION)

    @Test

    fun resolveRunFlagForSubSequenceTest() {

        val runStart = 5