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

Fix references to resources for Settings

Browse Source 
Bug: 293810334
Test: m Settings
Change-Id: Ie140278f492ef7e1c062ec1ecae2866c521a86aa
This commit is contained in:
Chaohui Wang
2023-07-31 15:56:42 +08:00
parent ed505c25fa
commit 2541381259
247 changed files with 859 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java
View File

@@ -30,7 +30,6 @@ import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -45,7 +44,8 @@ public abstract class AbstractBluetoothA2dpPreferenceController extends
OnDestroy {
@VisibleForTesting
static final int STREAMING_LABEL_ID = R.string.bluetooth_select_a2dp_codec_streaming_label;
static final int STREAMING_LABEL_ID =
com.android.settingslib.R.string.bluetooth_select_a2dp_codec_streaming_label;
protected final BluetoothA2dpConfigStore mBluetoothA2dpConfigStore;
protected BluetoothA2dp mBluetoothA2dp;

2
src/com/android/settings/development/AdbDeviceDetailsActionController.java
View File

@@ -70,7 +70,7 @@ public class AdbDeviceDetailsActionController extends AbstractPreferenceControll
mButtonsPref = ((ActionButtonsPreference) screen.findPreference(getPreferenceKey()))
.setButton1Visible(false)
.setButton2Icon(R.drawable.ic_settings_delete)
.setButton2Text(R.string.adb_device_forget)
.setButton2Text(com.android.settingslib.R.string.adb_device_forget)
.setButton2OnClickListener(view -> forgetDevice());
}

3
src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java
View File

@@ -23,7 +23,6 @@ import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.widget.FooterPreference;
@@ -71,7 +70,7 @@ public class AdbDeviceDetailsFingerprintController extends AbstractPreferenceCon
mFingerprintCategory = (PreferenceCategory) screen.findPreference(getPreferenceKey());
mFingerprintPref = new FooterPreference(mFingerprintCategory.getContext());
final CharSequence titleFormat = mContext.getText(
R.string.adb_device_fingerprint_title_format);
com.android.settingslib.R.string.adb_device_fingerprint_title_format);
mFingerprintPref.setTitle(String.format(
titleFormat.toString(), mPairedDevice.guid));
mFingerprintCategory.addPreference(mFingerprintPref);

5
src/com/android/settings/development/AdbIpAddressPreferenceController.java
View File

@@ -29,7 +29,6 @@ import android.util.Log;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.deviceinfo.AbstractConnectivityPreferenceController;
@@ -110,13 +109,13 @@ public class AdbIpAddressPreferenceController extends AbstractConnectivityPrefer
if (ipAddress != null) {
int port = getPort();
if (port <= 0) {
mAdbIpAddrPref.setSummary(R.string.status_unavailable);
mAdbIpAddrPref.setSummary(com.android.settingslib.R.string.status_unavailable);
} else {
ipAddress += ":" + port;
}
mAdbIpAddrPref.setSummary(ipAddress);
} else {
mAdbIpAddrPref.setSummary(R.string.status_unavailable);
mAdbIpAddrPref.setSummary(com.android.settingslib.R.string.status_unavailable);
}
}

6
src/com/android/settings/development/AdbPairedDevicePreference.java
View File

@@ -75,11 +75,11 @@ public class AdbPairedDevicePreference extends Preference {
gearNoBg.setVisibility(View.VISIBLE);
}
static void setTitle(AdbPairedDevicePreference preference,
PairDevice pairedDevice) {
static void setTitle(AdbPairedDevicePreference preference, PairDevice pairedDevice) {
preference.setTitle(pairedDevice.name);
preference.setSummary(pairedDevice.connected
? preference.getContext().getText(R.string.adb_wireless_device_connected_summary)
? preference.getContext()
.getText(com.android.settingslib.R.string.adb_wireless_device_connected_summary)
: "");
}

2
src/com/android/settings/development/AdbQrcodeScannerFragment.java
View File

@@ -177,7 +177,7 @@ public class AdbQrcodeScannerFragment extends WifiDppQrCodeBaseFragment implemen
mVerifyingTextView = view.findViewById(R.id.verifying_textview);
setHeaderTitle(R.string.wifi_dpp_scan_qr_code);
mSummary.setText(R.string.adb_wireless_qrcode_pairing_description);
mSummary.setText(com.android.settingslib.R.string.adb_wireless_qrcode_pairing_description);
mErrorMessage = view.findViewById(R.id.error_message);
}

12
src/com/android/settings/development/AdbWirelessDialogController.java
View File

