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

Commit e56f0149 authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Remove launched text flag 

Bug: 332542108
Bug: 364533012
Flag: EXEMPT removing fix_misaligned_context_menu
Test: N/A
Change-Id: Ibcebe63df0467f7f3a9025ab94eb9188045499a2
parent f993a291

core/java/android/text/ClientFlags.java

+1 −8
Original line number Diff line number Diff line
@@ -16,21 +16,14 @@ 


package android.text;



import com.android.text.flags.Flags;



/**

 * An aconfig feature flags that can be accessible from application process without

 * ContentProvider IPCs.

 *

 * When you add new flags, you have to add flag string to {@link TextFlags#TEXT_ACONFIGS_FLAGS}.

 *

 * TODO(nona): Remove this class.

 * @hide

 */

public class ClientFlags {

    /**

     * @see Flags#fixMisalignedContextMenu()

     */

    public static boolean fixMisalignedContextMenu() {

        return TextFlags.isFeatureEnabled(Flags.FLAG_FIX_MISALIGNED_CONTEXT_MENU);

    }

}

core/java/android/text/TextFlags.java

+1 −4
Original line number Diff line number Diff line
@@ -19,11 +19,10 @@ package android.text; 
import android.annotation.NonNull;

import android.app.AppGlobals;



import com.android.text.flags.Flags;



/**

 * Flags in the "text" namespace.

 *

 * TODO(nona): Remove this class.

 * @hide

 */

public final class TextFlags {
@@ -55,7 +54,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_FIX_MISALIGNED_CONTEXT_MENU,

    };



    /**
@@ -64,7 +62,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.fixMisalignedContextMenu(),

    };



    /**

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

+0 −10
Original line number Diff line number Diff line
@@ -83,16 +83,6 @@ flag { 
  bug: "297962571"

}



flag {

  name: "fix_misaligned_context_menu"

  namespace: "text"

  description: "Fix the context menu misalignment and incosistent icon size."

  bug: "332542108"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "missing_getter_apis"

  namespace: "text"

core/java/com/android/internal/view/menu/ListMenuItemView.java

+1 −6
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ import android.widget.LinearLayout; 
import android.widget.RadioButton;

import android.widget.TextView;



import com.android.text.flags.Flags;



/**

 * The item view for each item in the ListView-based MenuViews.

 */
@@ -283,10 +281,7 @@ public class ListMenuItemView extends LinearLayout 


    private void insertIconView() {

        LayoutInflater inflater = getInflater();

        mIconView = (ImageView) inflater.inflate(

                !Flags.fixMisalignedContextMenu()

                        ? com.android.internal.R.layout.list_menu_item_fixed_size_icon :

                        com.android.internal.R.layout.list_menu_item_icon,

        mIconView = (ImageView) inflater.inflate(com.android.internal.R.layout.list_menu_item_icon,

                this, false);

        addContentView(mIconView, 0);

    }

core/java/com/android/internal/view/menu/StandardMenuPopup.java

+1 −4
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ import android.widget.PopupWindow; 
import android.widget.PopupWindow.OnDismissListener;

import android.widget.TextView;



import com.android.text.flags.Flags;



import java.util.Objects;



/**
@@ -122,8 +120,7 @@ final class StandardMenuPopup extends MenuPopup implements OnDismissListener, On 
        mMenu = menu;

        mOverflowOnly = overflowOnly;

        final LayoutInflater inflater = LayoutInflater.from(context);

        mAdapter = new MenuAdapter(menu, inflater, mOverflowOnly,

                Flags.fixMisalignedContextMenu() ? ITEM_LAYOUT_MATERIAL : ITEM_LAYOUT);

        mAdapter = new MenuAdapter(menu, inflater, mOverflowOnly, ITEM_LAYOUT_MATERIAL);

        mPopupStyleAttr = popupStyleAttr;

        mPopupStyleRes = popupStyleRes;