summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Quddus Chong <quddusc@google.com> 2012-11-14 13:16:29 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-11-14 13:16:29 -0800
commit05b5ffb394e1122a6357f5bf4b358b8064321f5e (patch)
tree056dd5ebb068cdaf01d8898707a5e5bb04ea31ff
parent167ecf88939a9c4984be16c7967c6cfd4aa37ed3 (diff)
parent8578c51771a0cae379ad941ab1e9e4f1b8237da2 (diff)
am 8578c517: am 1716ecf4: am f4ad0192: am 73b1f68e: Merge "docs: Updated uiautomator API docs to reflect correct API level. bug: 7538348" into jb-mr1-dev
* commit '8578c51771a0cae379ad941ab1e9e4f1b8237da2': docs: Updated uiautomator API docs to reflect correct API level. bug: 7538348
-rw-r--r--docs/html/tools/help/uiautomator/UiDevice.jd25
-rw-r--r--docs/html/tools/help/uiautomator/UiObject.jd5
2 files changed, 24 insertions, 6 deletions
diff --git a/docs/html/tools/help/uiautomator/UiDevice.jd b/docs/html/tools/help/uiautomator/UiDevice.jd
index 0c0c7d9dfc81..1c8805b0b5ba 100644
--- a/docs/html/tools/help/uiautomator/UiDevice.jd
+++ b/docs/html/tools/help/uiautomator/UiDevice.jd
@@ -1606,7 +1606,10 @@ From class
<h5 class="jd-tagtitle">Returns</h5>
<ul class="nolist"><li>product name of the device</li></ul>
</div>
-
+ <div class="jd-tagdata">
+ <h5 class="jd-tagtitle">Since</h5>
+ <ul class="nolist"><li>Android API Level 17</li></ul>
+</div>
</div>
</div>
@@ -1715,7 +1718,10 @@ From class
<h5 class="jd-tagtitle">Returns</h5>
<ul class="nolist"><li>true if it is in natural orientation</li></ul>
</div>
-
+ <div class="jd-tagdata">
+ <h5 class="jd-tagtitle">Since</h5>
+ <ul class="nolist"><li>Android API Level 17</li></ul>
+</div>
</div>
</div>
@@ -2493,7 +2499,10 @@ From class
</tr>
</table>
</div>
-
+ <div class="jd-tagdata">
+ <h5 class="jd-tagtitle">Since</h5>
+ <ul class="nolist"><li>Android API Level 17</li></ul>
+</div>
</div>
</div>
@@ -2541,7 +2550,10 @@ From class
</tr>
</table>
</div>
-
+ <div class="jd-tagdata">
+ <h5 class="jd-tagtitle">Since</h5>
+ <ul class="nolist"><li>Android API Level 17</li></ul>
+</div>
</div>
</div>
@@ -2589,7 +2601,10 @@ From class
</tr>
</table>
</div>
-
+ <div class="jd-tagdata">
+ <h5 class="jd-tagtitle">Since</h5>
+ <ul class="nolist"><li>Android API Level 17</li></ul>
+</div>
</div>
</div>
diff --git a/docs/html/tools/help/uiautomator/UiObject.jd b/docs/html/tools/help/uiautomator/UiObject.jd
index 799ac8232bfb..a22df50bcbe8 100644
--- a/docs/html/tools/help/uiautomator/UiObject.jd
+++ b/docs/html/tools/help/uiautomator/UiObject.jd
@@ -1376,7 +1376,6 @@ From class
</tr>
</table>
</div>
-
</div>
</div>
@@ -1753,6 +1752,10 @@ From class
</tr>
</table>
</div>
+ <div class="jd-tagdata">
+ <h5 class="jd-tagtitle">Since</h5>
+ <ul class="nolist"><li>Android API Level 17</li></ul>
+</div>
</div>
</div>