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

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

Focus remains on the button after turning on/off 

Test: manually test talkback
Fixes: 145181672
Change-Id: I16ceb81dd686e4a18354dfd464c7683ba94df79d
parent 66b82d06

res/layout/night_display_activation_button.xml

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
    <Button

        android:id="@+id/night_display_turn_on_button"

        style="@style/ActionPrimaryButton"

        android:focusableInTouchMode="true"

        android:layout_marginStart="@dimen/screen_margin_sides"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"
@@ -32,6 +33,7 @@ 
    <Button

        android:id="@+id/night_display_turn_off_button"

        style="@style/ActionSecondaryButton"

        android:focusableInTouchMode="true"

        android:layout_marginStart="@dimen/screen_margin_sides"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

res/layout/zen_mode_settings_button.xml

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
    <Button

        android:id="@+id/zen_mode_settings_turn_on_button"

        style="@style/ActionPrimaryButton"

        android:focusableInTouchMode="true"

        android:layout_marginStart="@dimen/screen_margin_sides"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"
@@ -33,6 +34,7 @@ 
    <Button

        android:id="@+id/zen_mode_settings_turn_off_button"

        style="@style/ActionSecondaryButton"

        android:focusableInTouchMode="true"

        android:layout_marginStart="@dimen/screen_margin_sides"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

src/com/android/settings/display/NightDisplayActivationPreferenceController.java

+2 −0
Original line number Diff line number Diff line
@@ -126,10 +126,12 @@ public class NightDisplayActivationPreferenceController extends TogglePreference 
            mTurnOnButton.setVisibility(View.GONE);

            mTurnOffButton.setVisibility(View.VISIBLE);

            mTurnOffButton.setText(buttonText);

            mTurnOffButton.requestFocus();

        } else {

            mTurnOnButton.setVisibility(View.VISIBLE);

            mTurnOffButton.setVisibility(View.GONE);

            mTurnOnButton.setText(buttonText);

            mTurnOnButton.requestFocus();

        }

    }

}

src/com/android/settings/notification/ZenModeButtonPreferenceController.java

+3 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ public class ZenModeButtonPreferenceController extends AbstractZenModePreference 
        if (null == mZenButtonOn) {

            mZenButtonOn = ((LayoutPreference) preference)

                    .findViewById(R.id.zen_mode_settings_turn_on_button);

            mZenButtonOn.setFocusableInTouchMode(true);

            updateZenButtonOnClickListener();

        }
@@ -86,12 +87,14 @@ public class ZenModeButtonPreferenceController extends AbstractZenModePreference 
            case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:

                mZenButtonOff.setVisibility(View.VISIBLE);

                mZenButtonOn.setVisibility(View.GONE);

                mZenButtonOff.requestFocus();

                break;

            case Settings.Global.ZEN_MODE_OFF:

            default:

                mZenButtonOff.setVisibility(View.GONE);

                updateZenButtonOnClickListener();

                mZenButtonOn.setVisibility(View.VISIBLE);

                mZenButtonOn.requestFocus();

        }

    }