diff options
author | David Friedman <dmail@google.com> | 2015-08-20 01:15:08 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 01:15:08 +0000 |
commit | 6a21a5a142dad98c7bc678a9c9d0859d7558da4b (patch) | |
tree | 76ba4ecd452f61d56347ad53c1273f0cc24c428d /docs/html/reference/android/support/wearable/view/BoxInsetLayout.html | |
parent | 6540375add2eafe9734ea6a54ebaa2c0587608e8 (diff) | |
parent | 9f4ddca909e1f7d4274da3282a05494d6fb2f3f9 (diff) | |
download | frameworks_base-6a21a5a142dad98c7bc678a9c9d0859d7558da4b.zip frameworks_base-6a21a5a142dad98c7bc678a9c9d0859d7558da4b.tar.gz frameworks_base-6a21a5a142dad98c7bc678a9c9d0859d7558da4b.tar.bz2 |
am 9f4ddca9: am 56c22d29: Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs
* commit '9f4ddca909e1f7d4274da3282a05494d6fb2f3f9':
Docs: Creating interactive watch faces Bug: 21721463
Diffstat (limited to 'docs/html/reference/android/support/wearable/view/BoxInsetLayout.html')
-rw-r--r-- | docs/html/reference/android/support/wearable/view/BoxInsetLayout.html | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/html/reference/android/support/wearable/view/BoxInsetLayout.html b/docs/html/reference/android/support/wearable/view/BoxInsetLayout.html index 5619e75..d315135 100644 --- a/docs/html/reference/android/support/wearable/view/BoxInsetLayout.html +++ b/docs/html/reference/android/support/wearable/view/BoxInsetLayout.html @@ -128,7 +128,7 @@ type="text/css"> var metaTags = []; var devsite = false; </script> -<script src="../../../../../assets/js/docs.js?v=5" type="text/javascript"></script> +<script src="../../../../../assets/js/docs.js?v=6" type="text/javascript"></script> @@ -501,6 +501,7 @@ type="text/css"> <li class="api apilevel-"><a href="../../../../../reference/android/support/wearable/view/GridPagerAdapter.html">GridPagerAdapter</a></li> <li class="api apilevel-"><a href="../../../../../reference/android/support/wearable/view/GridViewPager.html">GridViewPager</a></li> <li class="api apilevel-"><a href="../../../../../reference/android/support/wearable/view/GridViewPager.LayoutParams.html">GridViewPager.LayoutParams</a></li> + <li class="api apilevel-"><a href="../../../../../reference/android/support/wearable/view/ProgressSpinner.html">ProgressSpinner</a></li> <li class="api apilevel-"><a href="../../../../../reference/android/support/wearable/view/SimpleAnimatorListener.html">SimpleAnimatorListener</a></li> <li class="api apilevel-"><a href="../../../../../reference/android/support/wearable/view/WatchViewStub.html">WatchViewStub</a></li> <li class="api apilevel-"><a href="../../../../../reference/android/support/wearable/view/WearableFrameLayout.html">WearableFrameLayout</a></li> @@ -725,7 +726,7 @@ Summary: <div id="naMessage"></div> -<div id="jd-content" class="api apilevel-"><p style="border:2px solid #99ccff;padding:12px;margin-top:20px"><strong>Note:</strong> The Wearable Support Library classes under the <code>android.support.wearable</code> package are subject to change. For the full Android API reference, see <a href="/reference/">Reference</a>.</p> +<div id="jd-content" class="api apilevel-"> <table class="jd-inheritance-table"> @@ -15573,6 +15574,7 @@ From interface <option value="es">Español</option> <option value="ja">日本語</option> <option value="ko">한국어</option> + <option value="pt-br">Português Brasileiro</option> <option value="ru">Русский</option> <option value="zh-cn">中文(简体)</option> <option value="zh-tw">中文(繁體)</option> |