summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-05-12 17:56:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-12 17:56:57 +0000
commit1cb088c1281deec042bdf00e0f2d227f7e5cd718 (patch)
tree786e750c7c6384ccd981cca97a109f661281f645 /api
parent033655636e9b936244f2ee3ae28e1363506007d4 (diff)
parent661e63658da39cccfe49a129e4860455716ff3c9 (diff)
downloadframeworks_base-1cb088c1281deec042bdf00e0f2d227f7e5cd718.zip
frameworks_base-1cb088c1281deec042bdf00e0f2d227f7e5cd718.tar.gz
frameworks_base-1cb088c1281deec042bdf00e0f2d227f7e5cd718.tar.bz2
Merge "Support for hollow switch and seek bar thumbs"
Diffstat (limited to 'api')
-rw-r--r--api/current.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 9c142d44..40e3ad2 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -1047,6 +1047,7 @@ package android {
field public static final int spinnerStyle = 16842881; // 0x1010081
field public static final int spinnersShown = 16843595; // 0x101034b
field public static final int splitMotionEvents = 16843503; // 0x10102ef
+ field public static final int splitTrack = 16843858; // 0x1010452
field public static final int src = 16843033; // 0x1010119
field public static final int ssp = 16843747; // 0x10103e3
field public static final int sspPattern = 16843749; // 0x10103e5
@@ -34386,9 +34387,11 @@ package android.widget {
ctor public AbsSeekBar(android.content.Context, android.util.AttributeSet, int);
ctor public AbsSeekBar(android.content.Context, android.util.AttributeSet, int, int);
method public int getKeyProgressIncrement();
+ method public boolean getSplitTrack();
method public android.graphics.drawable.Drawable getThumb();
method public int getThumbOffset();
method public void setKeyProgressIncrement(int);
+ method public void setSplitTrack(boolean);
method public void setThumb(android.graphics.drawable.Drawable);
method public void setThumbOffset(int);
}
@@ -36193,6 +36196,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 getSplitTrack();
method public int getSwitchMinWidth();
method public int getSwitchPadding();
method public java.lang.CharSequence getTextOff();
@@ -36201,6 +36205,7 @@ package android.widget {
method public int getThumbTextPadding();
method public android.graphics.drawable.Drawable getTrackDrawable();
method public void onMeasure(int, int);
+ method public void setSplitTrack(boolean);
method public void setSwitchMinWidth(int);
method public void setSwitchPadding(int);
method public void setSwitchTextAppearance(android.content.Context, int);