@@ -59,22 +59,26 @@ public class AdbWirelessDialogController {
switch (mMode) {
case AdbWirelessDialogUiBase.MODE_PAIRING:
String title = res.getString(R.string.adb_pairing_device_dialog_title);
String title = res.getString(
com.android.settingslib.R.string.adb_pairing_device_dialog_title);
mUi.setTitle(title);
mView.findViewById(R.id.l_pairing_six_digit).setVisibility(View.VISIBLE);
mUi.setCancelButton(res.getString(R.string.cancel));
mUi.setCanceledOnTouchOutside(false);
break;
case AdbWirelessDialogUiBase.MODE_PAIRING_FAILED:
String msg = res.getString(R.string.adb_pairing_device_dialog_failed_msg);
mUi.setTitle(R.string.adb_pairing_device_dialog_failed_title);
String msg = res.getString(
com.android.settingslib.R.string.adb_pairing_device_dialog_failed_msg);
mUi.setTitle(
com.android.settingslib.R.string.adb_pairing_device_dialog_failed_title);
mView.findViewById(R.id.l_pairing_failed).setVisibility(View.VISIBLE);
mFailedMsg = (TextView) mView.findViewById(R.id.pairing_failed_label);
mFailedMsg.setText(msg);
mUi.setSubmitButton(res.getString(R.string.okay));
break;
case AdbWirelessDialogUiBase.MODE_QRCODE_FAILED:
mUi.setTitle(R.string.adb_pairing_device_dialog_failed_title);
mUi.setTitle(
com.android.settingslib.R.string.adb_pairing_device_dialog_failed_title);
mView.findViewById(R.id.l_qrcode_pairing_failed).setVisibility(View.VISIBLE);
mUi.setSubmitButton(res.getString(R.string.okay));
break;

6
src/com/android/settings/development/AnimatorDurationScalePreferenceController.java
View File

@@ -25,7 +25,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -48,9 +47,10 @@ public class AnimatorDurationScalePreferenceController extends DeveloperOptionsP
mWindowManager = IWindowManager.Stub.asInterface(
ServiceManager.getService(Context.WINDOW_SERVICE));
mListValues = context.getResources().getStringArray(R.array.animator_duration_scale_values);
mListValues = context.getResources()
.getStringArray(com.android.settingslib.R.array.animator_duration_scale_values);
mListSummaries = context.getResources().getStringArray(
R.array.animator_duration_scale_entries);
com.android.settingslib.R.array.animator_duration_scale_entries);
}
@Override

4
src/com/android/settings/development/AppPicker.java
View File

