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

Merge "Don't leave space for summary text if it's an empty string" into klp-dev

Browse Source
This commit is contained in:
Amith Yamasani
2013-09-10 15:59:37 +00:00
committed by Android (Google) Code Review
parent e3d0f02282 b25158886b
commit 618f8cc5db
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/preference/TwoStatePreference.java
View File

@@ -21,6 +21,7 @@ import android.content.SharedPreferences;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.text.TextUtils;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.View; import android.view.View;
import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityEvent;
@@ -215,17 +216,17 @@ public abstract class TwoStatePreference extends Preference {
TextView summaryView = (TextView) view.findViewById(com.android.internal.R.id.summary); TextView summaryView = (TextView) view.findViewById(com.android.internal.R.id.summary);
if (summaryView != null) { if (summaryView != null) {
boolean useDefaultSummary = true; boolean useDefaultSummary = true;
if (mChecked && mSummaryOn != null) { if (mChecked && !TextUtils.isEmpty(mSummaryOn)) {
summaryView.setText(mSummaryOn); summaryView.setText(mSummaryOn);
useDefaultSummary = false; useDefaultSummary = false;
} else if (!mChecked && mSummaryOff != null) { } else if (!mChecked && !TextUtils.isEmpty(mSummaryOff)) {
summaryView.setText(mSummaryOff); summaryView.setText(mSummaryOff);
useDefaultSummary = false; useDefaultSummary = false;
} }
if (useDefaultSummary) { if (useDefaultSummary) {
final CharSequence summary = getSummary(); final CharSequence summary = getSummary();
if (summary != null) { if (!TextUtils.isEmpty(summary)) {
summaryView.setText(summary); summaryView.setText(summary);
useDefaultSummary = false; useDefaultSummary = false;
} }