Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp

This commit is contained in:
Andreas Gampe
2014-11-19 00:20:49 +00:00
committed by Android Git Automerger

View File

@@ -378,10 +378,10 @@ public class PopupWindow {
}
/**
* Set the flag on popup to ignore cheek press event; by default this flag
* Set the flag on popup to ignore cheek press events; by default this flag
* is set to false
* which means the pop wont ignore cheek press dispatch events.
*
* which means the popup will not ignore cheek press dispatch events.
*
* <p>If the popup is showing, calling this method will take effect only
* the next time the popup is shown or through a manual call to one of
* the {@link #update()} methods.</p>