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

2
src/com/android/settings/wifi/ConnectedWifiEntryPreference.java
View File

@@ -56,7 +56,7 @@ public class ConnectedWifiEntryPreference extends LongPressWifiEntryPreference i
holder.findViewById(R.id.settings_button_no_background).setVisibility(
canSignIn ? View.INVISIBLE : View.VISIBLE);
gear.setVisibility(canSignIn ? View.VISIBLE : View.INVISIBLE);
holder.findViewById(R.id.two_target_divider).setVisibility(
holder.findViewById(com.android.settingslib.widget.R.id.two_target_divider).setVisibility(
canSignIn ? View.VISIBLE : View.INVISIBLE);
}

3
src/com/android/settings/wifi/LinkablePreference.java
View File

@@ -49,7 +49,8 @@ public class LinkablePreference extends Preference {
public LinkablePreference(Context ctx, AttributeSet attrs) {
this(ctx, attrs, TypedArrayUtils.getAttr(
ctx, R.attr.footerPreferenceStyle, android.R.attr.preferenceStyle));
ctx, com.android.settingslib.widget.R.attr.footerPreferenceStyle,
android.R.attr.preferenceStyle));
}
public LinkablePreference(Context ctx) {

4
src/com/android/settings/wifi/NetworkRequestDialogFragment.java
View File

@@ -142,7 +142,7 @@ public class NetworkRequestDialogFragment extends NetworkRequestDialogBaseFragme
// Prepares adapter.
mDialogAdapter = new WifiEntryAdapter(context,
R.layout.preference_access_point, mFilteredWifiEntries);
com.android.settingslib.R.layout.preference_access_point, mFilteredWifiEntries);
final AlertDialog.Builder builder = new AlertDialog.Builder(context)
.setCustomTitle(customTitle)
@@ -326,7 +326,7 @@ public class NetworkRequestDialogFragment extends NetworkRequestDialogBaseFragme
view = mInflater.inflate(mResourceId, parent, false);
final View divider = view.findViewById(
com.android.settingslib.R.id.two_target_divider);
com.android.settingslib.widget.R.id.two_target_divider);
divider.setVisibility(View.GONE);
}

30
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -920,7 +920,7 @@ public class WifiConfigController implements TextWatcher,
} catch (NumberFormatException e) {
// Set the hint as default after user types in ip address
mNetworkPrefixLengthView.setText(mConfigUi.getContext().getString(
R.string.wifi_network_prefix_length_hint));
com.android.settingslib.R.string.wifi_network_prefix_length_hint));
} catch (IllegalArgumentException e) {
return R.string.wifi_ip_settings_invalid_ip_address;
}
@@ -953,7 +953,8 @@ public class WifiConfigController implements TextWatcher,
if (TextUtils.isEmpty(dns)) {
//If everything else is valid, provide hint as a default option
mDns1View.setText(mConfigUi.getContext().getString(R.string.wifi_dns1_hint));
mDns1View.setText(mConfigUi.getContext().getString(
com.android.settingslib.R.string.wifi_dns1_hint));
} else {
dnsAddr = getIPv4Address(dns);
if (dnsAddr == null) {
@@ -1705,29 +1706,36 @@ public class WifiConfigController implements TextWatcher,
int idx = 0;
// Populate the Wi-Fi security spinner with the various supported key management types
spinnerAdapter.add(mContext.getString(R.string.wifi_security_none));
spinnerAdapter.add(mContext.getString(com.android.settingslib.R.string.wifi_security_none));
mSecurityInPosition[idx++] = AccessPoint.SECURITY_NONE;
if (mWifiManager.isEnhancedOpenSupported()) {
spinnerAdapter.add(mContext.getString(R.string.wifi_security_owe));
spinnerAdapter.add(
mContext.getString(com.android.settingslib.R.string.wifi_security_owe));
mSecurityInPosition[idx++] = AccessPoint.SECURITY_OWE;
}
spinnerAdapter.add(mContext.getString(R.string.wifi_security_wep));
spinnerAdapter.add(mContext.getString(com.android.settingslib.R.string.wifi_security_wep));
mSecurityInPosition[idx++] = AccessPoint.SECURITY_WEP;
spinnerAdapter.add(mContext.getString(R.string.wifi_security_wpa_wpa2));
spinnerAdapter.add(
mContext.getString(com.android.settingslib.R.string.wifi_security_wpa_wpa2));
mSecurityInPosition[idx++] = AccessPoint.SECURITY_PSK;
if (mWifiManager.isWpa3SaeSupported()) {
spinnerAdapter.add(mContext.getString(R.string.wifi_security_sae));
spinnerAdapter.add(
mContext.getString(com.android.settingslib.R.string.wifi_security_sae));
mSecurityInPosition[idx++] = AccessPoint.SECURITY_SAE;
spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_wpa_wpa2));
spinnerAdapter.add(mContext.getString(
com.android.settingslib.R.string.wifi_security_eap_wpa_wpa2));
mSecurityInPosition[idx++] = AccessPoint.SECURITY_EAP;
spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_wpa3));
spinnerAdapter.add(
mContext.getString(com.android.settingslib.R.string.wifi_security_eap_wpa3));
mSecurityInPosition[idx++] = AccessPoint.SECURITY_EAP_WPA3_ENTERPRISE;
} else {
spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap));
spinnerAdapter.add(
mContext.getString(com.android.settingslib.R.string.wifi_security_eap));
mSecurityInPosition[idx++] = AccessPoint.SECURITY_EAP;
}
if (mWifiManager.isWpa3SuiteBSupported()) {
spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_suiteb));
spinnerAdapter.add(
mContext.getString(com.android.settingslib.R.string.wifi_security_eap_suiteb));
mSecurityInPosition[idx++] = AccessPoint.SECURITY_EAP_SUITE_B;
}

