summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorBryce Lee <brycelee@google.com>2015-02-06 12:06:34 -0800
committerBryce Lee <brycelee@google.com>2015-02-06 12:06:34 -0800
commit53b9fbd1610b6d3deb837dab34fd309d515f6385 (patch)
tree1bc0e11815601a7547b00be33763e8306b9fa717 /api
parent13c7044186b90f7f63e7a17996222edfb18460f5 (diff)
downloadframeworks_base-53b9fbd1610b6d3deb837dab34fd309d515f6385.zip
frameworks_base-53b9fbd1610b6d3deb837dab34fd309d515f6385.tar.gz
frameworks_base-53b9fbd1610b6d3deb837dab34fd309d515f6385.tar.bz2
Expose userActivityTimeout through @SystemApi getter/setter.
This reverts commit 0dad5720902fad041bc8e2221953aab6dd1d2d8f. System api documentation is not updated under PDK builds. Change-Id: I851bcd66e0b764265e69ac104d5604bf316d5d10
Diffstat (limited to 'api')
-rw-r--r--api/system-current.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 8fec910..c6d7364 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -36913,8 +36913,10 @@ package android.view {
method public java.lang.String debug(java.lang.String);
method public int describeContents();
method public final java.lang.CharSequence getTitle();
+ method public final long getUserActivityTimeout();
method public static boolean mayUseInputMethod(int);
method public final void setTitle(java.lang.CharSequence);
+ method public final void setUserActivityTimeout(long);
method public void writeToParcel(android.os.Parcel, int);
field public static final int ALPHA_CHANGED = 128; // 0x80
field public static final int ANIMATION_CHANGED = 16; // 0x10