diff options
| author | Jason Monk <jmonk@google.com> | 2015-08-10 20:09:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-10 20:09:20 +0000 |
| commit | cf1e22f4471f39f4cf3c134006ecf9ffedb91e36 (patch) | |
| tree | a1ca46e2c9a012e611a8448f4692be11320da2d6 | |
| parent | 8cf54264995aea65d77c25b5050cb3aac0196c59 (diff) | |
| parent | 3006c377c2f62add27e6c40d5b27349501b31d6c (diff) | |
| download | packages_apps_Settings-cf1e22f4471f39f4cf3c134006ecf9ffedb91e36.zip packages_apps_Settings-cf1e22f4471f39f4cf3c134006ecf9ffedb91e36.tar.gz packages_apps_Settings-cf1e22f4471f39f4cf3c134006ecf9ffedb91e36.tar.bz2 | |
Merge "Remove extra help & feedback menu from power usage" into mnc-dev
| -rw-r--r-- | src/com/android/settings/fuelgauge/PowerUsageSummary.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index a1fcb52..9248075 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -129,7 +129,6 @@ public class PowerUsageSummary extends PowerUsageBase { @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - super.onCreateOptionsMenu(menu, inflater); if (DEBUG) { menu.add(0, MENU_STATS_TYPE, 0, R.string.menu_stats_total) .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); menu.add(0, MENU_HIGH_POWER_APPS, 0, R.string.high_power_apps); + super.onCreateOptionsMenu(menu, inflater); + } - String helpUrl; - if (!TextUtils.isEmpty(helpUrl = getResources().getString(R.string.help_url_battery))) { - final MenuItem help = menu.add(0, MENU_HELP, 0, R.string.help_label); - HelpUtils.prepareHelpMenuItem(getActivity(), help, helpUrl, getClass().getName()); - } + @Override + protected int getHelpResource() { + return R.string.help_url_battery; } @Override |