diff options
| author | Alan Viverette <alanv@google.com> | 2015-05-06 17:24:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-06 17:24:31 +0000 |
| commit | 4d5c20c613a6716b14bd8ca3f178672c356a89e5 (patch) | |
| tree | acadebfa8bc3f5b682ee6ddf33eb60d1c8ddc95a /api | |
| parent | 26d955fd02e0bf3f76c50bceeba4b61598f1a8b2 (diff) | |
| parent | 80ebe0d4ecb36d0e82dce499ccc0810cf3a0ec89 (diff) | |
| download | frameworks_base-4d5c20c613a6716b14bd8ca3f178672c356a89e5.zip frameworks_base-4d5c20c613a6716b14bd8ca3f178672c356a89e5.tar.gz frameworks_base-4d5c20c613a6716b14bd8ca3f178672c356a89e5.tar.bz2 | |
Merge "ListPopupWindow should use window layout type SUB_PANEL" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index cf365ff..375bee7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -40658,6 +40658,7 @@ package android.widget { method public void setSoftInputMode(int); method public void setVerticalOffset(int); method public void setWidth(int); + method public void setWindowLayoutType(int); method public void show(); field public static final int INPUT_METHOD_FROM_FOCUSABLE = 0; // 0x0 field public static final int INPUT_METHOD_NEEDED = 1; // 0x1 diff --git a/api/system-current.txt b/api/system-current.txt index e08ffd4..63ba05f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -43180,6 +43180,7 @@ package android.widget { method public void setSoftInputMode(int); method public void setVerticalOffset(int); method public void setWidth(int); + method public void setWindowLayoutType(int); method public void show(); field public static final int INPUT_METHOD_FROM_FOCUSABLE = 0; // 0x0 field public static final int INPUT_METHOD_NEEDED = 1; // 0x1 |