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

Commit 8f9218a5 authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Move some exported flags into 24Q3.aconfig 

- use_bounds_for_width
The code dependency is already removed by I2c30b8e330b6d896888f08794ca30ca81c8a7f01

- word_style_auto
Code Dependency: I5949f357dade0e034fb64016e4eeac3df863c8c3
CTS: I0923b913450677a9a9fa96b53e00f89ec5b212b6

- letter_spacing_justification
Code Dependency: I98ab2af28ca24026eb6655324ea520e669f26e73
CTS: Ifc3033e3b9c8078903b9c071047c1003985e51a7

Bug: 63938206
Bug: 280005585
Bug: 283193133
Bug: 364533012
Flag: EXEMPT removing use_bounds_for_width
Test: N/A
Change-Id: Ic99ea27cfd0300b04fdd7bc1b252910d57039c61
parent 4cc911dd

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

0 → 100644
+28 −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"

}

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

+0 −24
Original line number Diff line number Diff line
@@ -50,30 +50,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