commit 0f1c3af76b719a728ed567435ea4db30a33364d2
author Jeff Sharkey <jsharkey@android.com> Tue Apr 03 20:46:42 2012 -0700
committer Jeff Sharkey <jsharkey@android.com> Tue Apr 03 20:46:42 2012 -0700
tree 4e26b9ae3b0e6286774cbde9e4fc4dd3fceeed6f
parent af92c532e7e0fc076aa8fb55c43f8964dba16fcb

Hide Preference title when empty.

Change-Id: I1c1d73f5a4647657c7da65c72192fbac061fe259

core/java/android/preference/Preference.java

diff --git a/core/java/android/preference/Preference.java b/core/java/android/preference/Preference.java
index 74a376d..8df4339 100644
--- a/core/java/android/preference/Preference.java
+++ b/core/java/android/preference/Preference.java
@@ -497,27 +497,30 @@
      * @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());
-        }
-        
-        textView = (TextView) view.findViewById(com.android.internal.R.id.summary);
-        if (textView != null) {
-            final CharSequence summary = getSummary();
-            if (!TextUtils.isEmpty(summary)) {
-                if (textView.getVisibility() != View.VISIBLE) {
-                    textView.setVisibility(View.VISIBLE);
-                }
-                
-                textView.setText(getSummary());
+        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 {
-                if (textView.getVisibility() != View.GONE) {
-                    textView.setVisibility(View.GONE);
-                }
+                titleView.setVisibility(View.GONE);
             }
         }
-        
+
+        final TextView summaryView = (TextView) view.findViewById(
+                com.android.internal.R.id.summary);
+        if (summaryView != null) {
+            final CharSequence summary = getSummary();
+            if (!TextUtils.isEmpty(summary)) {
+                summaryView.setText(summary);
+                summaryView.setVisibility(View.VISIBLE);
+            } else {
+                summaryView.setVisibility(View.GONE);
+            }
+        }
+
         ImageView imageView = (ImageView) view.findViewById(com.android.internal.R.id.icon);
         if (imageView != null) {
             if (mIconResId != 0 || mIcon != null) {