diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-06-23 07:13:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-23 07:13:25 -0700 |
| commit | 41e6e0c49f51e5bafca4912d407202f572d4e208 (patch) | |
| tree | dc2bf7f938a2fa05c692da08b7c59ed3eca86eb5 /api | |
| parent | 4786626b0fe62181f35afcc49f0d0aa10dc715e2 (diff) | |
| parent | c34188a95405526416325604386af4f48ba20918 (diff) | |
| download | frameworks_base-41e6e0c49f51e5bafca4912d407202f572d4e208.zip frameworks_base-41e6e0c49f51e5bafca4912d407202f572d4e208.tar.gz frameworks_base-41e6e0c49f51e5bafca4912d407202f572d4e208.tar.bz2 | |
am c34188a9: resolved conflicts for merge of f8f76d52 to jb-dev-plus-aosp
* commit 'c34188a95405526416325604386af4f48ba20918':
Add the possibility to modify the View focus rect
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 cd4592b..5b22bef 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3697,6 +3697,8 @@ package android.app { ctor public MediaRouteButton(android.content.Context, android.util.AttributeSet); ctor public MediaRouteButton(android.content.Context, android.util.AttributeSet, int); method public int getRouteTypes(); + method public void onAttachedToWindow(); + method public void onDetachedFromWindow(); method public void setExtendedSettingsClickListener(android.view.View.OnClickListener); method public void setRouteTypes(int); method public void showDialog(); @@ -24122,6 +24124,7 @@ package android.view { method public long getDrawingTime(); method public boolean getFilterTouchesWhenObscured(); method public boolean getFitsSystemWindows(); + method public void getFocusRect(android.graphics.Rect); method public java.util.ArrayList<android.view.View> getFocusables(int); method public void getFocusedRect(android.graphics.Rect); method public boolean getGlobalVisibleRect(android.graphics.Rect, android.graphics.Point); |