diff options
| author | Jason Monk <jmonk@google.com> | 2015-05-27 16:02:08 -0400 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2015-05-28 09:50:45 -0400 |
| commit | 15dcebe1e79ad396a08873f940e2f33d432cf387 (patch) | |
| tree | df04a6a1c9073e88cefeb8ef31b07c6faffc6963 /src/com/android/settings/SettingsPreferenceFragment.java | |
| parent | ecf4339bc74f8d4fb504e8f32b1d4828e9975e37 (diff) | |
| download | packages_apps_Settings-15dcebe1e79ad396a08873f940e2f33d432cf387.zip packages_apps_Settings-15dcebe1e79ad396a08873f940e2f33d432cf387.tar.gz packages_apps_Settings-15dcebe1e79ad396a08873f940e2f33d432cf387.tar.bz2 | |
Help fallbacks and intent work
- Handle a backup URI, so that if the specified URI is not available,
another can be used.
- Add some data to help intents when they are intent URIs
- Fill in the context with a classname when it isn't present
Bug: 15475009
Change-Id: I7050fa61121901929e650b20bd7a0ae21e8ba207
Diffstat (limited to 'src/com/android/settings/SettingsPreferenceFragment.java')
| -rw-r--r-- | src/com/android/settings/SettingsPreferenceFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java index 095785b..baf04d4 100644 --- a/src/com/android/settings/SettingsPreferenceFragment.java +++ b/src/com/android/settings/SettingsPreferenceFragment.java @@ -294,7 +294,7 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { if (mHelpUri != null && getActivity() != null) { - HelpUtils.prepareHelpMenuItem(getActivity(), menu, mHelpUri); + HelpUtils.prepareHelpMenuItem(getActivity(), menu, mHelpUri, getClass().getName()); } } |