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

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

Merge "Clean up tv_global_actions_focus flags" into main

parents fff1d506 aa428beb

packages/SystemUI/aconfig/systemui.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -1812,13 +1812,6 @@ flag { 
    bug: "403422950"

}



flag {

    name: "tv_global_actions_focus"

    namespace: "systemui"

    description: "Enables global actions focus on TV."

    bug: "402759931"

}



flag {

    name: "stuck_hearing_devices_qs_tile_fix"

    namespace: "systemui"

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java

+8 −10
Original line number Diff line number Diff line
@@ -2045,18 +2045,16 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene 
            messageView.setSelected(true); // necessary for marquee to work

            mIconView.setImageDrawable(getIcon(context));

            mIconView.setScaleType(ScaleType.CENTER_CROP);

            if (com.android.systemui.Flags.tvGlobalActionsFocus()) {

            if (isTv()) {

                mIconView.setFocusable(true);

                mIconView.setClickable(true);

                    mIconView.setBackground(mContext.getDrawable(com.android.systemui.res.R.drawable

                                    .global_actions_lite_button_background));

                mIconView.setBackground(mContext.getDrawable(

                        com.android.systemui.res.R.drawable.global_actions_lite_button_background));

                mIconView.setOnClickListener(i -> onClick());

                if (mItems.get(0) == this) {

                    mIconView.requestFocus();

                }

            }

            }



            if (mMessage != null) {

                messageView.setText(mMessage);

packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogLiteTest.java

+0 −4
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import android.media.AudioManager; 
import android.os.Handler;

import android.os.PowerManager;

import android.os.UserManager;

import android.platform.test.annotations.EnableFlags;

import android.provider.Settings;

import android.testing.TestableLooper;

import android.view.Display;
@@ -63,7 +62,6 @@ import com.android.internal.logging.UiEventLogger; 
import com.android.internal.statusbar.IStatusBarService;

import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.systemui.Flags;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.animation.DialogTransitionAnimator;

import com.android.systemui.broadcast.BroadcastDispatcher;
@@ -924,7 +922,6 @@ public class GlobalActionsDialogLiteTest extends SysuiTestCase { 
    }



    @Test

    @EnableFlags(Flags.FLAG_TV_GLOBAL_ACTIONS_FOCUS)

    public void testCreateActionItems_noneTv_actionsNotFocuseableAndClickable() {

        // Test like a TV, which only has standby and shut down.

        mGlobalActionsDialogLite = spy(mGlobalActionsDialogLite);
@@ -959,7 +956,6 @@ public class GlobalActionsDialogLiteTest extends SysuiTestCase { 
    }



    @Test

    @EnableFlags(Flags.FLAG_TV_GLOBAL_ACTIONS_FOCUS)

    public void testCreateActionItems_tv_actionsFocusableAndClickable() {

        // Test like a TV, which only has standby and shut down.

        mGlobalActionsDialogLite = spy(mGlobalActionsDialogLite);