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

Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev

Browse Source
This commit is contained in:
Zoltan Szatmary-Ban
2014-09-25 10:35:57 +00:00
committed by Android (Google) Code Review
parent eac7cc5eea d50c7a8878
commit 7258650efd
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/Utils.java
View File

@@ -613,6 +613,8 @@ public final class Utils {
int titleResId, CharSequence title, boolean isShortcut, UserHandle userHandle) {
Intent intent = onBuildStartFragmentIntent(context, fragmentName, args, titleResId,
title, isShortcut);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
context.startActivityAsUser(intent, userHandle);
}

6
src/com/android/settings/fuelgauge/PowerUsageDetail.java
View File

@@ -259,9 +259,15 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener
args.putIntArray(PowerUsageDetail.EXTRA_DETAIL_TYPES, types);
args.putDoubleArray(PowerUsageDetail.EXTRA_DETAIL_VALUES, values);
// This is a workaround, see b/17523189
if (userId == UserHandle.myUserId()) {
caller.startPreferencePanel(PowerUsageDetail.class.getName(), args,
R.string.details_title, null, null, 0);
} else {
caller.startPreferencePanelAsUser(PowerUsageDetail.class.getName(), args,
R.string.details_title, null, new UserHandle(userId));
}
}
public static final int ACTION_DISPLAY_SETTINGS = 1;
public static final int ACTION_WIFI_SETTINGS = 2;