diff options
| author | Abodunrinwa Toki <toki@google.com> | 2015-06-08 11:36:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-08 11:36:19 +0000 |
| commit | 7d3b8833df5857f5cc70d6c101abe7501fa22b49 (patch) | |
| tree | cc6bf4ae5c7a487b2946ed0093c01471b6053db0 /api | |
| parent | 6280481af6a7fb2631012a34b03b2d6b0d01eae5 (diff) | |
| parent | 9e211282d3ee54c9840947951593554c3bd5a77c (diff) | |
| download | frameworks_base-7d3b8833df5857f5cc70d6c101abe7501fa22b49.zip frameworks_base-7d3b8833df5857f5cc70d6c101abe7501fa22b49.tar.gz frameworks_base-7d3b8833df5857f5cc70d6c101abe7501fa22b49.tar.bz2 | |
Merge "Fix ActionMode.snooze API" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 6 | ||||
| -rw-r--r-- | api/system-current.txt | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index 8386ddf..75cd2a1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -34596,6 +34596,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(); @@ -34607,8 +34608,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 } @@ -36673,7 +36673,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 5364985..6d55448 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -36861,6 +36861,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(); @@ -36872,8 +36873,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 } @@ -38938,7 +38938,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(); |