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

Commit c84b3ce9 authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Remove KEYGUARD_TALKBACK_FIX flag and its changes 

The change isn't being used and is not needed.

Test: atest SystemUITests
Flag: EXEMPT removing KEYGUARD_TALKBACK_FIX old flag
Fixes: 336802406
Change-Id: I5d5810091ff68c2ae8f9380df7378ff0d7492304
parent 52f8f787

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewControllerTest.java

+1 −5
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.keyguard;





import static com.android.systemui.flags.Flags.KEYGUARD_TALKBACK_FIX;

import static com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController.INDICATION_TYPE_BATTERY;

import static com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController.INDICATION_TYPE_BIOMETRIC_MESSAGE;

import static com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController.INDICATION_TYPE_DISCLOSURE;
@@ -43,7 +42,6 @@ import androidx.test.filters.SmallTest; 


import com.android.keyguard.logging.KeyguardLogger;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.flags.FakeFeatureFlags;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.statusbar.phone.KeyguardIndicationTextView;

import com.android.systemui.util.concurrency.DelayableExecutor;
@@ -83,10 +81,8 @@ public class KeyguardIndicationRotateTextViewControllerTest extends SysuiTestCas 
    public void setUp() throws Exception {

        MockitoAnnotations.initMocks(this);

        when(mView.getTextColors()).thenReturn(ColorStateList.valueOf(Color.WHITE));

        FakeFeatureFlags flags = new FakeFeatureFlags();

        flags.set(KEYGUARD_TALKBACK_FIX, true);

        mController = new KeyguardIndicationRotateTextViewController(mView, mExecutor,

                mStatusBarStateController, mLogger, flags);

                mStatusBarStateController, mLogger);

        mController.onViewAttached();



        verify(mStatusBarStateController).addCallback(mStatusBarStateListenerCaptor.capture());

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/KeyguardIndicationControllerBaseTest.java

+0 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.statusbar; 


import static android.app.admin.DevicePolicyManager.DEVICE_OWNER_TYPE_DEFAULT;



import static com.android.systemui.flags.Flags.KEYGUARD_TALKBACK_FIX;

import static com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController.INDICATION_TYPE_TRANSIENT;

import static com.android.systemui.keyguard.ScreenLifecycle.SCREEN_ON;
@@ -279,7 +278,6 @@ public class KeyguardIndicationControllerBaseTest extends SysuiTestCase { 
        }



        mFlags = new FakeFeatureFlags();

        mFlags.set(KEYGUARD_TALKBACK_FIX, true);

        mController = new KeyguardIndicationController(

                mContext,

                mTestableLooper.getLooper(),
@@ -294,7 +292,6 @@ public class KeyguardIndicationControllerBaseTest extends SysuiTestCase { 
                mAlarmManager,

                mUserTracker,

                mock(BouncerMessageInteractor.class),

                mFlags,

                mIndicationHelper,

                KeyguardInteractorFactory.create(mFlags).getKeyguardInteractor(),

                mBiometricMessageInteractor,

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextViewTest.java

+0 −19
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 


package com.android.systemui.statusbar.phone;



import static android.view.View.ACCESSIBILITY_LIVE_REGION_NONE;

import static android.view.View.ACCESSIBILITY_LIVE_REGION_POLITE;



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



import android.testing.TestableLooper;
@@ -59,22 +56,6 @@ public class KeyguardIndicationTextViewTest extends SysuiTestCase { 
        assertThat(mKeyguardIndicationTextView.getText()).isEqualTo("");

    }



    @Test

    public void alwaysAnnounce_setsLiveRegionToNone() {

        mKeyguardIndicationTextView.setAlwaysAnnounceEnabled(true);



        assertThat(mKeyguardIndicationTextView.getAccessibilityLiveRegion()).isEqualTo(

                ACCESSIBILITY_LIVE_REGION_NONE);

    }



    @Test

    public void alwaysAnnounce_setsLiveRegionToDefaultPolite_whenDisabled() {

        mKeyguardIndicationTextView.setAlwaysAnnounceEnabled(false);



        assertThat(mKeyguardIndicationTextView.getAccessibilityLiveRegion()).isEqualTo(

                ACCESSIBILITY_LIVE_REGION_POLITE);

    }



    @Test

    public void switchIndication_emptyText_hideIndication() {

        mKeyguardIndicationTextView.switchIndication("" /* text */, null);

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −4
Original line number Diff line number Diff line
@@ -103,10 +103,6 @@ object Flags { 
    @JvmField

    val WALLPAPER_PICKER_GRID_APPLY_BUTTON = unreleasedFlag("wallpaper_picker_grid_apply_button")



    /** Flag meant to guard the talkback fix for the KeyguardIndicationTextView */

    // TODO(b/286563884): Tracking bug

    @JvmField val KEYGUARD_TALKBACK_FIX = unreleasedFlag("keyguard_talkback_fix")



    /** Enables preview loading animation in the wallpaper picker. */

    // TODO(b/274443705): Tracking Bug

    @JvmField

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java

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


package com.android.systemui.keyguard;



import static com.android.systemui.flags.Flags.KEYGUARD_TALKBACK_FIX;



import android.annotation.Nullable;

import android.content.res.ColorStateList;

import android.graphics.Color;
@@ -30,7 +28,6 @@ import androidx.annotation.VisibleForTesting; 
import com.android.keyguard.logging.KeyguardLogger;

import com.android.systemui.Dumpable;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.statusbar.KeyguardIndicationController;

import com.android.systemui.statusbar.phone.KeyguardIndicationTextView;
@@ -78,7 +75,6 @@ public class KeyguardIndicationRotateTextViewController extends 


    // Executor that will show the next message after a delay

    private final DelayableExecutor mExecutor;

    private final FeatureFlags mFeatureFlags;



    @VisibleForTesting

    @Nullable ShowNextIndication mShowNextIndicationRunnable;
@@ -95,8 +91,7 @@ public class KeyguardIndicationRotateTextViewController extends 
            KeyguardIndicationTextView view,

            @Main DelayableExecutor executor,

            StatusBarStateController statusBarStateController,

            KeyguardLogger logger,

            FeatureFlags flags

            KeyguardLogger logger

    ) {

        super(view);

        mMaxAlpha = view.getAlpha();
@@ -105,14 +100,12 @@ public class KeyguardIndicationRotateTextViewController extends 
                ? mView.getTextColors() : ColorStateList.valueOf(Color.WHITE);

        mStatusBarStateController = statusBarStateController;

        mLogger = logger;

        mFeatureFlags = flags;

        init();

    }



    @Override

    protected void onViewAttached() {

        mStatusBarStateController.addCallback(mStatusBarStateListener);

        mView.setAlwaysAnnounceEnabled(mFeatureFlags.isEnabled(KEYGUARD_TALKBACK_FIX));

    }



    @Override