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

Merge "Focus remains on the button after turning on/off"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-11-27 05:01:09 +00:00
committed by Android (Google) Code Review
parent a6a4fb2c37 a30cb1158f
commit 190860a35e
4 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();
}
}
}

3
src/com/android/settings/notification/ZenModeButtonPreferenceController.java
View File

@@ -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();
}
}