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

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

Merge "Move no_break_no_hyphenation to released flags" into main

parents 159ffa58 25fefa8c

core/java/android/text/ClientFlags.java

+0 −7
Original line number Diff line number Diff line
@@ -27,13 +27,6 @@ import com.android.text.flags.Flags; 
 * @hide

 */

public class ClientFlags {

    /**

     * @see Flags#noBreakNoHyphenationSpan()

     */

    public static boolean noBreakNoHyphenationSpan() {

        return TextFlags.isFeatureEnabled(Flags.FLAG_NO_BREAK_NO_HYPHENATION_SPAN);

    }



    /**

     * @see Flags#fixMisalignedContextMenu()

     */

core/java/android/text/TextFlags.java

+0 −2
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ public final class TextFlags { 
     * List of text flags to be transferred to the application process.

     */

    public static final String[] TEXT_ACONFIGS_FLAGS = {

            Flags.FLAG_NO_BREAK_NO_HYPHENATION_SPAN,

            Flags.FLAG_FIX_MISALIGNED_CONTEXT_MENU,

    };
@@ -65,7 +64,6 @@ public final class TextFlags { 
     * The order must be the same to the TEXT_ACONFIG_FLAGS.

     */

    public static final boolean[] TEXT_ACONFIG_DEFAULT_VALUE = {

            Flags.noBreakNoHyphenationSpan(),

            Flags.fixMisalignedContextMenu(),

    };

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

+8 −0
Original line number Diff line number Diff line
@@ -44,3 +44,11 @@ flag { 
  is_fixed_read_only: true

  bug: "281769620"

}



flag {

  name: "no_break_no_hyphenation_span"

  is_exported: true

  namespace: "text"

  description: "A feature flag that adding new spans that prevents line breaking and hyphenation."

  bug: "283193586"

}

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

+0 −8
Original line number Diff line number Diff line 
package: "com.android.text.flags"

container: "system"



flag {

  name: "no_break_no_hyphenation_span"

  is_exported: true

  namespace: "text"

  description: "A feature flag that adding new spans that prevents line breaking and hyphenation."

  bug: "283193586"

}



flag {

  name: "use_optimized_boottime_font_loading"

  namespace: "text"