Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev (5c31e487) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7681,6 +7681,7 @@ package android.content.res {
	field public static final int UI_MODE_TYPE_NORMAL = 1; // 0x1		field public static final int UI_MODE_TYPE_NORMAL = 1; // 0x1
	field public static final int UI_MODE_TYPE_TELEVISION = 4; // 0x4		field public static final int UI_MODE_TYPE_TELEVISION = 4; // 0x4
	field public static final int UI_MODE_TYPE_UNDEFINED = 0; // 0x0		field public static final int UI_MODE_TYPE_UNDEFINED = 0; // 0x0
			field public static final int UI_MODE_TYPE_WATCH = 6; // 0x6
	field public int densityDpi;		field public int densityDpi;
	field public float fontScale;		field public float fontScale;
	field public int hardKeyboardHidden;		field public int hardKeyboardHidden;

core/java/android/app/UiModeManager.java

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -166,9 +166,11 @@ public class UiModeManager {
	/**		/**
	* Return the current running mode type. May be one of		* Return the current running mode type. May be one of
	* {@link Configuration#UI_MODE_TYPE_NORMAL Configuration.UI_MODE_TYPE_NORMAL},		* {@link Configuration#UI_MODE_TYPE_NORMAL Configuration.UI_MODE_TYPE_NORMAL},
	* {@link Configuration#UI_MODE_TYPE_DESK Configuration.UI_MODE_TYPE_DESK}, or		* {@link Configuration#UI_MODE_TYPE_DESK Configuration.UI_MODE_TYPE_DESK},
	* {@link Configuration#UI_MODE_TYPE_CAR Configuration.UI_MODE_TYPE_CAR}, or		* {@link Configuration#UI_MODE_TYPE_CAR Configuration.UI_MODE_TYPE_CAR},
	* {@link Configuration#UI_MODE_TYPE_TELEVISION Configuration.UI_MODE_TYPE_APPLIANCE}.		* {@link Configuration#UI_MODE_TYPE_TELEVISION Configuration.UI_MODE_TYPE_TELEVISION},
			* {@link Configuration#UI_MODE_TYPE_APPLIANCE Configuration.UI_MODE_TYPE_APPLIANCE}, or
			* {@link Configuration#UI_MODE_TYPE_WATCH Configuration.UI_MODE_TYPE_WATCH}.
	*/		*/
	public int getCurrentModeType() {		public int getCurrentModeType() {
	if (mService != null) {		if (mService != null) {

core/java/android/content/res/Configuration.java

+8 −2

core/res/res/values/config.xml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -471,6 +471,7 @@
	1 UI_MODE_TYPE_NORMAL		1 UI_MODE_TYPE_NORMAL
	4 UI_MODE_TYPE_TELEVISION		4 UI_MODE_TYPE_TELEVISION
	5 UI_MODE_TYPE_APPLIANCE		5 UI_MODE_TYPE_APPLIANCE
			6 UI_MODE_TYPE_WATCH
	Any other values will have surprising consequences. -->		Any other values will have surprising consequences. -->
	<integer name="config_defaultUiModeType">1</integer>		<integer name="config_defaultUiModeType">1</integer>

docs/html/guide/topics/resources/providing-resources.jd

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -562,6 +562,7 @@ which indicates the current device orientation.</p>
	<code>desk</code><br/>		<code>desk</code><br/>
	<code>television<br/>		<code>television<br/>
	<code>appliance</code>		<code>appliance</code>
			<code>watch</code>
	</td>		</td>
	<td>		<td>
	<ul class="nolist">		<ul class="nolist">
	@@ -573,8 +574,9 @@ which indicates the current device orientation.</p>
	non-pointer interaction</li>		non-pointer interaction</li>
	<li>{@code appliance}: Device is serving as an appliance, with		<li>{@code appliance}: Device is serving as an appliance, with
	no display</li>		no display</li>
			<li>{@code watch}: Device has a display and is worn on the wrist</li>
	</ul>		</ul>
	<p><em>Added in API level 8, television added in API 13.</em></p>		<p><em>Added in API level 8, television added in API 13, watch added in API 20.</em></p>
	<p>For information about how your app can respond when the device is inserted into or		<p>For information about how your app can respond when the device is inserted into or
	removed from a dock, read <a		removed from a dock, read <a
	href="{@docRoot}training/monitoring-device-state/docking-monitoring.html">Determining		href="{@docRoot}training/monitoring-device-state/docking-monitoring.html">Determining

Original line number	Original line	Diff line number	Diff line
	@@ -440,6 +440,11 @@ public final class Configuration implements Parcelable, Comparable<Configuration
	* <a href="{@docRoot}guide/topics/resources/providing-resources.html#UiModeQualifier">appliance</a>		* <a href="{@docRoot}guide/topics/resources/providing-resources.html#UiModeQualifier">appliance</a>
	* resource qualifier. */		* resource qualifier. */
	public static final int UI_MODE_TYPE_APPLIANCE = 0x05;		public static final int UI_MODE_TYPE_APPLIANCE = 0x05;
			/** Constant for {@link #uiMode}: a {@link #UI_MODE_TYPE_MASK}
			* value that corresponds to the
			* <a href="{@docRoot}guide/topics/resources/providing-resources.html#UiModeQualifier">watch</a>
			* resource qualifier. */
			public static final int UI_MODE_TYPE_WATCH = 0x06;

	/** Constant for {@link #uiMode}: bits that encode the night mode. */		/** Constant for {@link #uiMode}: bits that encode the night mode. */
	public static final int UI_MODE_NIGHT_MASK = 0x30;		public static final int UI_MODE_NIGHT_MASK = 0x30;
	@@ -462,8 +467,8 @@ public final class Configuration implements Parcelable, Comparable<Configuration
	* <p>The {@link #UI_MODE_TYPE_MASK} bits define the overall ui mode of the		* <p>The {@link #UI_MODE_TYPE_MASK} bits define the overall ui mode of the
	* device. They may be one of {@link #UI_MODE_TYPE_UNDEFINED},		* device. They may be one of {@link #UI_MODE_TYPE_UNDEFINED},
	* {@link #UI_MODE_TYPE_NORMAL}, {@link #UI_MODE_TYPE_DESK},		* {@link #UI_MODE_TYPE_NORMAL}, {@link #UI_MODE_TYPE_DESK},
	* {@link #UI_MODE_TYPE_CAR}, {@link #UI_MODE_TYPE_TELEVISION}, or		* {@link #UI_MODE_TYPE_CAR}, {@link #UI_MODE_TYPE_TELEVISION},
	* {@link #UI_MODE_TYPE_APPLIANCE}.		* {@link #UI_MODE_TYPE_APPLIANCE}, or {@link #UI_MODE_TYPE_WATCH}.
	*		*
	* <p>The {@link #UI_MODE_NIGHT_MASK} defines whether the screen		* <p>The {@link #UI_MODE_NIGHT_MASK} defines whether the screen
	* is in a special mode. They may be one of {@link #UI_MODE_NIGHT_UNDEFINED},		* is in a special mode. They may be one of {@link #UI_MODE_NIGHT_UNDEFINED},
	@@ -700,6 +705,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration
	case UI_MODE_TYPE_CAR: sb.append(" car"); break;		case UI_MODE_TYPE_CAR: sb.append(" car"); break;
	case UI_MODE_TYPE_TELEVISION: sb.append(" television"); break;		case UI_MODE_TYPE_TELEVISION: sb.append(" television"); break;
	case UI_MODE_TYPE_APPLIANCE: sb.append(" appliance"); break;		case UI_MODE_TYPE_APPLIANCE: sb.append(" appliance"); break;
			case UI_MODE_TYPE_WATCH: sb.append(" watch"); break;
	default: sb.append(" uimode="); sb.append(uiMode&UI_MODE_TYPE_MASK); break;		default: sb.append(" uimode="); sb.append(uiMode&UI_MODE_TYPE_MASK); break;
	}		}
	switch ((uiMode&UI_MODE_NIGHT_MASK)) {		switch ((uiMode&UI_MODE_NIGHT_MASK)) {