diff --git a/api/current.txt b/api/current.txt index 93c154d706d13..a62b33c87e77a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -38191,6 +38191,11 @@ package android.provider { field public static final java.lang.String VALUE = "value"; } + public static final class Settings.Panel { + field public static final java.lang.String ACTION_INTERNET_CONNECTIVITY = "android.settings.panel.action.INTERNET_CONNECTIVITY"; + field public static final java.lang.String ACTION_VOLUME = "android.settings.panel.action.VOLUME"; + } + public static final class Settings.Secure extends android.provider.Settings.NameValueTable { ctor public Settings.Secure(); method public static float getFloat(android.content.ContentResolver, java.lang.String, float); diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 93a59502ebea2..bd346308c2cf6 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -14195,6 +14195,44 @@ public final class Settings { } } + /** + *

+ * A Settings panel is floating UI that contains a fixed subset of settings to address a + * particular user problem. For example, the + * {@link #ACTION_INTERNET_CONNECTIVITY Internet Panel} surfaces settings related to + * connecting to the internet. + *

+ * Settings panels appear above the calling app to address the problem without + * the user needing to open Settings and thus leave their current screen. + */ + public static final class Panel { + private Panel() { + } + + /** + * Activity Action: Show a settings dialog containing settings to enable internet + * connection. + *

+ * Input: Nothing. + *

+ * Output: Nothing. + */ + @SdkConstant(SdkConstant.SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_INTERNET_CONNECTIVITY = + "android.settings.panel.action.INTERNET_CONNECTIVITY"; + + /** + * Activity Action: Show a settings dialog containing all volume streams. + *

+ * Input: Nothing. + *

+ * Output: Nothing. + */ + @SdkConstant(SdkConstant.SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_VOLUME = + "android.settings.panel.action.VOLUME"; + } + private static final String[] PM_WRITE_SETTINGS = { android.Manifest.permission.WRITE_SETTINGS };