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

Merge "Worked around back button navigation issue"

Browse Source
This commit is contained in:
Lifu Tang
2015-04-09 17:26:46 +00:00
committed by Android (Google) Code Review
parent 6bb9c54a79 d033285ca7
commit 82210af707
2 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -260,14 +260,8 @@ public class PowerUsageDetail extends InstrumentedFragment implements Button.OnC
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));
}
caller.startPreferencePanelAsUser(PowerUsageDetail.class.getName(), args,
R.string.details_title, null, new UserHandle(userId));
}
public static final int ACTION_DISPLAY_SETTINGS = 1;