PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- goodbye Header(s) !

Change-Id: Ied27f1f01dbed9c51cc74d28800d9ca7cab47d5a
This commit is contained in:
Fabrice Di Meglio
2014-05-13 12:49:14 -07:00
parent 488cae39da
commit e9326d2761
3 changed files with 3 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/android/settings/SettingsActivity.java
View File

@@ -77,7 +77,6 @@ import com.android.settings.bluetooth.BluetoothSettings;
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.Collections;
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 @@ public class SettingsActivity extends Activity
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);
@@ -671,25 +670,6 @@ public class SettingsActivity extends Activity
return false;
}
/**
* 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
@@ -919,7 +899,7 @@ public class SettingsActivity extends Activity
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) {