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

Commit e6a0bee5 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Fix crash in ignore optimizations dialog" into mnc-dev

parents 02c7e95f d5884c50

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

+0 −4
Original line number Diff line number Diff line
@@ -26,12 +26,8 @@ import android.content.DialogInterface.OnClickListener; 
import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.os.Bundle;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.view.ViewGroup.LayoutParams;

import android.widget.Checkable;

import android.widget.LinearLayout;

import android.widget.TextView;



import com.android.settings.R;

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

+9 −4
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ import com.android.settings.R; 
import com.android.settings.SettingsActivity;

import com.android.settings.Utils;

import com.android.settings.WirelessSettings;

import com.android.settings.applications.AppInfoBase;

import com.android.settings.applications.AppInfoWithHeader;

import com.android.settings.applications.InstalledAppDetails;

import com.android.settings.applications.LayoutPreference;
@@ -374,6 +373,14 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi 
        setupHeader();

    }



    @Override

    public void onActivityResult(int requestCode, int resultCode, Intent data) {

        super.onActivityResult(requestCode, resultCode, data);

        if (mHighPower != null) {

            mHighPower.setSummary(HighPowerDetail.getSummary(getActivity(), mApp.packageName));

        }

    }



    private void createDetails() {

        final Bundle args = getArguments();

        Context context = getActivity();
@@ -426,9 +433,7 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi 
                mHighPower.setOnPreferenceClickListener(new OnPreferenceClickListener() {

                    @Override

                    public boolean onPreferenceClick(Preference preference) {

                        AppInfoBase.startAppInfoFragment(HighPowerDetail.class,

                                R.string.high_power_apps, mApp.packageName, mApp.uid,

                                PowerUsageDetail.this, 0);

                        HighPowerDetail.show(PowerUsageDetail.this, mApp.packageName, 0, false);

                        return true;

                    }

                });