diff options
| author | Romain Guy <romainguy@google.com> | 2012-03-08 15:06:50 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-08 15:06:50 -0800 |
| commit | 583fcb9175cd0c614f096db633d9e784ab7e1f54 (patch) | |
| tree | a75573a0bc37dd1df88b127068a4e3c7f47e95ed /api | |
| parent | a0b29f556519653c9749cebff4af43e68b4d59ce (diff) | |
| parent | bb9908b828a8cfd5965553be66faa6af89973697 (diff) | |
| download | frameworks_base-583fcb9175cd0c614f096db633d9e784ab7e1f54.zip frameworks_base-583fcb9175cd0c614f096db633d9e784ab7e1f54.tar.gz frameworks_base-583fcb9175cd0c614f096db633d9e784ab7e1f54.tar.bz2 | |
Merge "Dispatch screen state change events to Views Bug #6120957"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index f79df94..dbbac96 100644 --- a/api/current.txt +++ b/api/current.txt @@ -23374,6 +23374,7 @@ package android.view { method public void onResolvedTextDirectionReset(); method protected void onRestoreInstanceState(android.os.Parcelable); method protected android.os.Parcelable onSaveInstanceState(); + method public void onScreenStateChanged(int); method protected void onScrollChanged(int, int, int, int); method protected boolean onSetAlpha(int); method protected void onSizeChanged(int, int, int, int); @@ -23583,6 +23584,8 @@ package android.view { field public static final android.util.Property ROTATION_Y; field public static final android.util.Property SCALE_X; field public static final android.util.Property SCALE_Y; + field public static final int SCREEN_STATE_OFF = 2; // 0x2 + field public static final int SCREEN_STATE_ON = 1; // 0x1 field public static final int SCROLLBARS_INSIDE_INSET = 16777216; // 0x1000000 field public static final int SCROLLBARS_INSIDE_OVERLAY = 0; // 0x0 field public static final int SCROLLBARS_OUTSIDE_INSET = 50331648; // 0x3000000 |