Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix references to resources for Settings

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

3
src/com/android/settings/security/CredentialManagementAppHeaderController.java
View File

@@ -82,7 +82,8 @@ public class CredentialManagementAppHeaderController extends BasePreferenceContr
ImageView appIconView = headerPref.findViewById(R.id.entity_header_icon);
TextView titleView = headerPref.findViewById(R.id.entity_header_title);
TextView summary1 = headerPref.findViewById(R.id.entity_header_summary);
TextView summary2 = headerPref.findViewById(R.id.entity_header_second_summary);
TextView summary2 = headerPref.findViewById(
com.android.settingslib.widget.R.id.entity_header_second_summary);
summary2.setVisibility(View.GONE);
try {

4
src/com/android/settings/security/InstallCaCertificateWarning.java
View File

@@ -58,7 +58,7 @@ public class InstallCaCertificateWarning extends Activity {
.setText(R.string.certificate_warning_install_anyway)
.setListener(installCaCertificate())
.setButtonType(FooterButton.ButtonType.OTHER)
.setTheme(R.style.SudGlifButton_Secondary)
.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary)
.build()
);
mixin.getSecondaryButtonView().setFilterTouchesWhenObscured(true);
@@ -68,7 +68,7 @@ public class InstallCaCertificateWarning extends Activity {
.setText(R.string.certificate_warning_dont_install)
.setListener(returnToInstallCertificateFromStorage())
.setButtonType(FooterButton.ButtonType.NEXT)
.setTheme(R.style.SudGlifButton_Primary)
.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)
.build()
);
mixin.getPrimaryButtonView().setFilterTouchesWhenObscured(true);

2
src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
View File

@@ -78,7 +78,7 @@ public class PowerButtonInstantLockPreferenceController extends AbstractPreferen
R.string.lockpattern_settings_power_button_instantly_locks_summary,
trustAgentLabel));
} else {
preference.setSummary(R.string.summary_empty);
preference.setSummary(com.android.settingslib.R.string.summary_empty);
}
}