summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2013-09-04 00:44:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-04 00:44:11 +0000
commit40fbaa79bc31aadefc5dacb314f66b5bcb6d52ae (patch)
tree52a5d42ad1c277740e93b293e1b5b892f8f25ea7 /core/java/android
parent14abafa10853d979d184e2e934253aaded105137 (diff)
parent3f9832d3c7b30bf4dc8ed9e5123b02daca96c878 (diff)
downloadframeworks_base-40fbaa79bc31aadefc5dacb314f66b5bcb6d52ae.zip
frameworks_base-40fbaa79bc31aadefc5dacb314f66b5bcb6d52ae.tar.gz
frameworks_base-40fbaa79bc31aadefc5dacb314f66b5bcb6d52ae.tar.bz2
Merge "Fix pre tag formatting in getDragToOpenListener documentation" into klp-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/widget/ListPopupWindow.java6
-rw-r--r--core/java/android/widget/PopupMenu.java6
2 files changed, 8 insertions, 4 deletions
diff --git a/core/java/android/widget/ListPopupWindow.java b/core/java/android/widget/ListPopupWindow.java
index f2da765..b7e1fdd 100644
--- a/core/java/android/widget/ListPopupWindow.java
+++ b/core/java/android/widget/ListPopupWindow.java
@@ -974,10 +974,12 @@ public class ListPopupWindow {
* currently touched list item.
* <p>
* Example usage:
- * <pre>ListPopupWindow myPopup = new ListPopupWindow(context);
+ * <pre>
+ * ListPopupWindow myPopup = new ListPopupWindow(context);
* myPopup.setAnchor(myAnchor);
* OnTouchListener dragListener = myPopup.createDragToOpenListener(myAnchor);
- * myAnchor.setOnTouchListener(dragListener);</pre>
+ * myAnchor.setOnTouchListener(dragListener);
+ * </pre>
*
* @param src the view on which the resulting listener will be set
* @return a touch listener that controls drag-to-open behavior
diff --git a/core/java/android/widget/PopupMenu.java b/core/java/android/widget/PopupMenu.java
index e5344c6..603db70 100644
--- a/core/java/android/widget/PopupMenu.java
+++ b/core/java/android/widget/PopupMenu.java
@@ -82,8 +82,10 @@ public class PopupMenu implements MenuBuilder.Callback, MenuPresenter.Callback {
* currently touched list item.
* <p>
* Example usage:
- * <pre>PopupMenu myPopup = new PopupMenu(context, myAnchor);
- * myAnchor.setOnTouchListener(myPopup.getDragToOpenListener());</pre>
+ * <pre>
+ * PopupMenu myPopup = new PopupMenu(context, myAnchor);
+ * myAnchor.setOnTouchListener(myPopup.getDragToOpenListener());
+ * </pre>
*
* @return a touch listener that controls drag-to-open behavior
*/