Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7258650e authored by Zoltan Szatmary-Ban's avatar Zoltan Szatmary-Ban Committed by Android (Google) Code Review
Browse files

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

parents eac7cc5e d50c7a88

src/com/android/settings/Utils.java

+2 −0
Original line number Diff line number Diff line
@@ -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);

    }

src/com/android/settings/fuelgauge/PowerUsageDetail.java

+8 −2
Original line number Diff line number Diff line
@@ -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;