summaryrefslogtreecommitdiffstats
path: root/docs/html/reference/android/support/wearable/view/BoxInsetLayout.LayoutParams.html
diff options
context:
space:
mode:
authorDavid Friedman <dmail@google.com>2015-08-20 00:57:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-20 00:57:50 +0000
commit9f4ddca909e1f7d4274da3282a05494d6fb2f3f9 (patch)
tree7b81707784019390991bc8c61a86b8023d97ce0f /docs/html/reference/android/support/wearable/view/BoxInsetLayout.LayoutParams.html
parent311f8eeee04937a08dd3576aaab74be19645c14e (diff)
parent56c22d29b8727e55073cede04b51e65eb6125b9f (diff)
downloadframeworks_base-9f4ddca909e1f7d4274da3282a05494d6fb2f3f9.zip
frameworks_base-9f4ddca909e1f7d4274da3282a05494d6fb2f3f9.tar.gz
frameworks_base-9f4ddca909e1f7d4274da3282a05494d6fb2f3f9.tar.bz2
am 56c22d29: Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs
* commit '56c22d29b8727e55073cede04b51e65eb6125b9f': Docs: Creating interactive watch faces Bug: 21721463
Diffstat (limited to 'docs/html/reference/android/support/wearable/view/BoxInsetLayout.LayoutParams.html')
-rw-r--r--docs/html/reference/android/support/wearable/view/BoxInsetLayout.LayoutParams.html6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/html/reference/android/support/wearable/view/BoxInsetLayout.LayoutParams.html b/docs/html/reference/android/support/wearable/view/BoxInsetLayout.LayoutParams.html
index 43097b4..d716836 100644
--- a/docs/html/reference/android/support/wearable/view/BoxInsetLayout.LayoutParams.html
+++ b/docs/html/reference/android/support/wearable/view/BoxInsetLayout.LayoutParams.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>
@@ -687,7 +688,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">
@@ -2431,6 +2432,7 @@ From class
<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>