Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99cf0e8e authored Mar 08, 2019 by TreeHugger Robot Committed by Android (Google) Code Review Mar 08, 2019

Merge "Add Wifi Settings Panel API"

parents 0ec0800d 20caff69

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -38954,6 +38954,7 @@ package android.provider {
		field public static final String ACTION_INTERNET_CONNECTIVITY = "android.settings.panel.action.INTERNET_CONNECTIVITY";
		field public static final String ACTION_NFC = "android.settings.panel.action.NFC";
		field public static final String ACTION_VOLUME = "android.settings.panel.action.VOLUME";
		field public static final String ACTION_WIFI = "android.settings.panel.action.WIFI";
		}

		public static final class Settings.Secure extends android.provider.Settings.NameValueTable {

core/java/android/provider/Settings.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -14964,6 +14964,17 @@ public final class Settings {
		public static final String ACTION_NFC =
		"android.settings.panel.action.NFC";

		/**
		* Activity Action: Show a settings dialog containing controls for Wifi.
		* <p>
		* Input: Nothing.
		* <p>
		* Output: Nothing.
		*/
		@SdkConstant(SdkConstant.SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_WIFI =
		"android.settings.panel.action.WIFI";

		/**
		* Activity Action: Show a settings dialog containing all volume streams.
		* <p>

core/proto/android/app/settings_enums.proto

+3 −0

Original line number	Diff line number	Diff line
		@@ -2299,4 +2299,7 @@ enum PageId {

		// Open: Settings will show the conditional when Grayscale mode is on
		SETTINGS_CONDITION_GRAYSCALE_MODE = 1683;

		// Panel for Wifi
		PANEL_WIFI = 1687;
		}

proto/src/metrics_constants/metrics_constants.proto

+3 −0

Original line number	Diff line number	Diff line
		@@ -7087,6 +7087,9 @@ message MetricsEvent {
		//ACTION: Log result for each card's eligibility check
		ACTION_CONTEXTUAL_CARD_ELIGIBILITY = 1686;

		// Panel for Wifi
		PANEL_WIFI = 1687;

		// ---- End Q Constants, all Q constants go above this line ----
		// Add new aosp constants above this line.
		// END OF AOSP CONSTANTS