@@ -32,8 +32,6 @@ import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import com.android.settings.R;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Collections;
@@ -168,7 +166,7 @@ public class AppPicker extends ListActivity {
Collections.sort(mPackageInfoList, sDisplayNameComparator);
if (mIncludeNothing) {
MyApplicationInfo info = new MyApplicationInfo();
info.label = context.getText(R.string.no_application);
info.label = context.getText(com.android.settingslib.R.string.no_application);
mPackageInfoList.add(0, info);
}
addAll(mPackageInfoList);

7
src/com/android/settings/development/AppViewHolder.java
View File

@@ -21,7 +21,6 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.android.settings.R;
import com.android.settingslib.applications.ApplicationsState;
// View Holder used when displaying views
@@ -36,7 +35,8 @@ public class AppViewHolder {
static public AppViewHolder createOrRecycle(LayoutInflater inflater, View convertView) {
if (convertView == null) {
convertView = inflater.inflate(R.layout.preference_app, null);
convertView =
inflater.inflate(com.android.settingslib.widget.R.layout.preference_app, null);
// Creates a ViewHolder and store references to the two children views
// we want to bind data to.
@@ -45,7 +45,8 @@ public class AppViewHolder {
holder.appName = convertView.findViewById(android.R.id.title);
holder.appIcon = convertView.findViewById(android.R.id.icon);
holder.summary = convertView.findViewById(android.R.id.summary);
holder.disabled = convertView.findViewById(R.id.appendix);
holder.disabled =
convertView.findViewById(com.android.settingslib.widget.R.id.appendix);
holder.widget = convertView.findViewById(android.R.id.widget_frame);
convertView.setTag(holder);
return holder;

5
src/com/android/settings/development/BackAnimationPreferenceDialog.java
View File

@@ -27,7 +27,6 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
/**
@@ -66,8 +65,8 @@ public class BackAnimationPreferenceDialog extends InstrumentedDialogFragment
@NonNull
public Dialog onCreateDialog(Bundle savedInstanceState) {
return new AlertDialog.Builder(getActivity())
.setTitle(R.string.back_navigation_animation)
.setMessage(R.string.back_navigation_animation_dialog)
.setTitle(com.android.settingslib.R.string.back_navigation_animation)
.setMessage(com.android.settingslib.R.string.back_navigation_animation_dialog)
.setPositiveButton(android.R.string.ok, this /* onClickListener */)
.create();
}

2
src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java
View File

@@ -25,8 +25,8 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.R;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class BackgroundProcessLimitPreferenceController extends

2
src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java
View File

@@ -24,8 +24,8 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.R;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class BluetoothAvrcpVersionPreferenceController extends DeveloperOptionsPreferenceController

2
src/com/android/settings/development/BluetoothMapVersionPreferenceController.java
View File

@@ -24,8 +24,8 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.R;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
/**

6
src/com/android/settings/development/BluetoothSnoopLogFilterProfileMapPreferenceController.java
View File

@@ -56,10 +56,12 @@ public class BluetoothSnoopLogFilterProfileMapPreferenceController
super(context);
mListValues =
context.getResources()
.getStringArray(R.array.bt_hci_snoop_log_profile_filter_values);
.getStringArray(com.android.settingslib.R
.array.bt_hci_snoop_log_profile_filter_values);
mListEntries =
context.getResources()
.getStringArray(R.array.bt_hci_snoop_log_profile_filter_entries);
.getStringArray(com.android.settingslib.R
.array.bt_hci_snoop_log_profile_filter_entries);
mProfilesFilterDisabledEntry =
context.getResources()
.getString(R.string.bt_hci_snoop_log_filtered_mode_disabled_summary);

6
src/com/android/settings/development/BluetoothSnoopLogFilterProfilePbapPreferenceController.java
View File

@@ -56,10 +56,12 @@ public class BluetoothSnoopLogFilterProfilePbapPreferenceController
super(context);
mListValues =
context.getResources()
.getStringArray(R.array.bt_hci_snoop_log_profile_filter_values);
.getStringArray(com.android.settingslib.R
.array.bt_hci_snoop_log_profile_filter_values);
mListEntries =
context.getResources()
.getStringArray(R.array.bt_hci_snoop_log_profile_filter_entries);
.getStringArray(com.android.settingslib.R
.array.bt_hci_snoop_log_profile_filter_entries);
mProfilesFilterDisabledEntry =
context.getResources()
.getString(R.string.bt_hci_snoop_log_filtered_mode_disabled_summary);

7
src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java
View File

@@ -26,7 +26,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -48,8 +47,10 @@ public class BluetoothSnoopLogPreferenceController extends DeveloperOptionsPrefe
public BluetoothSnoopLogPreferenceController(
Context context, DevelopmentSettingsDashboardFragment fragment) {
super(context);
mListValues = context.getResources().getStringArray(R.array.bt_hci_snoop_log_values);
mListEntries = context.getResources().getStringArray(R.array.bt_hci_snoop_log_entries);
mListValues = context.getResources()
.getStringArray(com.android.settingslib.R.array.bt_hci_snoop_log_values);
mListEntries = context.getResources()
.getStringArray(com.android.settingslib.R.array.bt_hci_snoop_log_entries);
mFragment = fragment;
}

9
src/com/android/settings/development/CachedAppsFreezerPreferenceController.java
View File

@@ -29,7 +29,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -46,9 +45,10 @@ public class CachedAppsFreezerPreferenceController extends DeveloperOptionsPrefe
public CachedAppsFreezerPreferenceController(Context context) {
super(context);
mListValues = context.getResources().getStringArray(R.array.cached_apps_freezer_values);
mListValues = context.getResources()
.getStringArray(com.android.settingslib.R.array.cached_apps_freezer_values);
mListSummaries = context.getResources().getStringArray(
R.array.cached_apps_freezer_entries);
com.android.settingslib.R.array.cached_apps_freezer_entries);
}
@Override
@@ -76,7 +76,8 @@ public class CachedAppsFreezerPreferenceController extends DeveloperOptionsPrefe
if (!newValue.equals(currentValue)) {
final AlertDialog dialog = new AlertDialog.Builder(mContext)
.setMessage(R.string.cached_apps_freezer_reboot_dialog_text)
.setMessage(
com.android.settingslib.R.string.cached_apps_freezer_reboot_dialog_text)
.setPositiveButton(android.R.string.ok, getRebootDialogOkListener(newValue))
.setNegativeButton(android.R.string.cancel, getRebootDialogCancelListener())
.create();

3
src/com/android/settings/development/ClearAdbKeysWarningDialog.java
View File

@@ -25,7 +25,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
public class ClearAdbKeysWarningDialog extends InstrumentedDialogFragment implements
@@ -51,7 +50,7 @@ public class ClearAdbKeysWarningDialog extends InstrumentedDialogFragment implem
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
return new AlertDialog.Builder(getActivity())
.setMessage(R.string.adb_keys_warning_message)
.setMessage(com.android.settingslib.R.string.adb_keys_warning_message)
.setPositiveButton(android.R.string.ok, this /* onClickListener */)
.setNegativeButton(android.R.string.cancel, null /* onClickListener */)
.create();

2
src/com/android/settings/development/ColorModePreference.java
View File

@@ -26,7 +26,7 @@ import android.view.Display;
import androidx.preference.SwitchPreference;
import com.android.settings.R;
import com.android.settingslib.R;
import java.util.ArrayList;
import java.util.List;

7
src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java
View File

@@ -24,7 +24,6 @@ import android.view.ThreadedRenderer;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
@@ -41,8 +40,10 @@ public class DebugGpuOverdrawPreferenceController extends
public DebugGpuOverdrawPreferenceController(Context context) {
super(context);
mListValues = context.getResources().getStringArray(R.array.debug_hw_overdraw_values);
mListSummaries = context.getResources().getStringArray(R.array.debug_hw_overdraw_entries);
mListValues = context.getResources().getStringArray(
com.android.settingslib.R.array.debug_hw_overdraw_values);
mListSummaries = context.getResources().getStringArray(
com.android.settingslib.R.array.debug_hw_overdraw_entries);
}
@Override

7
src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java
View File

@@ -24,7 +24,6 @@ import android.view.ThreadedRenderer;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
@@ -41,8 +40,10 @@ public class DebugNonRectClipOperationsPreferenceController extends
public DebugNonRectClipOperationsPreferenceController(Context context) {
super(context);
mListValues = context.getResources().getStringArray(R.array.show_non_rect_clip_values);
mListSummaries = context.getResources().getStringArray(R.array.show_non_rect_clip_entries);
mListValues = context.getResources().getStringArray(
com.android.settingslib.R.array.show_non_rect_clip_values);
mListSummaries = context.getResources().getStringArray(
com.android.settingslib.R.array.show_non_rect_clip_entries);
}
@Override

3
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -243,7 +243,8 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
mIsAvailable = false;
// Show error message
if (!isUiRestrictedByOnlyAdmin()) {
getEmptyTextView().setText(R.string.development_settings_not_available);
getEmptyTextView().setText(
com.android.settingslib.R.string.development_settings_not_available);
}
getPreferenceScreen().removeAll();
return;

5
src/com/android/settings/development/DisableLogPersistWarningDialog.java
View File

@@ -25,7 +25,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
public class DisableLogPersistWarningDialog extends InstrumentedDialogFragment implements
@@ -55,8 +54,8 @@ public class DisableLogPersistWarningDialog extends InstrumentedDialogFragment i
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
return new AlertDialog.Builder(getActivity())
.setTitle(R.string.dev_logpersist_clear_warning_title)
.setMessage(R.string.dev_logpersist_clear_warning_message)
.setTitle(com.android.settingslib.R.string.dev_logpersist_clear_warning_title)
.setMessage(com.android.settingslib.R.string.dev_logpersist_clear_warning_message)
.setPositiveButton(android.R.string.ok, this /* onClickListener */)
.setNegativeButton(android.R.string.cancel, this /* onClickListener */)
.create();

5
src/com/android/settings/development/EnableAdbWarningDialog.java
View File

@@ -25,7 +25,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
public class EnableAdbWarningDialog extends InstrumentedDialogFragment implements
@@ -50,8 +49,8 @@ public class EnableAdbWarningDialog extends InstrumentedDialogFragment implement
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
return new AlertDialog.Builder(getActivity())
.setTitle(R.string.adb_warning_title)
.setMessage(R.string.adb_warning_message)
.setTitle(com.android.settingslib.R.string.adb_warning_title)
.setMessage(com.android.settingslib.R.string.adb_warning_message)
.setPositiveButton(android.R.string.ok, this /* onClickListener */)
.setNegativeButton(android.R.string.cancel, this /* onClickListener */)
.create();

2
src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java
View File

@@ -24,8 +24,8 @@ import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentManager;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.R;
public class EnableDevelopmentSettingWarningDialog extends InstrumentedDialogFragment
implements DialogInterface.OnClickListener {

4
src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java
View File

@@ -51,8 +51,8 @@ public class EnableOemUnlockSettingWarningDialog extends InstrumentedDialogFragm
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
return new AlertDialog.Builder(getActivity())
.setTitle(R.string.confirm_enable_oem_unlock_title)
.setMessage(R.string.confirm_enable_oem_unlock_text)
.setTitle(com.android.settingslib.R.string.confirm_enable_oem_unlock_title)
.setMessage(com.android.settingslib.R.string.confirm_enable_oem_unlock_text)
.setPositiveButton(R.string.enable_text, this /* onClickListener */)
.setNegativeButton(android.R.string.cancel, this /* onClickListener */)
.create();

7
src/com/android/settings/development/GrammaticalGenderPreferenceController.java
View File

@@ -28,7 +28,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -56,8 +55,10 @@ public class GrammaticalGenderPreferenceController extends DeveloperOptionsPrefe
IActivityManager activityManager) {
super(context);
mListValues = context.getResources().getStringArray(R.array.grammatical_gender_values);
mListSummaries = context.getResources().getStringArray(R.array.grammatical_gender_entries);
mListValues = context.getResources()
.getStringArray(com.android.settingslib.R.array.grammatical_gender_values);
mListSummaries = context.getResources()
.getStringArray(com.android.settingslib.R.array.grammatical_gender_entries);
mActivityManager = activityManager;
}

2
src/com/android/settings/development/HdcpCheckingPreferenceController.java
View File

@@ -25,8 +25,8 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.R;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;

2
src/com/android/settings/development/LocalBackupPasswordPreferenceController.java
View File

@@ -25,8 +25,8 @@ import android.os.UserManager;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.R;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class LocalBackupPasswordPreferenceController extends DeveloperOptionsPreferenceController

9
src/com/android/settings/development/MockLocationAppPreferenceController.java
View File

@@ -30,7 +30,6 @@ import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -98,11 +97,13 @@ public class MockLocationAppPreferenceController extends DeveloperOptionsPrefere
if (!TextUtils.isEmpty(mockLocationApp)) {
mPreference.setSummary(
mContext.getResources().getString(R.string.mock_location_app_set,
getAppLabel(mockLocationApp)));
mContext.getResources()
.getString(com.android.settingslib.R.string.mock_location_app_set,
getAppLabel(mockLocationApp)));
} else {
mPreference.setSummary(
mContext.getResources().getString(R.string.mock_location_app_not_set));
mContext.getResources()
.getString(com.android.settingslib.R.string.mock_location_app_not_set));
}
}

