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

Merge "Remove mentions of "gesture" on the Accessibility Button settings page" into main

Browse Source
This commit is contained in:
Riley Jones
2024-09-10 23:31:54 +00:00
committed by Android (Google) Code Review
parent 1c756ec809 28e10455a1
commit 8d7cd93e46
5 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -5190,6 +5190,8 @@
<string name="accessibility_button_low_label">Transparent</string>
<!-- Label on the right side of transparency adjustment slider [CHAR LIMIT=30] -->
<string name="accessibility_button_high_label">Non-transparent</string>
<!-- Summary for settings that are disabled in the current button mode [CHAR LIMIT=30] -->
<string name="accessibility_button_disabled_button_mode_summary">Unavailable while using navigation bar button mode.</string>
<!-- Title for the accessibility preference to high contrast text. [CHAR LIMIT=35] -->
<string name="accessibility_toggle_high_text_contrast_preference_title">High contrast text</string>
<!-- Summary for the accessibility preference to high contrast text. [CHAR LIMIT=NONE] -->

11
src/com/android/settings/accessibility/AccessibilityButtonFragment.java
View File

@@ -33,8 +33,15 @@ public class AccessibilityButtonFragment extends DashboardFragment {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
final int titleResource = AccessibilityUtil.isGestureNavigateEnabled(getPrefContext())
? R.string.accessibility_button_gesture_title : R.string.accessibility_button_title;
final int titleResource;
if (android.provider.Flags.a11yStandaloneGestureEnabled()) {
titleResource = R.string.accessibility_button_title;
} else {
titleResource = AccessibilityUtil.isGestureNavigateEnabled(getPrefContext())
? R.string.accessibility_button_gesture_title
: R.string.accessibility_button_title;
}
getActivity().setTitle(titleResource);
}

4
src/com/android/settings/accessibility/AccessibilityButtonGesturePreferenceController.java
View File

@@ -50,9 +50,13 @@ public class AccessibilityButtonGesturePreferenceController extends BasePreferen
@Override
public int getAvailabilityStatus() {
if (android.provider.Flags.a11yStandaloneGestureEnabled()) {
return CONDITIONALLY_UNAVAILABLE;
} else {
return AccessibilityUtil.isGestureNavigateEnabled(mContext)
? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
}
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {

14
src/com/android/settings/accessibility/FloatingMenuFadePreferenceController.java
View File

@@ -28,6 +28,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -64,6 +65,18 @@ public class FloatingMenuFadePreferenceController extends BasePreferenceControll
? AVAILABLE : DISABLED_DEPENDENT_SETTING;
}
@Override
public CharSequence getSummary() {
if (mPreference != null) {
return mPreference.isEnabled()
? "%s"
: mContext.getString(
R.string.accessibility_button_disabled_button_mode_summary);
} else {
return "%s";
}
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
@@ -101,6 +114,7 @@ public class FloatingMenuFadePreferenceController extends BasePreferenceControll
private void updateAvailabilityStatus() {
mPreference.setEnabled(AccessibilityUtil.isFloatingMenuEnabled(mContext));
refreshSummary(mPreference);
}
private int getFloatingMenuFadeValue() {

14
src/com/android/settings/accessibility/FloatingMenuSizePreferenceController.java
View File

@@ -29,6 +29,7 @@ import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -79,6 +80,18 @@ public class FloatingMenuSizePreferenceController extends BasePreferenceControll
? AVAILABLE : DISABLED_DEPENDENT_SETTING;
}
@Override
public CharSequence getSummary() {
if (mPreference != null) {
return mPreference.isEnabled()
? "%s"
: mContext.getString(
R.string.accessibility_button_disabled_button_mode_summary);
} else {
return "%s";
}
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
@@ -119,6 +132,7 @@ public class FloatingMenuSizePreferenceController extends BasePreferenceControll
private void updateAvailabilityStatus() {
mPreference.setEnabled(AccessibilityUtil.isFloatingMenuEnabled(mContext));
refreshSummary(mPreference);
}
@Size