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

Merge "Rename prefix from suw to sud"

Browse Source
This commit is contained in:
Pasty Chang
2019-01-10 06:56:20 +00:00
committed by Android (Google) Code Review
parent b5f945994e 79614823cb
commit 43bb34e15c
67 changed files with 260 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,7 +156,7 @@ public class EncryptionInterstitial extends SettingsActivity {
.setText(R.string.encryption_interstitial_no)
.setListener(this::onNoButtonClicked)
.setButtonType(FooterButton.ButtonType.SKIP)
.setTheme(R.style.SuwGlifButton_Secondary)
.setTheme(R.style.SudGlifButton_Secondary)
.build()
);
@@ -165,7 +165,7 @@ public class EncryptionInterstitial extends SettingsActivity {
.setText(R.string.encryption_interstitial_yes)
.setListener(this::onYesButtonClicked)
.setButtonType(FooterButton.ButtonType.NEXT)
.setTheme(R.style.SuwGlifButton_Primary)
.setTheme(R.style.SudGlifButton_Primary)
.build()
);
}

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

@@ -423,7 +423,7 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL
.setText(R.string.master_clear_button_text)
.setListener(mInitiateListener)
.setButtonType(ButtonType.OTHER)
.setTheme(R.style.SuwGlifButton_Primary)
.setTheme(R.style.SudGlifButton_Primary)
.build()
);
mInitiateButton = buttonFooterMixin.getPrimaryButton();

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

@@ -160,7 +160,7 @@ public class MasterClearConfirm extends InstrumentedFragment {
.setText(R.string.master_clear_button_text)
.setListener(mFinalClickListener)
.setButtonType(ButtonType.OTHER)
.setTheme(R.style.SuwGlifButton_Primary)
.setTheme(R.style.SudGlifButton_Primary)
.build()
);
}

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

@@ -217,7 +217,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
updatePasswordQuality();
mToken = data.getByteArrayExtra(
ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
overridePendingTransition(R.anim.suw_slide_next_in, R.anim.suw_slide_next_out);
overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);
return;
} else {
setResult(result, data);
@@ -226,13 +226,13 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
} else if (requestCode == CONFIRM_REQUEST) {
if (resultCode == RESULT_OK && data != null) {
mToken = data.getByteArrayExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
overridePendingTransition(R.anim.suw_slide_next_in, R.anim.suw_slide_next_out);
overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);
} else {
setResult(result, data);
finish();
}
} else if (requestCode == LEARN_MORE_REQUEST) {
overridePendingTransition(R.anim.suw_slide_back_in, R.anim.suw_slide_back_out);
overridePendingTransition(R.anim.sud_slide_back_in, R.anim.sud_slide_back_out);
}
super.onActivityResult(requestCode, resultCode, data);
}

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

@@ -111,7 +111,7 @@ public abstract class BiometricsEnrollEnrolling extends BiometricEnrollBase
intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
}
startActivity(intent);
overridePendingTransition(R.anim.suw_slide_next_in, R.anim.suw_slide_next_out);
overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);
finish();
}

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

@@ -97,7 +97,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.SuwGlifButton_Secondary)
.setTheme(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.SuwGlifButton_Primary)
.setTheme(R.style.SudGlifButton_Primary)
.build()
);
}

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

@@ -66,7 +66,7 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
.setText(R.string.security_settings_face_enroll_introduction_cancel)
.setListener(this::onCancelButtonClick)
.setButtonType(FooterButton.ButtonType.SKIP)
.setTheme(R.style.SuwGlifButton_Secondary)
.setTheme(R.style.SudGlifButton_Secondary)
.build()
);
@@ -75,7 +75,7 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
.setText(R.string.wizard_next)
.setListener(this::onNextButtonClick)
.setButtonType(FooterButton.ButtonType.NEXT)
.setTheme(R.style.SuwGlifButton_Primary)
.setTheme(R.style.SudGlifButton_Primary)
.build()
);
}

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

@@ -143,7 +143,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.SuwGlifButton_Secondary)
.setTheme(R.style.SudGlifButton_Secondary)
.build()
);

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

