diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-23 15:18:20 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-23 15:18:20 -0700 |
| commit | 40277df7c33c0fc381eec589c768fe86de4b4404 (patch) | |
| tree | 23d1d89d58e7b6edd43f837ed27fb01108f4fb08 | |
| parent | 358d2cd96403383cfb91bb68598a4cb2fe2e170e (diff) | |
| parent | e360bb6bd8ea84b8d37604fc11dfc744b18fb0de (diff) | |
| download | frameworks_base-40277df7c33c0fc381eec589c768fe86de4b4404.zip frameworks_base-40277df7c33c0fc381eec589c768fe86de4b4404.tar.gz frameworks_base-40277df7c33c0fc381eec589c768fe86de4b4404.tar.bz2 | |
Merge "Add "television" mode." into honeycomb-mr2
| -rw-r--r-- | api/current.xml | 11 | ||||
| -rw-r--r-- | core/java/android/app/UiModeManager.java | 3 | ||||
| -rw-r--r-- | core/java/android/content/res/Configuration.java | 2 | ||||
| -rw-r--r-- | include/utils/ResourceTypes.h | 1 | ||||
| -rw-r--r-- | native/include/android/configuration.h | 1 | ||||
| -rw-r--r-- | tools/aapt/AaptAssets.cpp | 5 |
6 files changed, 22 insertions, 1 deletions
diff --git a/api/current.xml b/api/current.xml index a7555da..37ce1d5 100644 --- a/api/current.xml +++ b/api/current.xml @@ -64149,6 +64149,17 @@ visibility="public" > </field> +<field name="UI_MODE_TYPE_TELEVISION" + type="int" + transient="false" + volatile="false" + value="4" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="UI_MODE_TYPE_UNDEFINED" type="int" transient="false" diff --git a/core/java/android/app/UiModeManager.java b/core/java/android/app/UiModeManager.java index 95451d6..71f6445 100644 --- a/core/java/android/app/UiModeManager.java +++ b/core/java/android/app/UiModeManager.java @@ -167,7 +167,8 @@ public class UiModeManager { * 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_DESK Configuration.UI_MODE_TYPE_DESK}, or - * {@link Configuration#UI_MODE_TYPE_CAR Configuration.UI_MODE_TYPE_CAR}, + * {@link Configuration#UI_MODE_TYPE_CAR Configuration.UI_MODE_TYPE_CAR}, or + * {@link Configuration#UI_MODE_TYPE_TELEVISION Configuration.UI_MODE_TYPE_TV}. */ public int getCurrentModeType() { if (mService != null) { diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 12ec258..51a7115 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -226,6 +226,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration public static final int UI_MODE_TYPE_NORMAL = 0x01; public static final int UI_MODE_TYPE_DESK = 0x02; public static final int UI_MODE_TYPE_CAR = 0x03; + public static final int UI_MODE_TYPE_TELEVISION = 0x04; public static final int UI_MODE_NIGHT_MASK = 0x30; public static final int UI_MODE_NIGHT_UNDEFINED = 0x00; @@ -367,6 +368,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration case UI_MODE_TYPE_NORMAL: /* normal is not interesting to print */ break; case UI_MODE_TYPE_DESK: sb.append(" desk"); break; case UI_MODE_TYPE_CAR: sb.append(" car"); break; + case UI_MODE_TYPE_TELEVISION: sb.append(" television"); break; default: sb.append(" uimode="); sb.append(uiMode&UI_MODE_TYPE_MASK); break; } switch ((uiMode&UI_MODE_NIGHT_MASK)) { diff --git a/include/utils/ResourceTypes.h b/include/utils/ResourceTypes.h index 1604c13..c02d8ac 100644 --- a/include/utils/ResourceTypes.h +++ b/include/utils/ResourceTypes.h @@ -953,6 +953,7 @@ struct ResTable_config UI_MODE_TYPE_NORMAL = ACONFIGURATION_UI_MODE_TYPE_NORMAL, UI_MODE_TYPE_DESK = ACONFIGURATION_UI_MODE_TYPE_DESK, UI_MODE_TYPE_CAR = ACONFIGURATION_UI_MODE_TYPE_CAR, + UI_MODE_TYPE_TELEVISION = ACONFIGURATION_UI_MODE_TYPE_TELEVISION, // uiMode bits for the night switch. MASK_UI_MODE_NIGHT = 0x30, diff --git a/native/include/android/configuration.h b/native/include/android/configuration.h index 91533c8..39fef21 100644 --- a/native/include/android/configuration.h +++ b/native/include/android/configuration.h @@ -77,6 +77,7 @@ enum { ACONFIGURATION_UI_MODE_TYPE_NORMAL = 0x01, ACONFIGURATION_UI_MODE_TYPE_DESK = 0x02, ACONFIGURATION_UI_MODE_TYPE_CAR = 0x03, + ACONFIGURATION_UI_MODE_TYPE_TELEVISION = 0x04, ACONFIGURATION_UI_MODE_NIGHT_ANY = 0x00, ACONFIGURATION_UI_MODE_NIGHT_NO = 0x1, diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index 75535f8..4894196 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/AaptAssets.cpp @@ -913,6 +913,11 @@ bool AaptGroupEntry::getUiModeTypeName(const char* name, (out->uiMode&~ResTable_config::MASK_UI_MODE_TYPE) | ResTable_config::UI_MODE_TYPE_CAR; return true; + } else if (strcmp(name, "television") == 0) { + if (out) out->uiMode = + (out->uiMode&~ResTable_config::MASK_UI_MODE_TYPE) + | ResTable_config::UI_MODE_TYPE_TELEVISION; + return true; } return false; |