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

Remove duplicate strings.

Browse Source 
"Yes" and "no" were redefined many times with no clear benefit, so this
consolidates them into one definition.

Bug: 243843096
Test: Build, install, and open the Settings app
Test: atest SettingsRoboTests
Change-Id: I5f84d09f223efd478461ded93aeac82bf7b128d8
This commit is contained in:
Kweku Adams
2022-08-25 21:23:50 +00:00
parent fb2090e643
commit 5949fccc7a
73 changed files with 118 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -251,8 +251,8 @@ public class AccessibilitySettings extends DashboardFragment {
: context.getText(R.string.accessibility_summary_shortcut_disabled);
} else {
serviceState = serviceEnabled
? context.getText(R.string.accessibility_summary_state_enabled)
: context.getText(R.string.accessibility_summary_state_disabled);
? context.getText(R.string.on)
: context.getText(R.string.off);
}
final CharSequence serviceSummary = info.loadSummary(context.getPackageManager());

2
src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
View File

@@ -400,7 +400,7 @@ public abstract class AccessibilityShortcutPreferenceFragment extends DashboardF
}
if (!mShortcutPreference.isChecked()) {
return context.getText(R.string.switch_off_text);
return context.getText(R.string.off);
}
final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(context,

3
src/com/android/settings/accessibility/AccessibilityUtil.java
View File

@@ -130,8 +130,7 @@ public final class AccessibilityUtil {
static CharSequence getSummary(Context context, String settingsSecureKey) {
final boolean enabled = Settings.Secure.getInt(context.getContentResolver(),
settingsSecureKey, State.OFF) == State.ON;
final int resId = enabled ? R.string.accessibility_feature_state_on
: R.string.accessibility_feature_state_off;
final int resId = enabled ? R.string.on : R.string.off;
return context.getResources().getText(resId);
}

2
src/com/android/settings/accessibility/AutoclickPreferenceController.java
View File

@@ -39,7 +39,7 @@ public class AutoclickPreferenceController extends BasePreferenceController {
final boolean enabled = Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_AUTOCLICK_ENABLED, 0) == 1;
if (!enabled) {
return mContext.getResources().getText(R.string.accessibility_feature_state_off);
return mContext.getResources().getText(R.string.off);
}
final int delay = Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY,

3
src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java
View File

@@ -88,8 +88,7 @@ public class MagnificationGesturesPreferenceController extends TogglePreferenceC
resId = R.string.accessibility_screen_magnification_short_summary;
} else {
final boolean enabled = isChecked();
resId = (enabled ? R.string.accessibility_feature_state_on :
R.string.accessibility_feature_state_off);
resId = (enabled ? R.string.on : R.string.off);
}
return mContext.getString(resId);
}

3
src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java
View File

@@ -94,8 +94,7 @@ public class MagnificationNavbarPreferenceController extends TogglePreferenceCon
resId = R.string.accessibility_screen_magnification_navbar_short_summary;
} else {
final boolean enabled = isChecked();
resId = (enabled ? R.string.accessibility_feature_state_on :
R.string.accessibility_feature_state_off);
resId = (enabled ? R.string.on : R.string.off);
}
return mContext.getText(resId);
}

2
src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
View File

@@ -655,7 +655,7 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment
}
if (!mShortcutPreference.isChecked()) {
return context.getText(R.string.switch_off_text);
return context.getText(R.string.off);
}
final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(context,

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

@@ -337,7 +337,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
@Override
protected CharSequence getShortcutTypeSummary(Context context) {
if (!mShortcutPreference.isChecked()) {
return context.getText(R.string.switch_off_text);
return context.getText(R.string.off);
}
final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(context,
@@ -658,6 +658,6 @@ public class ToggleScreenMagnificationPreferenceFragment extends
final int uerShortcutType = getUserShortcutTypeFromSettings(context);
return (uerShortcutType != AccessibilityUtil.UserShortcutType.EMPTY)
? context.getText(R.string.accessibility_summary_shortcut_enabled)
: context.getText(R.string.accessibility_summary_shortcut_disabled);
: context.getText(R.string.off);
}
}

5
src/com/android/settings/accessibility/VibrationPreferenceController.java
View File

@@ -44,9 +44,6 @@ public class VibrationPreferenceController extends BasePreferenceController {
public CharSequence getSummary() {
final boolean isVibrateOn = Settings.System.getInt(mContext.getContentResolver(),
Settings.System.VIBRATE_ON, ON) == ON;
return mContext.getText(
isVibrateOn
? R.string.accessibility_vibration_settings_state_on
: R.string.accessibility_vibration_settings_state_off);
return mContext.getText(isVibrateOn ? R.string.on : R.string.off);
}
}