PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7099436c: Merge "Add back the refresh button and fix refresh when restarted." into honeycomb

Browse Source 
* commit '7099436ca6e963adae9fe978b39700441446f45d':
  Add back the refresh button and fix refresh when restarted.
This commit is contained in:
Amith Yamasani
2011-01-20 17:02:07 -08:00
committed by Android Git Automerger
parent 02cfbe9db5 7099436ca6
commit fc0968aca6
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/fuelgauge/PowerUsageSummary.java
View File

@@ -23,6 +23,7 @@ import com.android.settings.R;
import com.android.settings.applications.InstalledAppDetails; import com.android.settings.applications.InstalledAppDetails;
import com.android.settings.fuelgauge.PowerUsageDetail.DrainType; import com.android.settings.fuelgauge.PowerUsageDetail.DrainType;
import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.hardware.SensorManager; import android.hardware.SensorManager;
@@ -102,13 +103,16 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable {
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
if (icicle != null) {
mStats = sStatsXfer; mStats = sStatsXfer;
}
addPreferencesFromResource(R.xml.power_usage_summary); addPreferencesFromResource(R.xml.power_usage_summary);
mBatteryInfo = IBatteryStats.Stub.asInterface( mBatteryInfo = IBatteryStats.Stub.asInterface(
ServiceManager.getService("batteryinfo")); ServiceManager.getService("batteryinfo"));
mAppListGroup = (PreferenceGroup) findPreference("app_list"); mAppListGroup = (PreferenceGroup) findPreference("app_list");
mPowerProfile = new PowerProfile(getActivity()); mPowerProfile = new PowerProfile(getActivity());
setHasOptionsMenu(true);
} }
@Override @Override
@@ -284,9 +288,10 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable {
.setIcon(com.android.internal.R.drawable.ic_menu_info_details) .setIcon(com.android.internal.R.drawable.ic_menu_info_details)
.setAlphabeticShortcut('t'); .setAlphabeticShortcut('t');
} }
menu.add(0, MENU_STATS_REFRESH, 0, R.string.menu_stats_refresh) MenuItem refresh = menu.add(0, MENU_STATS_REFRESH, 0, R.string.menu_stats_refresh)
.setIcon(com.android.internal.R.drawable.ic_menu_refresh) .setIcon(com.android.internal.R.drawable.ic_menu_refresh)
.setAlphabeticShortcut('r'); .setAlphabeticShortcut('r');
refresh.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
} }
@Override @Override