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

* commit 'e6a0bee557c8f2ceaa25cd8287511b55479e7293':
  Fix crash in ignore optimizations dialog

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;

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,
+                        HighPowerDetail.show(PowerUsageDetail.this, mApp.packageName, 0, false);
-                                R.string.high_power_apps, mApp.packageName, mApp.uid,
-                                PowerUsageDetail.this, 0);
                         return true;
                     }
                 });