Merge "Allow help to be defined to intent uri"

This commit is contained in:
Jason Monk
2015-04-14 19:54:18 +00:00
committed by Android (Google) Code Review
14 changed files with 139 additions and 22 deletions

View File

@@ -55,6 +55,7 @@ import android.widget.Spinner;
import com.android.internal.content.PackageHelper;
import com.android.internal.logging.MetricsLogger;
import com.android.settings.HelpUtils;
import com.android.settings.InstrumentedFragment;
import com.android.settings.R;
import com.android.settings.Settings.AllApplicationsActivity;
@@ -449,6 +450,8 @@ public class ManageApplications extends InstrumentedFragment
if (mListType != LIST_TYPE_MAIN) {
return;
}
HelpUtils.prepareHelpMenuItem(getActivity(), menu, mListType == LIST_TYPE_MAIN
? R.string.help_uri_apps : R.string.help_uri_notifications);
mOptionsMenu = menu;
inflater.inflate(R.menu.manage_apps, menu);
updateOptionsMenu();