summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jacky Wang <jiannan@google.com> 2025-03-12 11:55:47 +0800
committer Jacky Wang <jiannan@google.com> 2025-03-12 11:57:32 +0800
commit150b2036cbd7577355adc0603319552286819235 (patch)
tree99278d3f985926f6fcf1fac4f22e243e0b15f5d4
parentec44be7b7b2f0bad4ab0ab13eeea3b74f673ecda (diff)
[MainSwitchPreference] Partially revert ag/32215978
Bug: 399273407 Bug: 400333584 Flag: EXEMPT bugfix Test: manual Change-Id: Ia26ccfc56e257d0bae52f39601015ada429eb291
-rw-r--r--packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java16
1 files changed, 16 insertions, 0 deletions
diff --git a/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java b/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java
index ddd9d2acdab3..9d4c5c2735fc 100644
--- a/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java
+++ b/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java
@@ -112,6 +112,22 @@ public class MainSwitchBar extends LinearLayout implements OnCheckedChangeListen
if (mSwitch.getVisibility() == VISIBLE) {
mSwitch.setOnCheckedChangeListener(this);
}
+
+ if (attrs != null) {
+ final TypedArray a = context.obtainStyledAttributes(attrs,
+ androidx.preference.R.styleable.Preference, 0 /*defStyleAttr*/,
+ 0 /*defStyleRes*/);
+ final CharSequence title = a.getText(
+ androidx.preference.R.styleable.Preference_android_title);
+ setTitle(title);
+ //TODO(b/369470034): update to next version
+ if (isExpressive && Build.VERSION.SDK_INT >= VERSION_CODES.VANILLA_ICE_CREAM) {
+ CharSequence summary = a.getText(
+ androidx.preference.R.styleable.Preference_android_summary);
+ setSummary(summary);
+ }
+ a.recycle();
+ }
}
@Override