diff --git a/src/com/android/settings/AllInOneTetherSettings.java b/src/com/android/settings/AllInOneTetherSettings.java index f98fdc1d234..b3644f8cf05 100644 --- a/src/com/android/settings/AllInOneTetherSettings.java +++ b/src/com/android/settings/AllInOneTetherSettings.java @@ -244,7 +244,8 @@ public class AllInOneTetherSettings extends RestrictedDashboardFragment if (mUnavailable) { if (!isUiRestrictedByOnlyAdmin()) { - getEmptyTextView().setText(R.string.tethering_settings_not_available); + getEmptyTextView().setText( + com.android.settingslib.R.string.tethering_settings_not_available); } getPreferenceScreen().removeAll(); return; diff --git a/src/com/android/settings/MainClear.java b/src/com/android/settings/MainClear.java index f706c785401..b559b476a07 100644 --- a/src/com/android/settings/MainClear.java +++ b/src/com/android/settings/MainClear.java @@ -437,7 +437,7 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis .setText(R.string.main_clear_button_text) .setListener(mInitiateListener) .setButtonType(ButtonType.OTHER) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build() ); mInitiateButton = mixin.getPrimaryButton(); @@ -501,10 +501,12 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis if (userInfo.isManagedProfile()) { titleText.setText(devicePolicyManager.getResources().getString( - WORK_CATEGORY_HEADER, () -> getString(R.string.category_work))); + WORK_CATEGORY_HEADER, () -> getString( + com.android.settingslib.R.string.category_work))); } else { titleText.setText(devicePolicyManager.getResources().getString( - PERSONAL_CATEGORY_HEADER, () -> getString(R.string.category_personal))); + PERSONAL_CATEGORY_HEADER, () -> getString( + com.android.settingslib.R.string.category_personal))); } contents.addView(titleView); } diff --git a/src/com/android/settings/MainClearConfirm.java b/src/com/android/settings/MainClearConfirm.java index defe403ab9a..b5ddd1aeb96 100644 --- a/src/com/android/settings/MainClearConfirm.java +++ b/src/com/android/settings/MainClearConfirm.java @@ -212,7 +212,7 @@ public class MainClearConfirm extends InstrumentedFragment { .setText(R.string.main_clear_button_text) .setListener(mFinalClickListener) .setButtonType(ButtonType.OTHER) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build() ); } diff --git a/src/com/android/settings/RestrictedCheckBox.java b/src/com/android/settings/RestrictedCheckBox.java index 828c4434d95..64bb0a67e6b 100644 --- a/src/com/android/settings/RestrictedCheckBox.java +++ b/src/com/android/settings/RestrictedCheckBox.java @@ -61,7 +61,8 @@ public class RestrictedCheckBox extends CheckBox { RestrictedLockUtilsInternal.setTextViewAsDisabledByAdmin(mContext, this, mDisabledByAdmin); if (mDisabledByAdmin) { - getButtonDrawable().setColorFilter(mContext.getColor(R.color.disabled_text_color), + getButtonDrawable().setColorFilter( + mContext.getColor(com.android.settingslib.R.color.disabled_text_color), PorterDuff.Mode.MULTIPLY); } else { getButtonDrawable().clearColorFilter(); diff --git a/src/com/android/settings/SetFullBackupPassword.java b/src/com/android/settings/SetFullBackupPassword.java index 833ba99190d..7252289527d 100644 --- a/src/com/android/settings/SetFullBackupPassword.java +++ b/src/com/android/settings/SetFullBackupPassword.java @@ -49,7 +49,8 @@ public class SetFullBackupPassword extends Activity { // Mismatch between new pw and its confirmation re-entry Log.i(TAG, "password mismatch"); Toast.makeText(SetFullBackupPassword.this, - R.string.local_backup_password_toast_confirmation_mismatch, + com.android.settingslib.R + .string.local_backup_password_toast_confirmation_mismatch, Toast.LENGTH_LONG).show(); return; } @@ -60,14 +61,15 @@ public class SetFullBackupPassword extends Activity { // success Log.i(TAG, "password set successfully"); Toast.makeText(SetFullBackupPassword.this, - R.string.local_backup_password_toast_success, + com.android.settingslib.R.string.local_backup_password_toast_success, Toast.LENGTH_LONG).show(); finish(); } else { // failure -- bad existing pw, usually Log.i(TAG, "failure; password mismatch?"); Toast.makeText(SetFullBackupPassword.this, - R.string.local_backup_password_toast_validation_failure, + com.android.settingslib.R + .string.local_backup_password_toast_validation_failure, Toast.LENGTH_LONG).show(); } } else if (v == mCancel) { diff --git a/src/com/android/settings/TrustedCredentialsFragment.java b/src/com/android/settings/TrustedCredentialsFragment.java index c90a44d17a9..ca95c1ad34d 100644 --- a/src/com/android/settings/TrustedCredentialsFragment.java +++ b/src/com/android/settings/TrustedCredentialsFragment.java @@ -333,11 +333,11 @@ public class TrustedCredentialsFragment extends ObservableFragment TextView title = convertView.findViewById(android.R.id.title); if (getUserInfoByGroup(groupPosition).isManagedProfile()) { title.setText(mDevicePolicyManager.getResources().getString(WORK_CATEGORY_HEADER, - () -> getString(R.string.category_work))); + () -> getString(com.android.settingslib.R.string.category_work))); } else { title.setText(mDevicePolicyManager.getResources().getString( PERSONAL_CATEGORY_HEADER, - () -> getString(R.string.category_personal))); + () -> getString(com.android.settingslib.R.string.category_personal))); } title.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_END); diff --git a/src/com/android/settings/accessibility/AccessibilitySetupWizardUtils.java b/src/com/android/settings/accessibility/AccessibilitySetupWizardUtils.java index b7a3439162d..6f1ed8f1843 100644 --- a/src/com/android/settings/accessibility/AccessibilitySetupWizardUtils.java +++ b/src/com/android/settings/accessibility/AccessibilitySetupWizardUtils.java @@ -21,12 +21,11 @@ import android.widget.LinearLayout; import androidx.annotation.StringRes; -import com.android.settings.R; - import com.google.android.setupcompat.template.FooterBarMixin; import com.google.android.setupcompat.template.FooterButton; import com.google.android.setupcompat.template.Mixin; import com.google.android.setupdesign.GlifPreferenceLayout; +import com.google.android.setupdesign.R; import com.google.android.setupdesign.util.ThemeHelper; /** Provides utility methods to accessibility settings for Setup Wizard only. */ diff --git a/src/com/android/settings/accessibility/BalanceSeekBarPreference.java b/src/com/android/settings/accessibility/BalanceSeekBarPreference.java index b03c8abd314..0254cae92b4 100644 --- a/src/com/android/settings/accessibility/BalanceSeekBarPreference.java +++ b/src/com/android/settings/accessibility/BalanceSeekBarPreference.java @@ -17,16 +17,12 @@ package com.android.settings.accessibility; import android.content.Context; -import android.media.AudioSystem; import android.os.UserHandle; import android.provider.Settings; import android.util.AttributeSet; -import android.view.View; import android.widget.ImageView; -import android.widget.SeekBar; import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; import com.android.settings.R; @@ -43,7 +39,7 @@ public class BalanceSeekBarPreference extends SeekBarPreference { public BalanceSeekBarPreference(Context context, AttributeSet attrs) { super(context, attrs, TypedArrayUtils.getAttr(context, - R.attr.preferenceStyle, + com.android.settingslib.R.attr.preferenceStyle, android.R.attr.preferenceStyle)); mContext = context; setLayoutResource(R.layout.preference_balance_slider); diff --git a/src/com/android/settings/accessibility/FlashNotificationsPreviewPreference.java b/src/com/android/settings/accessibility/FlashNotificationsPreviewPreference.java index 0141084cb12..79534d87e31 100644 --- a/src/com/android/settings/accessibility/FlashNotificationsPreviewPreference.java +++ b/src/com/android/settings/accessibility/FlashNotificationsPreviewPreference.java @@ -62,7 +62,8 @@ public class FlashNotificationsPreviewPreference extends Preference { private void init() { setLayoutResource(R.layout.flash_notification_preview_preference); - mBackgroundEnabled = getContext().getDrawable(R.drawable.settingslib_switch_bar_bg_on); + mBackgroundEnabled = getContext().getDrawable( + com.android.settingslib.widget.R.drawable.settingslib_switch_bar_bg_on); mBackgroundDisabled = getContext().getDrawable(R.drawable.switch_bar_bg_disabled); mTextColorDisabled = Utils.getColorAttrDefaultColor(getContext(), android.R.attr.textColorPrimary); diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java index 5e361005ad9..bc34e01ee8d 100644 --- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java @@ -95,8 +95,10 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { mComponentName = DALTONIZER_COMPONENT_NAME; - mPackageName = getText(R.string.accessibility_display_daltonizer_preference_title); - mHtmlDescription = getText(R.string.accessibility_display_daltonizer_preference_subtitle); + mPackageName = getText(com.android.settingslib.R + .string.accessibility_display_daltonizer_preference_title); + mHtmlDescription = getText(com.android.settingslib.R + .string.accessibility_display_daltonizer_preference_subtitle); mTopIntroTitle = getText(R.string.accessibility_daltonizer_about_intro_text); final View view = super.onCreateView(inflater, container, savedInstanceState); updateFooterPreference(); @@ -108,8 +110,8 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF super.onViewCreated(view, savedInstanceState); final View rootView = getActivity().getWindow().peekDecorView(); if (rootView != null) { - rootView.setAccessibilityPaneTitle(getString( - R.string.accessibility_display_daltonizer_preference_title)); + rootView.setAccessibilityPaneTitle(getString(com.android.settingslib.R + .string.accessibility_display_daltonizer_preference_title)); } } diff --git a/src/com/android/settings/accessibility/VibrationSettings.java b/src/com/android/settings/accessibility/VibrationSettings.java index 26a1bc2af7d..e7a249b07e2 100644 --- a/src/com/android/settings/accessibility/VibrationSettings.java +++ b/src/com/android/settings/accessibility/VibrationSettings.java @@ -81,7 +81,7 @@ public class VibrationSettings extends DashboardFragment { R.integer.config_vibration_supported_intensity_levels); if (rv != null && supportedIntensities > 1) { final int bottom_padding = res.getDimensionPixelSize( - R.dimen.settingslib_listPreferredItemPaddingEnd); + com.android.settingslib.widget.R.dimen.settingslib_listPreferredItemPaddingEnd); rv.setPaddingRelative(rv.getPaddingStart(), rv.getPaddingTop(), rv.getPaddingEnd(), rv.getPaddingBottom() + bottom_padding); } diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java index cdaba207592..ce780693b97 100644 --- a/src/com/android/settings/accounts/AccountPreferenceController.java +++ b/src/com/android/settings/accounts/AccountPreferenceController.java @@ -352,7 +352,7 @@ public class AccountPreferenceController extends AbstractPreferenceController } else if (userInfo.isManagedProfile()) { if (mType == ProfileSelectFragment.ProfileType.ALL) { setCategoryTitleFromDevicePolicyResource(preferenceGroup, WORK_CATEGORY_HEADER, - R.string.category_work); + com.android.settingslib.R.string.category_work); final String workGroupSummary = getWorkGroupSummary(context, userInfo); preferenceGroup.setSummary(workGroupSummary); setContentDescriptionFromDevicePolicyResource(preferenceGroup, @@ -366,7 +366,7 @@ public class AccountPreferenceController extends AbstractPreferenceController } else if (userInfo.isCloneProfile()) { if (mType == ProfileSelectFragment.ProfileType.ALL) { setCategoryTitleFromDevicePolicyResource(preferenceGroup, CLONE_CATEGORY_HEADER, - R.string.category_clone); + com.android.settingslib.R.string.category_clone); setContentDescriptionFromDevicePolicyResource(preferenceGroup, ACCESSIBILITY_CATEGORY_CLONE, R.string.accessibility_category_clone, null); @@ -375,7 +375,7 @@ public class AccountPreferenceController extends AbstractPreferenceController // Primary Profile if (mType == ProfileSelectFragment.ProfileType.ALL) { setCategoryTitleFromDevicePolicyResource(preferenceGroup, PERSONAL_CATEGORY_HEADER, - R.string.category_personal); + com.android.settingslib.R.string.category_personal); setContentDescriptionFromDevicePolicyResource(preferenceGroup, ACCESSIBILITY_CATEGORY_PERSONAL, R.string.accessibility_category_personal, null); diff --git a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java index f1b5be109d2..ddf92f5db24 100644 --- a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java +++ b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java @@ -92,7 +92,8 @@ public class AccountTypePreferenceLoader { final Context targetCtx = mFragment.getActivity().createPackageContextAsUser( desc.packageName, 0, mUserHandle); final Theme baseTheme = mFragment.getResources().newTheme(); - baseTheme.applyStyle(R.style.Theme_SettingsBase, true); + baseTheme.applyStyle( + com.android.settingslib.widget.R.style.Theme_SettingsBase, true); final Context themedCtx = new LocalClassLoaderContextThemeWrapper(getClass(), targetCtx, 0); themedCtx.getTheme().setTo(baseTheme); diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java index e95b41ae0e7..3d5bddb4cc5 100644 --- a/src/com/android/settings/applications/RunningServiceDetails.java +++ b/src/com/android/settings/applications/RunningServiceDetails.java @@ -226,8 +226,8 @@ public class RunningServiceDetails extends InstrumentedFragment void addServicesHeader() { if (mNumServices == 0) { - mServicesHeader = (TextView) mInflater.inflate(R.layout.preference_category, - mAllDetails, false); + mServicesHeader = (TextView) mInflater.inflate( + androidx.preference.R.layout.preference_category, mAllDetails, false); mServicesHeader.setText(R.string.runningservicedetails_services_title); mAllDetails.addView(mServicesHeader); } @@ -236,8 +236,8 @@ public class RunningServiceDetails extends InstrumentedFragment void addProcessesHeader() { if (mNumProcesses == 0) { - mProcessesHeader = (TextView) mInflater.inflate(R.layout.preference_category, - mAllDetails, false); + mProcessesHeader = (TextView) mInflater.inflate( + androidx.preference.R.layout.preference_category, mAllDetails, false); mProcessesHeader.setText(R.string.runningservicedetails_processes_title); mAllDetails.addView(mProcessesHeader); } diff --git a/src/com/android/settings/applications/RunningServices.java b/src/com/android/settings/applications/RunningServices.java index b1689d5c591..c75fe0698bc 100644 --- a/src/com/android/settings/applications/RunningServices.java +++ b/src/com/android/settings/applications/RunningServices.java @@ -42,7 +42,7 @@ public class RunningServices extends SettingsPreferenceFragment { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getActivity().setTitle(R.string.runningservices_settings_title); + getActivity().setTitle(com.android.settingslib.R.string.runningservices_settings_title); } @Override diff --git a/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java b/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java index b7232744365..2d1375c5150 100644 --- a/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java +++ b/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java @@ -88,9 +88,9 @@ public class ExternalSourcesDetails extends AppInfoWithHeader UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY, userHandle); if ((userRestrictionSource & UserManager.RESTRICTION_SOURCE_SYSTEM) != 0) { - return context.getString(R.string.disabled_by_admin); + return context.getString(com.android.settingslib.widget.R.string.disabled_by_admin); } else if (userRestrictionSource != 0) { - return context.getString(R.string.disabled); + return context.getString(com.android.settingslib.R.string.disabled); } final InstallAppsState appsState = new AppStateInstallAppsBridge(context, null, null) .createInstallAppsStateFor(entry.info.packageName, entry.info.uid); @@ -113,7 +113,7 @@ public class ExternalSourcesDetails extends AppInfoWithHeader if (mUserManager.hasBaseUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES, UserHandle.of(UserHandle.myUserId()))) { mSwitchPref.setChecked(false); - mSwitchPref.setSummary(R.string.disabled); + mSwitchPref.setSummary(com.android.settingslib.R.string.disabled); mSwitchPref.setEnabled(false); return true; } diff --git a/src/com/android/settings/applications/intentpicker/LeftSideCheckBoxPreference.java b/src/com/android/settings/applications/intentpicker/LeftSideCheckBoxPreference.java index fdb6d2541e0..199dc4ecbcc 100644 --- a/src/com/android/settings/applications/intentpicker/LeftSideCheckBoxPreference.java +++ b/src/com/android/settings/applications/intentpicker/LeftSideCheckBoxPreference.java @@ -22,7 +22,6 @@ import android.widget.CheckBox; import androidx.preference.PreferenceViewHolder; -import com.android.settings.R; import com.android.settingslib.widget.TwoTargetPreference; /** This preference has a check box in the left side. */ @@ -33,7 +32,7 @@ public class LeftSideCheckBoxPreference extends TwoTargetPreference { public LeftSideCheckBoxPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); - setLayoutResource(R.layout.preference_checkable_two_target); + setLayoutResource(com.android.settingslib.R.layout.preference_checkable_two_target); } public LeftSideCheckBoxPreference(Context context, AttributeSet attrs, int defStyleAttr) { @@ -51,7 +50,7 @@ public class LeftSideCheckBoxPreference extends TwoTargetPreference { public LeftSideCheckBoxPreference(Context context, boolean isChecked) { super(context); mChecked = isChecked; - setLayoutResource(R.layout.preference_checkable_two_target); + setLayoutResource(com.android.settingslib.R.layout.preference_checkable_two_target); } @Override diff --git a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java index e7bb88dadf1..fd998f57d36 100644 --- a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java +++ b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java @@ -167,13 +167,13 @@ public class AppFilterRegistry { mFilters[FILTER_APPS_PERSONAL] = new AppFilterItem( ApplicationsState.FILTER_PERSONAL, FILTER_APPS_PERSONAL, - R.string.category_personal); + com.android.settingslib.R.string.category_personal); // Work mFilters[FILTER_APPS_WORK] = new AppFilterItem( ApplicationsState.FILTER_WORK, FILTER_APPS_WORK, - R.string.category_work); + com.android.settingslib.R.string.category_work); // Usage access screen, never displayed. mFilters[FILTER_APPS_USAGE_ACCESS] = new AppFilterItem( @@ -219,7 +219,7 @@ public class AppFilterRegistry { mFilters[FILTER_ALARMS_AND_REMINDERS] = new AppFilterItem( AppStateAlarmsAndRemindersBridge.FILTER_CLOCK_APPS, FILTER_ALARMS_AND_REMINDERS, - R.string.alarms_and_reminders_title); + com.android.settingslib.R.string.alarms_and_reminders_title); // Apps that can manage media files mFilters[FILTER_APPS_MEDIA_MANAGEMENT] = new AppFilterItem( @@ -279,7 +279,7 @@ public class AppFilterRegistry { mFilters[FILTER_APPS_TURN_SCREEN_ON] = new AppFilterItem( AppStateTurnScreenOnBridge.FILTER_TURN_SCREEN_ON_APPS, FILTER_APPS_TURN_SCREEN_ON, - R.string.turn_screen_on_title); + com.android.settingslib.R.string.turn_screen_on_title); } public static AppFilterRegistry getInstance() { diff --git a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java index 58232ea4f85..57fe3d209d3 100644 --- a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java +++ b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java @@ -73,7 +73,7 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder { mAppName = itemView.findViewById(android.R.id.title); mAppIcon = itemView.findViewById(android.R.id.icon); mSummary = itemView.findViewById(android.R.id.summary); - mDisabled = itemView.findViewById(R.id.appendix); + mDisabled = itemView.findViewById(com.android.settingslib.widget.R.id.appendix); mSwitch = itemView.findViewById(R.id.switchWidget); mWidgetContainer = itemView.findViewById(android.R.id.widget_frame); mAddIcon = itemView.findViewById(R.id.add_preference_widget); @@ -86,7 +86,7 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder { static View newView(ViewGroup parent, boolean twoTarget, int listType) { ViewGroup view = (ViewGroup) LayoutInflater.from(parent.getContext()) - .inflate(R.layout.preference_app, parent, false); + .inflate(com.android.settingslib.widget.R.layout.preference_app, parent, false); ViewGroup widgetFrame = view.findViewById(android.R.id.widget_frame); if (twoTarget) { if (widgetFrame != null) { @@ -98,7 +98,8 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder { .inflate(R.layout.preference_widget_primary_switch, widgetFrame, true); } View divider = LayoutInflater.from(parent.getContext()).inflate( - R.layout.preference_two_target_divider, view, false); + com.android.settingslib.widget.R.layout.preference_two_target_divider, + view, false); // second to last, before widget frame view.addView(divider, view.getChildCount() - 1); } @@ -110,7 +111,8 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder { static View newHeader(ViewGroup parent, int resText) { ViewGroup view = (ViewGroup) LayoutInflater.from(parent.getContext()) - .inflate(R.layout.preference_app_header, parent, false); + .inflate(com.android.settingslib.widget.R.layout.preference_app_header, + parent, false); TextView textView = view.findViewById(R.id.apps_top_intro_text); textView.setText(resText); return view; @@ -183,7 +185,7 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder { } else if (!info.enabled || info.enabledSetting == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED) { mDisabled.setVisibility(View.VISIBLE); - mDisabled.setText(R.string.disabled); + mDisabled.setText(com.android.settingslib.R.string.disabled); } else { mDisabled.setVisibility(View.GONE); } diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java index d734a27f033..e370f3eef64 100644 --- a/src/com/android/settings/applications/manageapplications/ManageApplications.java +++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java @@ -689,7 +689,8 @@ public class ManageApplications extends InstrumentedFragment startAppInfoFragment(WriteSettingsDetails.class, R.string.write_system_settings); break; case LIST_TYPE_MANAGE_SOURCES: - startAppInfoFragment(ExternalSourcesDetails.class, R.string.install_other_apps); + startAppInfoFragment(ExternalSourcesDetails.class, + com.android.settingslib.R.string.install_other_apps); break; case LIST_TYPE_GAMES: startAppInfoFragment(AppStorageSettings.class, R.string.game_storage_settings); @@ -704,7 +705,7 @@ public class ManageApplications extends InstrumentedFragment break; case LIST_TYPE_ALARMS_AND_REMINDERS: startAppInfoFragment(AlarmsAndRemindersDetails.class, - R.string.alarms_and_reminders_label); + com.android.settingslib.R.string.alarms_and_reminders_label); break; case LIST_TYPE_MEDIA_MANAGEMENT_APPS: startAppInfoFragment(MediaManagementAppsDetails.class, @@ -741,7 +742,8 @@ public class ManageApplications extends InstrumentedFragment R.string.change_nfc_tag_apps_title); break; case LIST_TYPE_TURN_SCREEN_ON: - startAppInfoFragment(TurnScreenOnDetails.class, R.string.turn_screen_on_title); + startAppInfoFragment(TurnScreenOnDetails.class, + com.android.settingslib.R.string.turn_screen_on_title); break; // TODO: Figure out if there is a way where we can spin up the profile's settings // process ahead of time, to avoid a long load of data when user clicks on a managed @@ -1052,7 +1054,7 @@ public class ManageApplications extends InstrumentedFragment } else if (className.equals(WriteSettingsActivity.class.getName())) { screenTitle = R.string.write_settings; } else if (className.equals(ManageExternalSourcesActivity.class.getName())) { - screenTitle = R.string.install_other_apps; + screenTitle = com.android.settingslib.R.string.install_other_apps; } else if (className.equals(ChangeWifiStateActivity.class.getName())) { screenTitle = R.string.change_wifi_state_title; } else if (className.equals(ManageExternalStorageActivity.class.getName())) { @@ -1060,7 +1062,7 @@ public class ManageApplications extends InstrumentedFragment } else if (className.equals(MediaManagementAppsActivity.class.getName())) { screenTitle = R.string.media_management_apps_title; } else if (className.equals(AlarmsAndRemindersActivity.class.getName())) { - screenTitle = R.string.alarms_and_reminders_title; + screenTitle = com.android.settingslib.R.string.alarms_and_reminders_title; } else if (className.equals(NotificationAppListActivity.class.getName()) || className.equals( NotificationReviewPermissionsActivity.class.getName())) { @@ -1076,7 +1078,7 @@ public class ManageApplications extends InstrumentedFragment } else if (className.equals(ChangeNfcTagAppsActivity.class.getName())) { screenTitle = R.string.change_nfc_tag_apps_title; } else if (className.equals(TurnScreenOnSettingsActivity.class.getName())) { - screenTitle = R.string.turn_screen_on_title; + screenTitle = com.android.settingslib.R.string.turn_screen_on_title; } else { if (screenTitle == -1) { screenTitle = R.string.all_apps; diff --git a/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java b/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java index 4149e23c88b..42d2db29308 100644 --- a/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java +++ b/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java @@ -208,7 +208,8 @@ public class InteractAcrossProfilesDetails extends AppInfoBase title.setText(appLabel); } - final ImageView personalIconView = mHeader.findViewById(R.id.entity_header_icon_personal); + final ImageView personalIconView = mHeader.findViewById( + com.android.settingslib.widget.R.id.entity_header_icon_personal); if (personalIconView != null) { Drawable icon = IconDrawableFactory.newInstance(mContext) .getBadgedIcon(mPackageInfo.applicationInfo, personalProfile.getIdentifier()) @@ -219,7 +220,8 @@ public class InteractAcrossProfilesDetails extends AppInfoBase personalIconView.setImageDrawable(icon); } - final ImageView workIconView = mHeader.findViewById(R.id.entity_header_icon_work); + final ImageView workIconView = mHeader.findViewById( + com.android.settingslib.widget.R.id.entity_header_icon_work); if (workIconView != null) { Drawable icon = IconDrawableFactory.newInstance(mContext) .getBadgedIcon(mPackageInfo.applicationInfo, workProfile.getIdentifier()) @@ -499,20 +501,24 @@ public class InteractAcrossProfilesDetails extends AppInfoBase private void enableSwitchPref() { mSwitchPref.setChecked(true); mSwitchPref.setTitle(R.string.interact_across_profiles_switch_enabled); - final ImageView horizontalArrowIcon = mHeader.findViewById(R.id.entity_header_swap_horiz); + final ImageView horizontalArrowIcon = + mHeader.findViewById(com.android.settingslib.widget.R.id.entity_header_swap_horiz); if (horizontalArrowIcon != null) { horizontalArrowIcon.setImageDrawable( - mContext.getDrawable(R.drawable.ic_swap_horiz_blue)); + mContext.getDrawable( + com.android.settingslib.widget.R.drawable.ic_swap_horiz_blue)); } } private void disableSwitchPref() { mSwitchPref.setChecked(false); mSwitchPref.setTitle(R.string.interact_across_profiles_switch_disabled); - final ImageView horizontalArrowIcon = mHeader.findViewById(R.id.entity_header_swap_horiz); + final ImageView horizontalArrowIcon = + mHeader.findViewById(com.android.settingslib.widget.R.id.entity_header_swap_horiz); if (horizontalArrowIcon != null) { horizontalArrowIcon.setImageDrawable( - mContext.getDrawable(R.drawable.ic_swap_horiz_grey)); + mContext.getDrawable( + com.android.settingslib.widget.R.drawable.ic_swap_horiz_grey)); } } diff --git a/src/com/android/settings/biometrics/BiometricEnrollActivity.java b/src/com/android/settings/biometrics/BiometricEnrollActivity.java index ebbe2e85bcb..fe7d5384062 100644 --- a/src/com/android/settings/biometrics/BiometricEnrollActivity.java +++ b/src/com/android/settings/biometrics/BiometricEnrollActivity.java @@ -424,7 +424,9 @@ public class BiometricEnrollActivity extends InstrumentedActivity { // handles responses while parental consent is pending private void handleOnActivityResultWhileConsenting( int requestCode, int resultCode, Intent data) { - overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out); + overridePendingTransition( + com.google.android.setupdesign.R.anim.sud_slide_next_in, + com.google.android.setupdesign.R.anim.sud_slide_next_out); switch (requestCode) { case REQUEST_CHOOSE_LOCK: diff --git a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java index 46f534df364..44b1b3b17e5 100644 --- a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java @@ -367,7 +367,9 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase updatePasswordQuality(); final boolean handled = onSetOrConfirmCredentials(data); if (!handled) { - overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out); + overridePendingTransition( + com.google.android.setupdesign.R.anim.sud_slide_next_in, + com.google.android.setupdesign.R.anim.sud_slide_next_out); getNextButton().setEnabled(false); getChallenge(((sensorId, userId, challenge) -> { mSensorId = sensorId; @@ -387,7 +389,9 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase if (resultCode == RESULT_OK && data != null) { final boolean handled = onSetOrConfirmCredentials(data); if (!handled) { - overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out); + overridePendingTransition( + com.google.android.setupdesign.R.anim.sud_slide_next_in, + com.google.android.setupdesign.R.anim.sud_slide_next_out); getNextButton().setEnabled(false); getChallenge(((sensorId, userId, challenge) -> { mSensorId = sensorId; @@ -403,7 +407,9 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase finish(); } } else if (requestCode == LEARN_MORE_REQUEST) { - overridePendingTransition(R.anim.sud_slide_back_in, R.anim.sud_slide_back_out); + overridePendingTransition( + com.google.android.setupdesign.R.anim.sud_slide_back_in, + com.google.android.setupdesign.R.anim.sud_slide_back_out); } else if (requestCode == ENROLL_NEXT_BIOMETRIC_REQUEST || cameFromMultiBioFpAuthAddAnother) { if (isResultFinished(resultCode)) { diff --git a/src/com/android/settings/biometrics/BiometricHandoffActivity.java b/src/com/android/settings/biometrics/BiometricHandoffActivity.java index 7f28ced2029..263bab1607e 100644 --- a/src/com/android/settings/biometrics/BiometricHandoffActivity.java +++ b/src/com/android/settings/biometrics/BiometricHandoffActivity.java @@ -56,7 +56,7 @@ public class BiometricHandoffActivity extends BiometricEnrollBase { .setText(R.string.biometric_settings_hand_back_to_guardian_ok) .setButtonType(FooterButton.ButtonType.NEXT) .setListener(this::onNextButtonClick) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build(); } return mPrimaryFooterButton; diff --git a/src/com/android/settings/biometrics/activeunlock/ActiveUnlockRequireBiometricSetup.java b/src/com/android/settings/biometrics/activeunlock/ActiveUnlockRequireBiometricSetup.java index 1f30e566022..ce12c5929b1 100644 --- a/src/com/android/settings/biometrics/activeunlock/ActiveUnlockRequireBiometricSetup.java +++ b/src/com/android/settings/biometrics/activeunlock/ActiveUnlockRequireBiometricSetup.java @@ -88,7 +88,7 @@ public class ActiveUnlockRequireBiometricSetup extends BiometricEnrollBase { .setText(R.string.cancel) .setListener(this::onCancelClick) .setButtonType(FooterButton.ButtonType.CANCEL) - .setTheme(R.style.SudGlifButton_Secondary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary) .build() ); @@ -97,7 +97,7 @@ public class ActiveUnlockRequireBiometricSetup extends BiometricEnrollBase { .setText(R.string.security_settings_activeunlock_biometric_setup) .setListener(this::onNextButtonClick) .setButtonType(FooterButton.ButtonType.NEXT) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build() ); } diff --git a/src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java b/src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java index 487e254a929..587a0b24a49 100644 --- a/src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java +++ b/src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java @@ -315,8 +315,9 @@ public abstract class BiometricsSettingsBase extends DashboardFragment { if (BiometricUtils.containsGatekeeperPasswordHandle(data)) { mGkPwHandle = BiometricUtils.getGatekeeperPasswordHandle(data); if (!TextUtils.isEmpty(mRetryPreferenceKey)) { - getActivity().overridePendingTransition(R.anim.sud_slide_next_in, - R.anim.sud_slide_next_out); + getActivity().overridePendingTransition( + com.google.android.setupdesign.R.anim.sud_slide_next_in, + com.google.android.setupdesign.R.anim.sud_slide_next_out); retryPreferenceKey(mRetryPreferenceKey, mRetryPreferenceExtra); } } else { diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java index 4ef47522fa8..814dac1c456 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java @@ -117,7 +117,8 @@ public class FaceEnrollEducation extends BiometricEnrollBase { .setText(R.string.skip_label) .setListener(this::onSkipButtonClick) .setButtonType(FooterButton.ButtonType.SKIP) - .setTheme(R.style.SudGlifButton_Secondary) + .setTheme( + com.google.android.setupdesign.R.style.SudGlifButton_Secondary) .build() ); } else { @@ -126,7 +127,8 @@ public class FaceEnrollEducation extends BiometricEnrollBase { .setText(R.string.security_settings_face_enroll_introduction_cancel) .setListener(this::onSkipButtonClick) .setButtonType(FooterButton.ButtonType.CANCEL) - .setTheme(R.style.SudGlifButton_Secondary) + .setTheme( + com.google.android.setupdesign.R.style.SudGlifButton_Secondary) .build() ); } @@ -135,7 +137,7 @@ public class FaceEnrollEducation extends BiometricEnrollBase { .setText(R.string.security_settings_face_enroll_education_start) .setListener(this::onNextButtonClick) .setButtonType(FooterButton.ButtonType.NEXT) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build(); final AccessibilityManager accessibilityManager = getApplicationContext().getSystemService( diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java b/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java index 68fbe3899f1..472410bdcf3 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java @@ -100,7 +100,7 @@ public class FaceEnrollEnrolling extends BiometricsEnrollEnrolling { .setText(R.string.security_settings_face_enroll_enrolling_skip) .setListener(this::onSkipButtonClick) .setButtonType(FooterButton.ButtonType.SKIP) - .setTheme(R.style.SudGlifButton_Secondary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary) .build() ); diff --git a/src/com/android/settings/biometrics/face/FaceEnrollFinish.java b/src/com/android/settings/biometrics/face/FaceEnrollFinish.java index 6e99cdb344a..16aeeb0c360 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollFinish.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollFinish.java @@ -43,7 +43,7 @@ public class FaceEnrollFinish extends BiometricEnrollBase { .setText(R.string.security_settings_face_enroll_done) .setListener(this::onNextButtonClick) .setButtonType(FooterButton.ButtonType.NEXT) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build() ); } diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java index bea0c3389ec..eb50e0874c0 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java @@ -537,7 +537,7 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { .setText(R.string.security_settings_face_enroll_introduction_agree) .setButtonType(FooterButton.ButtonType.OPT_IN) .setListener(this::onNextButtonClick) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build(); } return mPrimaryFooterButton; @@ -551,7 +551,7 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { .setText(R.string.security_settings_face_enroll_introduction_no_thanks) .setListener(this::onSkipButtonClick) .setButtonType(FooterButton.ButtonType.NEXT) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build(); } return mSecondaryFooterButton; diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java index 0313d58c415..c62ab3b321d 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java @@ -273,7 +273,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { .setText(R.string.security_settings_fingerprint_enroll_enrolling_skip) .setListener(this::onSkipButtonClick) .setButtonType(FooterButton.ButtonType.SKIP) - .setTheme(R.style.SudGlifButton_Secondary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary) .build() ); diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java index aadc9329e4c..c207ec9def7 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java @@ -95,7 +95,7 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements .setText(R.string.security_settings_fingerprint_enroll_enrolling_skip) .setListener(this::onSkipButtonClick) .setButtonType(FooterButton.ButtonType.SKIP) - .setTheme(R.style.SudGlifButton_Secondary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary) .build() ); @@ -109,7 +109,7 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements .setText(R.string.security_settings_udfps_enroll_find_sensor_start_button) .setListener(this::onStartButtonClick) .setButtonType(FooterButton.ButtonType.NEXT) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build() ); diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java index a5d198d8d2b..722f213ce10 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java @@ -79,7 +79,7 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase { new FooterButton.Builder(this) .setText(R.string.fingerprint_enroll_button_add) .setButtonType(FooterButton.ButtonType.SKIP) - .setTheme(R.style.SudGlifButton_Secondary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary) .build() ); @@ -88,7 +88,7 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase { .setText(R.string.security_settings_fingerprint_enroll_done) .setListener(this::onNextButtonClick) .setButtonType(FooterButton.ButtonType.NEXT) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build() ); } diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java index 04063ed29d7..df23a5c76b1 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java @@ -127,13 +127,16 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { footerTitle1.setText(getFooterTitle1()); footerTitle2.setText(getFooterTitle2()); - final ScrollView scrollView = findViewById(R.id.sud_scroll_view); + final ScrollView scrollView = + findViewById(com.google.android.setupdesign.R.id.sud_scroll_view); scrollView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES); final Intent intent = getIntent(); if (mFromSettingsSummary && GatekeeperPasswordProvider.containsGatekeeperPasswordHandle(intent)) { - overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out); + overridePendingTransition( + com.google.android.setupdesign.R.anim.sud_slide_next_in, + com.google.android.setupdesign.R.anim.sud_slide_next_out); getNextButton().setEnabled(false); getChallenge(((sensorId, userId, challenge) -> { if (isFinishing()) { @@ -406,7 +409,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { .setText(R.string.security_settings_fingerprint_enroll_introduction_agree) .setListener(this::onNextButtonClick) .setButtonType(FooterButton.ButtonType.OPT_IN) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build(); } return mPrimaryFooterButton; @@ -420,7 +423,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { .setText(getNegativeButtonTextId()) .setListener(this::onSkipButtonClick) .setButtonType(FooterButton.ButtonType.NEXT) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build(); } return mSecondaryFooterButton; diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java index 3c4eb1082a5..e5d9dd8019c 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java @@ -876,8 +876,9 @@ public class FingerprintSettings extends SubSettings { final Activity activity = getActivity(); if (activity != null) { // Apply pending transition for auto adding first fingerprint case - activity.overridePendingTransition(R.anim.sud_slide_next_in, - R.anim.sud_slide_next_out); + activity.overridePendingTransition( + com.google.android.setupdesign.R.anim.sud_slide_next_in, + com.google.android.setupdesign.R.anim.sud_slide_next_out); } // To have smoother animation, change flow to let next visible activity diff --git a/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollEnrollingView.java b/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollEnrollingView.java index df2f2f77d3b..77b8aea6504 100644 --- a/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollEnrollingView.java +++ b/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollEnrollingView.java @@ -78,7 +78,7 @@ public class UdfpsEnrollEnrollingView extends GlifLayout { @Override protected void onFinishInflate() { super.onFinishInflate(); - mHeaderView = findViewById(R.id.sud_landscape_header_area); + mHeaderView = findViewById(com.google.android.setupdesign.R.id.sud_landscape_header_area); mUdfpsEnrollView = findViewById(R.id.udfps_animation_view); } @@ -201,8 +201,10 @@ public class UdfpsEnrollEnrollingView extends GlifLayout { return false; }; - findManagedViewById(mIsLandscape ? R.id.sud_landscape_content_area - : R.id.sud_layout_content).setOnHoverListener(onHoverListener); + findManagedViewById(mIsLandscape + ? com.google.android.setupdesign.R.id.sud_landscape_content_area + : com.google.android.setupdesign.R.id.sud_layout_content + ).setOnHoverListener(onHoverListener); } private void swapHeaderAndContent() { @@ -212,7 +214,8 @@ public class UdfpsEnrollEnrollingView extends GlifLayout { parentView.addView(mHeaderView); // Hide scroll indicators - BottomScrollView headerScrollView = mHeaderView.findViewById(R.id.sud_header_scroll_view); + BottomScrollView headerScrollView = mHeaderView.findViewById( + com.google.android.setupdesign.R.id.sud_header_scroll_view); headerScrollView.setScrollIndicators(0); } diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingRfpsFragment.kt b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingRfpsFragment.kt index 08a82179eed..2530628c94d 100644 --- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingRfpsFragment.kt +++ b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingRfpsFragment.kt @@ -23,14 +23,12 @@ import android.graphics.drawable.Animatable2 import android.graphics.drawable.AnimatedVectorDrawable import android.graphics.drawable.Drawable import android.graphics.drawable.LayerDrawable -import android.hardware.biometrics.BiometricFingerprintConstants import android.hardware.fingerprint.FingerprintManager.ENROLL_ENROLL import android.os.Bundle import android.text.TextUtils import android.util.Log import android.view.LayoutInflater import android.view.MotionEvent -import android.view.Surface import android.view.View import android.view.ViewGroup import android.view.animation.AnimationUtils.loadInterpolator @@ -41,7 +39,6 @@ import androidx.activity.OnBackPressedCallback import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity import androidx.lifecycle.Lifecycle -import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope @@ -511,6 +508,6 @@ fun FragmentActivity.bindFingerprintEnrollEnrollingRfpsView( .setText(R.string.security_settings_fingerprint_enroll_enrolling_skip) .setListener(onSkipClickListener) .setButtonType(FooterButton.ButtonType.SKIP) - .setTheme(R.style.SudGlifButton_Secondary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary) .build() } diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingSfpsFragment.kt b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingSfpsFragment.kt index fbdfc81256c..7faeeac986b 100644 --- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingSfpsFragment.kt +++ b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingSfpsFragment.kt @@ -23,9 +23,7 @@ import android.content.res.ColorStateList import android.content.res.Configuration import android.graphics.PorterDuff import android.graphics.PorterDuffColorFilter -import android.hardware.biometrics.BiometricFingerprintConstants import android.hardware.fingerprint.FingerprintManager.ENROLL_ENROLL -import android.hardware.fingerprint.FingerprintManager.FINGERPRINT_ERROR_CANCELED import android.os.Bundle import android.util.Log import android.view.LayoutInflater @@ -41,7 +39,6 @@ import androidx.activity.OnBackPressedCallback import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity import androidx.lifecycle.Lifecycle -import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope @@ -62,8 +59,8 @@ import com.google.android.setupcompat.template.FooterButton import com.google.android.setupdesign.GlifLayout import com.google.android.setupdesign.template.DescriptionMixin import com.google.android.setupdesign.template.HeaderMixin -import kotlinx.coroutines.launch import kotlin.math.roundToInt +import kotlinx.coroutines.launch /** * Fragment is used to handle enrolling process for sfps @@ -83,7 +80,10 @@ class FingerprintEnrollEnrollingSfpsFragment : Fragment() { get() = _errorDialogViewModel!! private val fastOutSlowInInterpolator: Interpolator - get() = AnimationUtils.loadInterpolator(activity, R.interpolator.fast_out_slow_in) + get() = AnimationUtils.loadInterpolator( + activity, + androidx.appcompat.R.interpolator.fast_out_slow_in, + ) private var enrollingView: GlifLayout? = null @@ -604,7 +604,7 @@ fun FragmentActivity.bindFingerprintEnrollEnrollingSfpsView( .setText(R.string.security_settings_fingerprint_enroll_enrolling_skip) .setListener(onSkipClickListener) .setButtonType(FooterButton.ButtonType.SKIP) - .setTheme(R.style.SudGlifButton_Secondary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary) .build() view.findViewById(R.id.fingerprint_progress_bar)!!.progressBackgroundTintMode = diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindRfpsFragment.kt b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindRfpsFragment.kt index ee5ca5642ab..be24fc65ee7 100644 --- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindRfpsFragment.kt +++ b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindRfpsFragment.kt @@ -16,7 +16,6 @@ package com.android.settings.biometrics2.ui.view import android.content.Context -import android.hardware.biometrics.BiometricFingerprintConstants import android.hardware.fingerprint.FingerprintManager.ENROLL_FIND_SENSOR import android.os.Bundle import android.util.Log @@ -28,7 +27,6 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity import androidx.lifecycle.Lifecycle import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope @@ -289,7 +287,7 @@ fun FragmentActivity.bindFingerprintEnrollFindRfpsView( FooterButton.Builder(this) .setText(R.string.security_settings_fingerprint_enroll_enrolling_skip) .setButtonType(FooterButton.ButtonType.SKIP) - .setTheme(R.style.SudGlifButton_Secondary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary) .build() .also { it.setOnClickListener(onSkipClickListener) diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindSfpsFragment.kt b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindSfpsFragment.kt index ab31dbccdf5..7455be1deda 100644 --- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindSfpsFragment.kt +++ b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindSfpsFragment.kt @@ -16,7 +16,6 @@ package com.android.settings.biometrics2.ui.view import android.content.Context -import android.hardware.biometrics.BiometricFingerprintConstants import android.hardware.fingerprint.FingerprintManager.ENROLL_FIND_SENSOR import android.os.Bundle import android.util.Log @@ -29,7 +28,6 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity import androidx.lifecycle.Lifecycle import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope @@ -307,7 +305,7 @@ fun FragmentActivity.bindFingerprintEnrollFindSfpsView( it.secondaryButton = FooterButton.Builder(this) .setText(R.string.security_settings_fingerprint_enroll_enrolling_skip) .setButtonType(FooterButton.ButtonType.SKIP) - .setTheme(R.style.SudGlifButton_Secondary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary) .build() it.secondaryButton.setOnClickListener(onSkipClickListener) } diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindUdfpsFragment.kt b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindUdfpsFragment.kt index 9e936d23a5c..3dce99c5380 100644 --- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindUdfpsFragment.kt +++ b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindUdfpsFragment.kt @@ -104,14 +104,14 @@ fun FragmentActivity.bindFingerprintEnrollFindUdfpsView( it.secondaryButton = FooterButton.Builder(this) .setText(R.string.security_settings_fingerprint_enroll_enrolling_skip) .setButtonType(FooterButton.ButtonType.SKIP) - .setTheme(R.style.SudGlifButton_Secondary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary) .build() it.secondaryButton.setOnClickListener(onSkipClickListener) it.primaryButton = FooterButton.Builder(this) .setText(R.string.security_settings_udfps_enroll_find_sensor_start_button) .setButtonType(FooterButton.ButtonType.NEXT) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build() it.primaryButton.setOnClickListener(onStartClickListener) } diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFinishFragment.kt b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFinishFragment.kt index 2ae47647ae2..2af2deeebce 100644 --- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFinishFragment.kt +++ b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFinishFragment.kt @@ -102,14 +102,14 @@ fun FragmentActivity.bindFingerprintEnrollFinishFragment( ) .setListener(nextButtonClickListener) .setButtonType(FooterButton.ButtonType.NEXT) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build() if (isAnotherFingerprintEnrollable) { footer.secondaryButton = FooterButton.Builder(this) .setText(R.string.fingerprint_enroll_button_add) .setListener(addButtonClickListener) .setButtonType(FooterButton.ButtonType.SKIP) - .setTheme(R.style.SudGlifButton_Secondary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary) .build() } } diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollIntroFragment.kt b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollIntroFragment.kt index e7e1cc8fc57..4205225aef9 100644 --- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollIntroFragment.kt +++ b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollIntroFragment.kt @@ -130,7 +130,7 @@ class FingerprintEnrollIntroFragment : Fragment() { primaryFooterButton = FooterButton.Builder(context) .setText(R.string.security_settings_fingerprint_enroll_introduction_agree) .setButtonType(FooterButton.ButtonType.OPT_IN) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build() .also { it.setOnClickListener(onNextClickListener) @@ -153,7 +153,7 @@ class FingerprintEnrollIntroFragment : Fragment() { R.string.security_settings_fingerprint_enroll_introduction_no_thanks ) .setButtonType(FooterButton.ButtonType.NEXT) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build() .also { it.setOnClickListener(onSkipOrCancelClickListener) diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollmentActivity.kt b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollmentActivity.kt index c295bb35ce9..012978dd5bd 100644 --- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollmentActivity.kt +++ b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollmentActivity.kt @@ -259,10 +259,10 @@ open class FingerprintEnrollmentActivity : FragmentActivity() { supportFragmentManager.beginTransaction() .setReorderingAllowed(true) .setCustomAnimations( - R.anim.shared_x_axis_activity_open_enter_dynamic_color, - R.anim.shared_x_axis_activity_open_exit, - R.anim.shared_x_axis_activity_close_enter_dynamic_color, - R.anim.shared_x_axis_activity_close_exit + com.google.android.setupdesign.R.anim.shared_x_axis_activity_open_enter_dynamic_color, + com.google.android.setupdesign.R.anim.shared_x_axis_activity_open_exit, + com.google.android.setupdesign.R.anim.shared_x_axis_activity_close_enter_dynamic_color, + com.google.android.setupdesign.R.anim.shared_x_axis_activity_close_exit ) .replace(R.id.fragment_container_view, fragmentClass, null, tag) .addToBackStack(tag) @@ -344,10 +344,10 @@ open class FingerprintEnrollmentActivity : FragmentActivity() { supportFragmentManager.beginTransaction() .setReorderingAllowed(true) .setCustomAnimations( - R.anim.shared_x_axis_activity_open_enter_dynamic_color, - R.anim.shared_x_axis_activity_open_exit, - R.anim.shared_x_axis_activity_close_enter_dynamic_color, - R.anim.shared_x_axis_activity_close_exit + com.google.android.setupdesign.R.anim.shared_x_axis_activity_open_enter_dynamic_color, + com.google.android.setupdesign.R.anim.shared_x_axis_activity_open_exit, + com.google.android.setupdesign.R.anim.shared_x_axis_activity_close_enter_dynamic_color, + com.google.android.setupdesign.R.anim.shared_x_axis_activity_close_exit ) .replace( R.id.fragment_container_view, @@ -376,10 +376,10 @@ open class FingerprintEnrollmentActivity : FragmentActivity() { supportFragmentManager.beginTransaction() .setReorderingAllowed(true) .setCustomAnimations( - R.anim.shared_x_axis_activity_open_enter_dynamic_color, - R.anim.shared_x_axis_activity_open_exit, - R.anim.shared_x_axis_activity_close_enter_dynamic_color, - R.anim.shared_x_axis_activity_close_exit + com.google.android.setupdesign.R.anim.shared_x_axis_activity_open_enter_dynamic_color, + com.google.android.setupdesign.R.anim.shared_x_axis_activity_open_exit, + com.google.android.setupdesign.R.anim.shared_x_axis_activity_close_enter_dynamic_color, + com.google.android.setupdesign.R.anim.shared_x_axis_activity_close_exit ) .replace( R.id.fragment_container_view, diff --git a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java index ebaa2fa640e..dca005ba65b 100644 --- a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java +++ b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java @@ -267,7 +267,7 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont Drawable createBtBatteryIcon(Context context, int level, boolean charging) { final BatteryMeterView.BatteryMeterDrawable drawable = new BatteryMeterView.BatteryMeterDrawable(context, - context.getColor(R.color.meter_background_color), + context.getColor(com.android.settingslib.R.color.meter_background_color), context.getResources().getDimensionPixelSize( R.dimen.advanced_bluetooth_battery_meter_width), context.getResources().getDimensionPixelSize( diff --git a/src/com/android/settings/bluetooth/BluetoothBroadcastDialog.java b/src/com/android/settings/bluetooth/BluetoothBroadcastDialog.java index 7fa63b06afc..13f056dec10 100644 --- a/src/com/android/settings/bluetooth/BluetoothBroadcastDialog.java +++ b/src/com/android/settings/bluetooth/BluetoothBroadcastDialog.java @@ -113,7 +113,7 @@ public class BluetoothBroadcastDialog extends InstrumentedDialogFragment { }); mAlertDialog = new AlertDialog.Builder(mContext, - com.android.settingslib.R.style.Theme_AlertDialog_SettingsLib) + com.android.settingslib.widget.R.style.Theme_AlertDialog_SettingsLib) .setView(layout) .create(); diff --git a/src/com/android/settings/bluetooth/BluetoothBroadcastSourcePreference.java b/src/com/android/settings/bluetooth/BluetoothBroadcastSourcePreference.java index 9904e8b81f9..6ec356e0257 100644 --- a/src/com/android/settings/bluetooth/BluetoothBroadcastSourcePreference.java +++ b/src/com/android/settings/bluetooth/BluetoothBroadcastSourcePreference.java @@ -42,7 +42,8 @@ import java.util.List; class BluetoothBroadcastSourcePreference extends Preference { private static final int RESOURCE_ID_UNKNOWN_PROGRAM_INFO = R.string.device_info_default; - private static final int RESOURCE_ID_ICON = R.drawable.settings_input_antenna; + private static final int RESOURCE_ID_ICON = + com.android.settingslib.R.drawable.settings_input_antenna; private BluetoothLeBroadcastMetadata mBluetoothLeBroadcastMetadata; private BluetoothLeBroadcastReceiveState mBluetoothLeBroadcastReceiveState; @@ -59,16 +60,19 @@ class BluetoothBroadcastSourcePreference extends Preference { @Override public void onBindViewHolder(final PreferenceViewHolder view) { super.onBindViewHolder(view); - view.findViewById(R.id.two_target_divider).setVisibility(View.INVISIBLE); - final ImageButton imageButton = (ImageButton) view.findViewById(R.id.icon_button); + view.findViewById(com.android.settingslib.widget.R.id.two_target_divider) + .setVisibility(View.INVISIBLE); + final ImageButton imageButton = + (ImageButton) view.findViewById(com.android.settingslib.R.id.icon_button); imageButton.setVisibility(View.GONE); - mFrictionImageView = (ImageView) view.findViewById(R.id.friction_icon); + mFrictionImageView = + (ImageView) view.findViewById(com.android.settingslib.R.id.friction_icon); updateStatusButton(); } private void initUi() { - setLayoutResource(R.layout.preference_access_point); - setWidgetLayoutResource(R.layout.access_point_friction_widget); + setLayoutResource(com.android.settingslib.R.layout.preference_access_point); + setWidgetLayoutResource(com.android.settingslib.R.layout.access_point_friction_widget); mTitle = getContext().getString(RESOURCE_ID_UNKNOWN_PROGRAM_INFO); mStatus = false; final Drawable drawable = getContext().getDrawable(RESOURCE_ID_ICON); diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java index 039080b26ba..082f8cf9d28 100644 --- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java +++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java @@ -378,7 +378,7 @@ public final class BluetoothDevicePreference extends GearPreference { private void pair() { if (!mCachedDevice.startPairing()) { Utils.showError(getContext(), mCachedDevice.getName(), - R.string.bluetooth_pairing_error_message); + com.android.settingslib.R.string.bluetooth_pairing_error_message); } } diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java index e11c275bded..8df466686e7 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java @@ -300,8 +300,10 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i mBuilder.setTitle(getString(R.string.bluetooth_pairing_request, mPairingController.getDeviceName())); mBuilder.setView(createView()); - mBuilder.setPositiveButton(getString(R.string.bluetooth_pairing_accept), this); - mBuilder.setNegativeButton(getString(R.string.bluetooth_pairing_decline), this); + mBuilder.setPositiveButton( + getString(com.android.settingslib.R.string.bluetooth_pairing_accept), this); + mBuilder.setNegativeButton( + getString(com.android.settingslib.R.string.bluetooth_pairing_decline), this); AlertDialog dialog = mBuilder.create(); return dialog; } diff --git a/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java index 6e826492aed..4587fbaad5d 100644 --- a/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java +++ b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java @@ -80,9 +80,9 @@ public final class BluetoothSummaryUpdater extends SummaryUpdater implements Blu case BluetoothAdapter.STATE_CONNECTED: return getConnectedDeviceSummary(); case BluetoothAdapter.STATE_CONNECTING: - return mContext.getString(R.string.bluetooth_connecting); + return mContext.getString(com.android.settingslib.R.string.bluetooth_connecting); case BluetoothAdapter.STATE_DISCONNECTING: - return mContext.getString(R.string.bluetooth_disconnecting); + return mContext.getString(com.android.settingslib.R.string.bluetooth_disconnecting); default: return mContext.getString(R.string.disconnected); } diff --git a/src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java index f72494f271c..a64874d3260 100644 --- a/src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java +++ b/src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java @@ -192,7 +192,7 @@ public class LeAudioBluetoothDetailsHeaderController extends BasePreferenceContr Drawable createBtBatteryIcon(Context context, int level) { final BatteryMeterView.BatteryMeterDrawable drawable = new BatteryMeterView.BatteryMeterDrawable(context, - context.getColor(R.color.meter_background_color), + context.getColor(com.android.settingslib.R.color.meter_background_color), context.getResources().getDimensionPixelSize( R.dimen.advanced_bluetooth_battery_meter_width), context.getResources().getDimensionPixelSize( @@ -287,7 +287,8 @@ public class LeAudioBluetoothDetailsHeaderController extends BasePreferenceContr com.android.settings.Utils.formatPercentage(batteryLevel); batterySummaryView.setText(batteryLevelPercentageString); batterySummaryView.setContentDescription(mContext.getString( - R.string.bluetooth_battery_level, batteryLevelPercentageString)); + com.android.settingslib.R.string.bluetooth_battery_level, + batteryLevelPercentageString)); batterySummaryView.setCompoundDrawablesRelativeWithIntrinsicBounds( createBtBatteryIcon(mContext, batteryLevel), /* top */ null, /* end */ null, /* bottom */ null); diff --git a/src/com/android/settings/bluetooth/QrCodeScanModeBaseActivity.java b/src/com/android/settings/bluetooth/QrCodeScanModeBaseActivity.java index 4af75ad5f90..30e5c7bf278 100644 --- a/src/com/android/settings/bluetooth/QrCodeScanModeBaseActivity.java +++ b/src/com/android/settings/bluetooth/QrCodeScanModeBaseActivity.java @@ -42,8 +42,8 @@ public abstract class QrCodeScanModeBaseActivity extends ObservableActivity { int defaultTheme = ThemeHelper.isSetupWizardDayNightEnabled(this) - ? R.style.SudThemeGlifV3_DayNight - : R.style.SudThemeGlifV3_Light; + ? com.google.android.setupdesign.R.style.SudThemeGlifV3_DayNight + : com.google.android.setupdesign.R.style.SudThemeGlifV3_Light; ThemeResolver themeResolver = new ThemeResolver.Builder(ThemeResolver.getDefault()) .setDefaultTheme(defaultTheme) diff --git a/src/com/android/settings/bluetooth/Utils.java b/src/com/android/settings/bluetooth/Utils.java index f1d6b20b519..a79ee1cf396 100644 --- a/src/com/android/settings/bluetooth/Utils.java +++ b/src/com/android/settings/bluetooth/Utils.java @@ -67,13 +67,13 @@ public final class Utils { public static int getConnectionStateSummary(int connectionState) { switch (connectionState) { case BluetoothProfile.STATE_CONNECTED: - return R.string.bluetooth_connected; + return com.android.settingslib.R.string.bluetooth_connected; case BluetoothProfile.STATE_CONNECTING: - return R.string.bluetooth_connecting; + return com.android.settingslib.R.string.bluetooth_connecting; case BluetoothProfile.STATE_DISCONNECTED: - return R.string.bluetooth_disconnected; + return com.android.settingslib.R.string.bluetooth_disconnected; case BluetoothProfile.STATE_DISCONNECTING: - return R.string.bluetooth_disconnecting; + return com.android.settingslib.R.string.bluetooth_disconnecting; default: return 0; } diff --git a/src/com/android/settings/core/PreferenceXmlParserUtils.java b/src/com/android/settings/core/PreferenceXmlParserUtils.java index af1ccf53951..f4fd5f7b935 100644 --- a/src/com/android/settings/core/PreferenceXmlParserUtils.java +++ b/src/com/android/settings/core/PreferenceXmlParserUtils.java @@ -263,9 +263,9 @@ public class PreferenceXmlParserUtils { private static String getUserRestriction(Context context, AttributeSet attrs) { TypedArray preferenceAttributes = context.obtainStyledAttributes(attrs, - R.styleable.RestrictedPreference); + com.android.settingslib.R.styleable.RestrictedPreference); String userRestriction = preferenceAttributes.getString( - R.styleable.RestrictedPreference_userRestriction); + com.android.settingslib.R.styleable.RestrictedPreference_userRestriction); preferenceAttributes.recycle(); return userRestriction; } diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java index ff84a3ff286..d5b3103330d 100644 --- a/src/com/android/settings/core/SettingsBaseActivity.java +++ b/src/com/android/settings/core/SettingsBaseActivity.java @@ -110,8 +110,10 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa } if (isToolbarEnabled() && !isAnySetupWizard) { - super.setContentView(R.layout.collapsing_toolbar_base_layout); - mCollapsingToolbarLayout = findViewById(R.id.collapsing_toolbar); + super.setContentView( + com.android.settingslib.widget.R.layout.collapsing_toolbar_base_layout); + mCollapsingToolbarLayout = + findViewById(com.android.settingslib.widget.R.id.collapsing_toolbar); mAppBarLayout = findViewById(R.id.app_bar); if (mCollapsingToolbarLayout != null) { mCollapsingToolbarLayout.setLineSpacingMultiplier(TOOLBAR_LINE_SPACING_MULTIPLIER); @@ -162,9 +164,12 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa final int transitionType = getTransitionType(intent); super.startActivityForResult(intent, requestCode, options); if (transitionType == TransitionType.TRANSITION_SLIDE) { - overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out); + overridePendingTransition( + com.google.android.setupdesign.R.anim.sud_slide_next_in, + com.google.android.setupdesign.R.anim.sud_slide_next_out); } else if (transitionType == TransitionType.TRANSITION_FADE) { - overridePendingTransition(android.R.anim.fade_in, R.anim.sud_stay); + overridePendingTransition( + android.R.anim.fade_in, com.google.android.setupdesign.R.anim.sud_stay); } } @@ -172,7 +177,8 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa protected void onPause() { // For accessibility activities launched from setup wizard. if (getTransitionType(getIntent()) == TransitionType.TRANSITION_FADE) { - overridePendingTransition(R.anim.sud_stay, android.R.anim.fade_out); + overridePendingTransition( + com.google.android.setupdesign.R.anim.sud_stay, android.R.anim.fade_out); } super.onPause(); } diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java index 9be2177524f..5c0580df682 100644 --- a/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java +++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java @@ -231,11 +231,11 @@ public abstract class ProfileSelectFragment extends DashboardFragment { if (position == WORK_TAB) { return devicePolicyManager.getResources().getString(WORK_CATEGORY_HEADER, - () -> getContext().getString(R.string.category_work)); + () -> getContext().getString(com.android.settingslib.R.string.category_work)); } return devicePolicyManager.getResources().getString(PERSONAL_CATEGORY_HEADER, - () -> getContext().getString(R.string.category_personal)); + () -> getContext().getString(com.android.settingslib.R.string.category_personal)); } static class ViewPagerAdapter extends FragmentStateAdapter { diff --git a/src/com/android/settings/dashboard/profileselector/UserAdapter.java b/src/com/android/settings/dashboard/profileselector/UserAdapter.java index f7cda690c20..0552a810603 100644 --- a/src/com/android/settings/dashboard/profileselector/UserAdapter.java +++ b/src/com/android/settings/dashboard/profileselector/UserAdapter.java @@ -77,10 +77,11 @@ public class UserAdapter extends BaseAdapter { if (userHandle == UserHandle.USER_CURRENT || userHandle == ActivityManager.getCurrentUser()) { return resources.getString(PERSONAL_CATEGORY_HEADER, - () -> context.getString(R.string.category_personal)); + () -> context.getString( + com.android.settingslib.R.string.category_personal)); } else { return resources.getString(WORK_CATEGORY_HEADER, - () -> context.getString(R.string.category_work)); + () -> context.getString(com.android.settingslib.R.string.category_work)); } } } diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java b/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java index 1fea84c7bf1..4921a339795 100644 --- a/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java +++ b/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java @@ -176,7 +176,7 @@ public class UnrestrictedDataAccessPreference extends AppSwitchPreference implem if (mDataUsageState != null) { setChecked(mDataUsageState.isDataSaverAllowlisted); if (isDisabledByAdmin()) { - setSummary(R.string.disabled_by_admin); + setSummary(com.android.settingslib.widget.R.string.disabled_by_admin); } else if (mDataUsageState.isDataSaverDenylisted) { setSummary(R.string.restrict_background_blocklisted); } else { diff --git a/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java index 75145779ade..09f3871cf78 100644 --- a/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java +++ b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java @@ -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; diff --git a/src/com/android/settings/development/AdbDeviceDetailsActionController.java b/src/com/android/settings/development/AdbDeviceDetailsActionController.java index da4430d1300..1faf36f3782 100644 --- a/src/com/android/settings/development/AdbDeviceDetailsActionController.java +++ b/src/com/android/settings/development/AdbDeviceDetailsActionController.java @@ -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()); } diff --git a/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java b/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java index 3aa92f1f9aa..e4bb73779ec 100644 --- a/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java +++ b/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java @@ -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); diff --git a/src/com/android/settings/development/AdbIpAddressPreferenceController.java b/src/com/android/settings/development/AdbIpAddressPreferenceController.java index ce5a8513d38..36d1b99e301 100644 --- a/src/com/android/settings/development/AdbIpAddressPreferenceController.java +++ b/src/com/android/settings/development/AdbIpAddressPreferenceController.java @@ -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); } } diff --git a/src/com/android/settings/development/AdbPairedDevicePreference.java b/src/com/android/settings/development/AdbPairedDevicePreference.java index 5d30428709e..9cc85bc5224 100644 --- a/src/com/android/settings/development/AdbPairedDevicePreference.java +++ b/src/com/android/settings/development/AdbPairedDevicePreference.java @@ -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) : ""); } diff --git a/src/com/android/settings/development/AdbQrcodeScannerFragment.java b/src/com/android/settings/development/AdbQrcodeScannerFragment.java index afbb8e436dc..ca44747f163 100644 --- a/src/com/android/settings/development/AdbQrcodeScannerFragment.java +++ b/src/com/android/settings/development/AdbQrcodeScannerFragment.java @@ -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); } diff --git a/src/com/android/settings/development/AdbWirelessDialogController.java b/src/com/android/settings/development/AdbWirelessDialogController.java index 136c7b34cca..35471b993b2 100644 --- a/src/com/android/settings/development/AdbWirelessDialogController.java +++ b/src/com/android/settings/development/AdbWirelessDialogController.java @@ -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; diff --git a/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java b/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java index 766352a6cae..114b121be22 100644 --- a/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java +++ b/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java @@ -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 diff --git a/src/com/android/settings/development/AppPicker.java b/src/com/android/settings/development/AppPicker.java index 51215a15ae5..8f478b5e6fd 100644 --- a/src/com/android/settings/development/AppPicker.java +++ b/src/com/android/settings/development/AppPicker.java @@ -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); diff --git a/src/com/android/settings/development/AppViewHolder.java b/src/com/android/settings/development/AppViewHolder.java index 4deef904787..3e34275183b 100644 --- a/src/com/android/settings/development/AppViewHolder.java +++ b/src/com/android/settings/development/AppViewHolder.java @@ -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; diff --git a/src/com/android/settings/development/BackAnimationPreferenceDialog.java b/src/com/android/settings/development/BackAnimationPreferenceDialog.java index 8347e8dea95..97150752235 100644 --- a/src/com/android/settings/development/BackAnimationPreferenceDialog.java +++ b/src/com/android/settings/development/BackAnimationPreferenceDialog.java @@ -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(); } diff --git a/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java b/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java index 690d079257c..7a7d6fa58c0 100644 --- a/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java +++ b/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java @@ -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 diff --git a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java index 8c307a60baf..0bf94dea28e 100644 --- a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java +++ b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java @@ -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 diff --git a/src/com/android/settings/development/BluetoothMapVersionPreferenceController.java b/src/com/android/settings/development/BluetoothMapVersionPreferenceController.java index ac20627004f..b91a8ba7241 100644 --- a/src/com/android/settings/development/BluetoothMapVersionPreferenceController.java +++ b/src/com/android/settings/development/BluetoothMapVersionPreferenceController.java @@ -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; /** diff --git a/src/com/android/settings/development/BluetoothSnoopLogFilterProfileMapPreferenceController.java b/src/com/android/settings/development/BluetoothSnoopLogFilterProfileMapPreferenceController.java index 8ace9bb6dad..607b672b3d0 100644 --- a/src/com/android/settings/development/BluetoothSnoopLogFilterProfileMapPreferenceController.java +++ b/src/com/android/settings/development/BluetoothSnoopLogFilterProfileMapPreferenceController.java @@ -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); diff --git a/src/com/android/settings/development/BluetoothSnoopLogFilterProfilePbapPreferenceController.java b/src/com/android/settings/development/BluetoothSnoopLogFilterProfilePbapPreferenceController.java index c17291c5c72..18160110577 100644 --- a/src/com/android/settings/development/BluetoothSnoopLogFilterProfilePbapPreferenceController.java +++ b/src/com/android/settings/development/BluetoothSnoopLogFilterProfilePbapPreferenceController.java @@ -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); diff --git a/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java b/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java index 31ed652b741..1ef4810fb16 100644 --- a/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java +++ b/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java @@ -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; } diff --git a/src/com/android/settings/development/CachedAppsFreezerPreferenceController.java b/src/com/android/settings/development/CachedAppsFreezerPreferenceController.java index e57a3d714a2..5142a784612 100644 --- a/src/com/android/settings/development/CachedAppsFreezerPreferenceController.java +++ b/src/com/android/settings/development/CachedAppsFreezerPreferenceController.java @@ -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(); diff --git a/src/com/android/settings/development/ClearAdbKeysWarningDialog.java b/src/com/android/settings/development/ClearAdbKeysWarningDialog.java index cdf8a95fdc2..129f26a08f9 100644 --- a/src/com/android/settings/development/ClearAdbKeysWarningDialog.java +++ b/src/com/android/settings/development/ClearAdbKeysWarningDialog.java @@ -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(); diff --git a/src/com/android/settings/development/ColorModePreference.java b/src/com/android/settings/development/ColorModePreference.java index 9e5666ef22e..fef9d212ed7 100644 --- a/src/com/android/settings/development/ColorModePreference.java +++ b/src/com/android/settings/development/ColorModePreference.java @@ -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; diff --git a/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java b/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java index da4b94b1593..e53ab20c848 100644 --- a/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java +++ b/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java @@ -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 diff --git a/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java b/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java index 8f15c8697b6..fc7420612be 100644 --- a/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java +++ b/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java @@ -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 diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 01606f2fc4a..3dd3c62503b 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -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; diff --git a/src/com/android/settings/development/DisableLogPersistWarningDialog.java b/src/com/android/settings/development/DisableLogPersistWarningDialog.java index 4514b1b8ec6..6f7adf05a22 100644 --- a/src/com/android/settings/development/DisableLogPersistWarningDialog.java +++ b/src/com/android/settings/development/DisableLogPersistWarningDialog.java @@ -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(); diff --git a/src/com/android/settings/development/EnableAdbWarningDialog.java b/src/com/android/settings/development/EnableAdbWarningDialog.java index 5204130b6e1..0b65be2862b 100644 --- a/src/com/android/settings/development/EnableAdbWarningDialog.java +++ b/src/com/android/settings/development/EnableAdbWarningDialog.java @@ -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(); diff --git a/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java b/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java index 6b84cdc4c9f..497d7d60cd8 100644 --- a/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java +++ b/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java @@ -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 { diff --git a/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java b/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java index 9bfe9d2e723..0375acc07be 100644 --- a/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java +++ b/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java @@ -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(); diff --git a/src/com/android/settings/development/GrammaticalGenderPreferenceController.java b/src/com/android/settings/development/GrammaticalGenderPreferenceController.java index 993b3187894..7b8ec65ec96 100644 --- a/src/com/android/settings/development/GrammaticalGenderPreferenceController.java +++ b/src/com/android/settings/development/GrammaticalGenderPreferenceController.java @@ -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; } diff --git a/src/com/android/settings/development/HdcpCheckingPreferenceController.java b/src/com/android/settings/development/HdcpCheckingPreferenceController.java index 52fe8e04a76..f3afcc21967 100644 --- a/src/com/android/settings/development/HdcpCheckingPreferenceController.java +++ b/src/com/android/settings/development/HdcpCheckingPreferenceController.java @@ -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; diff --git a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java index d970f4266eb..2303a9199ff 100644 --- a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java +++ b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java @@ -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 diff --git a/src/com/android/settings/development/MockLocationAppPreferenceController.java b/src/com/android/settings/development/MockLocationAppPreferenceController.java index 6b0ed03a082..b20ef0259f9 100644 --- a/src/com/android/settings/development/MockLocationAppPreferenceController.java +++ b/src/com/android/settings/development/MockLocationAppPreferenceController.java @@ -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)); } } diff --git a/src/com/android/settings/development/OemUnlockPreferenceController.java b/src/com/android/settings/development/OemUnlockPreferenceController.java index 118312a1bb1..9076f9a976b 100644 --- a/src/com/android/settings/development/OemUnlockPreferenceController.java +++ b/src/com/android/settings/development/OemUnlockPreferenceController.java @@ -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(); } diff --git a/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java b/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java index 52e730ba36a..2a0c1d69b2f 100644 --- a/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java +++ b/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java @@ -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 diff --git a/src/com/android/settings/development/SecondaryDisplayPreferenceController.java b/src/com/android/settings/development/SecondaryDisplayPreferenceController.java index 3e1653d8a43..572013cfdb7 100644 --- a/src/com/android/settings/development/SecondaryDisplayPreferenceController.java +++ b/src/com/android/settings/development/SecondaryDisplayPreferenceController.java @@ -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 diff --git a/src/com/android/settings/development/SelectDebugAppPreferenceController.java b/src/com/android/settings/development/SelectDebugAppPreferenceController.java index b882c70c613..f0b0b27f072 100644 --- a/src/com/android/settings/development/SelectDebugAppPreferenceController.java +++ b/src/com/android/settings/development/SelectDebugAppPreferenceController.java @@ -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)); } } diff --git a/src/com/android/settings/development/SimulateColorSpacePreferenceController.java b/src/com/android/settings/development/SimulateColorSpacePreferenceController.java index 56fa76d379c..bff2494c230 100644 --- a/src/com/android/settings/development/SimulateColorSpacePreferenceController.java +++ b/src/com/android/settings/development/SimulateColorSpacePreferenceController.java @@ -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"); } diff --git a/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java b/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java index 0a8e941ea57..ac683641fea 100644 --- a/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java +++ b/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java @@ -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 diff --git a/src/com/android/settings/development/WindowAnimationScalePreferenceController.java b/src/com/android/settings/development/WindowAnimationScalePreferenceController.java index 70b2e2de186..d8575a0ddfd 100644 --- a/src/com/android/settings/development/WindowAnimationScalePreferenceController.java +++ b/src/com/android/settings/development/WindowAnimationScalePreferenceController.java @@ -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 diff --git a/src/com/android/settings/development/WirelessDebuggingEnabler.java b/src/com/android/settings/development/WirelessDebuggingEnabler.java index 8fec233102b..d4e4fc78a12 100644 --- a/src/com/android/settings/development/WirelessDebuggingEnabler.java +++ b/src/com/android/settings/development/WirelessDebuggingEnabler.java @@ -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; diff --git a/src/com/android/settings/development/WirelessDebuggingFragment.java b/src/com/android/settings/development/WirelessDebuggingFragment.java index 7c600691aa6..8be8d913a98 100644 --- a/src/com/android/settings/development/WirelessDebuggingFragment.java +++ b/src/com/android/settings/development/WirelessDebuggingFragment.java @@ -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()) diff --git a/src/com/android/settings/development/WirelessDebuggingPreferenceController.java b/src/com/android/settings/development/WirelessDebuggingPreferenceController.java index f637ae12e33..b9171ac4e76 100644 --- a/src/com/android/settings/development/WirelessDebuggingPreferenceController.java +++ b/src/com/android/settings/development/WirelessDebuggingPreferenceController.java @@ -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; } diff --git a/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreference.java b/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreference.java index 39e2276432b..b0c60a83ca5 100644 --- a/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreference.java +++ b/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreference.java @@ -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)); } diff --git a/src/com/android/settings/development/bluetooth/BluetoothBitPerSampleDialogPreference.java b/src/com/android/settings/development/bluetooth/BluetoothBitPerSampleDialogPreference.java index 480c208091a..99eb730206f 100644 --- a/src/com/android/settings/development/bluetooth/BluetoothBitPerSampleDialogPreference.java +++ b/src/com/android/settings/development/bluetooth/BluetoothBitPerSampleDialogPreference.java @@ -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]); } diff --git a/src/com/android/settings/development/bluetooth/BluetoothChannelModeDialogPreference.java b/src/com/android/settings/development/bluetooth/BluetoothChannelModeDialogPreference.java index a878f327e88..4a4191a4a5f 100644 --- a/src/com/android/settings/development/bluetooth/BluetoothChannelModeDialogPreference.java +++ b/src/com/android/settings/development/bluetooth/BluetoothChannelModeDialogPreference.java @@ -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]); } diff --git a/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreference.java b/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreference.java index 929a6d02f10..11cfd341696 100644 --- a/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreference.java +++ b/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreference.java @@ -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]); } diff --git a/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreference.java b/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreference.java index a7d6a11f832..796cbe8ed6c 100644 --- a/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreference.java +++ b/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreference.java @@ -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]); } diff --git a/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreference.java b/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreference.java index 622c47ae5d4..71eda79003e 100644 --- a/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreference.java +++ b/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreference.java @@ -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]); } diff --git a/src/com/android/settings/development/qstile/DevelopmentTiles.java b/src/com/android/settings/development/qstile/DevelopmentTiles.java index 71a50b91090..e8d1c2cf648 100644 --- a/src/com/android/settings/development/qstile/DevelopmentTiles.java +++ b/src/com/android/settings/development/qstile/DevelopmentTiles.java @@ -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); } diff --git a/src/com/android/settings/development/snooplogger/SnoopLoggerFiltersPreferenceController.java b/src/com/android/settings/development/snooplogger/SnoopLoggerFiltersPreferenceController.java index 8262182fc63..b32d1617883 100644 --- a/src/com/android/settings/development/snooplogger/SnoopLoggerFiltersPreferenceController.java +++ b/src/com/android/settings/development/snooplogger/SnoopLoggerFiltersPreferenceController.java @@ -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 diff --git a/src/com/android/settings/development/storage/BlobInfoListView.java b/src/com/android/settings/development/storage/BlobInfoListView.java index d3c70336756..36d6c7a7fa6 100644 --- a/src/com/android/settings/development/storage/BlobInfoListView.java +++ b/src/com/android/settings/development/storage/BlobInfoListView.java @@ -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)); } } } diff --git a/src/com/android/settings/development/storage/LeaseInfoListView.java b/src/com/android/settings/development/storage/LeaseInfoListView.java index 597e155908b..bc9711945ca 100644 --- a/src/com/android/settings/development/storage/LeaseInfoListView.java +++ b/src/com/android/settings/development/storage/LeaseInfoListView.java @@ -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)); } } diff --git a/src/com/android/settings/development/storage/SharedDataPreferenceController.java b/src/com/android/settings/development/storage/SharedDataPreferenceController.java index 5d94dc81ee8..88f317bfbc9 100644 --- a/src/com/android/settings/development/storage/SharedDataPreferenceController.java +++ b/src/com/android/settings/development/storage/SharedDataPreferenceController.java @@ -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); } } } diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java index ad3c2c5dc22..ba0cd33fa07 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardBase.java +++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java @@ -116,7 +116,7 @@ public abstract class StorageWizardBase extends FragmentActivity { .setText(R.string.wizard_back) .setListener(this::onNavigateBack) .setButtonType(FooterButton.ButtonType.OTHER) - .setTheme(R.style.SudGlifButton_Secondary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary) .build() ); mFooterBarMixin.setPrimaryButton( @@ -124,7 +124,7 @@ public abstract class StorageWizardBase extends FragmentActivity { .setText(R.string.wizard_next) .setListener(this::onNavigateNext) .setButtonType(FooterButton.ButtonType.NEXT) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build() ); mBack = mFooterBarMixin.getSecondaryButton(); diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java index d3058cef57b..a74c4260ac8 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java @@ -630,24 +630,24 @@ public class SimStatusDialogController implements LifecycleObserver { @Override public void onRegistered(@AccessNetworkConstants.TransportType int imsTransportType) { mDialog.setText(IMS_REGISTRATION_STATE_VALUE_ID, mRes.getString( - R.string.ims_reg_status_registered)); + com.android.settingslib.R.string.ims_reg_status_registered)); } @Override public void onRegistering(@AccessNetworkConstants.TransportType int imsTransportType) { mDialog.setText(IMS_REGISTRATION_STATE_VALUE_ID, mRes.getString( - R.string.ims_reg_status_not_registered)); + com.android.settingslib.R.string.ims_reg_status_not_registered)); } @Override public void onUnregistered(@Nullable ImsReasonInfo info) { mDialog.setText(IMS_REGISTRATION_STATE_VALUE_ID, mRes.getString( - R.string.ims_reg_status_not_registered)); + com.android.settingslib.R.string.ims_reg_status_not_registered)); } @Override public void onTechnologyChangeFailed( @AccessNetworkConstants.TransportType int imsTransportType, @Nullable ImsReasonInfo info) { mDialog.setText(IMS_REGISTRATION_STATE_VALUE_ID, mRes.getString( - R.string.ims_reg_status_not_registered)); + com.android.settingslib.R.string.ims_reg_status_not_registered)); } }; diff --git a/src/com/android/settings/display/ScreenResolutionFragment.java b/src/com/android/settings/display/ScreenResolutionFragment.java index daf1793f11f..bb1d910fb8c 100644 --- a/src/com/android/settings/display/ScreenResolutionFragment.java +++ b/src/com/android/settings/display/ScreenResolutionFragment.java @@ -107,7 +107,8 @@ public class ScreenResolutionFragment extends RadioButtonPickerFragment { final FooterPreference footerPreference = new FooterPreference(screen.getContext()); footerPreference.setTitle(R.string.screen_resolution_footer); footerPreference.setSelectable(false); - footerPreference.setLayoutResource(R.layout.preference_footer); + footerPreference.setLayoutResource( + com.android.settingslib.widget.R.layout.preference_footer); screen.addPreference(footerPreference); } diff --git a/src/com/android/settings/display/ScreenTimeoutSettings.java b/src/com/android/settings/display/ScreenTimeoutSettings.java index 8ca8e0ead9a..5221b169716 100644 --- a/src/com/android/settings/display/ScreenTimeoutSettings.java +++ b/src/com/android/settings/display/ScreenTimeoutSettings.java @@ -128,7 +128,8 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements mPrivacyPreference.setIcon(R.drawable.ic_privacy_shield_24dp); mPrivacyPreference.setTitle(R.string.adaptive_sleep_privacy); mPrivacyPreference.setSelectable(false); - mPrivacyPreference.setLayoutResource(R.layout.preference_footer); + mPrivacyPreference.setLayoutResource( + com.android.settingslib.widget.R.layout.preference_footer); mPrivacyManager = SensorPrivacyManager.getInstance(context); mPrivacyChangedListener = (sensor, enabled) -> mAdaptiveSleepController.updatePreference(); } @@ -201,7 +202,8 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements mPrivacyPreference.setIcon(R.drawable.ic_privacy_shield_24dp); mPrivacyPreference.setTitle(R.string.adaptive_sleep_privacy); mPrivacyPreference.setSelectable(false); - mPrivacyPreference.setLayoutResource(R.layout.preference_footer); + mPrivacyPreference.setLayoutResource( + com.android.settingslib.widget.R.layout.preference_footer); if (isScreenAttentionAvailable(getContext())) { mAdaptiveSleepPermissionController.addToScreen(screen); diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java index 676d4ac4fb5..d72cd8f6758 100644 --- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java @@ -137,11 +137,13 @@ public class EnterpriseSetDefaultAppsListPreferenceController extends if (userInfo.isManagedProfile()) { category.setTitle(devicePolicyManager.getResources().getString( WORK_CATEGORY_HEADER, - () -> mContext.getString(R.string.category_work))); + () -> mContext.getString( + com.android.settingslib.R.string.category_work))); } else { category.setTitle(devicePolicyManager.getResources().getString( PERSONAL_CATEGORY_HEADER, - () -> mContext.getString(R.string.category_personal))); + () -> mContext.getString( + com.android.settingslib.R.string.category_personal))); } category.setOrder(i); createPreferences(prefContext, category, mApps.get(i)); diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java index 92292facde3..d7f1f68886d 100644 --- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java @@ -110,7 +110,8 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController private CharSequence generateLabel(BatteryInfo info) { if (Utils.containsIncompatibleChargers(mContext, TAG)) { - return mContext.getString(R.string.battery_info_status_not_charging); + return mContext.getString( + com.android.settingslib.R.string.battery_info_status_not_charging); } else if (BatteryUtils.isBatteryDefenderOn(info)) { return null; } else if (info.remainingLabel == null diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java index 9f8c2d02c23..4cc1b1b56aa 100644 --- a/src/com/android/settings/fuelgauge/BatteryInfo.java +++ b/src/com/android/settings/fuelgauge/BatteryInfo.java @@ -33,7 +33,6 @@ import androidx.annotation.Nullable; import androidx.annotation.WorkerThread; import com.android.internal.os.BatteryStatsHistoryIterator; -import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.overlay.FeatureFactory; import com.android.settings.widget.UsageView; @@ -133,11 +132,11 @@ public class BatteryInfo { } parserList[parsers.length] = parser; parseBatteryHistory(parserList); - String timeString = context.getString(R.string.charge_length_format, + String timeString = context.getString(com.android.settingslib.R.string.charge_length_format, Formatter.formatShortElapsedTime(context, timePeriod)); String remaining = ""; if (remainingTimeUs != 0) { - remaining = context.getString(R.string.remaining_length_format, + remaining = context.getString(com.android.settingslib.R.string.remaining_length_format, Formatter.formatShortElapsedTime(context, remainingTimeUs / 1000)); } view.setBottomLabels(new CharSequence[]{timeString, remaining}); @@ -287,7 +286,7 @@ public class BatteryInfo { || dockDefenderMode == BatteryUtils.DockDefenderMode.ACTIVE) { // Battery defender active, battery charging paused info.remainingLabel = null; - int chargingLimitedResId = R.string.power_charging_limited; + int chargingLimitedResId = com.android.settingslib.R.string.power_charging_limited; info.chargeLabel = context.getString(chargingLimitedResId, info.batteryPercentString); } else if ((chargeTimeMs > 0 && status != BatteryManager.BATTERY_STATUS_FULL && dockDefenderMode == BatteryUtils.DockDefenderMode.DISABLED) @@ -297,22 +296,24 @@ public class BatteryInfo { final CharSequence timeString = StringUtil.formatElapsedTime(context, (double) PowerUtil.convertUsToMs(info.remainingTimeUs), false /* withSeconds */, true /* collapseTimeUnit */); - int resId = R.string.power_charging_duration; + int resId = com.android.settingslib.R.string.power_charging_duration; info.remainingLabel = chargeTimeMs <= 0 ? null : context.getString( - R.string.power_remaining_charging_duration_only, timeString); + com.android.settingslib.R.string.power_remaining_charging_duration_only, + timeString); info.chargeLabel = chargeTimeMs <= 0 ? info.batteryPercentString : context.getString(resId, info.batteryPercentString, timeString); } else if (dockDefenderMode == BatteryUtils.DockDefenderMode.FUTURE_BYPASS) { // Dock defender will be triggered in the future, charging will be optimized. - info.chargeLabel = context.getString(R.string.power_charging_future_paused, + info.chargeLabel = context.getString( + com.android.settingslib.R.string.power_charging_future_paused, info.batteryPercentString); } else { final String chargeStatusLabel = Utils.getBatteryStatus(context, batteryBroadcast, compactStatus); info.remainingLabel = null; info.chargeLabel = info.batteryLevel == 100 ? info.batteryPercentString : - resources.getString(R.string.power_charging, info.batteryPercentString, - chargeStatusLabel); + resources.getString(com.android.settingslib.R.string.power_charging, + info.batteryPercentString, chargeStatusLabel); } } diff --git a/src/com/android/settings/fuelgauge/BatteryMeterView.java b/src/com/android/settings/fuelgauge/BatteryMeterView.java index 4a0dc1d6040..1cd9f7157b6 100644 --- a/src/com/android/settings/fuelgauge/BatteryMeterView.java +++ b/src/com/android/settings/fuelgauge/BatteryMeterView.java @@ -49,7 +49,8 @@ public class BatteryMeterView extends ImageView { public BatteryMeterView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - final int frameColor = context.getColor(R.color.meter_background_color); + final int frameColor = + context.getColor(com.android.settingslib.R.color.meter_background_color); mAccentColorFilter = Utils.getAlphaInvariantColorFilterForColor( Utils.getColorAttrDefaultColor(context, android.R.attr.colorAccent)); mErrorColorFilter = Utils.getAlphaInvariantColorFilterForColor( diff --git a/src/com/android/settings/fuelgauge/InactiveApps.java b/src/com/android/settings/fuelgauge/InactiveApps.java index 284e5be6c1f..a629fceb4a5 100644 --- a/src/com/android/settings/fuelgauge/InactiveApps.java +++ b/src/com/android/settings/fuelgauge/InactiveApps.java @@ -71,7 +71,7 @@ public class InactiveApps extends SettingsPreferenceFragment mUsageStats = getActivity().getSystemService(UsageStatsManager.class); addPreferencesFromResource(R.xml.placeholder_preference_screen); - getActivity().setTitle(R.string.inactive_apps_title); + getActivity().setTitle(com.android.settingslib.R.string.inactive_apps_title); } @Override @@ -148,7 +148,8 @@ public class InactiveApps extends SettingsPreferenceFragment final Resources res = getActivity().getResources(); final int appBucket = mUsageStats.getAppStandbyBucket(p.getKey()); final String bucketName = bucketToName(appBucket); - p.setSummary(res.getString(R.string.standby_bucket_summary, bucketName)); + p.setSummary(res.getString( + com.android.settingslib.R.string.standby_bucket_summary, bucketName)); // Buckets outside of the range of the dynamic ones are only used for special // purposes and can either not be changed out of, or might have undesirable // side-effects in combination with other assumptions. diff --git a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java index 728730265ba..b514888baa9 100644 --- a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java +++ b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java @@ -138,7 +138,8 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle private CharSequence generateLabel(BatteryInfo info) { if (Utils.containsIncompatibleChargers(mContext, TAG)) { - return mContext.getString(R.string.battery_info_status_not_charging); + return mContext.getString( + com.android.settingslib.R.string.battery_info_status_not_charging); } if (info.batteryStatus == BatteryManager.BATTERY_STATUS_NOT_CHARGING) { // Present status only if no remaining time or status anomalous @@ -148,7 +149,8 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle } else if (info.remainingLabel == null) { return info.batteryPercentString; } else { - return mContext.getString(R.string.power_remaining_settings_home_page, + return mContext.getString( + com.android.settingslib.R.string.power_remaining_settings_home_page, info.batteryPercentString, info.remainingLabel); } diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java index 86538ee8811..506607c6ec4 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java @@ -510,7 +510,8 @@ public class BatteryEntry { Context context, String name, final int uid) { Drawable icon = context.getDrawable(R.drawable.ic_power_system); if (uid == 0) { - name = context.getResources().getString(R.string.process_kernel_label); + name = context.getResources() + .getString(com.android.settingslib.R.string.process_kernel_label); } else if (uid == BatteryUtils.UID_REMOVED_APPS) { name = context.getResources().getString(R.string.process_removed_apps); } else if (uid == BatteryUtils.UID_TETHERING) { diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java index 94f0757c961..54c608cf309 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java @@ -215,7 +215,7 @@ public class KeyboardLayoutDialogFragment extends InstrumentedDialogFragment private void updateSwitchHintVisibility() { AlertDialog dialog = (AlertDialog)getDialog(); if (dialog != null) { - View customPanel = dialog.findViewById(R.id.customPanel); + View customPanel = dialog.findViewById(com.google.android.material.R.id.customPanel); customPanel.setVisibility(mAdapter.getCount() > 1 ? View.VISIBLE : View.GONE); } } diff --git a/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/src/com/android/settings/inputmethod/SpellCheckersSettings.java index 99f7a4e9435..a58d10ccf99 100644 --- a/src/com/android/settings/inputmethod/SpellCheckersSettings.java +++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java @@ -144,7 +144,8 @@ public class SpellCheckersSettings extends SettingsPreferenceFragment return getString(R.string.spell_checker_not_selected); } if (subtype == null) { - return getString(R.string.use_system_language_to_select_input_method_subtypes); + return getString(com.android.settingslib.R + .string.use_system_language_to_select_input_method_subtypes); } return subtype.getDisplayName( getActivity(), sci.getPackageName(), sci.getServiceInfo().applicationInfo); diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java index 61e6a424641..e6de7a5e69a 100644 --- a/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java +++ b/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java @@ -61,7 +61,7 @@ public class VirtualKeyboardPreferenceController extends AbstractPreferenceContr public void updateState(Preference preference) { final List imis = mImm.getEnabledInputMethodList(); if (imis == null) { - preference.setSummary(R.string.summary_empty); + preference.setSummary(com.android.settingslib.R.string.summary_empty); return; } @@ -77,7 +77,7 @@ public class VirtualKeyboardPreferenceController extends AbstractPreferenceContr labels.add(imi.loadLabel(mPm).toString()); } if (labels.isEmpty()) { - preference.setSummary(R.string.summary_empty); + preference.setSummary(com.android.settingslib.R.string.summary_empty); return; } diff --git a/src/com/android/settings/media/RemoteMediaSlice.java b/src/com/android/settings/media/RemoteMediaSlice.java index a9980e879e0..cebc14f4e1d 100644 --- a/src/com/android/settings/media/RemoteMediaSlice.java +++ b/src/com/android/settings/media/RemoteMediaSlice.java @@ -109,7 +109,7 @@ public class RemoteMediaSlice implements CustomSliceable { } final CharSequence castVolume = mContext.getText(R.string.remote_media_volume_option_title); final IconCompat icon = IconCompat.createWithResource(mContext, - R.drawable.ic_volume_remote); + com.android.settingslib.R.drawable.ic_volume_remote); // To create an empty icon to indent the row final IconCompat emptyIcon = createEmptyIcon(); for (RoutingSessionInfo info : infos) { @@ -199,7 +199,8 @@ public class RemoteMediaSlice implements CustomSliceable { PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); final SliceAction primarySliceAction = SliceAction.createDeeplink( primaryBroadcastIntent, - IconCompat.createWithResource(mContext, R.drawable.ic_volume_remote), + IconCompat.createWithResource( + mContext, com.android.settingslib.R.drawable.ic_volume_remote), ListBuilder.ICON_IMAGE, mContext.getString(R.string.media_output_label_title, Utils.getApplicationLabel(mContext, info.getClientPackageName()))); diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java index acb79cc23c3..1375ffcf58e 100644 --- a/src/com/android/settings/network/NetworkProviderSettings.java +++ b/src/com/android/settings/network/NetworkProviderSettings.java @@ -271,7 +271,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment return; } - setPinnedHeaderView(R.layout.progress_header); + setPinnedHeaderView(com.android.settingslib.widget.R.layout.progress_header); setProgressBarVisible(false); if (hasWifiManager()) { diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java index 5c7c54eda37..1304f5e5e8b 100644 --- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java +++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java @@ -155,12 +155,13 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat // Initial radio button text final RadioButton offRadioButton = view.findViewById(R.id.private_dns_mode_off); - offRadioButton.setText(R.string.private_dns_mode_off); + offRadioButton.setText(com.android.settingslib.R.string.private_dns_mode_off); final RadioButton opportunisticRadioButton = view.findViewById(R.id.private_dns_mode_opportunistic); - opportunisticRadioButton.setText(R.string.private_dns_mode_opportunistic); + opportunisticRadioButton.setText( + com.android.settingslib.R.string.private_dns_mode_opportunistic); final RadioButton providerRadioButton = view.findViewById(R.id.private_dns_mode_provider); - providerRadioButton.setText(R.string.private_dns_mode_provider); + providerRadioButton.setText(com.android.settingslib.R.string.private_dns_mode_provider); final TextView helpTextView = view.findViewById(R.id.private_dns_help_info); helpTextView.setMovementMethod(LinkMovementMethod.getInstance()); diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java index 4f727b1894e..21e4926f490 100644 --- a/src/com/android/settings/network/PrivateDnsPreferenceController.java +++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java @@ -128,14 +128,16 @@ public class PrivateDnsPreferenceController extends BasePreferenceController final boolean dnsesResolved = !ArrayUtils.isEmpty(dnses); switch (mode) { case PRIVATE_DNS_MODE_OFF: - return res.getString(R.string.private_dns_mode_off); + return res.getString(com.android.settingslib.R.string.private_dns_mode_off); case PRIVATE_DNS_MODE_OPPORTUNISTIC: return dnsesResolved ? res.getString(R.string.private_dns_mode_on) - : res.getString(R.string.private_dns_mode_opportunistic); + : res.getString( + com.android.settingslib.R.string.private_dns_mode_opportunistic); case PRIVATE_DNS_MODE_PROVIDER_HOSTNAME: return dnsesResolved ? PrivateDnsModeDialogPreference.getHostnameFromSettings(cr) - : res.getString(R.string.private_dns_mode_provider_failure); + : res.getString( + com.android.settingslib.R.string.private_dns_mode_provider_failure); } return ""; } diff --git a/src/com/android/settings/network/apn/ApnSettings.java b/src/com/android/settings/network/apn/ApnSettings.java index 82d56129a77..4addf77379d 100755 --- a/src/com/android/settings/network/apn/ApnSettings.java +++ b/src/com/android/settings/network/apn/ApnSettings.java @@ -248,7 +248,7 @@ public class ApnSettings extends RestrictedSettingsFragment public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - getEmptyTextView().setText(R.string.apn_settings_not_available); + getEmptyTextView().setText(com.android.settingslib.R.string.apn_settings_not_available); mUnavailable = isUiRestricted(); setHasOptionsMenu(!mUnavailable); if (mUnavailable) { diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java index ebc3ea6e226..9d057dc55f7 100644 --- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java +++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java @@ -194,8 +194,9 @@ public class NetworkSelectSettings extends DashboardFragment { final Activity activity = getActivity(); if (activity != null) { - mProgressHeader = setPinnedHeaderView(R.layout.progress_header) - .findViewById(R.id.progress_bar_animation); + mProgressHeader = setPinnedHeaderView( + com.android.settingslib.widget.R.layout.progress_header) + .findViewById(com.android.settingslib.widget.R.id.progress_bar_animation); setProgressBarVisible(false); } forceUpdateConnectedPreferenceCategory(); diff --git a/src/com/android/settings/network/tether/TetherSettings.java b/src/com/android/settings/network/tether/TetherSettings.java index 5398e9bf7a4..11887196c14 100644 --- a/src/com/android/settings/network/tether/TetherSettings.java +++ b/src/com/android/settings/network/tether/TetherSettings.java @@ -365,7 +365,8 @@ public class TetherSettings extends RestrictedSettingsFragment if (isUiRestricted()) { if (!isUiRestrictedByOnlyAdmin()) { - getEmptyTextView().setText(R.string.tethering_settings_not_available); + getEmptyTextView().setText( + com.android.settingslib.R.string.tethering_settings_not_available); } getPreferenceScreen().removeAll(); return; diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java index b1fcd5751fa..d10873ce472 100644 --- a/src/com/android/settings/nfc/AndroidBeam.java +++ b/src/com/android/settings/nfc/AndroidBeam.java @@ -84,7 +84,8 @@ public class AndroidBeam extends InstrumentedFragment mBeamDisallowedByOnlyAdmin = true; return new View(getContext()); } - mView = inflater.inflate(R.layout.preference_footer, container, false); + mView = inflater.inflate( + com.android.settingslib.widget.R.layout.preference_footer, container, false); ImageView iconInfo = mView.findViewById(android.R.id.icon); iconInfo.setImageResource(R.drawable.ic_info_outline_24dp); diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java index d6fdaf81c95..83d5a016867 100644 --- a/src/com/android/settings/notification/RedactionInterstitial.java +++ b/src/com/android/settings/notification/RedactionInterstitial.java @@ -150,7 +150,7 @@ public class RedactionInterstitial extends SettingsActivity { .setText(R.string.app_notifications_dialog_done) .setListener(this::onDoneButtonClicked) .setButtonType(FooterButton.ButtonType.NEXT) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build() ); } diff --git a/src/com/android/settings/notification/RemoteVolumeGroupController.java b/src/com/android/settings/notification/RemoteVolumeGroupController.java index e2faf023db2..50f9ed524da 100644 --- a/src/com/android/settings/notification/RemoteVolumeGroupController.java +++ b/src/com/android/settings/notification/RemoteVolumeGroupController.java @@ -125,7 +125,7 @@ public class RemoteVolumeGroupController extends BasePreferenceController implem seekBarPreference.setProgress(info.getVolume()); seekBarPreference.setMin(0); seekBarPreference.setOnPreferenceChangeListener(this); - seekBarPreference.setIcon(R.drawable.ic_volume_remote); + seekBarPreference.setIcon(com.android.settingslib.R.drawable.ic_volume_remote); seekBarPreference.setEnabled(mLocalMediaManager.shouldEnableVolumeSeekBar(info)); mPreferenceCategory.addPreference(seekBarPreference); } diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java index 12709fe8ad0..c126a88e4af 100644 --- a/src/com/android/settings/password/ChooseLockPassword.java +++ b/src/com/android/settings/password/ChooseLockPassword.java @@ -497,7 +497,8 @@ public class ChooseLockPassword extends SettingsActivity { .setText(R.string.lockpassword_clear_label) .setListener(this::onSkipOrClearButtonClick) .setButtonType(FooterButton.ButtonType.SKIP) - .setTheme(R.style.SudGlifButton_Secondary) + .setTheme( + com.google.android.setupdesign.R.style.SudGlifButton_Secondary) .build() ); mixin.setPrimaryButton( @@ -505,7 +506,7 @@ public class ChooseLockPassword extends SettingsActivity { .setText(R.string.next_label) .setListener(this::onNextButtonClick) .setButtonType(FooterButton.ButtonType.NEXT) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build() ); mSkipOrClearButton = mixin.getSecondaryButton(); @@ -519,7 +520,7 @@ public class ChooseLockPassword extends SettingsActivity { || DevicePolicyManager.PASSWORD_QUALITY_COMPLEX == mPasswordType; final LinearLayout headerLayout = view.findViewById( - R.id.sud_layout_header); + com.google.android.setupdesign.R.id.sud_layout_header); setupPasswordRequirementsView(headerLayout); mPasswordRestrictionView.setLayoutManager(new LinearLayoutManager(getActivity())); diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java index 7569c1596ec..20d1e7d8cd1 100644 --- a/src/com/android/settings/password/ChooseLockPattern.java +++ b/src/com/android/settings/password/ChooseLockPattern.java @@ -514,7 +514,8 @@ public class ChooseLockPattern extends SettingsActivity { .setText(R.string.lockpattern_tutorial_cancel_label) .setListener(this::onSkipOrClearButtonClick) .setButtonType(FooterButton.ButtonType.OTHER) - .setTheme(R.style.SudGlifButton_Secondary) + .setTheme( + com.google.android.setupdesign.R.style.SudGlifButton_Secondary) .build() ); mixin.setPrimaryButton( @@ -522,13 +523,14 @@ public class ChooseLockPattern extends SettingsActivity { .setText(R.string.lockpattern_tutorial_continue_label) .setListener(this::onNextButtonClick) .setButtonType(FooterButton.ButtonType.NEXT) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build() ); mSkipOrClearButton = mixin.getSecondaryButton(); mNextButton = mixin.getPrimaryButton(); // TODO(b/243008023) Workaround for Glif layout on 2 panel choose lock settings. - mSudContent = layout.findViewById(R.id.sud_layout_content); + mSudContent = layout.findViewById( + com.google.android.setupdesign.R.id.sud_layout_content); mSudContent.setPadding(mSudContent.getPaddingLeft(), 0, mSudContent.getPaddingRight(), 0); @@ -741,7 +743,7 @@ public class ChooseLockPattern extends SettingsActivity { if (stage == Stage.ConfirmWrong || stage == Stage.ChoiceTooShort) { TypedValue typedValue = new TypedValue(); Theme theme = getActivity().getTheme(); - theme.resolveAttribute(R.attr.colorError, typedValue, true); + theme.resolveAttribute(androidx.appcompat.R.attr.colorError, typedValue, true); mHeaderText.setTextColor(typedValue.data); } else if (mDefaultHeaderColorList != null) { mHeaderText.setTextColor(mDefaultHeaderColorList); diff --git a/src/com/android/settings/password/ConfirmLockPattern.java b/src/com/android/settings/password/ConfirmLockPattern.java index 7160d645338..3afb60efaaf 100644 --- a/src/com/android/settings/password/ConfirmLockPattern.java +++ b/src/com/android/settings/password/ConfirmLockPattern.java @@ -135,7 +135,8 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { mLockPatternView = (LockPatternView) view.findViewById(R.id.lockPattern); mErrorTextView = (TextView) view.findViewById(R.id.errorText); // TODO(b/243008023) Workaround for Glif layout on 2 panel choose lock settings. - mSudContent = mGlifLayout.findViewById(R.id.sud_layout_content); + mSudContent = mGlifLayout.findViewById( + com.google.android.setupdesign.R.id.sud_layout_content); mSudContent.setPadding(mSudContent.getPaddingLeft(), 0, mSudContent.getPaddingRight(), 0); mIsManagedProfile = UserManager.get(getActivity()).isManagedProfile(mEffectiveUserId); diff --git a/src/com/android/settings/password/ForgotPasswordActivity.java b/src/com/android/settings/password/ForgotPasswordActivity.java index 92dc336d49f..ae050853728 100644 --- a/src/com/android/settings/password/ForgotPasswordActivity.java +++ b/src/com/android/settings/password/ForgotPasswordActivity.java @@ -64,7 +64,7 @@ public class ForgotPasswordActivity extends Activity { .setText(android.R.string.ok) .setListener(v -> finish()) .setButtonType(FooterButton.ButtonType.DONE) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build() ); diff --git a/src/com/android/settings/password/PasswordUtils.java b/src/com/android/settings/password/PasswordUtils.java index a7edc891f3f..4bdc3240322 100644 --- a/src/com/android/settings/password/PasswordUtils.java +++ b/src/com/android/settings/password/PasswordUtils.java @@ -107,7 +107,7 @@ public final class PasswordUtils extends com.android.settingslib.Utils { /** Setup screen lock options button under the Glif Header. */ public static void setupScreenLockOptionsButton(Context context, View view, Button optButton) { final LinearLayout headerLayout = view.findViewById( - R.id.sud_layout_header); + com.google.android.setupdesign.R.id.sud_layout_header); final TextView sucTitleView = headerLayout.findViewById(R.id.suc_layout_title); if (headerLayout != null && sucTitleView != null) { final ViewGroup.MarginLayoutParams layoutTitleParams = diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java index bc6c5129968..7c0769e36b5 100644 --- a/src/com/android/settings/password/SetupChooseLockGeneric.java +++ b/src/com/android/settings/password/SetupChooseLockGeneric.java @@ -113,7 +113,7 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric { layout.setDescriptionText(loadDescriptionText()); layout.setDividerItemDecoration(new SettingsDividerItemDecoration(getContext())); layout.setDividerInset(getContext().getResources().getDimensionPixelSize( - R.dimen.sud_items_glif_text_divider_inset)); + com.google.android.setupdesign.R.dimen.sud_items_glif_text_divider_inset)); layout.setIcon(getContext().getDrawable(R.drawable.ic_lock)); diff --git a/src/com/android/settings/password/SetupChooseLockPassword.java b/src/com/android/settings/password/SetupChooseLockPassword.java index d0d7d93fcf7..f7bf014976a 100644 --- a/src/com/android/settings/password/SetupChooseLockPassword.java +++ b/src/com/android/settings/password/SetupChooseLockPassword.java @@ -99,7 +99,7 @@ public class SetupChooseLockPassword extends ChooseLockPassword { if (showOptionsButton && anyOptionsShown) { mOptionsButton = new Button(new ContextThemeWrapper(getActivity(), - R.style.SudGlifButton_Tertiary)); + com.google.android.setupdesign.R.style.SudGlifButton_Tertiary)); mOptionsButton.setId(R.id.screen_lock_options); PasswordUtils.setupScreenLockOptionsButton(getActivity(), view, mOptionsButton); mOptionsButton.setVisibility(View.VISIBLE); diff --git a/src/com/android/settings/password/SetupChooseLockPattern.java b/src/com/android/settings/password/SetupChooseLockPattern.java index 560906da03b..e233f44a77b 100644 --- a/src/com/android/settings/password/SetupChooseLockPattern.java +++ b/src/com/android/settings/password/SetupChooseLockPattern.java @@ -85,7 +85,7 @@ public class SetupChooseLockPattern extends ChooseLockPattern { View view = super.onCreateView(inflater, container, savedInstanceState); if (!getResources().getBoolean(R.bool.config_lock_pattern_minimal_ui)) { mOptionsButton = new Button(new ContextThemeWrapper(getActivity(), - R.style.SudGlifButton_Tertiary)); + com.google.android.setupdesign.R.style.SudGlifButton_Tertiary)); mOptionsButton.setId(R.id.screen_lock_options); PasswordUtils.setupScreenLockOptionsButton(getActivity(), view, mOptionsButton); mOptionsButton.setOnClickListener((btn) -> diff --git a/src/com/android/settings/search/actionbar/SearchMenuController.java b/src/com/android/settings/search/actionbar/SearchMenuController.java index 9e22bbffa50..0482b00df94 100644 --- a/src/com/android/settings/search/actionbar/SearchMenuController.java +++ b/src/com/android/settings/search/actionbar/SearchMenuController.java @@ -86,8 +86,8 @@ public class SearchMenuController implements LifecycleObserver, OnCreateOptionsM return; } final MenuItem searchItem = menu.add(Menu.NONE, MENU_SEARCH, 0 /* order */, - R.string.search_menu); - searchItem.setIcon(R.drawable.ic_search_24dp); + com.android.settingslib.widget.R.string.search_menu); + searchItem.setIcon(com.android.settingslib.widget.R.drawable.ic_search_24dp); searchItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); searchItem.setOnMenuItemClickListener(target -> { diff --git a/src/com/android/settings/security/CredentialManagementAppHeaderController.java b/src/com/android/settings/security/CredentialManagementAppHeaderController.java index 9361fb91ce8..693857ecea2 100644 --- a/src/com/android/settings/security/CredentialManagementAppHeaderController.java +++ b/src/com/android/settings/security/CredentialManagementAppHeaderController.java @@ -82,7 +82,8 @@ public class CredentialManagementAppHeaderController extends BasePreferenceContr ImageView appIconView = headerPref.findViewById(R.id.entity_header_icon); TextView titleView = headerPref.findViewById(R.id.entity_header_title); TextView summary1 = headerPref.findViewById(R.id.entity_header_summary); - TextView summary2 = headerPref.findViewById(R.id.entity_header_second_summary); + TextView summary2 = headerPref.findViewById( + com.android.settingslib.widget.R.id.entity_header_second_summary); summary2.setVisibility(View.GONE); try { diff --git a/src/com/android/settings/security/InstallCaCertificateWarning.java b/src/com/android/settings/security/InstallCaCertificateWarning.java index 139bc1c2700..7775f836013 100644 --- a/src/com/android/settings/security/InstallCaCertificateWarning.java +++ b/src/com/android/settings/security/InstallCaCertificateWarning.java @@ -58,7 +58,7 @@ public class InstallCaCertificateWarning extends Activity { .setText(R.string.certificate_warning_install_anyway) .setListener(installCaCertificate()) .setButtonType(FooterButton.ButtonType.OTHER) - .setTheme(R.style.SudGlifButton_Secondary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary) .build() ); mixin.getSecondaryButtonView().setFilterTouchesWhenObscured(true); @@ -68,7 +68,7 @@ public class InstallCaCertificateWarning extends Activity { .setText(R.string.certificate_warning_dont_install) .setListener(returnToInstallCertificateFromStorage()) .setButtonType(FooterButton.ButtonType.NEXT) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build() ); mixin.getPrimaryButtonView().setFilterTouchesWhenObscured(true); diff --git a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java index d3c10b01c87..67b0701fc6d 100644 --- a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java +++ b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java @@ -78,7 +78,7 @@ public class PowerButtonInstantLockPreferenceController extends AbstractPreferen R.string.lockpattern_settings_power_button_instantly_locks_summary, trustAgentLabel)); } else { - preference.setSummary(R.string.summary_empty); + preference.setSummary(com.android.settingslib.R.string.summary_empty); } } diff --git a/src/com/android/settings/sim/ChooseSimActivity.java b/src/com/android/settings/sim/ChooseSimActivity.java index cebc1ba6d98..9a75b63c1d1 100644 --- a/src/com/android/settings/sim/ChooseSimActivity.java +++ b/src/com/android/settings/sim/ChooseSimActivity.java @@ -316,8 +316,9 @@ public class ChooseSimActivity extends Activity @Override public void onBindView(View view) { super.onBindView(view); - TextView title = view.findViewById(R.id.sud_items_title); - TextView summary = view.findViewById(R.id.sud_items_summary); + TextView title = view.findViewById(com.google.android.setupdesign.R.id.sud_items_title); + TextView summary = + view.findViewById(com.google.android.setupdesign.R.id.sud_items_summary); title.setEnabled(isEnabled()); summary.setEnabled(isEnabled()); } diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java index 5d2bde31da0..ebf2104c29e 100644 --- a/src/com/android/settings/slices/SettingsSliceProvider.java +++ b/src/com/android/settings/slices/SettingsSliceProvider.java @@ -227,7 +227,7 @@ public class SettingsSliceProvider extends SliceProvider { final boolean nightMode = Utils.isNightMode(getContext()); if (mNightMode == null) { mNightMode = nightMode; - getContext().setTheme(R.style.Theme_SettingsBase); + getContext().setTheme(com.android.settingslib.widget.R.style.Theme_SettingsBase); } else if (mNightMode != nightMode) { Log.d(TAG, "Night mode changed, reload theme"); mNightMode = nightMode; diff --git a/src/com/android/settings/spa/app/AllAppList.kt b/src/com/android/settings/spa/app/AllAppList.kt index 8bd18844998..f3ad2e61b62 100644 --- a/src/com/android/settings/spa/app/AllAppList.kt +++ b/src/com/android/settings/spa/app/AllAppList.kt @@ -140,7 +140,8 @@ class AllAppListModel( System.lineSeparator() + context.getString(R.string.not_installed) } isDisabled(record) -> { - System.lineSeparator() + context.getString(R.string.disabled) + System.lineSeparator() + + context.getString(com.android.settingslib.R.string.disabled) } else -> "" } diff --git a/src/com/android/settings/spa/app/specialaccess/AlarmsAndRemindersAppList.kt b/src/com/android/settings/spa/app/specialaccess/AlarmsAndRemindersAppList.kt index d8d51eb54dc..c31eb7a6ebc 100644 --- a/src/com/android/settings/spa/app/specialaccess/AlarmsAndRemindersAppList.kt +++ b/src/com/android/settings/spa/app/specialaccess/AlarmsAndRemindersAppList.kt @@ -25,8 +25,8 @@ import android.content.pm.ApplicationInfo import android.os.PowerExemptionManager import androidx.compose.runtime.Composable import androidx.compose.runtime.livedata.observeAsState -import com.android.settings.R import com.android.settings.overlay.FeatureFactory.Companion.featureFactory +import com.android.settingslib.R import com.android.settingslib.spa.framework.compose.stateOf import com.android.settingslib.spaprivileged.model.app.AppRecord import com.android.settingslib.spaprivileged.model.app.IPackageManagers diff --git a/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt b/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt index 43add1ffb91..c98b2ee7a03 100644 --- a/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt +++ b/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt @@ -47,7 +47,7 @@ data class InstallUnknownAppsRecord( class InstallUnknownAppsListModel(private val context: Context) : TogglePermissionAppListModel { - override val pageTitleResId = R.string.install_other_apps + override val pageTitleResId = com.android.settingslib.R.string.install_other_apps override val switchTitleResId = R.string.external_source_switch_title override val footerResId = R.string.install_all_warning override val switchRestrictionKeys = diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java index 9f1d2f3e3d4..6d0518a84bf 100644 --- a/src/com/android/settings/tts/TextToSpeechSettings.java +++ b/src/com/android/settings/tts/TextToSpeechSettings.java @@ -548,7 +548,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment CharSequence[] entries = new CharSequence[availableLangs.size() + 1]; CharSequence[] entryValues = new CharSequence[availableLangs.size() + 1]; - entries[0] = getActivity().getString(R.string.tts_lang_use_system); + entries[0] = getActivity().getString(com.android.settingslib.R.string.tts_lang_use_system); entryValues[0] = ""; int i = 1; @@ -570,7 +570,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment private void setLocalePreference(int index) { if (index < 0) { mLocalePreference.setValue(""); - mLocalePreference.setSummary(R.string.tts_lang_not_selected); + mLocalePreference.setSummary(com.android.settingslib.R.string.tts_lang_not_selected); } else { mLocalePreference.setValueIndex(index); mLocalePreference.setSummary(mLocalePreference.getEntries()[index]); @@ -583,9 +583,9 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment try { final String currentLang = mTts.getLanguage().getISO3Language(); String[] strings = getActivity().getResources().getStringArray( - R.array.tts_demo_strings); + com.android.settingslib.R.array.tts_demo_strings); String[] langs = getActivity().getResources().getStringArray( - R.array.tts_demo_string_langs); + com.android.settingslib.R.array.tts_demo_string_langs); for (int i = 0; i < strings.length; ++i) { if (langs[i].equals(currentLang)) { @@ -597,7 +597,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment // Ignore and fall back to default sample string } } - return getString(R.string.tts_default_sample_string); + return getString(com.android.settingslib.R.string.tts_default_sample_string); } private boolean isNetworkRequiredForSynthesis() { @@ -746,7 +746,8 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment private void displayNetworkAlert() { AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); builder.setTitle(android.R.string.dialog_alert_title) - .setMessage(getActivity().getString(R.string.tts_engine_network_required)) + .setMessage(getActivity() + .getString(com.android.settingslib.R.string.tts_engine_network_required)) .setCancelable(false) .setPositiveButton(android.R.string.ok, null); diff --git a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java index 6a1b9bba93c..33648fe96f8 100644 --- a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java +++ b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java @@ -152,7 +152,8 @@ public class TtsEnginePreferenceFragment extends RadioButtonPickerFragment { final AlertDialog dialog = new AlertDialog.Builder(getPrefContext()) .setTitle(android.R.string.dialog_alert_title) .setMessage(mContext.getString( - R.string.tts_engine_security_warning, info.loadLabel())) + com.android.settingslib.R.string.tts_engine_security_warning, + info.loadLabel())) .setCancelable(true) .setPositiveButton(android.R.string.ok, positiveOnClickListener) .setNegativeButton(android.R.string.cancel, null) diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index b0816fdf4ad..64699ffa238 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -1004,9 +1004,9 @@ public class UserSettings extends SettingsPreferenceFragment mAddingUser = true; mAddingUserName = userType == USER_TYPE_USER ? (mPendingUserName != null ? mPendingUserName.toString() - : getString(R.string.user_new_user_name)) + : getString(com.android.settingslib.R.string.user_new_user_name)) : (mPendingUserName != null ? mPendingUserName.toString() - : getString(R.string.user_new_profile_name)); + : getString(com.android.settingslib.R.string.user_new_profile_name)); } mUserCreatingDialog = new UserCreatingDialog(getActivity()); @@ -1357,13 +1357,14 @@ public class UserSettings extends SettingsPreferenceFragment String guestExitSummary; if (mUserCaps.mIsEphemeral) { guestExitSummary = getContext().getString( - R.string.guest_notification_ephemeral); + com.android.settingslib.R.string.guest_notification_ephemeral); } else if (isGuestFirstLogin) { guestExitSummary = getContext().getString( - R.string.guest_notification_non_ephemeral); + com.android.settingslib.R.string.guest_notification_non_ephemeral); } else { guestExitSummary = getContext().getString( - R.string.guest_notification_non_ephemeral_non_first_login); + com.android.settingslib.R + .string.guest_notification_non_ephemeral_non_first_login); } mGuestExitPreference.setSummary(guestExitSummary); } @@ -1394,7 +1395,8 @@ public class UserSettings extends SettingsPreferenceFragment pref.setOnPreferenceClickListener(this); pref.setEnabled(canOpenUserDetails); pref.setSelectable(true); - Drawable icon = getContext().getDrawable(R.drawable.ic_account_circle_outline); + Drawable icon = getContext().getDrawable( + com.android.settingslib.R.drawable.ic_account_circle_outline); icon.setTint( getColorAttrDefaultColor(getContext(), android.R.attr.colorControlNormal)); pref.setIcon(encircleUserIcon( @@ -1439,14 +1441,15 @@ public class UserSettings extends SettingsPreferenceFragment && mUserManager.canAddMoreUsers(UserManager.USER_TYPE_FULL_GUEST) && WizardManagerHelper.isDeviceProvisioned(context) && mUserCaps.mUserSwitcherEnabled) { - Drawable icon = context.getDrawable(R.drawable.ic_account_circle); + Drawable icon = context.getDrawable( + com.android.settingslib.R.drawable.ic_account_circle); mAddGuest.setIcon(centerAndTint(icon)); isVisible = true; mAddGuest.setVisible(true); mAddGuest.setSelectable(true); if (mGuestUserAutoCreated && mGuestCreationScheduled.get()) { mAddGuest.setTitle(com.android.internal.R.string.guest_name); - mAddGuest.setSummary(R.string.guest_resetting); + mAddGuest.setSummary(com.android.settingslib.R.string.guest_resetting); mAddGuest.setEnabled(false); } else { mAddGuest.setTitle(com.android.settingslib.R.string.guest_new_guest); @@ -1460,14 +1463,16 @@ public class UserSettings extends SettingsPreferenceFragment private void updateAddUser(Context context) { updateAddUserCommon(context, mAddUser, mUserCaps.mCanAddRestrictedProfile); - Drawable icon = context.getDrawable(R.drawable.ic_account_circle_filled); + Drawable icon = context.getDrawable( + com.android.settingslib.R.drawable.ic_account_circle_filled); mAddUser.setIcon(centerAndTint(icon)); } private void updateAddSupervisedUser(Context context) { if (!TextUtils.isEmpty(mConfigSupervisedUserCreationPackage)) { updateAddUserCommon(context, mAddSupervisedUser, false); - Drawable icon = context.getDrawable(R.drawable.ic_add_supervised_user); + Drawable icon = context.getDrawable( + com.android.settingslib.R.drawable.ic_add_supervised_user); mAddSupervisedUser.setIcon(centerAndTint(icon)); } else { mAddSupervisedUser.setVisible(false); @@ -1505,7 +1510,8 @@ public class UserSettings extends SettingsPreferenceFragment icon.setTintBlendMode(BlendMode.SRC_IN); icon.setTint(getColorAttrDefaultColor(getContext(), android.R.attr.textColorPrimary)); - Drawable bg = getContext().getDrawable(R.drawable.user_avatar_bg).mutate(); + Drawable bg = getContext().getDrawable(com.android.settingslib.R.drawable.user_avatar_bg) + .mutate(); LayerDrawable ld = new LayerDrawable(new Drawable[] {bg, icon}); int size = getContext().getResources().getDimensionPixelSize( R.dimen.multiple_users_avatar_size); diff --git a/src/com/android/settings/vpn2/VpnInfoPreference.java b/src/com/android/settings/vpn2/VpnInfoPreference.java index cca45b54947..2a1b4952a78 100644 --- a/src/com/android/settings/vpn2/VpnInfoPreference.java +++ b/src/com/android/settings/vpn2/VpnInfoPreference.java @@ -70,7 +70,8 @@ public class VpnInfoPreference extends RestrictedPreference implements View.OnCl } // Hide the divider from view - final View divider = holder.findViewById(R.id.two_target_divider); + final View divider = + holder.findViewById(com.android.settingslib.widget.R.id.two_target_divider); divider.setVisibility(View.GONE); } diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java index 0389ecdf423..f3ad4e2263c 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.java @@ -196,7 +196,8 @@ public class VpnSettings extends RestrictedDashboardFragment implements if (mUnavailable) { // Show a message to explain that VPN settings have been disabled if (!isUiRestrictedByOnlyAdmin()) { - getEmptyTextView().setText(R.string.vpn_settings_not_available); + getEmptyTextView() + .setText(com.android.settingslib.R.string.vpn_settings_not_available); } getPreferenceScreen().removeAll(); return; diff --git a/src/com/android/settings/webview/WebViewUpdateServiceWrapper.java b/src/com/android/settings/webview/WebViewUpdateServiceWrapper.java index fd13586f460..ff4ae41a603 100644 --- a/src/com/android/settings/webview/WebViewUpdateServiceWrapper.java +++ b/src/com/android/settings/webview/WebViewUpdateServiceWrapper.java @@ -27,8 +27,6 @@ import android.webkit.WebViewFactory; import android.webkit.WebViewProviderInfo; import android.widget.Toast; -import com.android.settings.R; - import java.util.ArrayList; import java.util.List; @@ -101,7 +99,8 @@ public class WebViewUpdateServiceWrapper { // The user chose a package that became invalid since the list was last updated, // show a Toast to explain the situation. Toast toast = Toast.makeText(context, - R.string.select_webview_provider_toast_text, Toast.LENGTH_SHORT); + com.android.settingslib.R.string.select_webview_provider_toast_text, + Toast.LENGTH_SHORT); toast.show(); } diff --git a/src/com/android/settings/widget/AppCheckBoxPreference.java b/src/com/android/settings/widget/AppCheckBoxPreference.java index 3ce67ebf59c..7cf31b84f5e 100644 --- a/src/com/android/settings/widget/AppCheckBoxPreference.java +++ b/src/com/android/settings/widget/AppCheckBoxPreference.java @@ -25,27 +25,26 @@ import android.widget.LinearLayout; import androidx.preference.CheckBoxPreference; import androidx.preference.PreferenceViewHolder; -import com.android.settings.R; - /** * {@link CheckBoxPreference} that used only to display app */ public class AppCheckBoxPreference extends CheckBoxPreference { public AppCheckBoxPreference(Context context, AttributeSet attrs) { super(context, attrs); - setLayoutResource(R.layout.preference_app); + setLayoutResource(com.android.settingslib.widget.R.layout.preference_app); } public AppCheckBoxPreference(Context context) { super(context); - setLayoutResource(R.layout.preference_app); + setLayoutResource(com.android.settingslib.widget.R.layout.preference_app); } @Override public void onBindViewHolder(PreferenceViewHolder holder) { super.onBindViewHolder(holder); - final LinearLayout layout = (LinearLayout) holder.findViewById(R.id.summary_container); + final LinearLayout layout = (LinearLayout) holder + .findViewById(com.android.settingslib.widget.R.id.summary_container); if (layout != null) { // If summary doesn't exist, make it gone layout.setVisibility(TextUtils.isEmpty(getSummary()) ? View.GONE : View.VISIBLE); diff --git a/src/com/android/settings/widget/BottomLabelLayout.java b/src/com/android/settings/widget/BottomLabelLayout.java index 6323c4dcaa7..a267de04a5b 100644 --- a/src/com/android/settings/widget/BottomLabelLayout.java +++ b/src/com/android/settings/widget/BottomLabelLayout.java @@ -25,8 +25,6 @@ import android.widget.LinearLayout; import androidx.annotation.VisibleForTesting; -import com.android.settingslib.R; - /** * An extension of LinearLayout that automatically switches to vertical * orientation when it can't fit its child views horizontally. @@ -85,7 +83,7 @@ public class BottomLabelLayout extends LinearLayout { setOrientation(stacked ? LinearLayout.VERTICAL : LinearLayout.HORIZONTAL); setGravity(stacked ? Gravity.START : Gravity.BOTTOM); - final View spacer = findViewById(R.id.spacer); + final View spacer = findViewById(com.android.settings.R.id.spacer); if (spacer != null) { spacer.setVisibility(stacked ? View.GONE : View.VISIBLE); } diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java index 8a2403cf3c0..c56b36d4e88 100644 --- a/src/com/android/settings/widget/EntityHeaderController.java +++ b/src/com/android/settings/widget/EntityHeaderController.java @@ -116,7 +116,8 @@ public class EntityHeaderController { mHeader = header; } else { mHeader = LayoutInflater.from(fragment.getContext()) - .inflate(R.layout.settings_entity_header, null /* root */); + .inflate(com.android.settingslib.widget.R.layout.settings_entity_header, + null /* root */); } } @@ -254,9 +255,9 @@ public class EntityHeaderController { } setText(R.id.entity_header_title, mLabel); setText(R.id.entity_header_summary, mSummary); - setText(R.id.entity_header_second_summary, mSecondSummary); + setText(com.android.settingslib.widget.R.id.entity_header_second_summary, mSecondSummary); if (mIsInstantApp) { - setText(R.id.install_type, + setText(com.android.settingslib.widget.R.id.install_type, mHeader.getResources().getString(R.string.install_type_instant)); } @@ -271,7 +272,8 @@ public class EntityHeaderController { * Only binds entity header with button actions. */ public EntityHeaderController bindHeaderButtons() { - final View entityHeaderContent = mHeader.findViewById(R.id.entity_header_content); + final View entityHeaderContent = mHeader.findViewById( + com.android.settingslib.widget.R.id.entity_header_content); final ImageButton button1 = mHeader.findViewById(android.R.id.button1); final ImageButton button2 = mHeader.findViewById(android.R.id.button2); bindAppInfoLink(entityHeaderContent); diff --git a/src/com/android/settings/widget/SingleTargetGearPreference.java b/src/com/android/settings/widget/SingleTargetGearPreference.java index f6496ed4d88..2cc55085b62 100644 --- a/src/com/android/settings/widget/SingleTargetGearPreference.java +++ b/src/com/android/settings/widget/SingleTargetGearPreference.java @@ -58,7 +58,8 @@ public class SingleTargetGearPreference extends Preference { @Override public void onBindViewHolder(PreferenceViewHolder holder) { super.onBindViewHolder(holder); - final View divider = holder.findViewById(com.android.settingslib.R.id.two_target_divider); + final View divider = holder.findViewById( + com.android.settingslib.widget.R.id.two_target_divider); if (divider != null) { divider.setVisibility(View.INVISIBLE); } diff --git a/src/com/android/settings/widget/UsageGraph.java b/src/com/android/settings/widget/UsageGraph.java index 11ebd210d8f..78dcd7a5a14 100644 --- a/src/com/android/settings/widget/UsageGraph.java +++ b/src/com/android/settings/widget/UsageGraph.java @@ -84,17 +84,21 @@ public class UsageGraph extends View { mLinePaint.setStrokeCap(Cap.ROUND); mLinePaint.setStrokeJoin(Join.ROUND); mLinePaint.setAntiAlias(true); - mCornerRadius = resources.getDimensionPixelSize(R.dimen.usage_graph_line_corner_radius); + mCornerRadius = resources.getDimensionPixelSize( + com.android.settingslib.R.dimen.usage_graph_line_corner_radius); mLinePaint.setPathEffect(new CornerPathEffect(mCornerRadius)); - mLinePaint.setStrokeWidth(resources.getDimensionPixelSize(R.dimen.usage_graph_line_width)); + mLinePaint.setStrokeWidth(resources.getDimensionPixelSize( + com.android.settingslib.R.dimen.usage_graph_line_width)); mFillPaint = new Paint(mLinePaint); mFillPaint.setStyle(Style.FILL); mDottedPaint = new Paint(mLinePaint); mDottedPaint.setStyle(Style.STROKE); - float dots = resources.getDimensionPixelSize(R.dimen.usage_graph_dot_size); - float interval = resources.getDimensionPixelSize(R.dimen.usage_graph_dot_interval); + float dots = resources.getDimensionPixelSize( + com.android.settingslib.R.dimen.usage_graph_dot_size); + float interval = resources.getDimensionPixelSize( + com.android.settingslib.R.dimen.usage_graph_dot_interval); mDottedPaint.setStrokeWidth(dots * 3); mDottedPaint.setPathEffect(new DashPathEffect(new float[] {dots, interval}, 0)); mDottedPaint.setColor(context.getColor(R.color.usage_graph_dots)); @@ -103,7 +107,8 @@ public class UsageGraph extends View { context.getTheme().resolveAttribute(com.android.internal.R.attr.listDivider, v, true); mDivider = context.getDrawable(v.resourceId); mTintedDivider = context.getDrawable(v.resourceId); - mDividerSize = resources.getDimensionPixelSize(R.dimen.usage_graph_divider_size); + mDividerSize = resources.getDimensionPixelSize( + com.android.settingslib.R.dimen.usage_graph_divider_size); } void clearPaths() { diff --git a/src/com/android/settings/wifi/ConnectedWifiEntryPreference.java b/src/com/android/settings/wifi/ConnectedWifiEntryPreference.java index 54a4d04c68b..1dea59141e2 100644 --- a/src/com/android/settings/wifi/ConnectedWifiEntryPreference.java +++ b/src/com/android/settings/wifi/ConnectedWifiEntryPreference.java @@ -56,7 +56,7 @@ public class ConnectedWifiEntryPreference extends LongPressWifiEntryPreference i holder.findViewById(R.id.settings_button_no_background).setVisibility( canSignIn ? View.INVISIBLE : View.VISIBLE); gear.setVisibility(canSignIn ? View.VISIBLE : View.INVISIBLE); - holder.findViewById(R.id.two_target_divider).setVisibility( + holder.findViewById(com.android.settingslib.widget.R.id.two_target_divider).setVisibility( canSignIn ? View.VISIBLE : View.INVISIBLE); } diff --git a/src/com/android/settings/wifi/LinkablePreference.java b/src/com/android/settings/wifi/LinkablePreference.java index d29482dfa22..8f95917b509 100644 --- a/src/com/android/settings/wifi/LinkablePreference.java +++ b/src/com/android/settings/wifi/LinkablePreference.java @@ -49,7 +49,8 @@ public class LinkablePreference extends Preference { public LinkablePreference(Context ctx, AttributeSet attrs) { this(ctx, attrs, TypedArrayUtils.getAttr( - ctx, R.attr.footerPreferenceStyle, android.R.attr.preferenceStyle)); + ctx, com.android.settingslib.widget.R.attr.footerPreferenceStyle, + android.R.attr.preferenceStyle)); } public LinkablePreference(Context ctx) { diff --git a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java index 93d88e98799..65f305e249e 100644 --- a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java +++ b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java @@ -142,7 +142,7 @@ public class NetworkRequestDialogFragment extends NetworkRequestDialogBaseFragme // Prepares adapter. mDialogAdapter = new WifiEntryAdapter(context, - R.layout.preference_access_point, mFilteredWifiEntries); + com.android.settingslib.R.layout.preference_access_point, mFilteredWifiEntries); final AlertDialog.Builder builder = new AlertDialog.Builder(context) .setCustomTitle(customTitle) @@ -326,7 +326,7 @@ public class NetworkRequestDialogFragment extends NetworkRequestDialogBaseFragme view = mInflater.inflate(mResourceId, parent, false); final View divider = view.findViewById( - com.android.settingslib.R.id.two_target_divider); + com.android.settingslib.widget.R.id.two_target_divider); divider.setVisibility(View.GONE); } diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 8f0a983d1ff..b2b73464c76 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -920,7 +920,7 @@ public class WifiConfigController implements TextWatcher, } catch (NumberFormatException e) { // Set the hint as default after user types in ip address mNetworkPrefixLengthView.setText(mConfigUi.getContext().getString( - R.string.wifi_network_prefix_length_hint)); + com.android.settingslib.R.string.wifi_network_prefix_length_hint)); } catch (IllegalArgumentException e) { return R.string.wifi_ip_settings_invalid_ip_address; } @@ -953,7 +953,8 @@ public class WifiConfigController implements TextWatcher, if (TextUtils.isEmpty(dns)) { //If everything else is valid, provide hint as a default option - mDns1View.setText(mConfigUi.getContext().getString(R.string.wifi_dns1_hint)); + mDns1View.setText(mConfigUi.getContext().getString( + com.android.settingslib.R.string.wifi_dns1_hint)); } else { dnsAddr = getIPv4Address(dns); if (dnsAddr == null) { @@ -1705,29 +1706,36 @@ public class WifiConfigController implements TextWatcher, int idx = 0; // Populate the Wi-Fi security spinner with the various supported key management types - spinnerAdapter.add(mContext.getString(R.string.wifi_security_none)); + spinnerAdapter.add(mContext.getString(com.android.settingslib.R.string.wifi_security_none)); mSecurityInPosition[idx++] = AccessPoint.SECURITY_NONE; if (mWifiManager.isEnhancedOpenSupported()) { - spinnerAdapter.add(mContext.getString(R.string.wifi_security_owe)); + spinnerAdapter.add( + mContext.getString(com.android.settingslib.R.string.wifi_security_owe)); mSecurityInPosition[idx++] = AccessPoint.SECURITY_OWE; } - spinnerAdapter.add(mContext.getString(R.string.wifi_security_wep)); + spinnerAdapter.add(mContext.getString(com.android.settingslib.R.string.wifi_security_wep)); mSecurityInPosition[idx++] = AccessPoint.SECURITY_WEP; - spinnerAdapter.add(mContext.getString(R.string.wifi_security_wpa_wpa2)); + spinnerAdapter.add( + mContext.getString(com.android.settingslib.R.string.wifi_security_wpa_wpa2)); mSecurityInPosition[idx++] = AccessPoint.SECURITY_PSK; if (mWifiManager.isWpa3SaeSupported()) { - spinnerAdapter.add(mContext.getString(R.string.wifi_security_sae)); + spinnerAdapter.add( + mContext.getString(com.android.settingslib.R.string.wifi_security_sae)); mSecurityInPosition[idx++] = AccessPoint.SECURITY_SAE; - spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_wpa_wpa2)); + spinnerAdapter.add(mContext.getString( + com.android.settingslib.R.string.wifi_security_eap_wpa_wpa2)); mSecurityInPosition[idx++] = AccessPoint.SECURITY_EAP; - spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_wpa3)); + spinnerAdapter.add( + mContext.getString(com.android.settingslib.R.string.wifi_security_eap_wpa3)); mSecurityInPosition[idx++] = AccessPoint.SECURITY_EAP_WPA3_ENTERPRISE; } else { - spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap)); + spinnerAdapter.add( + mContext.getString(com.android.settingslib.R.string.wifi_security_eap)); mSecurityInPosition[idx++] = AccessPoint.SECURITY_EAP; } if (mWifiManager.isWpa3SuiteBSupported()) { - spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_suiteb)); + spinnerAdapter.add( + mContext.getString(com.android.settingslib.R.string.wifi_security_eap_suiteb)); mSecurityInPosition[idx++] = AccessPoint.SECURITY_EAP_SUITE_B; } diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java index f92b58fbd1c..26c6b4bd085 100644 --- a/src/com/android/settings/wifi/WifiConfigController2.java +++ b/src/com/android/settings/wifi/WifiConfigController2.java @@ -926,7 +926,7 @@ public class WifiConfigController2 implements TextWatcher, } catch (NumberFormatException e) { // Set the hint as default after user types in ip address mNetworkPrefixLengthView.setText(mConfigUi.getContext().getString( - R.string.wifi_network_prefix_length_hint)); + com.android.settingslib.R.string.wifi_network_prefix_length_hint)); } catch (IllegalArgumentException e) { return R.string.wifi_ip_settings_invalid_ip_address; } @@ -959,7 +959,8 @@ public class WifiConfigController2 implements TextWatcher, if (TextUtils.isEmpty(dns)) { //If everything else is valid, provide hint as a default option - mDns1View.setText(mConfigUi.getContext().getString(R.string.wifi_dns1_hint)); + mDns1View.setText(mConfigUi.getContext().getString( + com.android.settingslib.R.string.wifi_dns1_hint)); } else { dnsAddr = getIPv4Address(dns); if (dnsAddr == null) { @@ -1664,11 +1665,12 @@ public class WifiConfigController2 implements TextWatcher, public void afterTextChanged(Editable s) { if (s.length() == 0) { if (view.getId() == R.id.gateway) { - mGatewayView.setHint(R.string.wifi_gateway_hint); + mGatewayView.setHint(com.android.settingslib.R.string.wifi_gateway_hint); } else if (view.getId() == R.id.network_prefix_length) { - mNetworkPrefixLengthView.setHint(R.string.wifi_network_prefix_length_hint); + mNetworkPrefixLengthView.setHint( + com.android.settingslib.R.string.wifi_network_prefix_length_hint); } else if (view.getId() == R.id.dns1) { - mDns1View.setHint(R.string.wifi_dns1_hint); + mDns1View.setHint(com.android.settingslib.R.string.wifi_dns1_hint); } Button submit = mConfigUi.getSubmitButton(); if (submit == null) return; @@ -1810,29 +1812,36 @@ public class WifiConfigController2 implements TextWatcher, int idx = 0; // Populate the Wi-Fi security spinner with the various supported key management types - spinnerAdapter.add(mContext.getString(R.string.wifi_security_none)); + spinnerAdapter.add(mContext.getString(com.android.settingslib.R.string.wifi_security_none)); mSecurityInPosition[idx++] = WifiEntry.SECURITY_NONE; if (mWifiManager.isEnhancedOpenSupported()) { - spinnerAdapter.add(mContext.getString(R.string.wifi_security_owe)); + spinnerAdapter.add(mContext.getString( + com.android.settingslib.R.string.wifi_security_owe)); mSecurityInPosition[idx++] = WifiEntry.SECURITY_OWE; } - spinnerAdapter.add(mContext.getString(R.string.wifi_security_wep)); + spinnerAdapter.add(mContext.getString(com.android.settingslib.R.string.wifi_security_wep)); mSecurityInPosition[idx++] = WifiEntry.SECURITY_WEP; - spinnerAdapter.add(mContext.getString(R.string.wifi_security_wpa_wpa2)); + spinnerAdapter.add(mContext.getString( + com.android.settingslib.R.string.wifi_security_wpa_wpa2)); mSecurityInPosition[idx++] = WifiEntry.SECURITY_PSK; if (mWifiManager.isWpa3SaeSupported()) { - spinnerAdapter.add(mContext.getString(R.string.wifi_security_sae)); + spinnerAdapter.add(mContext.getString( + com.android.settingslib.R.string.wifi_security_sae)); mSecurityInPosition[idx++] = WifiEntry.SECURITY_SAE; - spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_wpa_wpa2)); + spinnerAdapter.add(mContext.getString( + com.android.settingslib.R.string.wifi_security_eap_wpa_wpa2)); mSecurityInPosition[idx++] = WifiEntry.SECURITY_EAP; - spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_wpa3)); + spinnerAdapter.add(mContext.getString( + com.android.settingslib.R.string.wifi_security_eap_wpa3)); mSecurityInPosition[idx++] = WifiEntry.SECURITY_EAP_WPA3_ENTERPRISE; } else { - spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap)); + spinnerAdapter.add(mContext.getString( + com.android.settingslib.R.string.wifi_security_eap)); mSecurityInPosition[idx++] = WifiEntry.SECURITY_EAP; } if (mWifiManager.isWpa3SuiteBSupported()) { - spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_suiteb)); + spinnerAdapter.add(mContext.getString( + com.android.settingslib.R.string.wifi_security_eap_suiteb)); mSecurityInPosition[idx++] = WifiEntry.SECURITY_EAP_SUITE_B; } diff --git a/src/com/android/settings/wifi/WifiEntryPreference.java b/src/com/android/settings/wifi/WifiEntryPreference.java index 7206666b576..e721945fc10 100644 --- a/src/com/android/settings/wifi/WifiEntryPreference.java +++ b/src/com/android/settings/wifi/WifiEntryPreference.java @@ -113,7 +113,8 @@ public class WifiEntryPreference extends RestrictedPreference implements view.itemView.setContentDescription(mContentDescription); // Turn off divider - view.findViewById(R.id.two_target_divider).setVisibility(View.INVISIBLE); + view.findViewById(com.android.settingslib.widget.R.id.two_target_divider) + .setVisibility(View.INVISIBLE); // Enable the icon button when the help string in this WifiEntry is not null. final ImageButton imageButton = (ImageButton) view.findViewById(R.id.icon_button); diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index ded01dd9b7a..c02f1d10c3d 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -224,8 +224,10 @@ public class WifiSettings extends RestrictedSettingsFragment super.onViewCreated(view, savedInstanceState); final Activity activity = getActivity(); if (activity != null) { - mProgressHeader = setPinnedHeaderView(R.layout.progress_header) - .findViewById(R.id.progress_bar_animation); + mProgressHeader = + setPinnedHeaderView(com.android.settingslib.widget.R.layout.progress_header) + .findViewById( + com.android.settingslib.widget.R.id.progress_bar_animation); setProgressBarVisible(false); } ((SettingsActivity) activity).getSwitchBar().setTitle( diff --git a/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java b/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java index 60031b02930..7878f5d81dc 100644 --- a/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java +++ b/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java @@ -550,7 +550,7 @@ public class AddAppNetworksFragment extends InstrumentedFragment implements } final View divider = view.findViewById( - com.android.settingslib.R.id.two_target_divider); + com.android.settingslib.widget.R.id.two_target_divider); if (divider != null) { divider.setVisibility(View.GONE); } diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java index e0a1e3965ef..48fcae8488f 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java +++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java @@ -25,7 +25,6 @@ import android.widget.TextView; import androidx.annotation.DrawableRes; -import com.android.settings.R; import com.android.settings.core.InstrumentedFragment; import com.google.android.setupcompat.template.FooterBarMixin; @@ -59,13 +58,13 @@ public abstract class WifiDppQrCodeBaseFragment extends InstrumentedFragment { if (isFooterAvailable()) { mLeftButton = new FooterButton.Builder(getContext()) .setButtonType(FooterButton.ButtonType.CANCEL) - .setTheme(R.style.SudGlifButton_Secondary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary) .build(); mGlifLayout.getMixin(FooterBarMixin.class).setSecondaryButton(mLeftButton); mRightButton = new FooterButton.Builder(getContext()) .setButtonType(FooterButton.ButtonType.NEXT) - .setTheme(R.style.SudGlifButton_Primary) + .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .build(); mGlifLayout.getMixin(FooterBarMixin.class).setPrimaryButton(mRightButton); } diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java index 00cb36b2670..3f486f2035c 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java @@ -31,7 +31,7 @@ import com.android.settings.R; public class WifiP2pPeer extends Preference { private static final int FIXED_RSSI = 60; - private static final int[] STATE_SECURED = {R.attr.state_encrypted}; + private static final int[] STATE_SECURED = {com.android.settingslib.R.attr.state_encrypted}; public WifiP2pDevice device; @VisibleForTesting final int mRssi; diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java index d8c39081c94..207d91a639c 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java @@ -206,7 +206,8 @@ public class WifiTetherSettings extends RestrictedDashboardFragment } if (mUnavailable) { if (!isUiRestrictedByOnlyAdmin()) { - getEmptyTextView().setText(R.string.tethering_settings_not_available); + getEmptyTextView() + .setText(com.android.settingslib.R.string.tethering_settings_not_available); } getPreferenceScreen().removeAll(); return; diff --git a/src/com/android/settings/wifi/tether/WifiTetherSsidPreference.java b/src/com/android/settings/wifi/tether/WifiTetherSsidPreference.java index 4343fcc399d..a9487a5df4c 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSsidPreference.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSsidPreference.java @@ -68,7 +68,7 @@ public class WifiTetherSsidPreference extends ValidatedEditTextPreference { private void initialize() { // TODO(b/129019971): use methods of divider line in parent object - setLayoutResource(com.android.settingslib.R.layout.preference_two_target); + setLayoutResource(com.android.settingslib.widget.R.layout.preference_two_target); setWidgetLayoutResource(R.layout.wifi_button_preference_widget); mShareIconDrawable = getDrawable(R.drawable.ic_qrcode_24dp); @@ -79,7 +79,8 @@ public class WifiTetherSsidPreference extends ValidatedEditTextPreference { super.onBindViewHolder(holder); final ImageButton shareButton = (ImageButton) holder.findViewById(R.id.button_icon); - final View dividerView = holder.findViewById(R.id.two_target_divider); + final View dividerView = holder.findViewById( + com.android.settingslib.widget.R.id.two_target_divider); if (mVisible) { shareButton.setOnClickListener(mClickListener); diff --git a/src/com/android/settings/wifi/tether/WifiTetherViewModel.java b/src/com/android/settings/wifi/tether/WifiTetherViewModel.java index fb2160fbed6..652612b7d2c 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherViewModel.java +++ b/src/com/android/settings/wifi/tether/WifiTetherViewModel.java @@ -52,11 +52,14 @@ public class WifiTetherViewModel extends AndroidViewModel { static Map sSecuritySummaryResMap = new HashMap<>(); static { - sSecuritySummaryResMap.put(SECURITY_TYPE_WPA3_SAE, R.string.wifi_security_sae); + sSecuritySummaryResMap.put( + SECURITY_TYPE_WPA3_SAE, com.android.settingslib.R.string.wifi_security_sae); sSecuritySummaryResMap.put(SECURITY_TYPE_WPA3_SAE_TRANSITION, - R.string.wifi_security_psk_sae); - sSecuritySummaryResMap.put(SECURITY_TYPE_WPA2_PSK, R.string.wifi_security_wpa2); - sSecuritySummaryResMap.put(SECURITY_TYPE_OPEN, R.string.wifi_security_none); + com.android.settingslib.R.string.wifi_security_psk_sae); + sSecuritySummaryResMap.put( + SECURITY_TYPE_WPA2_PSK, com.android.settingslib.R.string.wifi_security_wpa2); + sSecuritySummaryResMap.put( + SECURITY_TYPE_OPEN, com.android.settingslib.R.string.wifi_security_none); } static Map sSpeedSummaryResMap = new HashMap<>(); diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityDialogUtilsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityDialogUtilsTest.java index 4922eab8755..ad53ad60e05 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityDialogUtilsTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityDialogUtilsTest.java @@ -24,8 +24,6 @@ import android.content.Context; import androidx.appcompat.app.AlertDialog; import androidx.test.core.app.ApplicationProvider; -import com.android.settings.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -39,7 +37,7 @@ public class AccessibilityDialogUtilsTest { @Before public void setUp() { - mContext.setTheme(R.style.Theme_AppCompat); + mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat); } @Test diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceControllerTest.java index aef91438bed..95c4b778369 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceControllerTest.java @@ -72,7 +72,8 @@ public class AccessibilityFooterPreferenceControllerTest { mPreference.setTitle(TEST_TITLE); final LayoutInflater inflater = LayoutInflater.from(mContext); - final View view = inflater.inflate(R.layout.preference_footer, null); + final View view = inflater.inflate( + com.android.settingslib.widget.R.layout.preference_footer, null); mPreferenceViewHolder = PreferenceViewHolder.createInstanceForTests(view); mPreference.onBindViewHolder(mPreferenceViewHolder); diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceTest.java index 0f83bc3a254..6b556073928 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceTest.java @@ -26,8 +26,6 @@ import android.widget.TextView; import androidx.preference.PreferenceViewHolder; -import com.android.settings.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -48,7 +46,7 @@ public final class AccessibilityFooterPreferenceTest { final LayoutInflater inflater = LayoutInflater.from(context); final View view = - inflater.inflate(R.layout.preference_footer, null); + inflater.inflate(com.android.settingslib.widget.R.layout.preference_footer, null); mPreferenceViewHolder = PreferenceViewHolder.createInstanceForTests(view); } diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorialTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorialTest.java index 5bc7f1855d5..202fa8b684c 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorialTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorialTest.java @@ -37,7 +37,6 @@ import android.view.View; import androidx.appcompat.app.AlertDialog; import androidx.test.core.app.ApplicationProvider; -import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SubSettings; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -67,7 +66,7 @@ public final class AccessibilityGestureNavigationTutorialTest { @Before public void setUp() { - mContext.setTheme(R.style.Theme_AppCompat); + mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat); mShortcutTypes = /* initial */ 0; } diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest.java index 47c83703514..8174541ebd2 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest.java @@ -96,7 +96,7 @@ public class AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest { public void setUp() { MockitoAnnotations.initMocks(this); - mContext.setTheme(R.style.Theme_AppCompat); + mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat); mFragment = spy(new TestFragment()); when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager); when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext); diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java index bb723683d18..6dd1f110980 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java @@ -130,7 +130,7 @@ public class AccessibilitySettingsTest { when(mActivity.getContentResolver()).thenReturn(mContentResolver); when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager); when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext); - mContext.setTheme(R.style.Theme_AppCompat); + mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat); when(mContext.getSystemService(AppOpsManager.class)).thenReturn(mAppOpsManager); when(mAppOpsManager.noteOpNoThrow(eq(AppOpsManager.OP_ACCESS_RESTRICTED_SETTINGS), anyInt(), anyString())).thenReturn(AppOpsManager.MODE_ALLOWED); diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java index 7fbc3e36278..15374d69ea3 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java @@ -46,7 +46,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import androidx.test.core.app.ApplicationProvider; -import com.android.settings.R; import com.android.settings.testutils.shadow.ShadowFragment; import org.junit.Before; @@ -140,7 +139,7 @@ public class AccessibilityShortcutPreferenceFragmentTest { @Test public void setupEditShortcutDialog_shortcutPreferenceOff_checkboxIsEmptyValue() { - mContext.setTheme(R.style.Theme_AppCompat); + mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat); final AlertDialog dialog = AccessibilityDialogUtils.showEditShortcutDialog( mContext, AccessibilityDialogUtils.DialogType.EDIT_SHORTCUT_GENERIC, PLACEHOLDER_DIALOG_TITLE, @@ -158,7 +157,7 @@ public class AccessibilityShortcutPreferenceFragmentTest { @Test public void setupEditShortcutDialog_shortcutPreferenceOn_checkboxIsSavedValue() { - mContext.setTheme(R.style.Theme_AppCompat); + mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat); final AlertDialog dialog = AccessibilityDialogUtils.showEditShortcutDialog( mContext, AccessibilityDialogUtils.DialogType.EDIT_SHORTCUT_GENERIC, PLACEHOLDER_DIALOG_TITLE, @@ -180,7 +179,7 @@ public class AccessibilityShortcutPreferenceFragmentTest { @Test @Config(shadows = ShadowFragment.class) public void restoreValueFromSavedInstanceState_assignShortcutTypeToVariable() { - mContext.setTheme(R.style.Theme_AppCompat); + mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat); final AlertDialog dialog = AccessibilityDialogUtils.showEditShortcutDialog( mContext, AccessibilityDialogUtils.DialogType.EDIT_SHORTCUT_GENERIC, PLACEHOLDER_DIALOG_TITLE, @@ -206,7 +205,7 @@ public class AccessibilityShortcutPreferenceFragmentTest { @Test @Config(shadows = ShadowFragment.class) public void restoreValueFromSavedInstanceState_showTooltipView() { - mContext.setTheme(R.style.Theme_AppCompat); + mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat); mFragment.showQuickSettingsTooltipIfNeeded(QuickSettingsTooltipType.GUIDE_TO_EDIT); assertThat(getLatestPopupWindow().isShowing()).isTrue(); diff --git a/tests/robotests/src/com/android/settings/accessibility/FlashNotificationsPreviewPreferenceTest.java b/tests/robotests/src/com/android/settings/accessibility/FlashNotificationsPreviewPreferenceTest.java index 1e7f0898392..e9600086f2d 100644 --- a/tests/robotests/src/com/android/settings/accessibility/FlashNotificationsPreviewPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/FlashNotificationsPreviewPreferenceTest.java @@ -68,7 +68,8 @@ public class FlashNotificationsPreviewPreferenceTest { final View frame = mPreferenceViewHolder.findViewById(R.id.frame); final int backgroundResId = Shadows.shadowOf(frame.getBackground()).getCreatedFromResId(); - assertThat(backgroundResId).isEqualTo(R.drawable.settingslib_switch_bar_bg_on); + assertThat(backgroundResId).isEqualTo( + com.android.settingslib.widget.R.drawable.settingslib_switch_bar_bg_on); final TextView title = (TextView) mPreferenceViewHolder.findViewById(android.R.id.title); assertThat(title.getAlpha()).isEqualTo(1f); assertThat(title.getCurrentTextColor()).isEqualTo(textColorEnabled); diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationModePreferenceControllerTest.java index f0719185dcb..62ff39b0e95 100644 --- a/tests/robotests/src/com/android/settings/accessibility/MagnificationModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationModePreferenceControllerTest.java @@ -74,7 +74,7 @@ public class MagnificationModePreferenceControllerTest { @Before public void setUp() { mContext = ApplicationProvider.getApplicationContext(); - mContext.setTheme(R.style.Theme_AppCompat); + mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat); final PreferenceManager preferenceManager = new PreferenceManager(mContext); mScreen = preferenceManager.createPreferenceScreen(mContext); mModePreference = new Preference(mContext); diff --git a/tests/robotests/src/com/android/settings/accessibility/PreviewSizeSeekBarControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/PreviewSizeSeekBarControllerTest.java index 1cea0566313..66ce02b63db 100644 --- a/tests/robotests/src/com/android/settings/accessibility/PreviewSizeSeekBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/PreviewSizeSeekBarControllerTest.java @@ -43,7 +43,6 @@ import com.android.settings.SettingsPreferenceFragment; import com.android.settings.testutils.shadow.ShadowFragment; import com.android.settings.testutils.shadow.ShadowInteractionJankMonitor; import com.android.settings.widget.LabeledSeekBarPreference; -import com.android.settings.widget.SeekBarPreference; import org.junit.Before; import org.junit.Test; @@ -91,7 +90,7 @@ public class PreviewSizeSeekBarControllerTest { public void setUp() { MockitoAnnotations.initMocks(this); - mContext.setTheme(R.style.Theme_AppCompat); + mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat); mFragment = spy(new TestFragment()); when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager); when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext); diff --git a/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentTest.java index 0e67b17bdca..50a33f37f2f 100644 --- a/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentTest.java @@ -71,7 +71,7 @@ public class TextReadingPreferenceFragmentTest { @Before public void setUp() { - mContext.setTheme(R.style.Theme_AppCompat); + mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat); mFragment = spy(new TextReadingPreferenceFragment()); when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager); diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java index 70af21392ee..2909ea77272 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java @@ -114,7 +114,7 @@ public class ToggleFeaturePreferenceFragmentTest { final PreferenceScreen screen = spy(new PreferenceScreen(mContext, null)); when(screen.getPreferenceManager()).thenReturn(mPreferenceManager); doReturn(screen).when(mFragment).getPreferenceScreen(); - mContext.setTheme(R.style.Theme_AppCompat); + mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat); } @Test diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java index 2eac7851688..fe925df1ebb 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java @@ -559,7 +559,7 @@ public class ToggleScreenMagnificationPreferenceFragmentTest { } private AlertDialog createEditShortcutDialog(Context context) { - context.setTheme(R.style.Theme_AppCompat); + context.setTheme(androidx.appcompat.R.style.Theme_AppCompat); return AccessibilityDialogUtils.showEditShortcutDialog( context, DialogType.EDIT_SHORTCUT_MAGNIFICATION, PLACEHOLDER_DIALOG_TITLE, diff --git a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java index 8fb40bfdaa2..b3d1ff7dc51 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java @@ -72,7 +72,8 @@ public class AccountHeaderPreferenceControllerTest { MockitoAnnotations.initMocks(this); FakeFeatureFactory.setupForTest(); mHeaderPreference = new LayoutPreference( - RuntimeEnvironment.application, R.layout.settings_entity_header); + RuntimeEnvironment.application, + com.android.settingslib.widget.R.layout.settings_entity_header); doReturn(RuntimeEnvironment.application).when(mActivity).getApplicationContext(); mLifecycleOwner = () -> mLifecycle; mLifecycle = new Lifecycle(mLifecycleOwner); diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java index c5ed4593b65..b12c8db3959 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java @@ -76,7 +76,8 @@ public class AppHeaderViewPreferenceControllerTest { mActivity = spy(Robolectric.buildActivity(FragmentActivity.class).get()); mLifecycleOwner = () -> mLifecycle; mLifecycle = new Lifecycle(mLifecycleOwner); - mHeader = LayoutInflater.from(mContext).inflate(R.layout.settings_entity_header, null); + mHeader = LayoutInflater.from(mContext).inflate( + com.android.settingslib.widget.R.layout.settings_entity_header, null); when(mFragment.getActivity()).thenReturn(mActivity); when(mScreen.findPreference(anyString())).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java index 1311fe23a9f..b203d870307 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java @@ -28,7 +28,6 @@ import android.content.pm.PackageManager; import android.view.View; import android.widget.FrameLayout; -import com.android.settings.R; import com.android.settingslib.applications.ApplicationsState; import org.junit.Before; @@ -61,7 +60,8 @@ public class ApplicationViewHolderTest { info.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED; mHolder.updateDisableView(info); - assertThat(mHolder.mDisabled.getText()).isEqualTo(mContext.getText(R.string.disabled)); + assertThat(mHolder.mDisabled.getText()) + .isEqualTo(mContext.getText(com.android.settingslib.R.string.disabled)); } @Test @@ -69,8 +69,9 @@ public class ApplicationViewHolderTest { mHolder.setSummary("hello"); assertThat(mHolder.mSummary.getText()).isEqualTo("hello"); - mHolder.setSummary(R.string.disabled); - assertThat(mHolder.mSummary.getText()).isEqualTo(mContext.getText(R.string.disabled)); + mHolder.setSummary(com.android.settingslib.R.string.disabled); + assertThat(mHolder.mSummary.getText()) + .isEqualTo(mContext.getText(com.android.settingslib.R.string.disabled)); } @Test diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java index 910fbed18c1..06229481ba4 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java @@ -105,7 +105,7 @@ public class ManageApplicationsTest { public void setUp() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mContext.setTheme(R.style.Theme_AppCompat); + mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat); mAppReset = new RoboMenuItem(R.id.reset_app_preferences); mSortRecent = new RoboMenuItem(R.id.sort_order_recent_notification); mSortFrequent = new RoboMenuItem(R.id.sort_order_frequent_notification); diff --git a/tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java index 4917a85e873..aeef8ecc8d6 100644 --- a/tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java @@ -30,7 +30,6 @@ import android.content.pm.PackageManager; import android.content.pm.verify.domain.DomainVerificationManager; import android.content.pm.verify.domain.DomainVerificationUserState; -import com.android.settings.R; import com.android.settingslib.applications.ApplicationsState; import org.junit.Before; @@ -72,7 +71,8 @@ public class DomainAppPreferenceControllerTest { doReturn(true).when(domainVerificationUserState).isLinkHandlingAllowed(); final DomainAppPreference pref = new DomainAppPreference(mContext, mAppEntry); - assertThat(pref.getLayoutResource()).isEqualTo(R.layout.preference_app); + assertThat(pref.getLayoutResource()) + .isEqualTo(com.android.settingslib.widget.R.layout.preference_app); } private ApplicationInfo createApplicationInfo(String packageName) { diff --git a/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollIntroductionTest.java index df15e5c32f8..3165d05924c 100644 --- a/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollIntroductionTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollIntroductionTest.java @@ -385,7 +385,8 @@ public class FaceEnrollIntroductionTest { @Test public void testFaceEnrollIntroduction_hasBottomScrollView() { setupActivity(); - BottomScrollView scrollView = getGlifLayout(mActivity).findViewById(R.id.sud_scroll_view); + BottomScrollView scrollView = getGlifLayout(mActivity) + .findViewById(com.google.android.setupdesign.R.id.sud_scroll_view); assertThat(scrollView).isNotNull(); assertThat(scrollView.getVisibility()).isEqualTo(View.VISIBLE); diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java index df743959b2c..a048f8877f9 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java @@ -54,10 +54,11 @@ public class BluetoothDetailsButtonsControllerTest extends BluetoothDetailsContr public void setUp() { super.setUp(); final View buttons = View.inflate( - RuntimeEnvironment.application, R.layout.settingslib_action_buttons, + RuntimeEnvironment.application, + com.android.settingslib.widget.R.layout.settingslib_action_buttons, null /* parent */); - mConnectButton = buttons.findViewById(R.id.button2); - mForgetButton = buttons.findViewById(R.id.button1); + mConnectButton = buttons.findViewById(com.android.settingslib.widget.R.id.button2); + mForgetButton = buttons.findViewById(com.android.settingslib.widget.R.id.button1); mController = new BluetoothDetailsButtonsController(mContext, mFragment, mCachedDevice, mLifecycle); diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java index 08f708440fa..12ea9b2dfb9 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java @@ -29,7 +29,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; -import com.android.settings.R; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -140,7 +139,8 @@ public abstract class BluetoothDetailsControllerTestBase { .setAddress("B4:B0:34:B5:3B:1B") .setMajorDeviceClass(BluetoothClass.Device.Major.AUDIO_VIDEO) .setConnected(true) - .setConnectionSummary(mContext.getString(R.string.bluetooth_connected)); + .setConnectionSummary( + mContext.getString(com.android.settingslib.R.string.bluetooth_connected)); } /** diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java index a28c4f5010c..8be8b18c6ff 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java @@ -26,7 +26,6 @@ import static org.mockito.Mockito.when; import android.bluetooth.BluetoothDevice; import android.graphics.drawable.Drawable; -import com.android.settings.R; import com.android.settings.core.SettingsUIDeviceConfig; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.shadow.ShadowDeviceConfig; @@ -73,7 +72,8 @@ public class BluetoothDetailsHeaderControllerTest extends BluetoothDetailsContro mController = new BluetoothDetailsHeaderController(mContext, mFragment, mCachedDevice, mLifecycle, mBluetoothManager); - mPreference = new LayoutPreference(mContext, R.layout.settings_entity_header); + mPreference = new LayoutPreference( + mContext, com.android.settingslib.widget.R.layout.settings_entity_header); mPreference.setKey(mController.getPreferenceKey()); mScreen.addPreference(mPreference); setupDevice(mDeviceConfig); @@ -91,7 +91,8 @@ public class BluetoothDetailsHeaderControllerTest extends BluetoothDetailsContro */ @Test public void testContextMock() { - assertThat(mContext.getString(R.string.bluetooth_connected)).isNotNull(); + assertThat(mContext.getString(com.android.settingslib.R.string.bluetooth_connected)) + .isNotNull(); } @Test @@ -110,20 +111,20 @@ public class BluetoothDetailsHeaderControllerTest extends BluetoothDetailsContro public void connectionStatusChangesWhileScreenOpen() { InOrder inOrder = inOrder(mHeaderController); when(mCachedDevice.getConnectionSummary()) - .thenReturn(mContext.getString(R.string.bluetooth_connected)); + .thenReturn(mContext.getString(com.android.settingslib.R.string.bluetooth_connected)); showScreen(mController); inOrder.verify(mHeaderController) - .setSummary(mContext.getString(R.string.bluetooth_connected)); + .setSummary(mContext.getString(com.android.settingslib.R.string.bluetooth_connected)); when(mCachedDevice.getConnectionSummary()).thenReturn(null); mController.onDeviceAttributesChanged(); inOrder.verify(mHeaderController).setSummary((CharSequence) null); when(mCachedDevice.getConnectionSummary()) - .thenReturn(mContext.getString(R.string.bluetooth_connecting)); + .thenReturn(mContext.getString(com.android.settingslib.R.string.bluetooth_connecting)); mController.onDeviceAttributesChanged(); inOrder.verify(mHeaderController) - .setSummary(mContext.getString(R.string.bluetooth_connecting)); + .setSummary(mContext.getString(com.android.settingslib.R.string.bluetooth_connecting)); } @Test diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java index 3bc9a05acbc..76023c58ec1 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java @@ -33,7 +33,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.SwitchPreference; -import com.android.settings.R; import com.android.settings.testutils.shadow.ShadowBluetoothDevice; import com.android.settingslib.bluetooth.A2dpProfile; import com.android.settingslib.bluetooth.LocalBluetoothManager; @@ -219,15 +218,15 @@ public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsCont @Test public void oneProfile() { - addFakeProfile(R.string.bluetooth_profile_a2dp, true); + addFakeProfile(com.android.settingslib.R.string.bluetooth_profile_a2dp, true); showScreen(mController); verifyProfileSwitchTitles(getProfileSwitches(true)); } @Test public void multipleProfiles() { - addFakeProfile(R.string.bluetooth_profile_a2dp, true); - addFakeProfile(R.string.bluetooth_profile_headset, false); + addFakeProfile(com.android.settingslib.R.string.bluetooth_profile_a2dp, true); + addFakeProfile(com.android.settingslib.R.string.bluetooth_profile_headset, false); showScreen(mController); List switches = getProfileSwitches(true); verifyProfileSwitchTitles(switches); @@ -252,8 +251,8 @@ public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsCont @Test public void disableThenReenableOneProfile() { - addFakeProfile(R.string.bluetooth_profile_a2dp, true); - addFakeProfile(R.string.bluetooth_profile_headset, true); + addFakeProfile(com.android.settingslib.R.string.bluetooth_profile_a2dp, true); + addFakeProfile(com.android.settingslib.R.string.bluetooth_profile_headset, true); showScreen(mController); List switches = getProfileSwitches(true); SwitchPreference pref = switches.get(0); @@ -279,7 +278,7 @@ public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsCont @Test public void disconnectedDeviceOneProfile() { setupDevice(makeDefaultDeviceConfig().setConnected(false).setConnectionSummary(null)); - addFakeProfile(R.string.bluetooth_profile_a2dp, true); + addFakeProfile(com.android.settingslib.R.string.bluetooth_profile_a2dp, true); showScreen(mController); verifyProfileSwitchTitles(getProfileSwitches(true)); } @@ -289,7 +288,8 @@ public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsCont setupDevice(makeDefaultDeviceConfig()); mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED); PbapServerProfile psp = mock(PbapServerProfile.class); - when(psp.getNameResource(mDevice)).thenReturn(R.string.bluetooth_profile_pbap); + when(psp.getNameResource(mDevice)) + .thenReturn(com.android.settingslib.R.string.bluetooth_profile_pbap); when(psp.toString()).thenReturn(PbapServerProfile.NAME); when(psp.isProfileReady()).thenReturn(true); when(mProfileManager.getPbapProfile()).thenReturn(psp); @@ -298,7 +298,8 @@ public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsCont List switches = getProfileSwitches(false); assertThat(switches.size()).isEqualTo(1); SwitchPreference pref = switches.get(0); - assertThat(pref.getTitle()).isEqualTo(mContext.getString(R.string.bluetooth_profile_pbap)); + assertThat(pref.getTitle()).isEqualTo( + mContext.getString(com.android.settingslib.R.string.bluetooth_profile_pbap)); assertThat(pref.isChecked()).isTrue(); pref.performClick(); @@ -312,7 +313,8 @@ public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsCont setupDevice(makeDefaultDeviceConfig()); mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED); PbapServerProfile psp = mock(PbapServerProfile.class); - when(psp.getNameResource(mDevice)).thenReturn(R.string.bluetooth_profile_pbap); + when(psp.getNameResource(mDevice)) + .thenReturn(com.android.settingslib.R.string.bluetooth_profile_pbap); when(psp.toString()).thenReturn(PbapServerProfile.NAME); when(psp.isProfileReady()).thenReturn(true); when(mProfileManager.getPbapProfile()).thenReturn(psp); @@ -321,7 +323,8 @@ public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsCont List switches = getProfileSwitches(false); assertThat(switches.size()).isEqualTo(1); SwitchPreference pref = switches.get(0); - assertThat(pref.getTitle()).isEqualTo(mContext.getString(R.string.bluetooth_profile_pbap)); + assertThat(pref.getTitle()).isEqualTo( + mContext.getString(com.android.settingslib.R.string.bluetooth_profile_pbap)); assertThat(pref.isChecked()).isFalse(); pref.performClick(); @@ -334,7 +337,8 @@ public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsCont public void mapProfile() { setupDevice(makeDefaultDeviceConfig()); MapProfile mapProfile = mock(MapProfile.class); - when(mapProfile.getNameResource(mDevice)).thenReturn(R.string.bluetooth_profile_map); + when(mapProfile.getNameResource(mDevice)) + .thenReturn(com.android.settingslib.R.string.bluetooth_profile_map); when(mapProfile.isProfileReady()).thenReturn(true); when(mProfileManager.getMapProfile()).thenReturn(mapProfile); when(mProfileManager.getProfileByName(eq(mapProfile.toString()))).thenReturn(mapProfile); @@ -343,7 +347,8 @@ public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsCont List switches = getProfileSwitches(false); assertThat(switches.size()).isEqualTo(1); SwitchPreference pref = switches.get(0); - assertThat(pref.getTitle()).isEqualTo(mContext.getString(R.string.bluetooth_profile_map)); + assertThat(pref.getTitle()).isEqualTo( + mContext.getString(com.android.settingslib.R.string.bluetooth_profile_map)); assertThat(pref.isChecked()).isFalse(); pref.performClick(); @@ -355,9 +360,11 @@ public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsCont boolean highQualityAudioEnabled) { A2dpProfile profile = mock(A2dpProfile.class); when(mProfileManager.getProfileByName(eq(profile.toString()))).thenReturn(profile); - when(profile.getNameResource(mDevice)).thenReturn(R.string.bluetooth_profile_a2dp); + when(profile.getNameResource(mDevice)) + .thenReturn(com.android.settingslib.R.string.bluetooth_profile_a2dp); when(profile.getHighQualityAudioOptionLabel(mDevice)).thenReturn( - mContext.getString(R.string.bluetooth_profile_a2dp_high_quality_unknown_codec)); + mContext.getString(com.android.settingslib.R + .string.bluetooth_profile_a2dp_high_quality_unknown_codec)); when(profile.supportsHighQualityAudio(mDevice)).thenReturn(supportsHighQualityAudio); when(profile.isHighQualityAudioEnabled(mDevice)).thenReturn(highQualityAudioEnabled); when(profile.isEnabled(mDevice)).thenReturn(preferred); @@ -397,7 +404,8 @@ public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsCont SwitchPreference pref = (SwitchPreference) mProfiles.getPreference(0); assertThat(pref.getKey()) .isNotEqualTo(BluetoothDetailsProfilesController.HIGH_QUALITY_AUDIO_PREF_TAG); - assertThat(pref.getTitle()).isEqualTo(mContext.getString(R.string.bluetooth_profile_a2dp)); + assertThat(pref.getTitle()).isEqualTo( + mContext.getString(com.android.settingslib.R.string.bluetooth_profile_a2dp)); } @Test diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java index 2aca4a3d229..58f5a06c1dd 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java @@ -260,7 +260,8 @@ public class BluetoothSummaryUpdaterTest { mSummaryUpdater.onConnectionStateChanged(null /* device */, BluetoothAdapter.STATE_CONNECTING); - verify(mListener).onSummaryChanged(mContext.getString(R.string.bluetooth_connecting)); + verify(mListener).onSummaryChanged( + mContext.getString(com.android.settingslib.R.string.bluetooth_connecting)); } @Test @@ -272,7 +273,8 @@ public class BluetoothSummaryUpdaterTest { mSummaryUpdater.onConnectionStateChanged(null /* device */, BluetoothAdapter.STATE_DISCONNECTING); - verify(mListener).onSummaryChanged(mContext.getString(R.string.bluetooth_disconnecting)); + verify(mListener).onSummaryChanged( + mContext.getString(com.android.settingslib.R.string.bluetooth_disconnecting)); } @Test diff --git a/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java index 3c459de3792..a3ec66feffc 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java @@ -330,7 +330,7 @@ public class StylusDevicesControllerTest { @Test public void defaultNotesPreferenceClick_multiUserManagedProfile_showsProfileSelectorDialog() { - mContext.setTheme(R.style.Theme_AppCompat); + mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat); final String permissionPackageName = "permissions.package"; final UserHandle currentUser = Process.myUserHandle(); List userInfos = Arrays.asList( @@ -354,7 +354,7 @@ public class StylusDevicesControllerTest { @Test public void defaultNotesPreferenceClick_noManagedProfile_sendsManageDefaultRoleIntent() { final ArgumentCaptor captor = ArgumentCaptor.forClass(Intent.class); - mContext.setTheme(R.style.Theme_AppCompat); + mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat); final String permissionPackageName = "permissions.package"; final UserHandle currentUser = Process.myUserHandle(); List userInfos = Arrays.asList( diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java index 280b8d4c7ca..2b0ac7f6536 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java @@ -26,7 +26,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.graphics.drawable.Drawable; import android.hardware.usb.UsbManager; -import android.hardware.usb.UsbPort; import androidx.fragment.app.FragmentActivity; import androidx.lifecycle.LifecycleOwner; @@ -91,7 +90,8 @@ public class UsbDetailsHeaderControllerTest { ShadowEntityHeaderController.setUseMock(mHeaderController); mDetailsHeaderController = new UsbDetailsHeaderController(mContext, mFragment, mUsbBackend); - mPreference = new LayoutPreference(mContext, R.layout.settings_entity_header); + mPreference = new LayoutPreference( + mContext, com.android.settingslib.widget.R.layout.settings_entity_header); mPreference.setKey(mDetailsHeaderController.getPreferenceKey()); mScreen.addPreference(mPreference); } diff --git a/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectDialogTest.java b/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectDialogTest.java index 9a139615b84..e7e37d72b09 100644 --- a/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectDialogTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectDialogTest.java @@ -35,7 +35,6 @@ import android.widget.TextView; import androidx.test.core.app.ApplicationProvider; -import com.android.settings.R; import com.android.settingslib.drawer.ActivityTile; import com.android.settingslib.drawer.CategoryKey; import com.android.settingslib.drawer.Tile; @@ -144,14 +143,15 @@ public class ProfileSelectDialogTest { @Test public void createDialog_showsCorrectTitle() { - mContext.setTheme(R.style.Theme_AppCompat); + mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat); Dialog dialog = ProfileSelectDialog.createDialog(mContext, Lists.newArrayList(NORMAL_USER), (position) -> { }); dialog.show(); - TextView titleView = dialog.findViewById(R.id.topPanel).findViewById(android.R.id.title); + TextView titleView = dialog.findViewById(com.google.android.material.R.id.topPanel) + .findViewById(android.R.id.title); assertThat(titleView.getText().toString()).isEqualTo( mContext.getText(com.android.settingslib.R.string.choose_profile).toString()); } diff --git a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java index 84dc7393638..48b57a1c844 100644 --- a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java @@ -37,7 +37,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.R; import com.android.settings.applications.AppStateBaseBridge; import com.android.settings.datausage.AppStateDataUsageBridge.DataUsageState; import com.android.settings.testutils.FakeFeatureFactory; @@ -141,7 +140,8 @@ public class UnrestrictedDataAccessPreferenceControllerTest { } else if (testPkg2.equals(entry.info.packageName)) { assertThat(preference.isDisabledByAdmin()).isTrue(); assertThat(preference.getSummary()).isEqualTo( - mContext.getString(R.string.disabled_by_admin)); + mContext.getString( + com.android.settingslib.widget.R.string.disabled_by_admin)); } assertThat(preference.isChecked()).isFalse(); preference.performClick(); diff --git a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java index 3b7ff9fa077..97c4f672b48 100644 --- a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java @@ -16,10 +16,8 @@ package com.android.settings.development; -import static com.android.settings.development.AnimatorDurationScalePreferenceController - .ANIMATOR_DURATION_SCALE_SELECTOR; -import static com.android.settings.development.AnimatorDurationScalePreferenceController - .DEFAULT_VALUE; +import static com.android.settings.development.AnimatorDurationScalePreferenceController.ANIMATOR_DURATION_SCALE_SELECTOR; +import static com.android.settings.development.AnimatorDurationScalePreferenceController.DEFAULT_VALUE; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -31,8 +29,6 @@ import android.view.IWindowManager; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -71,9 +67,9 @@ public class AnimatorDurationScalePreferenceControllerTest { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; mListValues = mContext.getResources() - .getStringArray(R.array.animator_duration_scale_values); + .getStringArray(com.android.settingslib.R.array.animator_duration_scale_values); mListSummaries = mContext.getResources() - .getStringArray(R.array.animator_duration_scale_entries); + .getStringArray(com.android.settingslib.R.array.animator_duration_scale_entries); mController = new AnimatorDurationScalePreferenceController(mContext); ReflectionHelpers.setField(mController, "mWindowManager", mWindowManager); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java index 82ca52a58f4..d51547ebaac 100644 --- a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java @@ -28,8 +28,6 @@ import android.os.RemoteException; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -65,8 +63,10 @@ public class BackgroundProcessLimitPreferenceControllerTest { public void setup() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mListValues = mContext.getResources().getStringArray(R.array.app_process_limit_values); - mListSummaries = mContext.getResources().getStringArray(R.array.app_process_limit_entries); + mListValues = mContext.getResources() + .getStringArray(com.android.settingslib.R.array.app_process_limit_values); + mListSummaries = mContext.getResources() + .getStringArray(com.android.settingslib.R.array.app_process_limit_entries); mController = spy(new BackgroundProcessLimitPreferenceController(mContext)); doReturn(mActivityManager).when(mController).getActivityManagerService(); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java index 3677f810aa8..33f4c02f365 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java @@ -16,8 +16,7 @@ package com.android.settings.development; -import static com.android.settings.development.BluetoothAvrcpVersionPreferenceController - .BLUETOOTH_AVRCP_VERSION_PROPERTY; +import static com.android.settings.development.BluetoothAvrcpVersionPreferenceController.BLUETOOTH_AVRCP_VERSION_PROPERTY; import static com.google.common.truth.Truth.assertThat; @@ -31,8 +30,6 @@ import android.os.SystemProperties; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -66,8 +63,10 @@ public class BluetoothAvrcpVersionPreferenceControllerTest { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; final Resources resources = mContext.getResources(); - mListValues = resources.getStringArray(R.array.bluetooth_avrcp_version_values); - mListSummaries = resources.getStringArray(R.array.bluetooth_avrcp_versions); + mListValues = resources.getStringArray( + com.android.settingslib.R.array.bluetooth_avrcp_version_values); + mListSummaries = resources.getStringArray( + com.android.settingslib.R.array.bluetooth_avrcp_versions); mController = new BluetoothAvrcpVersionPreferenceController(mContext); when(mPreferenceScreen.findPreference(mController.getPreferenceKey())) .thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/development/BluetoothMapVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothMapVersionPreferenceControllerTest.java index f897fdf9412..3a4590743f6 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothMapVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothMapVersionPreferenceControllerTest.java @@ -14,8 +14,8 @@ * limitations under the License. */ package com.android.settings.development; -import static com.android.settings.development.BluetoothMapVersionPreferenceController - .BLUETOOTH_MAP_VERSION_PROPERTY; + +import static com.android.settings.development.BluetoothMapVersionPreferenceController.BLUETOOTH_MAP_VERSION_PROPERTY; import static com.google.common.truth.Truth.assertThat; @@ -29,8 +29,6 @@ import android.os.SystemProperties; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -59,8 +57,10 @@ public class BluetoothMapVersionPreferenceControllerTest { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; final Resources resources = mContext.getResources(); - mListValues = resources.getStringArray(R.array.bluetooth_map_version_values); - mListSummaries = resources.getStringArray(R.array.bluetooth_map_versions); + mListValues = resources.getStringArray( + com.android.settingslib.R.array.bluetooth_map_version_values); + mListSummaries = resources.getStringArray( + com.android.settingslib.R.array.bluetooth_map_versions); mController = new BluetoothMapVersionPreferenceController(mContext); when(mPreferenceScreen.findPreference(mController.getPreferenceKey())) .thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogFilterProfileMapPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogFilterProfileMapPreferenceControllerTest.java index 411cca07770..68dd04eb496 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogFilterProfileMapPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogFilterProfileMapPreferenceControllerTest.java @@ -26,8 +26,6 @@ import android.sysprop.BluetoothProperties; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -59,8 +57,10 @@ public class BluetoothSnoopLogFilterProfileMapPreferenceControllerTest { // Get XML values without mock // Setup test list preference using XML values mPreference = new ListPreference(mSpyContext); - mPreference.setEntries(R.array.bt_hci_snoop_log_profile_filter_entries); - mPreference.setEntryValues(R.array.bt_hci_snoop_log_profile_filter_values); + mPreference.setEntries( + com.android.settingslib.R.array.bt_hci_snoop_log_profile_filter_entries); + mPreference.setEntryValues( + com.android.settingslib.R.array.bt_hci_snoop_log_profile_filter_values); // Init the actual controller mController = new BluetoothSnoopLogFilterProfileMapPreferenceController(mSpyContext); // Construct preference in the controller via a mocked preference screen object diff --git a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogFilterProfilePbapPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogFilterProfilePbapPreferenceControllerTest.java index add84c38f6f..20bae4d9440 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogFilterProfilePbapPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogFilterProfilePbapPreferenceControllerTest.java @@ -26,8 +26,6 @@ import android.sysprop.BluetoothProperties; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -59,8 +57,10 @@ public class BluetoothSnoopLogFilterProfilePbapPreferenceControllerTest { // Get XML values without mock // Setup test list preference using XML values mPreference = new ListPreference(mSpyContext); - mPreference.setEntries(R.array.bt_hci_snoop_log_profile_filter_entries); - mPreference.setEntryValues(R.array.bt_hci_snoop_log_profile_filter_values); + mPreference.setEntries( + com.android.settingslib.R.array.bt_hci_snoop_log_profile_filter_entries); + mPreference.setEntryValues( + com.android.settingslib.R.array.bt_hci_snoop_log_profile_filter_values); // Init the actual controller mController = new BluetoothSnoopLogFilterProfilePbapPreferenceController(mSpyContext); // Construct preference in the controller via a mocked preference screen object diff --git a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java index 6668a534306..2d57a071b41 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java @@ -28,8 +28,6 @@ import android.os.SystemProperties; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -59,8 +57,8 @@ public class BluetoothSnoopLogPreferenceControllerTest { // Get XML values without mock // Setup test list preference using XML values mPreference = new ListPreference(mSpyContext); - mPreference.setEntries(R.array.bt_hci_snoop_log_entries); - mPreference.setEntryValues(R.array.bt_hci_snoop_log_values); + mPreference.setEntries(com.android.settingslib.R.array.bt_hci_snoop_log_entries); + mPreference.setEntryValues(com.android.settingslib.R.array.bt_hci_snoop_log_values); // Init the actual controller mController = new BluetoothSnoopLogPreferenceController(mSpyContext, null); // Construct preference in the controller via a mocked preference screen object diff --git a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java index 20d7971d9f5..1932abfd87d 100644 --- a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java @@ -28,8 +28,6 @@ import android.view.ThreadedRenderer; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -60,9 +58,10 @@ public class DebugGpuOverdrawPreferenceControllerTest { public void setup() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mListValues = mContext.getResources().getStringArray(R.array.debug_hw_overdraw_values); + mListValues = mContext.getResources().getStringArray( + com.android.settingslib.R.array.debug_hw_overdraw_values); mListSummaries = mContext.getResources().getStringArray( - R.array.debug_hw_overdraw_entries); + com.android.settingslib.R.array.debug_hw_overdraw_entries); mController = new DebugGpuOverdrawPreferenceController(mContext); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); mController.displayPreference(mScreen); diff --git a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java index d3f3c7e0763..b9558ba6234 100644 --- a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java @@ -28,8 +28,6 @@ import android.view.ThreadedRenderer; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -60,8 +58,10 @@ public class DebugNonRectClipOperationsPreferenceControllerTest { public void setup() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mListValues = mContext.getResources().getStringArray(R.array.show_non_rect_clip_values); - mListSummaries = mContext.getResources().getStringArray(R.array.show_non_rect_clip_entries); + mListValues = mContext.getResources().getStringArray( + com.android.settingslib.R.array.show_non_rect_clip_values); + mListSummaries = mContext.getResources().getStringArray( + com.android.settingslib.R.array.show_non_rect_clip_entries); mController = new DebugNonRectClipOperationsPreferenceController(mContext); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); mController.displayPreference(mScreen); diff --git a/tests/robotests/src/com/android/settings/development/GrammaticalGenderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/GrammaticalGenderPreferenceControllerTest.java index 005e6a8d19f..4ae28fac779 100644 --- a/tests/robotests/src/com/android/settings/development/GrammaticalGenderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/GrammaticalGenderPreferenceControllerTest.java @@ -34,8 +34,6 @@ import android.os.SystemProperties; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -63,8 +61,10 @@ public class GrammaticalGenderPreferenceControllerTest { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; final Resources resources = mContext.getResources(); - mListValues = resources.getStringArray(R.array.grammatical_gender_values); - mListSummaries = resources.getStringArray(R.array.grammatical_gender_entries); + mListValues = resources.getStringArray( + com.android.settingslib.R.array.grammatical_gender_values); + mListSummaries = resources.getStringArray( + com.android.settingslib.R.array.grammatical_gender_entries); mConfiguration = new Configuration(); mController = new GrammaticalGenderPreferenceController(mContext, mActivityManager); when(mPreferenceScreen.findPreference(mController.getPreferenceKey())) diff --git a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java index 48289427fc5..92750d97138 100644 --- a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java @@ -16,8 +16,7 @@ package com.android.settings.development; -import static com.android.settings.development.HdcpCheckingPreferenceController - .HDCP_CHECKING_PROPERTY; +import static com.android.settings.development.HdcpCheckingPreferenceController.HDCP_CHECKING_PROPERTY; import static com.google.common.truth.Truth.assertThat; @@ -32,8 +31,6 @@ import android.os.SystemProperties; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -69,8 +66,10 @@ public class HdcpCheckingPreferenceControllerTest { public void setup() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mValues = mContext.getResources().getStringArray(R.array.hdcp_checking_values); - mSummaries = mContext.getResources().getStringArray(R.array.hdcp_checking_summaries); + mValues = mContext.getResources().getStringArray( + com.android.settingslib.R.array.hdcp_checking_values); + mSummaries = mContext.getResources().getStringArray( + com.android.settingslib.R.array.hdcp_checking_summaries); mController = new HdcpCheckingPreferenceController(mContext); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); mController.displayPreference(mScreen); diff --git a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java index 5297ef56964..07684efbd86 100644 --- a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java @@ -15,8 +15,6 @@ import android.os.UserManager; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -60,7 +58,8 @@ public class LocalBackupPasswordPreferenceControllerTest { mController.updateState(mPreference); - verify(mPreference).setSummary(R.string.local_backup_password_summary_change); + verify(mPreference).setSummary( + com.android.settingslib.R.string.local_backup_password_summary_change); } @Test @@ -73,7 +72,8 @@ public class LocalBackupPasswordPreferenceControllerTest { mController.updateState(mPreference); - verify(mPreference).setSummary(R.string.local_backup_password_summary_none); + verify(mPreference).setSummary( + com.android.settingslib.R.string.local_backup_password_summary_none); } @Test diff --git a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java index 504909e7995..75dc9f8c403 100644 --- a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java @@ -23,8 +23,6 @@ import android.content.pm.PackageManager; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -79,7 +77,8 @@ public class MockLocationAppPreferenceControllerTest { mController.updateState(mPreference); - verify(mPreference).setSummary(mContext.getString(R.string.mock_location_app_set, appName)); + verify(mPreference).setSummary(mContext.getString( + com.android.settingslib.R.string.mock_location_app_set, appName)); } @Test @@ -89,7 +88,8 @@ public class MockLocationAppPreferenceControllerTest { mController.updateState(mPreference); - verify(mPreference).setSummary(mContext.getString(R.string.mock_location_app_not_set)); + verify(mPreference).setSummary(mContext.getString( + com.android.settingslib.R.string.mock_location_app_not_set)); } @Test diff --git a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java index 5cdb8e70bf5..234f8207028 100644 --- a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java @@ -32,7 +32,6 @@ import android.content.res.Resources; import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; -import com.android.settings.R; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -67,7 +66,8 @@ public class PictureColorModePreferenceControllerTest { when(mPreferenceScreen.findPreference(mController.getPreferenceKey())) .thenReturn(mPreference); when(mContext.getResources()).thenReturn(mResources); - when(mResources.getIntArray(R.array.color_mode_ids)).thenReturn(new int[0]); + when(mResources.getIntArray(com.android.settingslib.R.array.color_mode_ids)) + .thenReturn(new int[0]); mController.displayPreference(mPreferenceScreen); } diff --git a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java index 3fd480a259f..0f83859769f 100644 --- a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java @@ -28,8 +28,6 @@ import android.view.ThreadedRenderer; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -60,8 +58,10 @@ public class ProfileGpuRenderingPreferenceControllerTest { public void setup() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mListValues = mContext.getResources().getStringArray(R.array.track_frame_time_values); - mListSummaries = mContext.getResources().getStringArray(R.array.track_frame_time_entries); + mListValues = mContext.getResources().getStringArray( + com.android.settingslib.R.array.track_frame_time_values); + mListSummaries = mContext.getResources().getStringArray( + com.android.settingslib.R.array.track_frame_time_entries); mController = new ProfileGpuRenderingPreferenceController(mContext); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); mController.displayPreference(mScreen); diff --git a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java index 16bb62644e6..bb0ac2c2737 100644 --- a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java @@ -28,8 +28,6 @@ import android.provider.Settings; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -70,8 +68,10 @@ public class SecondaryDisplayPreferenceControllerTest { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; final Resources resources = mContext.getResources(); - mListValues = resources.getStringArray(R.array.overlay_display_devices_values); - mListSummaries = resources.getStringArray(R.array.overlay_display_devices_entries); + mListValues = resources.getStringArray( + com.android.settingslib.R.array.overlay_display_devices_values); + mListSummaries = resources.getStringArray( + com.android.settingslib.R.array.overlay_display_devices_entries); mController = new SecondaryDisplayPreferenceController(mContext); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); mController.displayPreference(mScreen); diff --git a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java index 2c85bb01c06..a998ddc038f 100644 --- a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java @@ -16,8 +16,7 @@ package com.android.settings.development; -import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes - .REQUEST_CODE_DEBUG_APP; +import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_DEBUG_APP; import static com.google.common.truth.Truth.assertThat; @@ -36,8 +35,6 @@ import android.provider.Settings; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -92,7 +89,8 @@ public class SelectDebugAppPreferenceControllerTest { Settings.Global.putString(contentResolver, Settings.Global.DEBUG_APP, debugApp); mController.updateState(mPreference); - verify(mPreference).setSummary(mContext.getString(R.string.debug_app_set, debugApp)); + verify(mPreference).setSummary( + mContext.getString(com.android.settingslib.R.string.debug_app_set, debugApp)); } @Test @@ -102,7 +100,8 @@ public class SelectDebugAppPreferenceControllerTest { Settings.Global.putString(contentResolver, Settings.Global.DEBUG_APP, debugApp); mController.updateState(mPreference); - verify(mPreference).setSummary(mContext.getString(R.string.debug_app_not_set)); + verify(mPreference).setSummary( + mContext.getString(com.android.settingslib.R.string.debug_app_not_set)); } @Test @@ -114,7 +113,8 @@ public class SelectDebugAppPreferenceControllerTest { .onActivityResult(REQUEST_CODE_DEBUG_APP, Activity.RESULT_OK, activityResultIntent); assertThat(result).isTrue(); - verify(mPreference).setSummary(mContext.getString(R.string.debug_app_set, appLabel)); + verify(mPreference).setSummary( + mContext.getString(com.android.settingslib.R.string.debug_app_set, appLabel)); } @Test @@ -128,6 +128,7 @@ public class SelectDebugAppPreferenceControllerTest { mController.onDeveloperOptionsSwitchDisabled(); verify(mPreference).setEnabled(false); - verify(mPreference).setSummary(mContext.getString(R.string.debug_app_not_set)); + verify(mPreference).setSummary( + mContext.getString(com.android.settingslib.R.string.debug_app_not_set)); } } diff --git a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java index 93fc90dfde9..003eb72b9a9 100644 --- a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java @@ -16,10 +16,8 @@ package com.android.settings.development; -import static com.android.settings.development.SimulateColorSpacePreferenceController - .SETTING_VALUE_OFF; -import static com.android.settings.development.SimulateColorSpacePreferenceController - .SETTING_VALUE_ON; +import static com.android.settings.development.SimulateColorSpacePreferenceController.SETTING_VALUE_OFF; +import static com.android.settings.development.SimulateColorSpacePreferenceController.SETTING_VALUE_ON; import static com.google.common.truth.Truth.assertThat; @@ -34,8 +32,6 @@ import android.provider.Settings; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -67,7 +63,8 @@ public class SimulateColorSpacePreferenceControllerTest { public void setup() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mListValues = mContext.getResources().getStringArray(R.array.simulate_color_space_values); + mListValues = mContext.getResources().getStringArray( + com.android.settingslib.R.array.simulate_color_space_values); mController = new SimulateColorSpacePreferenceController(mContext); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); mController.displayPreference(mScreen); @@ -130,8 +127,10 @@ public class SimulateColorSpacePreferenceControllerTest { mController.updateState(mPreference); - verify(mPreference).setSummary(res.getString(R.string.daltonizer_type_overridden, - res.getString(R.string.accessibility_display_daltonizer_preference_title))); + verify(mPreference).setSummary( + res.getString(com.android.settingslib.R.string.daltonizer_type_overridden, + res.getString(com.android.settingslib.R + .string.accessibility_display_daltonizer_preference_title))); } @Test diff --git a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java index f06aa8de99d..73ff74e95e0 100644 --- a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java @@ -16,10 +16,8 @@ package com.android.settings.development; -import static com.android.settings.development.TransitionAnimationScalePreferenceController - .DEFAULT_VALUE; -import static com.android.settings.development.TransitionAnimationScalePreferenceController - .TRANSITION_ANIMATION_SCALE_SELECTOR; +import static com.android.settings.development.TransitionAnimationScalePreferenceController.DEFAULT_VALUE; +import static com.android.settings.development.TransitionAnimationScalePreferenceController.TRANSITION_ANIMATION_SCALE_SELECTOR; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -32,8 +30,6 @@ import android.view.IWindowManager; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -72,8 +68,10 @@ public class TransitionAnimationScalePreferenceControllerTest { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; final Resources resources = mContext.getResources(); - mListValues = resources.getStringArray(R.array.transition_animation_scale_values); - mListSummaries = resources.getStringArray(R.array.transition_animation_scale_entries); + mListValues = resources.getStringArray( + com.android.settingslib.R.array.transition_animation_scale_values); + mListSummaries = resources.getStringArray( + com.android.settingslib.R.array.transition_animation_scale_entries); mController = new TransitionAnimationScalePreferenceController(mContext); ReflectionHelpers.setField(mController, "mWindowManager", mWindowManager); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java index 4d8d3e8e72c..6104b2ddec6 100644 --- a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java @@ -16,10 +16,8 @@ package com.android.settings.development; -import static com.android.settings.development.WindowAnimationScalePreferenceController - .DEFAULT_VALUE; -import static com.android.settings.development.WindowAnimationScalePreferenceController - .WINDOW_ANIMATION_SCALE_SELECTOR; +import static com.android.settings.development.WindowAnimationScalePreferenceController.DEFAULT_VALUE; +import static com.android.settings.development.WindowAnimationScalePreferenceController.WINDOW_ANIMATION_SCALE_SELECTOR; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -32,8 +30,6 @@ import android.view.IWindowManager; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -72,8 +68,10 @@ public class WindowAnimationScalePreferenceControllerTest { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; final Resources resources = mContext.getResources(); - mListValues = resources.getStringArray(R.array.window_animation_scale_values); - mListSummaries = resources.getStringArray(R.array.window_animation_scale_entries); + mListValues = resources.getStringArray( + com.android.settingslib.R.array.window_animation_scale_values); + mListSummaries = resources.getStringArray( + com.android.settingslib.R.array.window_animation_scale_entries); mController = new WindowAnimationScalePreferenceController(mContext); ReflectionHelpers.setField(mController, "mWindowManager", mWindowManager); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreferenceTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreferenceTest.java index 323486e5da9..21fc6d222bb 100644 --- a/tests/robotests/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreferenceTest.java @@ -170,8 +170,9 @@ public class BaseBluetoothDialogPreferenceTest { @Test public void generateSummary_checkString() { - final String summary = String.format(mContext.getResources().getString( - R.string.bluetooth_select_a2dp_codec_streaming_label), SUMMARY2); + String label = mContext.getResources().getString( + com.android.settingslib.R.string.bluetooth_select_a2dp_codec_streaming_label); + final String summary = String.format(label, SUMMARY2); assertThat(mPreference.generateSummary(1)).isEqualTo(summary); } diff --git a/tests/robotests/src/com/android/settings/development/snooplogger/SnoopLoggerFiltersPreferenceTest.java b/tests/robotests/src/com/android/settings/development/snooplogger/SnoopLoggerFiltersPreferenceTest.java index 56f29baebc1..a8faabef0f6 100644 --- a/tests/robotests/src/com/android/settings/development/snooplogger/SnoopLoggerFiltersPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/development/snooplogger/SnoopLoggerFiltersPreferenceTest.java @@ -18,8 +18,6 @@ package com.android.settings.development.snooplogger; import android.content.Context; -import com.android.settings.R; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -39,9 +37,11 @@ public class SnoopLoggerFiltersPreferenceTest { @Before public void setUp() { mContext = RuntimeEnvironment.application; - sKEY = mContext.getResources().getStringArray(R.array.bt_hci_snoop_log_filters_values)[0]; + sKEY = mContext.getResources().getStringArray( + com.android.settingslib.R.array.bt_hci_snoop_log_filters_values)[0]; sENTRY = - mContext.getResources().getStringArray(R.array.bt_hci_snoop_log_filters_entries)[0]; + mContext.getResources().getStringArray( + com.android.settingslib.R.array.bt_hci_snoop_log_filters_entries)[0]; mPreference = new SnoopLoggerFiltersPreference(mContext, sKEY, sENTRY); } diff --git a/tests/robotests/src/com/android/settings/development/storage/SharedDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/storage/SharedDataPreferenceControllerTest.java index 88904df6864..251d354d463 100644 --- a/tests/robotests/src/com/android/settings/development/storage/SharedDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/storage/SharedDataPreferenceControllerTest.java @@ -31,8 +31,6 @@ import android.os.UserHandle; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -78,8 +76,8 @@ public class SharedDataPreferenceControllerTest { mController.updateState(mPreference); verify(mPreference).setEnabled(true); - assertThat(mPreference.getSummary()) - .isEqualTo(mContext.getString(R.string.shared_data_summary)); + assertThat(mPreference.getSummary()).isEqualTo( + mContext.getString(com.android.settingslib.R.string.shared_data_summary)); } @Test @@ -88,8 +86,8 @@ public class SharedDataPreferenceControllerTest { mController.updateState(mPreference); verify(mPreference).setEnabled(false); - assertThat(mPreference.getSummary()) - .isEqualTo(mContext.getString(R.string.shared_data_no_blobs_text)); + assertThat(mPreference.getSummary()).isEqualTo( + mContext.getString(com.android.settingslib.R.string.shared_data_no_blobs_text)); } @Test @@ -98,8 +96,8 @@ public class SharedDataPreferenceControllerTest { mController.updateState(mPreference); verify(mPreference).setEnabled(false); - assertThat(mPreference.getSummary()) - .isEqualTo(mContext.getString(R.string.shared_data_no_blobs_text)); + assertThat(mPreference.getSummary()).isEqualTo( + mContext.getString(com.android.settingslib.R.string.shared_data_no_blobs_text)); } private List generateBlobList() { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java index 5fcb9c1e8ef..e697786f93a 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java @@ -122,7 +122,7 @@ public class StorageItemPreferenceControllerTest { final StorageItemPreference documentsAndOther = spy(new StorageItemPreference(mContext)); documentsAndOther.setIcon(R.drawable.ic_folder_vd_theme_24); final StorageItemPreference system = spy(new StorageItemPreference(mContext)); - system.setIcon(R.drawable.ic_system_update); + system.setIcon(com.android.settingslib.R.drawable.ic_system_update); final StorageItemPreference trash = spy(new StorageItemPreference(mContext)); trash.setIcon(R.drawable.ic_trash_can); diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java index b3de1841989..5d478e7fd32 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java @@ -210,7 +210,7 @@ public class EnterprisePrivacySettingsTest extends AbsBasePrivacySettingsPrefere // Need to set the Theme.AppCompat theme (or descendant) with this activity, otherwise // a {@link IllegalStateException} is thrown when setting the content view. - setTheme(R.style.Theme_AppCompat_Light); + setTheme(androidx.appcompat.R.style.Theme_AppCompat_Light); setContentView(frameLayout); } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java index 2779e0ac0c7..4b097bb7498 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java @@ -304,8 +304,8 @@ public class BatteryHeaderPreferenceControllerTest { mController.updateHeaderPreference(mBatteryInfo); - verify(mBatteryUsageProgressBarPref).setBottomSummary( - mContext.getString(R.string.battery_info_status_not_charging)); + verify(mBatteryUsageProgressBarPref).setBottomSummary(mContext.getString( + com.android.settingslib.R.string.battery_info_status_not_charging)); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java index f6bc2975f34..7a7a3846393 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java @@ -17,17 +17,14 @@ package com.android.settings.fuelgauge; import static com.android.settings.core.BasePreferenceController.AVAILABLE; -import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.ComponentName; import android.content.Context; -import android.content.Intent; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; import android.hardware.usb.UsbPortStatus; @@ -46,10 +43,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; - -import java.util.ArrayList; -import java.util.List; @RunWith(RobolectricTestRunner.class) public class TopLevelBatteryPreferenceControllerTest { @@ -143,7 +136,8 @@ public class TopLevelBatteryPreferenceControllerTest { BatteryInfo info = new BatteryInfo(); assertThat(mController.getDashboardLabel(mContext, info, true)) - .isEqualTo(mContext.getString(R.string.battery_info_status_not_charging)); + .isEqualTo(mContext.getString( + com.android.settingslib.R.string.battery_info_status_not_charging)); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java index 108d6e2244d..e9606daceca 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java @@ -280,7 +280,8 @@ public class BatteryEntryTest { public void getNameAndIconFromUid_rerturnExpectedName() { final NameAndIcon nameAndIcon = BatteryEntry.getNameAndIconFromUid( mContext, /* name */ null, /* uid */ 0); - assertThat(nameAndIcon.mName).isEqualTo(getString(R.string.process_kernel_label)); + assertThat(nameAndIcon.mName).isEqualTo( + getString(com.android.settingslib.R.string.process_kernel_label)); assertNameAndIcon("mediaserver", R.string.process_mediaserver_label); assertNameAndIcon("dex2oat32", R.string.process_dex2oat_label); diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerGaugePreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerGaugePreferenceTest.java index bee30454060..b25b845b354 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerGaugePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerGaugePreferenceTest.java @@ -53,7 +53,8 @@ public class PowerGaugePreferenceTest { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mRootView = LayoutInflater.from(mContext).inflate(R.layout.preference_app, null); + mRootView = LayoutInflater.from(mContext) + .inflate(com.android.settingslib.widget.R.layout.preference_app, null); mWidgetView = LayoutInflater.from(mContext).inflate(R.layout.preference_widget_summary, null); final LinearLayout widgetFrame = mRootView.findViewById(android.R.id.widget_frame); @@ -62,7 +63,8 @@ public class PowerGaugePreferenceTest { mPreferenceViewHolder = PreferenceViewHolder.createInstanceForTests(mRootView); mPowerGaugePreference = new PowerGaugePreference(mContext); - assertThat(mPowerGaugePreference.getLayoutResource()).isEqualTo(R.layout.preference_app); + assertThat(mPowerGaugePreference.getLayoutResource()) + .isEqualTo(com.android.settingslib.widget.R.layout.preference_app); } @Test diff --git a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java index 6fe731e2af7..0a5be27730d 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java @@ -33,8 +33,6 @@ import android.view.inputmethod.InputMethodManager; import androidx.core.text.BidiFormatter; import androidx.preference.Preference; -import com.android.settings.R; - import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -93,7 +91,7 @@ public class VirtualKeyboardPreferenceControllerTest { public void updateState_noEnabledIMEs_setEmptySummary() { mController.updateState(mPreference); - verify(mPreference).setSummary(R.string.summary_empty); + verify(mPreference).setSummary(com.android.settingslib.R.string.summary_empty); } @Test diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java index 225f91bde17..2955c88cc7b 100644 --- a/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java @@ -80,7 +80,7 @@ public class RecentLocationAccessPreferenceControllerTest { mController.init(mDashboardFragment); final String key = mController.getPreferenceKey(); mAppEntitiesHeaderView = LayoutInflater.from(mContext).inflate( - R.layout.app_entities_header, null /* root */); + com.android.settingslib.widget.R.layout.app_entities_header, null /* root */); when(mScreen.findPreference(key)).thenReturn(mLayoutPreference); when(mLayoutPreference.getKey()).thenReturn(key); when(mLayoutPreference.getContext()).thenReturn(mContext); @@ -108,7 +108,8 @@ public class RecentLocationAccessPreferenceControllerTest { final TextView title = mAppEntitiesHeaderView.findViewById(R.id.header_title); assertThat(title.getText()).isEqualTo( mContext.getText(R.string.location_category_recent_location_access)); - final TextView details = mAppEntitiesHeaderView.findViewById(R.id.header_details); + final TextView details = mAppEntitiesHeaderView + .findViewById(com.android.settingslib.widget.R.id.header_details); assertThat(details.getText()).isEqualTo( mContext.getText(R.string.location_recent_location_access_view_details)); assertThat(details.hasOnClickListeners()).isTrue(); diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java index af292a923aa..b5c821805f3 100644 --- a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java @@ -211,7 +211,8 @@ public class PrivateDnsPreferenceControllerTest { ConnectivitySettingsManager.setPrivateDnsHostname(mContext, HOSTNAME); mController.updateState(mPreference); verify(mController, atLeastOnce()).getSummary(); - verify(mPreference).setSummary(getResourceString(R.string.private_dns_mode_off)); + verify(mPreference).setSummary(getResourceString( + com.android.settingslib.R.string.private_dns_mode_off)); } @Test @@ -221,7 +222,8 @@ public class PrivateDnsPreferenceControllerTest { ConnectivitySettingsManager.setPrivateDnsHostname(mContext, HOSTNAME); mController.updateState(mPreference); verify(mController, atLeastOnce()).getSummary(); - verify(mPreference).setSummary(getResourceString(R.string.private_dns_mode_opportunistic)); + verify(mPreference).setSummary(getResourceString( + com.android.settingslib.R.string.private_dns_mode_opportunistic)); LinkProperties lp = mock(LinkProperties.class); when(lp.getValidatedPrivateDnsServers()).thenReturn(NON_EMPTY_ADDRESS_LIST); @@ -234,7 +236,8 @@ public class PrivateDnsPreferenceControllerTest { when(lp.getValidatedPrivateDnsServers()).thenReturn(Collections.emptyList()); updateLinkProperties(lp); mController.updateState(mPreference); - verify(mPreference).setSummary(getResourceString(R.string.private_dns_mode_opportunistic)); + verify(mPreference).setSummary(getResourceString( + com.android.settingslib.R.string.private_dns_mode_opportunistic)); } @Test @@ -244,8 +247,8 @@ public class PrivateDnsPreferenceControllerTest { ConnectivitySettingsManager.setPrivateDnsHostname(mContext, HOSTNAME); mController.updateState(mPreference); verify(mController, atLeastOnce()).getSummary(); - verify(mPreference).setSummary( - getResourceString(R.string.private_dns_mode_provider_failure)); + verify(mPreference).setSummary(getResourceString( + com.android.settingslib.R.string.private_dns_mode_provider_failure)); LinkProperties lp = mock(LinkProperties.class); when(lp.getValidatedPrivateDnsServers()).thenReturn(NON_EMPTY_ADDRESS_LIST); @@ -258,8 +261,8 @@ public class PrivateDnsPreferenceControllerTest { when(lp.getValidatedPrivateDnsServers()).thenReturn(Collections.emptyList()); updateLinkProperties(lp); mController.updateState(mPreference); - verify(mPreference).setSummary( - getResourceString(R.string.private_dns_mode_provider_failure)); + verify(mPreference).setSummary(getResourceString( + com.android.settingslib.R.string.private_dns_mode_provider_failure)); } @Test @@ -269,7 +272,8 @@ public class PrivateDnsPreferenceControllerTest { ConnectivitySettingsManager.setPrivateDnsHostname(mContext, ""); mController.updateState(mPreference); verify(mController, atLeastOnce()).getSummary(); - verify(mPreference).setSummary(getResourceString(R.string.private_dns_mode_opportunistic)); + verify(mPreference).setSummary(getResourceString( + com.android.settingslib.R.string.private_dns_mode_opportunistic)); reset(mController); reset(mPreference); @@ -277,7 +281,8 @@ public class PrivateDnsPreferenceControllerTest { ConnectivitySettingsManager.setPrivateDnsDefaultMode(mContext, PRIVATE_DNS_MODE_OFF); mController.updateState(mPreference); verify(mController, atLeastOnce()).getSummary(); - verify(mPreference).setSummary(getResourceString(R.string.private_dns_mode_off)); + verify(mPreference).setSummary(getResourceString( + com.android.settingslib.R.string.private_dns_mode_off)); reset(mController); reset(mPreference); @@ -287,7 +292,8 @@ public class PrivateDnsPreferenceControllerTest { ConnectivitySettingsManager.setPrivateDnsMode(mContext, PRIVATE_DNS_MODE_OPPORTUNISTIC); mController.updateState(mPreference); verify(mController, atLeastOnce()).getSummary(); - verify(mPreference).setSummary(getResourceString(R.string.private_dns_mode_opportunistic)); + verify(mPreference).setSummary(getResourceString( + com.android.settingslib.R.string.private_dns_mode_opportunistic)); } @Ignore diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java index 8bccf1aa4da..3242a597175 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java @@ -111,7 +111,7 @@ public class SetupChooseLockPasswordTest { public void createActivity_withShowOptionsButtonExtra_shouldShowButtonUnderSudHeader() { SetupChooseLockPassword activity = createSetupChooseLockPassword(); final LinearLayout headerLayout = activity.findViewById( - R.id.sud_layout_header); + com.google.android.setupdesign.R.id.sud_layout_header); assertThat(headerLayout).isNotNull(); final Button optionsButton = headerLayout.findViewById(R.id.screen_lock_options); diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java index c5e08137863..d6df6c44199 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java @@ -262,7 +262,7 @@ public class SetupChooseLockPatternTest { final TextView headerView = layout.findViewById(R.id.sud_layout_subtitle); final TypedValue typedValue = new TypedValue(); final Resources.Theme theme = mActivity.getTheme(); - theme.resolveAttribute(R.attr.colorError, typedValue, true); + theme.resolveAttribute(androidx.appcompat.R.attr.colorError, typedValue, true); final int errorColor = typedValue.data; enterShortPattern(); diff --git a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java index 2a7bd29a964..b899e3a8459 100644 --- a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java +++ b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java @@ -33,7 +33,6 @@ import android.view.MenuItem; import androidx.fragment.app.FragmentActivity; -import com.android.settings.R; import com.android.settings.core.InstrumentedFragment; import com.android.settings.testutils.shadow.ShadowUtils; @@ -71,7 +70,8 @@ public class SearchMenuControllerTest { Global.putInt(mActivity.getContentResolver(), Global.DEVICE_PROVISIONED, 1); when(mHost.getActivity()).thenReturn(mActivity); - when(mMenu.add(Menu.NONE, MENU_SEARCH, 0 /* order */, R.string.search_menu)) + when(mMenu.add(Menu.NONE, MENU_SEARCH, 0 /* order */, + com.android.settingslib.widget.R.string.search_menu)) .thenReturn(mock(MenuItem.class)); } @@ -80,7 +80,8 @@ public class SearchMenuControllerTest { SearchMenuController.init(mHost); mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */); - verify(mMenu).add(Menu.NONE, MENU_SEARCH, 0 /* order */, R.string.search_menu); + verify(mMenu).add(Menu.NONE, MENU_SEARCH, 0 /* order */, + com.android.settingslib.widget.R.string.search_menu); } @Test diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java index 8884ab80460..efbf64625cc 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java @@ -119,7 +119,7 @@ public class PowerButtonInstantLockPreferenceControllerTest { mController.updateState(mPreference); assertThat(mPreference.isChecked()).isFalse(); assertThat(mPreference.getSummary()).isEqualTo(mContext.getString( - R.string.summary_empty)); + com.android.settingslib.R.string.summary_empty)); } @Test diff --git a/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java index 6340b164dd9..5637b20cb58 100644 --- a/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java @@ -24,8 +24,6 @@ import android.view.View; import androidx.preference.PreferenceViewHolder; -import com.android.settings.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -46,20 +44,24 @@ public class AppCheckBoxPreferenceTest { mPreference = new AppCheckBoxPreference(mContext); mAttrPreference = new AppCheckBoxPreference(mContext, null /* attrs */); mPreferenceViewHolder = PreferenceViewHolder.createInstanceForTests( - LayoutInflater.from(mContext).inflate(R.layout.preference_app, null)); + LayoutInflater.from(mContext) + .inflate(com.android.settingslib.widget.R.layout.preference_app, null)); } @Test public void testGetLayoutResource() { - assertThat(mPreference.getLayoutResource()).isEqualTo(R.layout.preference_app); - assertThat(mAttrPreference.getLayoutResource()).isEqualTo(R.layout.preference_app); + assertThat(mPreference.getLayoutResource()) + .isEqualTo(com.android.settingslib.widget.R.layout.preference_app); + assertThat(mAttrPreference.getLayoutResource()) + .isEqualTo(com.android.settingslib.widget.R.layout.preference_app); } @Test public void onBindViewHolder_appendixGone() { mPreference.onBindViewHolder(mPreferenceViewHolder); - assertThat(mPreferenceViewHolder.findViewById(R.id.appendix).getVisibility()) - .isEqualTo(View.GONE); + View appendix = + mPreferenceViewHolder.findViewById(com.android.settingslib.widget.R.id.appendix); + assertThat(appendix.getVisibility()).isEqualTo(View.GONE); } } diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java index 2d903823ca0..ed0ff6d0110 100644 --- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java @@ -100,7 +100,8 @@ public class EntityHeaderControllerTest { @Test public void testBuildView_constructedWithView_shouldReturnSameView() { - View inputView = mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */); + View inputView = mLayoutInflater.inflate( + com.android.settingslib.widget.R.layout.settings_entity_header, null /* root */); mController = EntityHeaderController.newInstance(mActivity, mFragment, inputView); View view = mController.done(mActivity); @@ -110,11 +111,12 @@ public class EntityHeaderControllerTest { @Test public void bindViews_shouldBindAllData() { final String testString = "test"; - final View header = - mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */); + final View header = mLayoutInflater.inflate( + com.android.settingslib.widget.R.layout.settings_entity_header, null /* root */); final TextView label = header.findViewById(R.id.entity_header_title); final TextView summary = header.findViewById(R.id.entity_header_summary); - final TextView secondSummary = header.findViewById(R.id.entity_header_second_summary); + final TextView secondSummary = header.findViewById( + com.android.settingslib.widget.R.id.entity_header_second_summary); mController = EntityHeaderController.newInstance(mActivity, mFragment, header); mController.setLabel(testString); @@ -137,8 +139,8 @@ public class EntityHeaderControllerTest { info.activityInfo = new ActivityInfo(); info.activityInfo.packageName = "123"; info.activityInfo.name = "321"; - final View view = mLayoutInflater - .inflate(R.layout.settings_entity_header, null /* root */); + final View view = mLayoutInflater.inflate( + com.android.settingslib.widget.R.layout.settings_entity_header, null /* root */); when(mActivity.getApplicationContext()).thenReturn(mContext); mController = EntityHeaderController.newInstance(mActivity, mFragment, view); @@ -165,7 +167,8 @@ public class EntityHeaderControllerTest { info.activityInfo = new ActivityInfo(); info.activityInfo.packageName = "123"; info.activityInfo.name = "321"; - final View view = mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */); + final View view = mLayoutInflater.inflate( + com.android.settingslib.widget.R.layout.settings_entity_header, null /* root */); when(mActivity.getApplicationContext()).thenReturn(mContext); mController = EntityHeaderController.newInstance(mActivity, mFragment, view); @@ -181,8 +184,8 @@ public class EntityHeaderControllerTest { @Test public void bindButton_noAppInfo_shouldNotAttachClickListener() { - final View appLinks = - mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */); + final View appLinks = mLayoutInflater.inflate( + com.android.settingslib.widget.R.layout.settings_entity_header, null /* root */); final FragmentActivity activity = mock(FragmentActivity.class); when(mFragment.getActivity()).thenReturn(activity); @@ -199,7 +202,8 @@ public class EntityHeaderControllerTest { assertThat(appLinks.findViewById(android.R.id.button2).getVisibility()) .isEqualTo(View.GONE); - appLinks.findViewById(R.id.entity_header_content).performClick(); + appLinks.findViewById(com.android.settingslib.widget.R.id.entity_header_content) + .performClick(); verify(mFragment, never()).getActivity(); verify(activity, never()).startActivity(any(Intent.class)); } @@ -207,8 +211,8 @@ public class EntityHeaderControllerTest { @Ignore @Test public void bindButton_hasAppInfo_shouldAttachClickListener() { - final View appLinks = - mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */); + final View appLinks = mLayoutInflater.inflate( + com.android.settingslib.widget.R.layout.settings_entity_header, null /* root */); final FragmentActivity activity = mock(FragmentActivity.class); when(mFragment.getActivity()).thenReturn(activity); when(mContext.getString(eq(R.string.application_info_label))).thenReturn("App Info"); @@ -222,15 +226,16 @@ public class EntityHeaderControllerTest { EntityHeaderController.ActionType.ACTION_NONE); mController.done(mActivity); - appLinks.findViewById(R.id.entity_header_content).performClick(); + appLinks.findViewById(com.android.settingslib.widget.R.id.entity_header_content) + .performClick(); verify(activity) .startActivityForResultAsUser(any(Intent.class), anyInt(), any(UserHandle.class)); } @Test public void iconContentDescription_shouldWorkWithSetIcon() { - final View view = - mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */); + final View view = mLayoutInflater.inflate( + com.android.settingslib.widget.R.layout.settings_entity_header, null /* root */); when(mFragment.getActivity()).thenReturn(mock(FragmentActivity.class)); mController = EntityHeaderController.newInstance(mActivity, mFragment, view); String description = "Fake Description"; @@ -243,8 +248,8 @@ public class EntityHeaderControllerTest { @Test public void iconContentDescription_shouldWorkWithoutSetIcon() { - final View view = mLayoutInflater - .inflate(R.layout.settings_entity_header, null /* root */); + final View view = mLayoutInflater.inflate( + com.android.settingslib.widget.R.layout.settings_entity_header, null /* root */); when(mFragment.getActivity()).thenReturn(mock(FragmentActivity.class)); mController = EntityHeaderController.newInstance(mActivity, mFragment, view); String description = "Fake Description"; @@ -256,8 +261,8 @@ public class EntityHeaderControllerTest { @Test public void bindButton_hasAppNotifIntent_shouldShowButton() { - final View appLinks = mLayoutInflater - .inflate(R.layout.settings_entity_header, null /* root */); + final View appLinks = mLayoutInflater.inflate( + com.android.settingslib.widget.R.layout.settings_entity_header, null /* root */); mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks); mController.setAppNotifPrefIntent(new Intent()) @@ -277,23 +282,23 @@ public class EntityHeaderControllerTest { @Test public void instantApps_normalAppsDontGetLabel() { final View header = mLayoutInflater.inflate( - R.layout.settings_entity_header, null /* root */); + com.android.settingslib.widget.R.layout.settings_entity_header, null /* root */); mController = EntityHeaderController.newInstance(mActivity, mFragment, header); mController.done(mActivity); - assertThat(header.findViewById(R.id.install_type).getVisibility()) - .isEqualTo(View.GONE); + View installType = header.findViewById(com.android.settingslib.widget.R.id.install_type); + assertThat(installType.getVisibility()).isEqualTo(View.GONE); } // Test that the "instant apps" label is present in the header when we have an instant app. @Test public void instantApps_expectedHeaderItem() { final View header = mLayoutInflater.inflate( - R.layout.settings_entity_header, null /* root */); + com.android.settingslib.widget.R.layout.settings_entity_header, null /* root */); mController = EntityHeaderController.newInstance(mActivity, mFragment, header); mController.setIsInstantApp(true); mController.done(mActivity); - TextView label = header.findViewById(R.id.install_type); + TextView label = header.findViewById(com.android.settingslib.widget.R.id.install_type); assertThat(label.getVisibility()).isEqualTo(View.VISIBLE); assertThat(label.getText()).isEqualTo( diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java index 1ec222e6b31..00f2e19c28b 100644 --- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java +++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java @@ -83,7 +83,7 @@ public class HighlightablePreferenceGroupAdapterTest { false /* highlighted*/)); when(mAdapter.getItem(anyInt())).thenReturn(mPreference); mViewHolder = PreferenceViewHolder.createInstanceForTests( - View.inflate(mContext, R.layout.preference, null)); + View.inflate(mContext, androidx.preference.R.layout.preference, null)); } @Test diff --git a/tests/robotests/src/com/android/settings/widget/PrimaryCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/PrimaryCheckBoxPreferenceTest.java index a1d74e3828f..f3fa61eaea3 100644 --- a/tests/robotests/src/com/android/settings/widget/PrimaryCheckBoxPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/PrimaryCheckBoxPreferenceTest.java @@ -125,7 +125,8 @@ public class PrimaryCheckBoxPreferenceTest { public void clickWidgetView_shouldToggleCheckBox() { final LayoutInflater inflater = LayoutInflater.from(mContext); final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests( - inflater.inflate(R.layout.preference_two_target, null)); + inflater.inflate( + com.android.settingslib.widget.R.layout.preference_two_target, null)); final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame); assertThat(widgetView).isNotNull(); @@ -144,7 +145,8 @@ public class PrimaryCheckBoxPreferenceTest { public void clickWidgetView_shouldNotToggleCheckBoxIfDisabled() { final LayoutInflater inflater = LayoutInflater.from(mContext); final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests( - inflater.inflate(R.layout.preference_two_target, null)); + inflater.inflate( + com.android.settingslib.widget.R.layout.preference_two_target, null)); final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame); assertThat(widgetView).isNotNull(); @@ -160,7 +162,8 @@ public class PrimaryCheckBoxPreferenceTest { @Test public void clickWidgetView_shouldNotifyPreferenceChanged() { final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests( - LayoutInflater.from(mContext).inflate(R.layout.preference_two_target, null)); + LayoutInflater.from(mContext).inflate( + com.android.settingslib.widget.R.layout.preference_two_target, null)); final View widgetView = holder.findViewById(android.R.id.widget_frame); final OnPreferenceChangeListener listener = mock(OnPreferenceChangeListener.class); mPreference.setOnPreferenceChangeListener(listener); diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java index faaa0fa917f..dc60714b7f8 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java @@ -398,15 +398,18 @@ public class WifiConfigController2Test { for (int i = 0; i < adapter.getCount(); i++) { String val = adapter.getItem(i); - if (val.compareTo(mContext.getString(R.string.wifi_security_sae)) == 0) { + if (val.compareTo(mContext.getString( + com.android.settingslib.R.string.wifi_security_sae)) == 0) { saeFound = true; } - if (val.compareTo(mContext.getString(R.string.wifi_security_eap_suiteb)) == 0) { + if (val.compareTo(mContext.getString( + com.android.settingslib.R.string.wifi_security_eap_suiteb)) == 0) { suitebFound = true; } - if (val.compareTo(mContext.getString(R.string.wifi_security_owe)) == 0) { + if (val.compareTo(mContext.getString( + com.android.settingslib.R.string.wifi_security_owe)) == 0) { oweFound = true; } } diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java index 8ecbaf64b12..2ff4596d63a 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java @@ -351,15 +351,18 @@ public class WifiConfigControllerTest { for (int i = 0; i < adapter.getCount(); i++) { String val = adapter.getItem(i); - if (val.compareTo(mContext.getString(R.string.wifi_security_sae)) == 0) { + if (val.compareTo(mContext.getString( + com.android.settingslib.R.string.wifi_security_sae)) == 0) { saeFound = true; } - if (val.compareTo(mContext.getString(R.string.wifi_security_eap_suiteb)) == 0) { + if (val.compareTo(mContext.getString( + com.android.settingslib.R.string.wifi_security_eap_suiteb)) == 0) { suitebFound = true; } - if (val.compareTo(mContext.getString(R.string.wifi_security_owe)) == 0) { + if (val.compareTo(mContext.getString( + com.android.settingslib.R.string.wifi_security_owe)) == 0) { oweFound = true; } } diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java index 75d49feafe4..9f56fcd2d22 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java @@ -221,7 +221,7 @@ public class WifiTetherSettingsTest { @Test public void onSecuritySummaryChanged_canNotShowWifiHotspot_returnFalse() { - int stringResId = R.string.wifi_security_sae; + int stringResId = com.android.settingslib.R.string.wifi_security_sae; mSettings.mWifiHotspotSecurity = mock(Preference.class); mSettings.onSecuritySummaryChanged(stringResId); diff --git a/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java index 8c24cbb1d2e..1eb670f5d21 100644 --- a/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java +++ b/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java @@ -35,7 +35,6 @@ import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -53,7 +52,6 @@ import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.telephony.UiccCardInfo; -import android.telephony.UiccPortInfo; import android.telephony.euicc.EuiccManager; import androidx.lifecycle.LifecycleOwner; @@ -61,7 +59,6 @@ import androidx.test.annotation.UiThreadTest; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; -import com.android.settings.R; import com.android.settings.testutils.ResourcesUtils; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -73,13 +70,10 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; @RunWith(AndroidJUnit4.class) public class SimStatusDialogControllerTest { @@ -405,7 +399,7 @@ public class SimStatusDialogControllerTest { mController.initialize(); verify(mDialog).setText(IMS_REGISTRATION_STATE_VALUE_ID, - mContext.getString(R.string.ims_reg_status_registered)); + mContext.getString(com.android.settingslib.R.string.ims_reg_status_registered)); } @Test @@ -418,7 +412,7 @@ public class SimStatusDialogControllerTest { mController.initialize(); verify(mDialog).setText(IMS_REGISTRATION_STATE_VALUE_ID, - mContext.getString(R.string.ims_reg_status_not_registered)); + mContext.getString(com.android.settingslib.R.string.ims_reg_status_not_registered)); } @Test