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

Merge "Fix references to resources for Settings" into main

Browse Source
This commit is contained in:
Chaohui Wang
2023-08-08 08:40:42 +00:00
committed by Android (Google) Code Review
parent 997a731b90 2541381259
commit 0062308347
247 changed files with 859 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/AllInOneTetherSettings.java
View File

@@ -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;

8
src/com/android/settings/MainClear.java
View File

@@ -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);
}

2
src/com/android/settings/MainClearConfirm.java
View File

@@ -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()
);
}

3
src/com/android/settings/RestrictedCheckBox.java
View File

@@ -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();

8
src/com/android/settings/SetFullBackupPassword.java
View File

@@ -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) {

4
src/com/android/settings/TrustedCredentialsFragment.java
View File

@@ -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);

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

@@ -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. */

6
src/com/android/settings/accessibility/BalanceSeekBarPreference.java
View File

@@ -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);

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

@@ -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);

10
src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
View File

@@ -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));
}
}

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

@@ -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);
}

6
src/com/android/settings/accounts/AccountPreferenceController.java
View File

@@ -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);

3
src/com/android/settings/accounts/AccountTypePreferenceLoader.java
View File

@@ -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);

8
src/com/android/settings/applications/RunningServiceDetails.java
View File

@@ -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);
}

2
src/com/android/settings/applications/RunningServices.java
View File

@@ -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

6
src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java
View File

@@ -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;
}

5
src/com/android/settings/applications/intentpicker/LeftSideCheckBoxPreference.java
View File

@@ -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

8
src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
View File

@@ -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() {

12
src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
View File

@@ -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);
}

14
src/com/android/settings/applications/manageapplications/ManageApplications.java
View File

@@ -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;

18
src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java
View File

@@ -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));
}
}

4
src/com/android/settings/biometrics/BiometricEnrollActivity.java
View File

@@ -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:

12
src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
View File

@@ -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)) {

2
src/com/android/settings/biometrics/BiometricHandoffActivity.java
View File

@@ -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;

4
src/com/android/settings/biometrics/activeunlock/ActiveUnlockRequireBiometricSetup.java
View File

@@ -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()
);
}

5
src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java
View File

@@ -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 {

8
src/com/android/settings/biometrics/face/FaceEnrollEducation.java
View File

@@ -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(

2
src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java
View File

@@ -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()
);

2
src/com/android/settings/biometrics/face/FaceEnrollFinish.java
View File

@@ -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()
);
}

4
src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
View File

@@ -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;

2
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -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()
);

4
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
View File

@@ -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()
);

4
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
View File

@@ -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()
);
}

11
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
View File

@@ -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;

5
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -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

11
src/com/android/settings/biometrics/fingerprint/UdfpsEnrollEnrollingView.java
View File

@@ -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);
}

5
src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingRfpsFragment.kt
View File

@@ -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()
}

12
src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingSfpsFragment.kt
View File

@@ -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<ProgressBar>(R.id.fingerprint_progress_bar)!!.progressBackgroundTintMode =

4
src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindRfpsFragment.kt
View File

@@ -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)

4
src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindSfpsFragment.kt
View File

@@ -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)
}

4
src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindUdfpsFragment.kt
View File

@@ -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)
}

4
src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFinishFragment.kt
View File

@@ -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()
}
}

4
src/com/android/settings/biometrics2/ui/view/FingerprintEnrollIntroFragment.kt
View File

@@ -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)

24
src/com/android/settings/biometrics2/ui/view/FingerprintEnrollmentActivity.kt
View File

@@ -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,

2
src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
View File

@@ -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(

2
src/com/android/settings/bluetooth/BluetoothBroadcastDialog.java
View File

@@ -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();

16
src/com/android/settings/bluetooth/BluetoothBroadcastSourcePreference.java
View File

@@ -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);

2
src/com/android/settings/bluetooth/BluetoothDevicePreference.java
View File

@@ -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);
}
}

6
src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
View File

@@ -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;
}

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

@@ -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);
}

5
src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java
View File

@@ -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);

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

@@ -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)

8
src/com/android/settings/bluetooth/Utils.java
View File

@@ -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;
}

4
src/com/android/settings/core/PreferenceXmlParserUtils.java
View File

@@ -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;
}

16
src/com/android/settings/core/SettingsBaseActivity.java
View File

@@ -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();
}

4
src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
View File

@@ -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 {

5
src/com/android/settings/dashboard/profileselector/UserAdapter.java
View File

@@ -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));
}
}
}

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

@@ -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 {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Some files were not shown because too many files have changed in this diff Show More