am 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide"
* commit '3f0f02b94e5be6724659f860aef5e637ff61d3aa':
'When to daydream' dialog does not follow the JB dialog design guide
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 586373c..db8b4b7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4845,6 +4845,8 @@
<string name="help_url_security" translatable="false"></string>
<!-- Help URL, Tap & pay [DO NOT TRANSLATE] -->
<string name="help_url_nfc_payment" translatable="false"></string>
+ <!-- Help URL, Remote display [DO NOT TRANSLATE] -->
+ <string name="help_url_remote_display" translatable="false"></string>
<!-- User account title [CHAR LIMIT=30] -->
<string name="user_account_title">Account for content</string>
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index db7eb2b..663d278 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -326,7 +326,6 @@
ManageApplications.class.getName(),
ProcessStatsUi.class.getName(),
NotificationStation.class.getName(),
- AppOpsSummary.class.getName(),
LocationSettings.class.getName(),
SecuritySettings.class.getName(),
PrivacySettings.class.getName(),
@@ -1081,7 +1080,15 @@
public static class DeviceInfoSettingsActivity extends Settings { /* empty */ }
public static class ApplicationSettingsActivity extends Settings { /* empty */ }
public static class ManageApplicationsActivity extends Settings { /* empty */ }
- public static class AppOpsSummaryActivity extends Settings { /* empty */ }
+ public static class AppOpsSummaryActivity extends Settings {
+ @Override
+ public boolean isValidFragment(String className) {
+ if (AppOpsSummary.class.getName().equals(className)) {
+ return true;
+ }
+ return super.isValidFragment(className);
+ }
+ }
public static class StorageUseActivity extends Settings { /* empty */ }
public static class DevelopmentSettingsActivity extends Settings { /* empty */ }
public static class AccessibilitySettingsActivity extends Settings { /* empty */ }
diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java
index d04f6f2..d7f4708 100755
--- a/src/com/android/settings/wfd/WifiDisplaySettings.java
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -137,6 +137,11 @@
}
@Override
+ protected int getHelpResource() {
+ return R.string.help_url_remote_display;
+ }
+
+ @Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);