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

Not to retrieve Preference_title

Browse Source 
No longer retrieve Preference_title in SettingsMainSwitchPreference,
because it's private in androidx, migrate to Preference's getTitle() and
setTitle() instead.

This will help to fix references to resources for Settings in the future
cls.

Bug: 293810334
Test: visual - on Adaptive brightness page
Change-Id: If40a879ff222e980a563662797dffb00f6b62597
This commit is contained in:
Chaohui Wang
2023-08-03 16:48:04 +08:00
parent eb42040010
commit e2821e8c44
1 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/settings/widget/SettingsMainSwitchPreference.java
View File

@@ -19,12 +19,9 @@ package com.android.settings.widget;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.content.Context;
import android.content.res.TypedArray;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.widget.Switch;
import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.PreferenceViewHolder;
import androidx.preference.TwoStatePreference;
@@ -40,7 +37,7 @@ import java.util.List;
/**
* SettingsMainSwitchPreference is a Preference with a customized Switch.
* This component is used as the main switch of the page
* to enable or disable the prefereces on the page.
* to enable or disable the preferences on the page.
*/
public class SettingsMainSwitchPreference extends TwoStatePreference implements
OnMainSwitchChangeListener {
@@ -50,7 +47,6 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements
private final List<OnMainSwitchChangeListener> mSwitchChangeListeners = new ArrayList<>();
private SettingsMainSwitchBar mMainSwitchBar;
private CharSequence mTitle;
private EnforcedAdmin mEnforcedAdmin;
private RestrictedPreferenceHelper mRestrictedHelper;
@@ -103,17 +99,6 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements
mSwitchChangeListeners.add(this);
if (attrs != null) {
final TypedArray a = context.obtainStyledAttributes(attrs,
androidx.preference.R.styleable.Preference, 0/*defStyleAttr*/,
0/*defStyleRes*/);
final CharSequence title = TypedArrayUtils.getText(a,
androidx.preference.R.styleable.Preference_title,
androidx.preference.R.styleable.Preference_android_title);
if (!TextUtils.isEmpty(title)) {
setTitle(title.toString());
}
a.recycle();
mRestrictedHelper = new RestrictedPreferenceHelper(context, this, attrs);
}
}
@@ -135,9 +120,9 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements
@Override
public void setTitle(CharSequence title) {
mTitle = title;
super.setTitle(title);
if (mMainSwitchBar != null) {
mMainSwitchBar.setTitle(mTitle);
mMainSwitchBar.setTitle(title);
}
}
@@ -245,7 +230,7 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements
private void initMainSwitchBar() {
if (mMainSwitchBar != null) {
mMainSwitchBar.setTitle(mTitle);
mMainSwitchBar.setTitle(getTitle());
mMainSwitchBar.setDisabledByAdmin(mEnforcedAdmin);
}
}