PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Explicitly request focus after button pressed" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-13 00:19:44 +00:00
committed by Android (Google) Code Review
parent 5c4334276f 258fd7c03b
commit d9a246c49e
4 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/night_display_activation_button.xml
View File

@@ -24,7 +24,6 @@
<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"
@@ -33,7 +32,6 @@
<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"

2
res/layout/zen_mode_settings_button.xml
View File

@@ -38,7 +38,6 @@
android:layout_marginTop="@dimen/zen_mode_settings_button_margin_vertical"
android:layout_marginBottom="@dimen/zen_mode_settings_button_margin_vertical"
android:text="@string/zen_mode_button_turn_on"
android:focusableInTouchMode="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@@ -50,7 +49,6 @@
android:layout_marginTop="@dimen/zen_mode_settings_button_margin_vertical"
android:layout_marginBottom="@dimen/zen_mode_settings_button_margin_vertical"
android:text="@string/zen_mode_button_turn_off"
android:focusableInTouchMode="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>

22
src/com/android/settings/display/NightDisplayActivationPreferenceController.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.display;
import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED;
import android.content.Context;
import android.hardware.display.ColorDisplayManager;
import android.text.TextUtils;
@@ -39,20 +41,16 @@ public class NightDisplayActivationPreferenceController extends TogglePreference
private NightDisplayTimeFormatter mTimeFormatter;
private LayoutPreference mPreference;
// Night light can also be toggled from QS. If night light wasn't toggled by this preference,
// don't requestFocus
private boolean mButtonTriggered = false;
private Button mTurnOffButton;
private Button mTurnOnButton;
private final OnClickListener mListener = new OnClickListener() {
@Override
public void onClick(View v) {
mButtonTriggered = true;
mMetricsFeatureProvider.logClickedPreference(mPreference, getMetricsCategory());
mColorDisplayManager.setNightDisplayActivated(
!mColorDisplayManager.isNightDisplayActivated());
updateStateInternal();
updateStateInternal(true);
}
};
@@ -93,7 +91,7 @@ public class NightDisplayActivationPreferenceController extends TogglePreference
@Override
public final void updateState(Preference preference) {
updateStateInternal();
updateStateInternal(false);
}
/** FOR SLICES */
@@ -113,7 +111,7 @@ public class NightDisplayActivationPreferenceController extends TogglePreference
return mTimeFormatter.getAutoModeSummary(mContext, mColorDisplayManager);
}
private void updateStateInternal() {
private void updateStateInternal(boolean selfChanged) {
if (mTurnOnButton == null || mTurnOffButton == null) {
return;
}
@@ -143,17 +141,15 @@ public class NightDisplayActivationPreferenceController extends TogglePreference
mTurnOnButton.setVisibility(View.GONE);
mTurnOffButton.setVisibility(View.VISIBLE);
mTurnOffButton.setText(buttonText);
if (mButtonTriggered) {
mButtonTriggered = false;
mTurnOffButton.requestFocus();
if (selfChanged) {
mTurnOffButton.sendAccessibilityEvent(TYPE_VIEW_FOCUSED);
}
} else {
mTurnOnButton.setVisibility(View.VISIBLE);
mTurnOffButton.setVisibility(View.GONE);
mTurnOnButton.setText(buttonText);
if (mButtonTriggered) {
mButtonTriggered = false;
mTurnOnButton.requestFocus();
if (selfChanged) {
mTurnOnButton.sendAccessibilityEvent(TYPE_VIEW_FOCUSED);
}
}
}

23
src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.notification.zen;
import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.Settings;
@@ -40,8 +42,9 @@ public class ZenModeButtonPreferenceController extends AbstractZenModePreference
private static final String TAG = "EnableZenModeButton";
private final FragmentManager mFragment;
// DND can also be toggled from QS. If DND wasn't toggled by this preference, don't requestFocus
private boolean mButtonTriggered = false;
// DND can also be toggled from QS. If DND wasn't toggled by this preference, don't
// reroute focus.
private boolean mRefocusButton = false;
private Button mZenButtonOn;
private Button mZenButtonOff;
@@ -75,7 +78,7 @@ public class ZenModeButtonPreferenceController extends AbstractZenModePreference
mZenButtonOff = ((LayoutPreference) preference)
.findViewById(R.id.zen_mode_settings_turn_off_button);
mZenButtonOff.setOnClickListener(v -> {
mButtonTriggered = true;
mRefocusButton = true;
writeMetrics(preference, false);
mBackend.setZenMode(Settings.Global.ZEN_MODE_OFF);
});
@@ -91,9 +94,9 @@ public class ZenModeButtonPreferenceController extends AbstractZenModePreference
case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
mZenButtonOff.setVisibility(View.VISIBLE);
mZenButtonOn.setVisibility(View.GONE);
if (mButtonTriggered) {
mButtonTriggered = false;
mZenButtonOff.requestFocus();
if (mRefocusButton) {
mRefocusButton = false;
mZenButtonOff.sendAccessibilityEvent(TYPE_VIEW_FOCUSED);
}
break;
case Settings.Global.ZEN_MODE_OFF:
@@ -101,16 +104,16 @@ public class ZenModeButtonPreferenceController extends AbstractZenModePreference
mZenButtonOff.setVisibility(View.GONE);
updateZenButtonOnClickListener(preference);
mZenButtonOn.setVisibility(View.VISIBLE);
if (mButtonTriggered) {
mButtonTriggered = false;
mZenButtonOn.requestFocus();
if (mRefocusButton) {
mRefocusButton = false;
mZenButtonOn.sendAccessibilityEvent(TYPE_VIEW_FOCUSED);
}
}
}
private void updateZenButtonOnClickListener(Preference preference) {
mZenButtonOn.setOnClickListener(v -> {
mButtonTriggered = true;
mRefocusButton = true;
writeMetrics(preference, true);
int zenDuration = getZenDuration();
switch (zenDuration) {