37
src/com/android/settings/wifi/WifiConfigController2.java
View File

@@ -926,7 +926,7 @@ public class WifiConfigController2 implements TextWatcher,
} catch (NumberFormatException e) {
// Set the hint as default after user types in ip address
mNetworkPrefixLengthView.setText(mConfigUi.getContext().getString(
R.string.wifi_network_prefix_length_hint));
com.android.settingslib.R.string.wifi_network_prefix_length_hint));
} catch (IllegalArgumentException e) {
return R.string.wifi_ip_settings_invalid_ip_address;
}
@@ -959,7 +959,8 @@ public class WifiConfigController2 implements TextWatcher,
if (TextUtils.isEmpty(dns)) {
//If everything else is valid, provide hint as a default option
mDns1View.setText(mConfigUi.getContext().getString(R.string.wifi_dns1_hint));
mDns1View.setText(mConfigUi.getContext().getString(
com.android.settingslib.R.string.wifi_dns1_hint));
} else {
dnsAddr = getIPv4Address(dns);
if (dnsAddr == null) {
@@ -1664,11 +1665,12 @@ public class WifiConfigController2 implements TextWatcher,
public void afterTextChanged(Editable s) {
if (s.length() == 0) {
if (view.getId() == R.id.gateway) {
mGatewayView.setHint(R.string.wifi_gateway_hint);
mGatewayView.setHint(com.android.settingslib.R.string.wifi_gateway_hint);
} else if (view.getId() == R.id.network_prefix_length) {
mNetworkPrefixLengthView.setHint(R.string.wifi_network_prefix_length_hint);
mNetworkPrefixLengthView.setHint(
com.android.settingslib.R.string.wifi_network_prefix_length_hint);
} else if (view.getId() == R.id.dns1) {
mDns1View.setHint(R.string.wifi_dns1_hint);
mDns1View.setHint(com.android.settingslib.R.string.wifi_dns1_hint);
}
Button submit = mConfigUi.getSubmitButton();
if (submit == null) return;
@@ -1810,29 +1812,36 @@ public class WifiConfigController2 implements TextWatcher,
int idx = 0;
// Populate the Wi-Fi security spinner with the various supported key management types
spinnerAdapter.add(mContext.getString(R.string.wifi_security_none));
spinnerAdapter.add(mContext.getString(com.android.settingslib.R.string.wifi_security_none));
mSecurityInPosition[idx++] = WifiEntry.SECURITY_NONE;
if (mWifiManager.isEnhancedOpenSupported()) {
spinnerAdapter.add(mContext.getString(R.string.wifi_security_owe));
spinnerAdapter.add(mContext.getString(
com.android.settingslib.R.string.wifi_security_owe));
mSecurityInPosition[idx++] = WifiEntry.SECURITY_OWE;
}
spinnerAdapter.add(mContext.getString(R.string.wifi_security_wep));
spinnerAdapter.add(mContext.getString(com.android.settingslib.R.string.wifi_security_wep));
mSecurityInPosition[idx++] = WifiEntry.SECURITY_WEP;
spinnerAdapter.add(mContext.getString(R.string.wifi_security_wpa_wpa2));
spinnerAdapter.add(mContext.getString(
com.android.settingslib.R.string.wifi_security_wpa_wpa2));
mSecurityInPosition[idx++] = WifiEntry.SECURITY_PSK;
if (mWifiManager.isWpa3SaeSupported()) {
spinnerAdapter.add(mContext.getString(R.string.wifi_security_sae));
spinnerAdapter.add(mContext.getString(
com.android.settingslib.R.string.wifi_security_sae));
mSecurityInPosition[idx++] = WifiEntry.SECURITY_SAE;
spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_wpa_wpa2));
spinnerAdapter.add(mContext.getString(
com.android.settingslib.R.string.wifi_security_eap_wpa_wpa2));
mSecurityInPosition[idx++] = WifiEntry.SECURITY_EAP;
spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_wpa3));
spinnerAdapter.add(mContext.getString(
com.android.settingslib.R.string.wifi_security_eap_wpa3));
mSecurityInPosition[idx++] = WifiEntry.SECURITY_EAP_WPA3_ENTERPRISE;
} else {
spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap));
spinnerAdapter.add(mContext.getString(
com.android.settingslib.R.string.wifi_security_eap));
mSecurityInPosition[idx++] = WifiEntry.SECURITY_EAP;
}
if (mWifiManager.isWpa3SuiteBSupported()) {
spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_suiteb));
spinnerAdapter.add(mContext.getString(
com.android.settingslib.R.string.wifi_security_eap_suiteb));
mSecurityInPosition[idx++] = WifiEntry.SECURITY_EAP_SUITE_B;
}

