summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAbodunrinwa Toki <toki@google.com>2015-06-05 02:46:57 +0100
committerAbodunrinwa Toki <toki@google.com>2015-06-05 03:35:15 +0100
commit9e211282d3ee54c9840947951593554c3bd5a77c (patch)
treeb66ce0e50997a498c8fb3ec5194500309b3abe53 /api
parent6b717c66a70663ea9d8b972289a8d4d74d90bc5a (diff)
downloadframeworks_base-9e211282d3ee54c9840947951593554c3bd5a77c.zip
frameworks_base-9e211282d3ee54c9840947951593554c3bd5a77c.tar.gz
frameworks_base-9e211282d3ee54c9840947951593554c3bd5a77c.tar.bz2
Fix ActionMode.snooze API
Bug: 21572677 Change-Id: If9fdb8ace3773b983418b0148082712644fd1fa5
Diffstat (limited to 'api')
-rw-r--r--api/current.txt6
-rw-r--r--api/system-current.txt6
2 files changed, 6 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt
index 51a1e79..e6b7bc4 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -34567,6 +34567,7 @@ package android.view {
method public abstract java.lang.CharSequence getTitle();
method public boolean getTitleOptionalHint();
method public int getType();
+ method public void hide(long);
method public abstract void invalidate();
method public void invalidateContentRect();
method public boolean isTitleOptional();
@@ -34578,8 +34579,7 @@ package android.view {
method public abstract void setTitle(int);
method public void setTitleOptionalHint(boolean);
method public void setType(int);
- method public void snooze(int);
- field public static final int SNOOZE_TIME_DEFAULT;
+ field public static final int DEFAULT_HIDE_DURATION = -1; // 0xffffffff
field public static final int TYPE_FLOATING = 1; // 0x1
field public static final int TYPE_PRIMARY = 0; // 0x0
}
@@ -36645,7 +36645,7 @@ package android.view {
public class ViewConfiguration {
ctor public deprecated ViewConfiguration();
method public static android.view.ViewConfiguration get(android.content.Context);
- method public static int getDefaultActionModeSnoozeTime();
+ method public static long getDefaultActionModeHideDuration();
method public static int getDoubleTapTimeout();
method public static deprecated int getEdgeSlop();
method public static deprecated int getFadingEdgeLength();
diff --git a/api/system-current.txt b/api/system-current.txt
index 7ce111c..84d6cd8 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -36832,6 +36832,7 @@ package android.view {
method public abstract java.lang.CharSequence getTitle();
method public boolean getTitleOptionalHint();
method public int getType();
+ method public void hide(long);
method public abstract void invalidate();
method public void invalidateContentRect();
method public boolean isTitleOptional();
@@ -36843,8 +36844,7 @@ package android.view {
method public abstract void setTitle(int);
method public void setTitleOptionalHint(boolean);
method public void setType(int);
- method public void snooze(int);
- field public static final int SNOOZE_TIME_DEFAULT;
+ field public static final int DEFAULT_HIDE_DURATION = -1; // 0xffffffff
field public static final int TYPE_FLOATING = 1; // 0x1
field public static final int TYPE_PRIMARY = 0; // 0x0
}
@@ -38910,7 +38910,7 @@ package android.view {
public class ViewConfiguration {
ctor public deprecated ViewConfiguration();
method public static android.view.ViewConfiguration get(android.content.Context);
- method public static int getDefaultActionModeSnoozeTime();
+ method public static long getDefaultActionModeHideDuration();
method public static int getDoubleTapTimeout();
method public static deprecated int getEdgeSlop();
method public static deprecated int getFadingEdgeLength();