diff options
| author | Zoltan Szatmary-Ban <szatmz@google.com> | 2014-09-25 10:35:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-25 10:35:58 +0000 |
| commit | 7258650efdea447dea6f2f557cb9d2b90df92754 (patch) | |
| tree | 4d46b2f9de845d43cc2f973166d3672fce9195b1 /src/com/android/settings/fuelgauge | |
| parent | eac7cc5eead6d79fb6e0558d8005b4c8ea1911a1 (diff) | |
| parent | d50c7a887873cf4860498de37bddbfce0816ecf4 (diff) | |
| download | packages_apps_Settings-7258650efdea447dea6f2f557cb9d2b90df92754.zip packages_apps_Settings-7258650efdea447dea6f2f557cb9d2b90df92754.tar.gz packages_apps_Settings-7258650efdea447dea6f2f557cb9d2b90df92754.tar.bz2 | |
Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev
Diffstat (limited to 'src/com/android/settings/fuelgauge')
| -rw-r--r-- | src/com/android/settings/fuelgauge/PowerUsageDetail.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java index 36a2444..3b8ecbe 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java @@ -259,8 +259,14 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener args.putIntArray(PowerUsageDetail.EXTRA_DETAIL_TYPES, types); args.putDoubleArray(PowerUsageDetail.EXTRA_DETAIL_VALUES, values); - caller.startPreferencePanelAsUser(PowerUsageDetail.class.getName(), args, - R.string.details_title, null, new UserHandle(userId)); + // 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; |