diff options
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/view/WindowManager.java | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index f74538f94779..d971ce7a4b1a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -37454,8 +37454,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 diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 740cb5d07b52..905d6d7fa207 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -16,6 +16,7 @@ package android.view; +import android.annotation.SystemApi; import android.app.Presentation; import android.content.Context; import android.content.pm.ActivityInfo; @@ -1593,7 +1594,19 @@ public interface WindowManager extends ViewManager { public final CharSequence getTitle() { return mTitle; } - + + /** @hide */ + @SystemApi + public final void setUserActivityTimeout(long timeout) { + userActivityTimeout = timeout; + } + + /** @hide */ + @SystemApi + public final long getUserActivityTimeout() { + return userActivityTimeout; + } + public int describeContents() { return 0; } |