4
src/com/android/settings/development/OemUnlockPreferenceController.java
View File

@@ -159,7 +159,7 @@ public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceCon
}
private void updateOemUnlockSettingDescription() {
int oemUnlockSummary = R.string.oem_unlock_enable_summary;
int oemUnlockSummary = com.android.settingslib.R.string.oem_unlock_enable_summary;
if (isBootloaderUnlocked()) {
oemUnlockSummary = R.string.oem_unlock_enable_disabled_summary_bootloader_unlocked;
} else if (isSimLockedDevice()) {
@@ -203,7 +203,7 @@ public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceCon
final ChooseLockSettingsHelper.Builder builder =
new ChooseLockSettingsHelper.Builder(mActivity, mFragment);
return builder.setRequestCode(requestCode)
.setTitle(resources.getString(R.string.oem_unlock_enable))
.setTitle(resources.getString(com.android.settingslib.R.string.oem_unlock_enable))
.show();
}

7
src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java
View File

@@ -24,7 +24,6 @@ import android.view.ThreadedRenderer;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
@@ -40,8 +39,10 @@ public class ProfileGpuRenderingPreferenceController extends DeveloperOptionsPre
public ProfileGpuRenderingPreferenceController(Context context) {
super(context);
mListValues = context.getResources().getStringArray(R.array.track_frame_time_values);
mListSummaries = context.getResources().getStringArray(R.array.track_frame_time_entries);
mListValues = context.getResources()
.getStringArray(com.android.settingslib.R.array.track_frame_time_values);
mListSummaries = context.getResources()
.getStringArray(com.android.settingslib.R.array.track_frame_time_entries);
}
@Override

2
src/com/android/settings/development/SecondaryDisplayPreferenceController.java
View File

@@ -23,8 +23,8 @@ import android.text.TextUtils;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.R;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class SecondaryDisplayPreferenceController extends DeveloperOptionsPreferenceController

12
src/com/android/settings/development/SelectDebugAppPreferenceController.java
View File

@@ -28,7 +28,6 @@ import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -82,7 +81,8 @@ public class SelectDebugAppPreferenceController extends DeveloperOptionsPreferen
@Override
protected void onDeveloperOptionsSwitchDisabled() {
super.onDeveloperOptionsSwitchDisabled();
mPreference.setSummary(mContext.getResources().getString(R.string.debug_app_not_set));
mPreference.setSummary(mContext.getResources()
.getString(com.android.settingslib.R.string.debug_app_not_set));
}
@VisibleForTesting
@@ -94,10 +94,12 @@ public class SelectDebugAppPreferenceController extends DeveloperOptionsPreferen
final String debugApp = Settings.Global.getString(
mContext.getContentResolver(), Settings.Global.DEBUG_APP);
if (debugApp != null && debugApp.length() > 0) {
mPreference.setSummary(mContext.getResources().getString(R.string.debug_app_set,
getAppLabel(debugApp)));
mPreference.setSummary(mContext.getResources()
.getString(com.android.settingslib.R.string.debug_app_set,
getAppLabel(debugApp)));
} else {
mPreference.setSummary(mContext.getResources().getString(R.string.debug_app_not_set));
mPreference.setSummary(mContext.getResources()
.getString(com.android.settingslib.R.string.debug_app_not_set));
}
}

