Merge "Hide Preference title when empty." (4dfdf4d6) · Commits · e / os / android_frameworks_base

core/java/android/preference/Preference.java

+18 −15

Original line number	Diff line number	Diff line
		@@ -497,24 +497,27 @@ public class Preference implements Comparable<Preference>, OnDependencyChangeLis
		* @see #onCreateView(ViewGroup)
		*/
		protected void onBindView(View view) {
		TextView textView = (TextView) view.findViewById(com.android.internal.R.id.title);
		if (textView != null) {
		textView.setText(getTitle());
		final TextView titleView = (TextView) view.findViewById(
		com.android.internal.R.id.title);
		if (titleView != null) {
		final CharSequence title = getTitle();
		if (!TextUtils.isEmpty(title)) {
		titleView.setText(title);
		titleView.setVisibility(View.VISIBLE);
		} else {
		titleView.setVisibility(View.GONE);
		}
		}

		textView = (TextView) view.findViewById(com.android.internal.R.id.summary);
		if (textView != null) {
		final TextView summaryView = (TextView) view.findViewById(
		com.android.internal.R.id.summary);
		if (summaryView != null) {
		final CharSequence summary = getSummary();
		if (!TextUtils.isEmpty(summary)) {
		if (textView.getVisibility() != View.VISIBLE) {
		textView.setVisibility(View.VISIBLE);
		}

		textView.setText(getSummary());
		summaryView.setText(summary);
		summaryView.setVisibility(View.VISIBLE);
		} else {
		if (textView.getVisibility() != View.GONE) {
		textView.setVisibility(View.GONE);
		}
		summaryView.setVisibility(View.GONE);
		}
		}