@@ -53,7 +53,7 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase {
.setText(R.string.skip_label)
.setListener(this::onSkipButtonClick)
.setButtonType(FooterButton.ButtonType.SKIP)
.setTheme(R.style.SuwGlifButton_Secondary)
.setTheme(R.style.SudGlifButton_Secondary)
.build()
);
@@ -155,7 +155,7 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase {
if (requestCode == CONFIRM_REQUEST) {
if (resultCode == RESULT_OK && data != null) {
mToken = data.getByteArrayExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
overridePendingTransition(R.anim.suw_slide_next_in, R.anim.suw_slide_next_out);
overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);
getIntent().putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
startLookingForFingerprint();
} else {

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

@@ -47,7 +47,7 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase {
new FooterButton.Builder(this)
.setText(R.string.fingerprint_enroll_button_add)
.setButtonType(FooterButton.ButtonType.SKIP)
.setTheme(R.style.SuwGlifButton_Secondary)
.setTheme(R.style.SudGlifButton_Secondary)
.build()
);
@@ -56,7 +56,7 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase {
.setText(R.string.security_settings_fingerprint_enroll_done)
.setListener(this::onNextButtonClick)
.setButtonType(FooterButton.ButtonType.NEXT)
.setTheme(R.style.SuwGlifButton_Primary)
.setTheme(R.style.SudGlifButton_Primary)
.build()
);
}

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

@@ -53,7 +53,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
.setText(R.string.security_settings_face_enroll_introduction_cancel)
.setListener(this::onCancelButtonClick)
.setButtonType(FooterButton.ButtonType.SKIP)
.setTheme(R.style.SuwGlifButton_Secondary)
.setTheme(R.style.SudGlifButton_Secondary)
.build()
);
@@ -62,7 +62,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
.setText(R.string.wizard_next)
.setListener(this::onNextButtonClick)
.setButtonType(FooterButton.ButtonType.NEXT)
.setTheme(R.style.SuwGlifButton_Primary)
.setTheme(R.style.SudGlifButton_Primary)
.build()
);
}

4
src/com/android/settings/deviceinfo/StorageWizardBase.java
View File

@@ -100,7 +100,7 @@ public abstract class StorageWizardBase extends FragmentActivity {
.setText(R.string.wizard_back)
.setListener(this::onNavigateBack)
.setButtonType(FooterButton.ButtonType.OTHER)
.setTheme(R.style.SuwGlifButton_Secondary)
.setTheme(R.style.SudGlifButton_Secondary)
.build()
);
mButtonFooterMixin.setPrimaryButton(
@@ -108,7 +108,7 @@ public abstract class StorageWizardBase extends FragmentActivity {
.setText(R.string.wizard_next)
.setListener(this::onNavigateNext)
.setButtonType(FooterButton.ButtonType.NEXT)
.setTheme(R.style.SuwGlifButton_Primary)
.setTheme(R.style.SudGlifButton_Primary)
.build()
);
mBack = mButtonFooterMixin.getSecondaryButton();

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

@@ -139,7 +139,7 @@ public class RedactionInterstitial extends SettingsActivity {
.setText(R.string.app_notifications_dialog_done)
.setListener(this::onDoneButtonClicked)
.setButtonType(FooterButton.ButtonType.NEXT)
.setTheme(R.style.SuwGlifButton_Primary)
.setTheme(R.style.SudGlifButton_Primary)
.build()
);
}

4
src/com/android/settings/password/ChooseLockPattern.java
View File

@@ -476,7 +476,7 @@ public class ChooseLockPattern extends SettingsActivity {
R.layout.choose_lock_pattern, container, false);
layout.setHeaderText(getActivity().getTitle());
if (getResources().getBoolean(R.bool.config_lock_pattern_minimal_ui)) {
View iconView = layout.findViewById(R.id.suw_layout_icon);
View iconView = layout.findViewById(R.id.suc_layout_icon);
if (iconView != null) {
iconView.setVisibility(View.GONE);
}
@@ -494,7 +494,7 @@ public class ChooseLockPattern extends SettingsActivity {
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
mTitleText = view.findViewById(R.id.suw_layout_title);
mTitleText = view.findViewById(R.id.suc_layout_title);
mHeaderText = (TextView) view.findViewById(R.id.headerText);
mDefaultHeaderColorList = mHeaderText.getTextColors();
mMessageText = view.findViewById(R.id.message);

2
src/com/android/settings/password/ConfirmLockPassword.java
View File

@@ -135,7 +135,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
mHeaderTextView = (TextView) view.findViewById(R.id.headerText);
if (mHeaderTextView == null) {
mHeaderTextView = view.findViewById(R.id.suw_layout_title);
mHeaderTextView = view.findViewById(R.id.suc_layout_title);
}
mDetailsTextView = (TextView) view.findViewById(R.id.detailsText);
mErrorTextView = (TextView) view.findViewById(R.id.errorText);

2
src/com/android/settings/password/SetupChooseLockGeneric.java
View File

@@ -86,7 +86,7 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
GlifPreferenceLayout layout = (GlifPreferenceLayout) view;
layout.setDividerItemDecoration(new SettingsDividerItemDecoration(getContext()));
layout.setDividerInset(getContext().getResources().getDimensionPixelSize(
R.dimen.suw_items_glif_text_divider_inset));
R.dimen.sud_items_glif_text_divider_inset));
layout.setIcon(getContext().getDrawable(R.drawable.ic_lock));