PawletOS/app_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/wifi/tether/WifiTetherSettings.java
View File

@@ -206,7 +206,8 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
}
if (mUnavailable) {
if (!isUiRestrictedByOnlyAdmin()) {
getEmptyTextView().setText(R.string.tethering_settings_not_available);
getEmptyTextView()
.setText(com.android.settingslib.R.string.tethering_settings_not_available);
}
getPreferenceScreen().removeAll();
return;

5
src/com/android/settings/wifi/tether/WifiTetherSsidPreference.java
View File

@@ -68,7 +68,7 @@ public class WifiTetherSsidPreference extends ValidatedEditTextPreference {
private void initialize() {
// TODO(b/129019971): use methods of divider line in parent object
setLayoutResource(com.android.settingslib.R.layout.preference_two_target);
setLayoutResource(com.android.settingslib.widget.R.layout.preference_two_target);
setWidgetLayoutResource(R.layout.wifi_button_preference_widget);
mShareIconDrawable = getDrawable(R.drawable.ic_qrcode_24dp);
@@ -79,7 +79,8 @@ public class WifiTetherSsidPreference extends ValidatedEditTextPreference {
super.onBindViewHolder(holder);
final ImageButton shareButton = (ImageButton) holder.findViewById(R.id.button_icon);
final View dividerView = holder.findViewById(R.id.two_target_divider);
final View dividerView = holder.findViewById(
com.android.settingslib.widget.R.id.two_target_divider);
if (mVisible) {
shareButton.setOnClickListener(mClickListener);

11
src/com/android/settings/wifi/tether/WifiTetherViewModel.java
View File

@@ -52,11 +52,14 @@ public class WifiTetherViewModel extends AndroidViewModel {
static Map<Integer, Integer> sSecuritySummaryResMap = new HashMap<>();
static {
sSecuritySummaryResMap.put(SECURITY_TYPE_WPA3_SAE, R.string.wifi_security_sae);
sSecuritySummaryResMap.put(
SECURITY_TYPE_WPA3_SAE, com.android.settingslib.R.string.wifi_security_sae);
sSecuritySummaryResMap.put(SECURITY_TYPE_WPA3_SAE_TRANSITION,
R.string.wifi_security_psk_sae);
sSecuritySummaryResMap.put(SECURITY_TYPE_WPA2_PSK, R.string.wifi_security_wpa2);
sSecuritySummaryResMap.put(SECURITY_TYPE_OPEN, R.string.wifi_security_none);
com.android.settingslib.R.string.wifi_security_psk_sae);
sSecuritySummaryResMap.put(
SECURITY_TYPE_WPA2_PSK, com.android.settingslib.R.string.wifi_security_wpa2);
sSecuritySummaryResMap.put(
SECURITY_TYPE_OPEN, com.android.settingslib.R.string.wifi_security_none);
}
static Map<Integer, Integer> sSpeedSummaryResMap = new HashMap<>();