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

Merge "Remove extra help & feedback menu from power usage" into mnc-dev

Browse Source
This commit is contained in:
Jason Monk
2015-08-10 20:09:20 +00:00
committed by Android (Google) Code Review
parent 8cf5426499 3006c377c2
commit cf1e22f447
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,7 +129,6 @@ public class PowerUsageSummary extends PowerUsageBase {
@Override @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
if (DEBUG) { if (DEBUG) {
menu.add(0, MENU_STATS_TYPE, 0, R.string.menu_stats_total) menu.add(0, MENU_STATS_TYPE, 0, R.string.menu_stats_total)
.setIcon(com.android.internal.R.drawable.ic_menu_info_details) .setIcon(com.android.internal.R.drawable.ic_menu_info_details)
@@ -140,12 +139,12 @@ public class PowerUsageSummary extends PowerUsageBase {
batterySaver.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); batterySaver.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
menu.add(0, MENU_HIGH_POWER_APPS, 0, R.string.high_power_apps); menu.add(0, MENU_HIGH_POWER_APPS, 0, R.string.high_power_apps);
super.onCreateOptionsMenu(menu, inflater);
}
String helpUrl; @Override
if (!TextUtils.isEmpty(helpUrl = getResources().getString(R.string.help_url_battery))) { protected int getHelpResource() {
final MenuItem help = menu.add(0, MENU_HELP, 0, R.string.help_label); return R.string.help_url_battery;
HelpUtils.prepareHelpMenuItem(getActivity(), help, helpUrl, getClass().getName());
}
} }
@Override @Override