7
src/com/android/settings/development/SimulateColorSpacePreferenceController.java
View File

@@ -26,7 +26,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -83,8 +82,10 @@ public class SimulateColorSpacePreferenceController extends DeveloperOptionsPref
if (index < 0) {
final Resources res = mContext.getResources();
// We're using a mode controlled by accessibility preferences.
listPreference.setSummary(res.getString(R.string.daltonizer_type_overridden,
res.getString(R.string.accessibility_display_daltonizer_preference_title)));
listPreference.setSummary(
res.getString(com.android.settingslib.R.string.daltonizer_type_overridden,
res.getString(com.android.settingslib.R
.string.accessibility_display_daltonizer_preference_title)));
} else {
listPreference.setSummary("%s");
}

5
src/com/android/settings/development/TransitionAnimationScalePreferenceController.java
View File

@@ -25,7 +25,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -50,9 +49,9 @@ public class TransitionAnimationScalePreferenceController extends
mWindowManager = IWindowManager.Stub.asInterface(
ServiceManager.getService(Context.WINDOW_SERVICE));
mListValues = context.getResources().getStringArray(
R.array.transition_animation_scale_values);
com.android.settingslib.R.array.transition_animation_scale_values);
mListSummaries = context.getResources().getStringArray(
R.array.transition_animation_scale_entries);
com.android.settingslib.R.array.transition_animation_scale_entries);
}
@Override

6
src/com/android/settings/development/WindowAnimationScalePreferenceController.java
View File

@@ -25,7 +25,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -49,9 +48,10 @@ public class WindowAnimationScalePreferenceController extends
mWindowManager = IWindowManager.Stub.asInterface(
ServiceManager.getService(Context.WINDOW_SERVICE));
mListValues = context.getResources().getStringArray(R.array.window_animation_scale_values);
mListValues = context.getResources()
.getStringArray(com.android.settingslib.R.array.window_animation_scale_values);
mListSummaries = context.getResources().getStringArray(
R.array.window_animation_scale_entries);
com.android.settingslib.R.array.window_animation_scale_entries);
}
@Override

5
src/com/android/settings/development/WirelessDebuggingEnabler.java
View File

