Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25413812 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Fix references to resources for Settings 

Bug: 293810334
Test: m Settings
Change-Id: Ie140278f492ef7e1c062ec1ecae2866c521a86aa
parent ed505c25

src/com/android/settings/AllInOneTetherSettings.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

src/com/android/settings/MainClear.java

+5 −3
Original line number Diff line number Diff line
@@ -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);

            }

src/com/android/settings/MainClearConfirm.java

+1 −1
Original line number Diff line number Diff line
@@ -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()

        );

    }

src/com/android/settings/RestrictedCheckBox.java

+2 −1
Original line number Diff line number Diff line
@@ -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();

src/com/android/settings/SetFullBackupPassword.java

+5 −3
Original line number Diff line number Diff line
@@ -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) {