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

Merge "Remove duplicate strings."

Browse Source
This commit is contained in:
TreeHugger Robot
2022-08-26 17:52:54 +00:00
committed by Android (Google) Code Review
parent c8d69051a4 5949fccc7a
commit 66a56fdd37
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);
}
}

4
src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java
View File

@@ -94,11 +94,11 @@ public class AppNotificationPreferenceController extends AppInfoPreferenceContro
return "";
}
if (appRow.banned) {
return context.getText(R.string.notifications_disabled);
return context.getText(R.string.off);
} else if (appRow.channelCount == 0) {
return NotificationBackend.getSentSummary(context, appRow.sentByApp, false);
} else if (appRow.channelCount == appRow.blockedChannelCount) {
return context.getText(R.string.notifications_disabled);
return context.getText(R.string.off);
} else {
if (appRow.blockedChannelCount == 0) {
return NotificationBackend.getSentSummary(context, appRow.sentByApp, false);

3
src/com/android/settings/backup/BackupDataPreferenceController.java
View File

@@ -54,8 +54,7 @@ public class BackupDataPreferenceController extends BasePreferenceController {
public CharSequence getSummary() {
if (!mPSCD.isBackupGray()) {
return mPSCD.isBackupEnabled()
? mContext.getText(R.string.accessibility_feature_state_on)
: mContext.getText(R.string.accessibility_feature_state_off);
? mContext.getText(R.string.on) : mContext.getText(R.string.off);
}
return null;
}

3
src/com/android/settings/backup/BackupSettingsHelper.java
View File

@@ -58,8 +58,7 @@ public class BackupSettingsHelper {
UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
if (userManager.getUserProfiles().size() == 1) {
try {
int resId = mBackupManager.isBackupEnabled() ? R.string.backup_summary_state_on
: R.string.backup_summary_state_off;
int resId = mBackupManager.isBackupEnabled() ? R.string.on : R.string.off;
return mContext.getText(resId).toString();
} catch (RemoteException e) {
Log.e(TAG, "Error getting isBackupEnabled", e);

4
src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java
View File

@@ -74,7 +74,7 @@ public final class BluetoothSummaryUpdater extends SummaryUpdater implements Blu
@Override
public String getSummary() {
if (mBluetoothAdapter == null || !mBluetoothAdapter.isEnabled()) {
return mContext.getString(R.string.bluetooth_disabled);
return mContext.getString(R.string.off);
}
switch (mBluetoothAdapter.getConnectionState()) {
case BluetoothAdapter.STATE_CONNECTED:
@@ -95,7 +95,7 @@ public final class BluetoothSummaryUpdater extends SummaryUpdater implements Blu
final Set<BluetoothDevice> devices = mBluetoothAdapter.getBondedDevices();
if (devices == null) {
Log.e(TAG, "getConnectedDeviceSummary, bonded devices are null");
return mContext.getString(R.string.bluetooth_disabled);
return mContext.getString(R.string.off);
} else if (devices.isEmpty()) {
Log.e(TAG, "getConnectedDeviceSummary, no bonded devices");
return mContext.getString(R.string.disconnected);

4
src/com/android/settings/connecteddevice/NfcAndPaymentFragmentController.java
View File

@@ -54,9 +54,9 @@ public class NfcAndPaymentFragmentController extends BasePreferenceController {
public CharSequence getSummary() {
if (mNfcAdapter != null) {
if (mNfcAdapter.isEnabled()) {
return mContext.getText(R.string.nfc_setting_on);
return mContext.getText(R.string.on);
} else {
return mContext.getText(R.string.nfc_setting_off);
return mContext.getText(R.string.off);
}
}
return null;

2
src/com/android/settings/datausage/DataSaverPreference.java
View File

@@ -44,7 +44,7 @@ public class DataSaverPreference extends Preference implements DataSaverBackend.
@Override
public void onDataSaverChanged(boolean isDataSaving) {
setSummary(isDataSaving ? R.string.data_saver_on : R.string.data_saver_off);
setSummary(isDataSaving ? R.string.on : R.string.off);
}
@Override

4
src/com/android/settings/display/AutoBrightnessPreferenceController.java
View File

@@ -57,9 +57,7 @@ public class AutoBrightnessPreferenceController extends TogglePreferenceControll
@Override
public CharSequence getSummary() {
return mContext.getText(isChecked()
? R.string.auto_brightness_summary_on
: R.string.auto_brightness_summary_off);
return mContext.getText(isChecked() ? R.string.on : R.string.off);
}
@Override

4
src/com/android/settings/display/SmartAutoRotatePreferenceController.java
View File

@@ -165,7 +165,7 @@ public class SmartAutoRotatePreferenceController extends TogglePreferenceControl
@Override
public CharSequence getSummary() {
int activeStringId = R.string.auto_rotate_option_off;
int activeStringId = R.string.off;
if (!RotationPolicy.isRotationLocked(mContext)) {
final int cameraRotate = Settings.Secure.getIntForUser(
mContext.getContentResolver(),
@@ -176,7 +176,7 @@ public class SmartAutoRotatePreferenceController extends TogglePreferenceControl
&& !isCameraLocked()
&& !isPowerSaveMode()
? R.string.auto_rotate_option_face_based
: R.string.auto_rotate_option_on;
: R.string.on;
}
return mContext.getString(activeStringId);
}

2
src/com/android/settings/dream/DreamSettings.java
View File

@@ -137,7 +137,7 @@ public class DreamSettings extends DashboardFragment implements OnMainSwitchChan
@VisibleForTesting
static CharSequence getSummaryTextFromBackend(DreamBackend backend, Context context) {
if (!backend.isEnabled()) {
return context.getString(R.string.screensaver_settings_summary_off);
return context.getString(R.string.off);
} else {
return backend.getActiveDreamName();
}

3
src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceController.java
View File

@@ -95,8 +95,7 @@ public class EmergencyGestureEntrypointPreferenceController extends BasePreferen
public CharSequence getSummary() {
return mContext.getText(
mEmergencyNumberUtils.getEmergencyGestureEnabled()
? R.string.gesture_setting_on
: R.string.gesture_setting_off);
? R.string.on : R.string.off);
}
/**

4
src/com/android/settings/fuelgauge/BatterySaverController.java
View File

@@ -97,7 +97,7 @@ public class BatterySaverController extends BasePreferenceController
public CharSequence getSummary() {
final boolean isPowerSaveOn = mPowerManager.isPowerSaveMode();
if (isPowerSaveOn) {
return mContext.getString(R.string.battery_saver_on_summary);
return mContext.getString(R.string.on);
}
final ContentResolver resolver = mContext.getContentResolver();
@@ -109,7 +109,7 @@ public class BatterySaverController extends BasePreferenceController
return percent != 0 ?
mContext.getString(R.string.battery_saver_off_scheduled_summary,
Utils.formatPercentage(percent)) :
mContext.getString(R.string.battery_saver_off_summary);
mContext.getString(R.string.off);
} else {
return mContext.getString(R.string.battery_saver_pref_auto_routine_summary);
}

3
src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java
View File

@@ -128,8 +128,7 @@ public class AssistGestureSettingsPreferenceController extends GesturePreference
if (!mAssistOnly) {
isEnabled = isEnabled || isSilenceGestureEnabled();
}
return mContext.getText(
isEnabled ? R.string.gesture_setting_on : R.string.gesture_setting_off);
return mContext.getText(isEnabled ? R.string.on : R.string.off);
}
@Override

3
src/com/android/settings/gestures/GesturePreferenceController.java
View File

@@ -60,8 +60,7 @@ public abstract class GesturePreferenceController extends TogglePreferenceContro
@Override
public CharSequence getSummary() {
return mContext.getText(
isChecked() ? R.string.gesture_setting_on : R.string.gesture_setting_off);
return mContext.getText(isChecked() ? R.string.on : R.string.off);
}
@Override

2
src/com/android/settings/gestures/OneHandedEnablePreferenceController.java
View File

@@ -51,7 +51,7 @@ public class OneHandedEnablePreferenceController extends BasePreferenceControlle
public CharSequence getSummary() {
return mContext.getText(
OneHandedSettingsUtils.isOneHandedModeEnabled(mContext)
? R.string.gesture_setting_on : R.string.gesture_setting_off);
? R.string.on : R.string.off);
}
@Override

2
src/com/android/settings/gestures/PreventRingingParentPreferenceController.java
View File

@@ -104,7 +104,7 @@ public class PreventRingingParentPreferenceController extends TogglePreferenceCo
break;
// VOLUME_HUSH_OFF
default:
summary = mContext.getText(R.string.switch_off_text);
summary = mContext.getText(R.string.off);
}
preference.setEnabled(true);
mPreference.setSwitchEnabled(true);

2
src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java
View File

@@ -66,7 +66,7 @@ public class SpellCheckerPreferenceController extends AbstractPreferenceControll
return;
}
if (!mTextServicesManager.isSpellCheckerEnabled()) {
preference.setSummary(R.string.switch_off_text);
preference.setSummary(R.string.off);
} else {
final SpellCheckerInfo sci = mTextServicesManager.getCurrentSpellChecker();
if (sci != null) {

7
src/com/android/settings/location/LocationForWorkPreferenceController.java
View File

@@ -44,8 +44,7 @@ public class LocationForWorkPreferenceController extends LocationBasePreferenceC
final boolean switchState = mPreference.isChecked();
mUserManager.setUserRestriction(UserManager.DISALLOW_SHARE_LOCATION, !switchState,
Utils.getManagedProfile(mUserManager));
mPreference.setSummary(switchState ?
R.string.switch_on_text : R.string.switch_off_text);
mPreference.setSummary(switchState ? R.string.on : R.string.off);
return true;
}
return false;
@@ -81,11 +80,11 @@ public class LocationForWorkPreferenceController extends LocationBasePreferenceC
mLocationEnabler.isManagedProfileRestrictedByBase();
if (isRestrictedByBase || !enabled) {
mPreference.setChecked(false);
summaryResId = enabled ? R.string.switch_off_text
summaryResId = enabled ? R.string.off
: R.string.location_app_permission_summary_location_off;
} else {
mPreference.setChecked(true);
summaryResId = R.string.switch_on_text;
summaryResId = R.string.on;
}
mPreference.setSummary(summaryResId);
}

3
src/com/android/settings/location/LocationServicesBluetoothScanningPreferenceController.java
View File

@@ -46,8 +46,7 @@ public class LocationServicesBluetoothScanningPreferenceController extends
public CharSequence getSummary() {
final boolean bleScanOn = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0) == 1;
int resId =
bleScanOn ? R.string.scanning_status_text_on : R.string.scanning_status_text_off;
final int resId = bleScanOn ? R.string.on : R.string.off;
return mContext.getString(resId);
}

3
src/com/android/settings/location/LocationServicesWifiScanningPreferenceController.java
View File

@@ -47,8 +47,7 @@ public class LocationServicesWifiScanningPreferenceController extends BasePrefer
@Override
public CharSequence getSummary() {
final boolean wifiScanOn = mWifiManager.isScanAlwaysAvailable();
int resId =
wifiScanOn ? R.string.scanning_status_text_on : R.string.scanning_status_text_off;
final int resId = wifiScanOn ? R.string.on : R.string.off;
return mContext.getString(resId);
}

2
src/com/android/settings/location/TopLevelLocationPreferenceController.java
View File

@@ -57,7 +57,7 @@ public class TopLevelLocationPreferenceController extends BasePreferenceControll
}
return sSummary;
} else {
return mContext.getString(R.string.location_settings_summary_location_off);
return mContext.getString(R.string.off);
}
}

4
src/com/android/settings/network/AdaptiveConnectivityPreferenceController.java
View File

@@ -48,7 +48,7 @@ public class AdaptiveConnectivityPreferenceController extends BasePreferenceCont
public CharSequence getSummary() {
return Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 1) == 1
? mContext.getString(R.string.adaptive_connectivity_switch_on)
: mContext.getString(R.string.adaptive_connectivity_switch_off);
? mContext.getString(R.string.on)
: mContext.getString(R.string.off);
}
}

2
src/com/android/settings/network/PrivateDnsPreferenceController.java
View File

@@ -130,7 +130,7 @@ public class PrivateDnsPreferenceController extends BasePreferenceController
case PRIVATE_DNS_MODE_OFF:
return res.getString(R.string.private_dns_mode_off);
case PRIVATE_DNS_MODE_OPPORTUNISTIC:
return dnsesResolved ? res.getString(R.string.private_dns_mode_on)
return dnsesResolved ? res.getString(R.string.on)
: res.getString(R.string.private_dns_mode_opportunistic);
case PRIVATE_DNS_MODE_PROVIDER_HOSTNAME:
return dnsesResolved

4
src/com/android/settings/network/TetherPreferenceController.java
View File

@@ -216,7 +216,7 @@ public class TetherPreferenceController extends AbstractPreferenceController imp
}
if (!hotSpotOn && !tetherOn) {
// Both off
mPreference.setSummary(R.string.switch_off_text);
mPreference.setSummary(R.string.off);
} else if (hotSpotOn && tetherOn) {
// Both on
mPreference.setSummary(R.string.tether_settings_summary_hotspot_on_tether_on);
@@ -232,7 +232,7 @@ public class TetherPreferenceController extends AbstractPreferenceController imp
// Preference is not ready yet.
return;
}
mPreference.setSummary(R.string.switch_off_text);
mPreference.setSummary(R.string.off);
}
class SettingObserver extends ContentObserver {

2
src/com/android/settings/nfc/AndroidBeamEnabler.java
View File

@@ -65,7 +65,7 @@ public class AndroidBeamEnabler extends BaseNfcEnabler {
if (mNfcAdapter.isNdefPushEnabled() && mPreference.isEnabled()) {
mPreference.setSummary(R.string.android_beam_on_summary);
} else {
mPreference.setSummary(R.string.android_beam_off_summary);
mPreference.setSummary(R.string.off);
}
break;
case NfcAdapter.STATE_TURNING_ON:

2
src/com/android/settings/notification/BubbleSummaryNotificationPreferenceController.java
View File

@@ -44,7 +44,7 @@ public class BubbleSummaryNotificationPreferenceController extends BasePreferenc
return mContext.getString(
areBubblesEnabled()
? R.string.notifications_bubble_setting_on_summary
: R.string.switch_off_text);
: R.string.off);
}
@Override

2
src/com/android/settings/notification/SpatialAudioParentPreferenceController.java
View File

@@ -71,7 +71,7 @@ public class SpatialAudioParentPreferenceController extends BasePreferenceContro
return mContext.getString(R.string.spatial_summary_on_one,
mContext.getString(R.string.spatial_audio_wired_headphones));
} else {
return mContext.getString(R.string.spatial_summary_off);
return mContext.getString(R.string.off);
}
}
}

2
src/com/android/settings/notification/zen/ZenModeSettings.java
View File

@@ -194,7 +194,7 @@ public class ZenModeSettings extends ZenModeSettingsBase {
String description = ZenModeConfig.getDescription(mContext, true, config, false);
if (description == null) {
return mContext.getString(R.string.zen_mode_sound_summary_on);
return mContext.getString(R.string.on);
} else {
return mContext.getString(R.string.zen_mode_sound_summary_on_with_info,
description);

2
src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceController.java
View File

@@ -274,7 +274,7 @@ public class ZenModeSettingsFooterPreferenceController extends AbstractZenModePr
}
private int getAllowRes(boolean allow) {
return allow ? R.string.zen_mode_sound_summary_on : R.string.switch_off_text;
return allow ? R.string.on : R.string.off;
}
@Override

4
src/com/android/settings/notification/zen/ZenRulePreference.java
View File

@@ -151,7 +151,7 @@ public class ZenRulePreference extends PrimarySwitchPreference {
}
return (rule == null || !rule.isEnabled())
? mContext.getResources().getString(R.string.switch_off_text)
: mContext.getResources().getString(R.string.switch_on_text);
? mContext.getResources().getString(R.string.off)
: mContext.getResources().getString(R.string.on);
}
}

2
src/com/android/settings/print/PrintSettingPreferenceController.java
View File

@@ -116,7 +116,7 @@ public class PrintSettingPreferenceController extends BasePreferenceController i
final List<PrintServiceInfo> services =
mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES);
if (services == null || services.isEmpty()) {
return mContext.getText(R.string.print_settings_summary_no_service);
return mContext.getText(R.string.off);
} else {
final int count = services.size();
return mContext.getResources().getQuantityString(

4
src/com/android/settings/print/PrintSettingsFragment.java
View File

@@ -204,9 +204,9 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
preference.setPersistent(false);
if (service.isEnabled()) {
preference.setSummary(getString(R.string.print_feature_state_on));
preference.setSummary(getString(R.string.on));
} else {
preference.setSummary(getString(R.string.print_feature_state_off));
preference.setSummary(getString(R.string.off));
}
Drawable drawable = service.getResolveInfo().loadIcon(pm);

4
src/com/android/settings/security/ScreenPinningPreferenceController.java
View File

@@ -38,7 +38,7 @@ public class ScreenPinningPreferenceController extends BasePreferenceController
public CharSequence getSummary() {
return Settings.System.getInt(mContext.getContentResolver(),
Settings.System.LOCK_TO_APP_ENABLED, 0) != 0
? mContext.getText(R.string.screen_pinning_switch_on_text)
: mContext.getText(R.string.screen_pinning_switch_off_text);
? mContext.getText(R.string.on)
: mContext.getText(R.string.off);
}
}

3
src/com/android/settings/widget/SwitchBar.java
View File

@@ -38,7 +38,6 @@ import android.widget.Switch;
import android.widget.TextView;
import androidx.annotation.ColorInt;
import androidx.annotation.StringRes;
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
@@ -135,7 +134,7 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC
lp.setMarginEnd(switchBarMarginEnd);
setBackgroundColor(mBackgroundColor);
setSwitchBarText(R.string.switch_on_text, R.string.switch_off_text);
setSwitchBarText(R.string.on, R.string.off);
addOnSwitchChangeListener(
(switchView, isChecked) -> setTextViewLabelAndBackground(isChecked));

2
src/com/android/settings/wifi/WifiSummaryUpdater.java
View File

@@ -87,7 +87,7 @@ public final class WifiSummaryUpdater extends SummaryUpdater {
@Override
public String getSummary() {
if (!mWifiTracker.enabled) {
return mContext.getString(R.string.switch_off_text);
return mContext.getString(R.string.off);
}
if (!mWifiTracker.connected) {
return mContext.getString(R.string.disconnected);