diff options
author | Jason Monk <jmonk@google.com> | 2015-06-30 10:15:53 -0400 |
---|---|---|
committer | Jason Monk <jmonk@google.com> | 2015-06-30 10:17:25 -0400 |
commit | d5884c502322c799768bbcc441172468cb13c353 (patch) | |
tree | 44c38dc15e0e2c5f8c9f121854bbe0d476b4637d /src/com/android | |
parent | d9bd96b3094039fdcb8c76042a6f2dc21d6c7875 (diff) | |
download | packages_apps_Settings-d5884c502322c799768bbcc441172468cb13c353.zip packages_apps_Settings-d5884c502322c799768bbcc441172468cb13c353.tar.gz packages_apps_Settings-d5884c502322c799768bbcc441172468cb13c353.tar.bz2 |
Fix crash in ignore optimizations dialog
Launch it like a dialog, because it is one.
Bug: 22181580
Change-Id: Ibeda8506cfb7a9a9d60f70462a4e03972b38f8aa
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/settings/fuelgauge/HighPowerDetail.java | 4 | ||||
-rw-r--r-- | src/com/android/settings/fuelgauge/PowerUsageDetail.java | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/com/android/settings/fuelgauge/HighPowerDetail.java b/src/com/android/settings/fuelgauge/HighPowerDetail.java index 8c75868..859b5b8 100644 --- a/src/com/android/settings/fuelgauge/HighPowerDetail.java +++ b/src/com/android/settings/fuelgauge/HighPowerDetail.java @@ -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; diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java index 90781a0..9e7fa48 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java @@ -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; } }); |