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

Allow help to be defined to intent uri

Browse Source 
Allow help uris to be either an intent uri or as uri (as they were
before). Also add a default help uri, and specific helps for several
screens.

Bug: 15475009
Change-Id: Iff982892973f01d32ff61ea88d4844e9a7153500
This commit is contained in:
Jason Monk
2015-04-14 15:06:39 -04:00
parent 5f937152a5
commit 23acc2bb8a
14 changed files with 139 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/nfc/AndroidBeam.java
View File

@@ -17,17 +17,19 @@
package com.android.settings.nfc;
import android.app.ActionBar;
import android.app.Fragment;
import android.content.Context;
import android.nfc.NfcAdapter;
import android.os.Bundle;
import android.os.UserManager;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Switch;
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.SettingsActivity;
@@ -53,6 +55,13 @@ public class AndroidBeam extends InstrumentedFragment
mNfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
mBeamDisallowed = ((UserManager) getActivity().getSystemService(Context.USER_SERVICE))
.hasUserRestriction(UserManager.DISALLOW_OUTGOING_BEAM);
setHasOptionsMenu(true);
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
HelpUtils.prepareHelpMenuItem(getActivity(), menu, R.string.help_uri_beam);
}
@Override