summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-07-30 13:29:39 -0700
committerAlan Viverette <alanv@google.com>2014-07-30 13:37:35 -0700
commit0c0dde7171c7ea35bbc6d64a41f94b428cb4d1f6 (patch)
tree44f17649bc950877d054d5ed85dc2378562de39d /api
parentf660edb25a99282ce86b91804cd0145c1ef54bab (diff)
downloadframeworks_base-0c0dde7171c7ea35bbc6d64a41f94b428cb4d1f6.zip
frameworks_base-0c0dde7171c7ea35bbc6d64a41f94b428cb4d1f6.tar.gz
frameworks_base-0c0dde7171c7ea35bbc6d64a41f94b428cb4d1f6.tar.bz2
Update switch assets, fix SearchView asset 9-patch areas
BUG: 16606037 BUG: 16467249 Change-Id: I9a5888e37317d1f8a6481f9733f784bbd37268f3
Diffstat (limited to 'api')
-rw-r--r--api/current.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index a3a99c7..45581db 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -1123,6 +1123,7 @@ package android {
field public static final int showDividers = 16843561; // 0x1010329
field public static final int showOnLockScreen = 16843721; // 0x10103c9
field public static final int showSilent = 16843259; // 0x10101fb
+ field public static final int showText = 16843952; // 0x10104b0
field public static final int showWeekNumber = 16843582; // 0x101033e
field public static final int shownWeekCount = 16843585; // 0x1010341
field public static final int shrinkColumns = 16843082; // 0x101014a
@@ -39379,6 +39380,7 @@ package android.widget {
ctor public Switch(android.content.Context, android.util.AttributeSet);
ctor public Switch(android.content.Context, android.util.AttributeSet, int);
ctor public Switch(android.content.Context, android.util.AttributeSet, int, int);
+ method public boolean getShowText();
method public boolean getSplitTrack();
method public int getSwitchMinWidth();
method public int getSwitchPadding();
@@ -39388,6 +39390,7 @@ package android.widget {
method public int getThumbTextPadding();
method public android.graphics.drawable.Drawable getTrackDrawable();
method public void onMeasure(int, int);
+ method public void setShowText(boolean);
method public void setSplitTrack(boolean);
method public void setSwitchMinWidth(int);
method public void setSwitchPadding(int);