Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expose userActivityTimeout through @SystemApi getter/setter.

Browse Source 
This reverts commit 0dad572090.
System api documentation is not updated under PDK builds.

Change-Id: I851bcd66e0b764265e69ac104d5604bf316d5d10
This commit is contained in:
Bryce Lee
2015-02-06 12:06:34 -08:00
parent 13c7044186
commit 53b9fbd161
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -36913,8 +36913,10 @@ package android.view {
method public java.lang.String debug(java.lang.String); method public java.lang.String debug(java.lang.String);
method public int describeContents(); method public int describeContents();
method public final java.lang.CharSequence getTitle(); method public final java.lang.CharSequence getTitle();
method public final long getUserActivityTimeout();
method public static boolean mayUseInputMethod(int); method public static boolean mayUseInputMethod(int);
method public final void setTitle(java.lang.CharSequence); method public final void setTitle(java.lang.CharSequence);
method public final void setUserActivityTimeout(long);
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
field public static final int ALPHA_CHANGED = 128; // 0x80 field public static final int ALPHA_CHANGED = 128; // 0x80
field public static final int ANIMATION_CHANGED = 16; // 0x10 field public static final int ANIMATION_CHANGED = 16; // 0x10

13
core/java/android/view/WindowManager.java
View File

@@ -16,6 +16,7 @@
package android.view; package android.view;
import android.annotation.SystemApi;
import android.app.Presentation; import android.app.Presentation;
import android.content.Context; import android.content.Context;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
@@ -1591,6 +1592,18 @@ public interface WindowManager extends ViewManager {
return mTitle; return mTitle;
} }
/** @hide */
@SystemApi
public final void setUserActivityTimeout(long timeout) {
userActivityTimeout = timeout;
}
/** @hide */
@SystemApi
public final long getUserActivityTimeout() {
return userActivityTimeout;
}
public int describeContents() { public int describeContents() {
return 0; return 0;
} }