commit e9326d276135b657738d851e0a56df447f09567a
author Fabrice Di Meglio <fdimeglio@google.com> Tue May 13 12:49:14 2014 -0700
committer Fabrice Di Meglio <fdimeglio@google.com> Tue May 13 12:49:14 2014 -0700
tree 1a49314ded0afa23962526dddbc71962ae87a857
parent 488cae39dab2e8c298e8a1f1eec37bf0d96a83d2

Code cleaning: remove all remaining references to the old Header class

- goodbye Header(s) !

Change-Id: Ied27f1f01dbed9c51cc74d28800d9ca7cab47d5a

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 60b1184..00368e4 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -77,7 +77,6 @@
 import com.android.settings.dashboard.DashboardCategory;
 import com.android.settings.dashboard.DashboardSummary;
 import com.android.settings.dashboard.DashboardTile;
-import com.android.settings.dashboard.Header;
 import com.android.settings.dashboard.NoHomeDialogFragment;
 import com.android.settings.dashboard.SearchResultsSummary;
 import com.android.settings.deviceinfo.Memory;
@@ -115,7 +114,7 @@
 import java.util.Comparator;
 import java.util.List;
 
-import static com.android.settings.dashboard.Header.HEADER_ID_UNDEFINED;
+import static com.android.settings.dashboard.DashboardTile.TILE_ID_UNDEFINED;
 
 public class SettingsActivity extends Activity
         implements PreferenceManager.OnPreferenceTreeClickListener,
@@ -492,7 +491,7 @@
                 switchToFragment( initialFragmentName, initialArguments, true, false,
                         mInitialTitle, false);
             } else {
-                // No UP if we are displaying the Headers
+                // No UP if we are displaying the main Dashboard
                 mDisplayHomeAsUpEnabled = false;
                 if (mCategories.size() > 0) {
                     mInitialTitle = getText(R.string.dashboard_title);
@@ -672,25 +671,6 @@
     }
 
     /**
-     * When in two-pane mode, switch to the fragment pane to show the given
-     * preference fragment.
-     *
-     * @param header The new header to display.
-     * @param position The position of the Header in the list.
-     */
-    private void onHeaderClick(Header header, int position) {
-        if (header == null) {
-            return;
-        }
-        if (header.fragment != null) {
-            Utils.startWithFragment(this, header.fragment, header.fragmentArguments, null, 0,
-                    header.getTitle(getResources()));
-        } else if (header.intent != null) {
-            startActivity(header.intent);
-        }
-    }
-
-    /**
      * Called to determine whether the header list should be hidden.
      * The default implementation returns the
      * value given in {@link #EXTRA_NO_HEADERS} or false if it is not supplied.
@@ -919,7 +899,7 @@
                                     attrs, com.android.internal.R.styleable.PreferenceHeader);
                             tile.id = sa.getResourceId(
                                     com.android.internal.R.styleable.PreferenceHeader_id,
-                                    (int)HEADER_ID_UNDEFINED);
+                                    (int)TILE_ID_UNDEFINED);
                             tv = sa.peekValue(
                                     com.android.internal.R.styleable.PreferenceHeader_title);
                             if (tv != null && tv.type == TypedValue.TYPE_STRING) {