@@ -26,7 +26,6 @@ import android.provider.Settings;
import android.util.Log;
import android.widget.Toast;
import com.android.settings.R;
import com.android.settings.widget.SwitchWidgetController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -125,8 +124,8 @@ public class WirelessDebuggingEnabler implements SwitchWidgetController.OnSwitch
public boolean onSwitchToggled(boolean isChecked) {
if (isChecked && !WirelessDebuggingPreferenceController.isWifiConnected(mContext)) {
// No connected Wi-Fi network. Reset the switch to off.
Toast.makeText(
mContext, R.string.adb_wireless_no_network_msg, Toast.LENGTH_LONG)
Toast.makeText(mContext, com.android.settingslib.R.string.adb_wireless_no_network_msg,
Toast.LENGTH_LONG)
.show();
mSwitchWidget.setChecked(false);
return false;

5
src/com/android/settings/development/WirelessDebuggingFragment.java
View File

@@ -211,7 +211,8 @@ public class WirelessDebuggingFragment extends DashboardFragment
mOffMessagePreference =
new FooterPreference(mFooterCategory.getContext());
final CharSequence title = getText(R.string.adb_wireless_list_empty_off);
final CharSequence title =
getText(com.android.settingslib.R.string.adb_wireless_list_empty_off);
mOffMessagePreference.setTitle(title);
mFooterCategory.addPreference(mOffMessagePreference);
}
@@ -418,7 +419,7 @@ public class WirelessDebuggingFragment extends DashboardFragment
// For sending to the device details fragment.
p.savePairedDeviceToExtras(p.getExtras());
new SubSettingLauncher(getContext())
.setTitleRes(R.string.adb_wireless_device_details_title)
.setTitleRes(com.android.settingslib.R.string.adb_wireless_device_details_title)
.setDestination(AdbDeviceDetailsFragment.class.getName())
.setArguments(p.getExtras())
.setSourceMetricsCategory(getMetricsCategory())

4
src/com/android/settings/development/WirelessDebuggingPreferenceController.java
View File

@@ -34,7 +34,6 @@ import android.widget.Toast;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.PrimarySwitchPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -163,7 +162,8 @@ public class WirelessDebuggingPreferenceController extends DeveloperOptionsPrefe
if (enabled && !isWifiConnected(mContext)) {
// Cannot enable ADB over Wi-Fi if we're not connected to wifi.
Toast.makeText(
mContext, R.string.adb_wireless_no_network_msg, Toast.LENGTH_LONG)
mContext, com.android.settingslib.R.string.adb_wireless_no_network_msg,
Toast.LENGTH_LONG)
.show();
return false;
}

6
src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreference.java
View File

@@ -103,7 +103,8 @@ public abstract class BaseBluetoothDialogPreference extends CustomDialogPreferen
// View will be invisible when all options are enabled.
helpTextView.setVisibility(View.GONE);
} else {
helpTextView.setText(R.string.bluetooth_select_a2dp_codec_type_help_info);
helpTextView.setText(
com.android.settingslib.R.string.bluetooth_select_a2dp_codec_type_help_info);
helpTextView.setVisibility(View.VISIBLE);
}
}
@@ -135,7 +136,8 @@ public abstract class BaseBluetoothDialogPreference extends CustomDialogPreferen
}
return index == getDefaultIndex() ? mSummaryStrings.get(getDefaultIndex()) :
String.format(getContext().getResources().getString(
R.string.bluetooth_select_a2dp_codec_streaming_label),
com.android.settingslib.R
.string.bluetooth_select_a2dp_codec_streaming_label),
mSummaryStrings.get(index));
}

4
src/com/android/settings/development/bluetooth/BluetoothBitPerSampleDialogPreference.java
View File

@@ -61,12 +61,12 @@ public class BluetoothBitPerSampleDialogPreference extends BaseBluetoothDialogPr
mRadioButtonIds.add(R.id.bluetooth_audio_bit_per_sample_24);
mRadioButtonIds.add(R.id.bluetooth_audio_bit_per_sample_32);
String[] stringArray = context.getResources().getStringArray(
R.array.bluetooth_a2dp_codec_bits_per_sample_titles);
com.android.settingslib.R.array.bluetooth_a2dp_codec_bits_per_sample_titles);
for (int i = 0; i < stringArray.length; i++) {
mRadioButtonStrings.add(stringArray[i]);
}
stringArray = context.getResources().getStringArray(
R.array.bluetooth_a2dp_codec_bits_per_sample_summaries);
com.android.settingslib.R.array.bluetooth_a2dp_codec_bits_per_sample_summaries);
for (int i = 0; i < stringArray.length; i++) {
mSummaryStrings.add(stringArray[i]);
}

4
src/com/android/settings/development/bluetooth/BluetoothChannelModeDialogPreference.java
View File

@@ -60,12 +60,12 @@ public class BluetoothChannelModeDialogPreference extends BaseBluetoothDialogPre
mRadioButtonIds.add(R.id.bluetooth_audio_channel_mode_mono);
mRadioButtonIds.add(R.id.bluetooth_audio_channel_mode_stereo);
String[] stringArray = context.getResources().getStringArray(
R.array.bluetooth_a2dp_codec_channel_mode_titles);
com.android.settingslib.R.array.bluetooth_a2dp_codec_channel_mode_titles);
for (int i = 0; i < stringArray.length; i++) {
mRadioButtonStrings.add(stringArray[i]);
}
stringArray = context.getResources().getStringArray(
R.array.bluetooth_a2dp_codec_channel_mode_summaries);
com.android.settingslib.R.array.bluetooth_a2dp_codec_channel_mode_summaries);
for (int i = 0; i < stringArray.length; i++) {
mSummaryStrings.add(stringArray[i]);
}

5
src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreference.java
View File

@@ -64,11 +64,12 @@ public class BluetoothCodecDialogPreference extends BaseBluetoothDialogPreferenc
mRadioButtonIds.add(R.id.bluetooth_audio_codec_lc3);
mRadioButtonIds.add(R.id.bluetooth_audio_codec_opus);
String[] stringArray = context.getResources().getStringArray(
R.array.bluetooth_a2dp_codec_titles);
com.android.settingslib.R.array.bluetooth_a2dp_codec_titles);
for (int i = 0; i < stringArray.length; i++) {
mRadioButtonStrings.add(stringArray[i]);
}
stringArray = context.getResources().getStringArray(R.array.bluetooth_a2dp_codec_summaries);
stringArray = context.getResources()
.getStringArray(com.android.settingslib.R.array.bluetooth_a2dp_codec_summaries);
for (int i = 0; i < stringArray.length; i++) {
mSummaryStrings.add(stringArray[i]);
}

