diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-09-19 11:33:42 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2012-09-19 22:04:44 -0700 |
| commit | 89d5546d7fd3a3bb19820c42e8b4527013dd6545 (patch) | |
| tree | d3c39ef51f626165545504772f0fb8ba8f01f076 /core/java/android/provider/Settings.java | |
| parent | 4e7b551fbffa6112821ed6cfeedd6128463fccd0 (diff) | |
| download | frameworks_base-89d5546d7fd3a3bb19820c42e8b4527013dd6545.zip frameworks_base-89d5546d7fd3a3bb19820c42e8b4527013dd6545.tar.gz frameworks_base-89d5546d7fd3a3bb19820c42e8b4527013dd6545.tar.bz2 | |
Add support for remembering Wifi display devices.
Add a setting to globally disable Wifi display.
Fixed a bug where the wifi display broadcast receiver
was running on the wrong thread.
Removed the wifi-display QuickSettings dialog, all functionality
has been moved to Settings.
Bug: 7178216
Bug: 7192799
Change-Id: I9796baac8245d664cf28fa147b9ed978d81d8ab9
Diffstat (limited to 'core/java/android/provider/Settings.java')
| -rw-r--r-- | core/java/android/provider/Settings.java | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 2cda5a8..bb118b2 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -214,6 +214,21 @@ public final class Settings { "android.settings.BLUETOOTH_SETTINGS"; /** + * Activity Action: Show settings to allow configuration of Wifi Displays. + * <p> + * In some cases, a matching Activity may not exist, so ensure you + * safeguard against this. + * <p> + * Input: Nothing. + * <p> + * Output: Nothing. + * @hide + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_WIFI_DISPLAY_SETTINGS = + "android.settings.WIFI_DISPLAY_SETTINGS"; + + /** * Activity Action: Show settings to allow configuration of date and time. * <p> * In some cases, a matching Activity may not exist, so ensure you @@ -5540,6 +5555,13 @@ public final class Settings { "web_autofill_query_url"; /** + * Whether Wifi display is enabled/disabled + * 0=disabled. 1=enabled. + * @hide + */ + public static final String WIFI_DISPLAY_ON = "wifi_display_on"; + + /** * Whether to notify the user of open networks. * <p> * If not connected and the scan results have an open network, we will |