diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-11-30 01:38:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-11-30 01:38:33 +0000 |
| commit | 4031bc78e46a151c06b617c0274b5cf397820270 (patch) | |
| tree | 6419ff0b2d3178f0ddf71870c4fae3294d1a339f /src/com/android/settings/connecteddevice | |
| parent | ef48f651346db1e84af3c32bd441a20a3169529c (diff) | |
| parent | e0b0e9f9025038d72f8129606cc1f432afcb54e0 (diff) | |
| download | packages_apps_Settings-4031bc78e46a151c06b617c0274b5cf397820270.tar.gz packages_apps_Settings-4031bc78e46a151c06b617c0274b5cf397820270.tar.bz2 packages_apps_Settings-4031bc78e46a151c06b617c0274b5cf397820270.zip | |
Merge changes from topic "settings_presubmit_instr_test"
* changes:
Refactor help menu stuff into a controller
Fix UniquePreferenceTest
Diffstat (limited to 'src/com/android/settings/connecteddevice')
| -rw-r--r-- | src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java | 2 | ||||
| -rw-r--r-- | src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentOld.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java index 8b0e568ed9..e4a6a64c3e 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java @@ -48,7 +48,7 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { } @Override - protected int getHelpResource() { + public int getHelpResource() { return R.string.help_url_connected_devices; } diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentOld.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentOld.java index 6a8f26d9e0..7097b3625f 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentOld.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentOld.java @@ -62,7 +62,7 @@ public class ConnectedDeviceDashboardFragmentOld extends DashboardFragment { } @Override - protected int getHelpResource() { + public int getHelpResource() { return R.string.help_url_connected_devices; } |