summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJae Seo <jaeseo@google.com>2014-08-19 23:36:02 -0700
committerJae Seo <jaeseo@google.com>2014-08-20 20:59:51 -0700
commit14355950d5ce42b8043cfb96d192f1c76b93d496 (patch)
treed6af4246a9def7651ada317944457f44598dbaca /api
parent635bc8bc84fe5da6d667c280bea6d96c46ffa3fd (diff)
downloadframeworks_base-14355950d5ce42b8043cfb96d192f1c76b93d496.zip
frameworks_base-14355950d5ce42b8043cfb96d192f1c76b93d496.tar.gz
frameworks_base-14355950d5ce42b8043cfb96d192f1c76b93d496.tar.bz2
API Review: android.media.tv
TvContentRating: - The XML file: attributes should have android: prefix and should allow string resource references for labels. Bug: 17114406 Change-Id: Ife2f4dc6c2c8a5a1714cdeedb27aab40fce73e2b
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 5b8ba4d..6f07cd4 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -309,6 +309,7 @@ package android {
field public static final int addStatesFromChildren = 16842992; // 0x10100f0
field public static final int adjustViewBounds = 16843038; // 0x101011e
field public static final int advancedPrintOptionsActivity = 16843761; // 0x10103f1
+ field public static final int ageHint = 16843962; // 0x10104ba
field public static final int alertDialogIcon = 16843605; // 0x1010355
field public static final int alertDialogStyle = 16842845; // 0x101005d
field public static final int alertDialogTheme = 16843529; // 0x1010309
@@ -467,6 +468,7 @@ package android {
field public static final int controlX2 = 16843800; // 0x1010418
field public static final int controlY1 = 16843799; // 0x1010417
field public static final int controlY2 = 16843801; // 0x1010419
+ field public static final int country = 16843963; // 0x10104bb
field public static final int cropToPadding = 16843043; // 0x1010123
field public static final int cursorVisible = 16843090; // 0x1010152
field public static final int customNavigationLayout = 16843474; // 0x10102d2