3
src/com/android/settings/wifi/WifiEntryPreference.java
View File

@@ -113,7 +113,8 @@ public class WifiEntryPreference extends RestrictedPreference implements
view.itemView.setContentDescription(mContentDescription);
// Turn off divider
view.findViewById(R.id.two_target_divider).setVisibility(View.INVISIBLE);
view.findViewById(com.android.settingslib.widget.R.id.two_target_divider)
.setVisibility(View.INVISIBLE);
// Enable the icon button when the help string in this WifiEntry is not null.
final ImageButton imageButton = (ImageButton) view.findViewById(R.id.icon_button);

6
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -224,8 +224,10 @@ public class WifiSettings extends RestrictedSettingsFragment
super.onViewCreated(view, savedInstanceState);
final Activity activity = getActivity();
if (activity != null) {
mProgressHeader = setPinnedHeaderView(R.layout.progress_header)
.findViewById(R.id.progress_bar_animation);
mProgressHeader =
setPinnedHeaderView(com.android.settingslib.widget.R.layout.progress_header)
.findViewById(
com.android.settingslib.widget.R.id.progress_bar_animation);
setProgressBarVisible(false);
}
((SettingsActivity) activity).getSwitchBar().setTitle(

2
src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
View File

@@ -550,7 +550,7 @@ public class AddAppNetworksFragment extends InstrumentedFragment implements
}
final View divider = view.findViewById(
com.android.settingslib.R.id.two_target_divider);
com.android.settingslib.widget.R.id.two_target_divider);
if (divider != null) {
divider.setVisibility(View.GONE);
}

5
src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java
View File

@@ -25,7 +25,6 @@ import android.widget.TextView;
import androidx.annotation.DrawableRes;
import com.android.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.google.android.setupcompat.template.FooterBarMixin;
@@ -59,13 +58,13 @@ public abstract class WifiDppQrCodeBaseFragment extends InstrumentedFragment {
if (isFooterAvailable()) {
mLeftButton = new FooterButton.Builder(getContext())
.setButtonType(FooterButton.ButtonType.CANCEL)
.setTheme(R.style.SudGlifButton_Secondary)
.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary)
.build();
mGlifLayout.getMixin(FooterBarMixin.class).setSecondaryButton(mLeftButton);
mRightButton = new FooterButton.Builder(getContext())
.setButtonType(FooterButton.ButtonType.NEXT)
.setTheme(R.style.SudGlifButton_Primary)
.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)
.build();
mGlifLayout.getMixin(FooterBarMixin.class).setPrimaryButton(mRightButton);
}

2
src/com/android/settings/wifi/p2p/WifiP2pPeer.java
View File

@@ -31,7 +31,7 @@ import com.android.settings.R;
public class WifiP2pPeer extends Preference {
private static final int FIXED_RSSI = 60;
private static final int[] STATE_SECURED = {R.attr.state_encrypted};
private static final int[] STATE_SECURED = {com.android.settingslib.R.attr.state_encrypted};
public WifiP2pDevice device;
@VisibleForTesting final int mRssi;

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