5
src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreference.java
View File

@@ -65,12 +65,13 @@ public class BluetoothQualityDialogPreference extends BaseBluetoothDialogPrefere
mRadioButtonIds.add(R.id.bluetooth_audio_quality_optimized_connection);
mRadioButtonIds.add(R.id.bluetooth_audio_quality_best_effort);
String[] stringArray = context.getResources().getStringArray(
R.array.bluetooth_a2dp_codec_ldac_playback_quality_titles);
com.android.settingslib.R.array.bluetooth_a2dp_codec_ldac_playback_quality_titles);
for (int i = 0; i < stringArray.length; i++) {
mRadioButtonStrings.add(stringArray[i]);
}
stringArray = context.getResources().getStringArray(
R.array.bluetooth_a2dp_codec_ldac_playback_quality_summaries);
com.android.settingslib.R
.array.bluetooth_a2dp_codec_ldac_playback_quality_summaries);
for (int i = 0; i < stringArray.length; i++) {
mSummaryStrings.add(stringArray[i]);
}

4
src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreference.java
View File

@@ -62,12 +62,12 @@ public class BluetoothSampleRateDialogPreference extends BaseBluetoothDialogPref
mRadioButtonIds.add(R.id.bluetooth_audio_sample_rate_882);
mRadioButtonIds.add(R.id.bluetooth_audio_sample_rate_960);
String[] stringArray = context.getResources().getStringArray(
R.array.bluetooth_a2dp_codec_sample_rate_titles);
com.android.settingslib.R.array.bluetooth_a2dp_codec_sample_rate_titles);
for (int i = 0; i < stringArray.length; i++) {
mRadioButtonStrings.add(stringArray[i]);
}
stringArray = context.getResources().getStringArray(
R.array.bluetooth_a2dp_codec_sample_rate_summaries);
com.android.settingslib.R.array.bluetooth_a2dp_codec_sample_rate_summaries);
for (int i = 0; i < stringArray.length; i++) {
mSummaryStrings.add(stringArray[i]);
}

4
src/com/android/settings/development/qstile/DevelopmentTiles.java
View File

