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

Merge "Add more logging for onHeaderClick(...)"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-04-04 17:18:22 +00:00
committed by Android (Google) Code Review
parent cccd683f1f bbdada8fab
commit 45d3c5130f
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -644,8 +644,9 @@ public class SettingsActivity extends Activity
* preference fragment. * preference fragment.
* *
* @param header The new header to display. * @param header The new header to display.
* @param position The position of the Header in the list.
*/ */
private void onHeaderClick(Header header) { private void onHeaderClick(Header header, int position) {
if (header == null) { if (header == null) {
return; return;
} }
@@ -655,6 +656,9 @@ public class SettingsActivity extends Activity
} else if (header.intent != null) { } else if (header.intent != null) {
startActivity(header.intent); startActivity(header.intent);
} else { } else {
String title = header.getTitle(getResources()).toString();
Log.e(LOG_TAG, "Can't switch to header that has no Fragment nor Intent. Title: " +
title + " Position: " + position);
throw new IllegalStateException( throw new IllegalStateException(
"Can't switch to header that has no Fragment nor Intent"); "Can't switch to header that has no Fragment nor Intent");
} }
@@ -1210,7 +1214,7 @@ public class SettingsActivity extends Activity
Object item = mHeaderAdapter.getItem(position); Object item = mHeaderAdapter.getItem(position);
if (item instanceof Header) { if (item instanceof Header) {
mSelectedHeader = (Header) item; mSelectedHeader = (Header) item;
onHeaderClick(mSelectedHeader); onHeaderClick(mSelectedHeader, position);
revertToInitialFragment(); revertToInitialFragment();
} }
} }