@@ -50,7 +50,6 @@ import androidx.annotation.VisibleForTesting;
import com.android.internal.app.LocalePicker;
import com.android.internal.inputmethod.ImeTracing;
import com.android.internal.statusbar.IStatusBarService;
import com.android.settings.R;
import com.android.settings.development.WirelessDebuggingPreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -433,7 +432,8 @@ public abstract class DevelopmentTiles extends TileService {
mContext = getApplicationContext();
mKeyguardManager = (KeyguardManager) mContext.getSystemService(
Context.KEYGUARD_SERVICE);
mToast = Toast.makeText(mContext, R.string.adb_wireless_no_network_msg,
mToast = Toast.makeText(mContext,
com.android.settingslib.R.string.adb_wireless_no_network_msg,
Toast.LENGTH_LONG);
}

7
src/com/android/settings/development/snooplogger/SnoopLoggerFiltersPreferenceController.java
View File

@@ -22,7 +22,6 @@ import android.sysprop.BluetoothProperties;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
/** A {@link BasePreferenceController} used in {@link SnoopLoggerFiltersDashboard} */
@@ -35,9 +34,11 @@ public class SnoopLoggerFiltersPreferenceController extends BasePreferenceContro
public SnoopLoggerFiltersPreferenceController(Context context, String key) {
super(context, key);
mListValues =
context.getResources().getStringArray(R.array.bt_hci_snoop_log_filters_values);
context.getResources().getStringArray(
com.android.settingslib.R.array.bt_hci_snoop_log_filters_values);
mListEntries =
context.getResources().getStringArray(R.array.bt_hci_snoop_log_filters_entries);
context.getResources().getStringArray(
com.android.settingslib.R.array.bt_hci_snoop_log_filters_entries);
}
@Override

18
src/com/android/settings/development/storage/BlobInfoListView.java
View File

@@ -83,7 +83,8 @@ public class BlobInfoListView extends ListActivity {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == SharedDataUtils.LEASE_VIEW_REQUEST_CODE
&& resultCode == SharedDataUtils.LEASE_VIEW_RESULT_CODE_FAILURE) {
Toast.makeText(this, R.string.shared_data_delete_failure_text, Toast.LENGTH_LONG)
Toast.makeText(this, com.android.settingslib.R.string.shared_data_delete_failure_text,
Toast.LENGTH_LONG)
.show();
}
// do nothing on LEASE_VIEW_RESULT_CODE_SUCCESS since data is updated in onResume()
@@ -103,7 +104,7 @@ public class BlobInfoListView extends ListActivity {
private void showDeleteBlobDialog(BlobInfo blob) {
final AlertDialog dialog = new AlertDialog.Builder(mContext)
.setMessage(R.string.shared_data_no_accessors_dialog_text)
.setMessage(com.android.settingslib.R.string.shared_data_no_accessors_dialog_text)
.setPositiveButton(android.R.string.ok, getDialogOnClickListener(blob))
.setNegativeButton(android.R.string.cancel, null)
.create();
@@ -116,7 +117,9 @@ public class BlobInfoListView extends ListActivity {
mBlobStoreManager.deleteBlob(blob);
} catch (IOException e) {
Log.e(TAG, "Unable to delete blob: " + e.getMessage());
Toast.makeText(this, R.string.shared_data_delete_failure_text, Toast.LENGTH_LONG)
Toast.makeText(this,
com.android.settingslib.R.string.shared_data_delete_failure_text,
Toast.LENGTH_LONG)
.show();
}
queryBlobsAndUpdateList();
@@ -128,7 +131,8 @@ public class BlobInfoListView extends ListActivity {
mAdapter.updateList(mBlobStoreManager.queryBlobsForUser(UserHandle.CURRENT));
} catch (IOException e) {
Log.e(TAG, "Unable to fetch blobs for current user: " + e.getMessage());
Toast.makeText(this, R.string.shared_data_query_failure_text, Toast.LENGTH_LONG).show();
Toast.makeText(this, com.android.settingslib.R.string.shared_data_query_failure_text,
Toast.LENGTH_LONG).show();
finish();
}
}
@@ -155,7 +159,8 @@ public class BlobInfoListView extends ListActivity {
final BlobInfo blob = getItem(position);
holder.blobLabel.setText(blob.getLabel());
holder.blobId.setText(getString(R.string.blob_id_text, blob.getId()));
holder.blobId.setText(
getString(com.android.settingslib.R.string.blob_id_text, blob.getId()));
holder.blobExpiry.setText(formatExpiryTime(blob.getExpiryTimeMs()));
holder.blobSize.setText(SharedDataUtils.formatSize(blob.getSizeBytes()));
return convertView;
@@ -165,7 +170,8 @@ public class BlobInfoListView extends ListActivity {
if (expiryTimeMs == 0) {
return getString(R.string.blob_never_expires_text);
}
return getString(R.string.blob_expires_text, SharedDataUtils.formatTime(expiryTimeMs));
return getString(com.android.settingslib.R.string.blob_expires_text,
SharedDataUtils.formatTime(expiryTimeMs));
}
}
}

11
src/com/android/settings/development/storage/LeaseInfoListView.java
View File

@@ -100,7 +100,7 @@ public class LeaseInfoListView extends ListActivity {
blobLabel.setText(mBlobInfo.getLabel());
blobLabel.setTypeface(Typeface.DEFAULT_BOLD);
blobId.setText(getString(R.string.blob_id_text, mBlobInfo.getId()));
blobId.setText(getString(com.android.settingslib.R.string.blob_id_text, mBlobInfo.getId()));
blobExpiry.setVisibility(View.GONE);
blobSize.setText(SharedDataUtils.formatSize(mBlobInfo.getSizeBytes()));
return headerView;
@@ -110,7 +110,7 @@ public class LeaseInfoListView extends ListActivity {
final Button deleteButton = new Button(this);
deleteButton.setLayoutParams(
new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
deleteButton.setText(R.string.delete_blob_text);
deleteButton.setText(com.android.settingslib.R.string.delete_blob_text);
deleteButton.setOnClickListener(getButtonOnClickListener());
return deleteButton;
}
@@ -118,7 +118,7 @@ public class LeaseInfoListView extends ListActivity {
private View.OnClickListener getButtonOnClickListener() {
return v -> {
final AlertDialog dialog = new AlertDialog.Builder(mContext)
.setMessage(R.string.delete_blob_confirmation_text)
.setMessage(com.android.settingslib.R.string.delete_blob_confirmation_text)
.setPositiveButton(android.R.string.ok, getDialogOnClickListener())
.setNegativeButton(android.R.string.cancel, null)
.create();
@@ -185,7 +185,8 @@ public class LeaseInfoListView extends ListActivity {
}
} finally {
if (TextUtils.isEmpty(description)) {
description = getString(R.string.accessor_no_description_text);
description = getString(
com.android.settingslib.R.string.accessor_no_description_text);
}
}
return description;
@@ -195,7 +196,7 @@ public class LeaseInfoListView extends ListActivity {
if (expiryTimeMillis == 0) {
return getString(R.string.accessor_never_expires_text);
}
return getString(R.string.accessor_expires_text,
return getString(com.android.settingslib.R.string.accessor_expires_text,
SharedDataUtils.formatTime(expiryTimeMillis));
}
}

8
src/com/android/settings/development/storage/SharedDataPreferenceController.java
View File

@@ -23,7 +23,6 @@ import android.util.Log;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -52,12 +51,13 @@ public class SharedDataPreferenceController extends DeveloperOptionsPreferenceCo
final boolean showPref = mBlobStoreManager != null
&& !mBlobStoreManager.queryBlobsForUser(UserHandle.CURRENT).isEmpty();
preference.setEnabled(showPref);
preference.setSummary(showPref ? R.string.shared_data_summary
: R.string.shared_data_no_blobs_text);
preference.setSummary(
showPref ? com.android.settingslib.R.string.shared_data_summary
: com.android.settingslib.R.string.shared_data_no_blobs_text);
} catch (IOException e) {
Log.e(TAG, "Unable to fetch blobs for current user: " + e.getMessage());
preference.setEnabled(false);
preference.setSummary(R.string.shared_data_no_blobs_text);
preference.setSummary(com.android.settingslib.R.string.shared_data_no_blobs_text);
}
}
}