merge in lmp-mr1-release history after reset to lmp-mr1-dev
diff --git a/current/android.jar b/current/android.jar
index aef757a..0d285aa 100644
--- a/current/android.jar
+++ b/current/android.jar
Binary files differ
diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar
index 138cb2f..5cab28b 100644
--- a/current/support/annotations/android-support-annotations.jar
+++ b/current/support/annotations/android-support-annotations.jar
Binary files differ
diff --git a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
index 9d6fac6..8f7f60a 100644
--- a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
+++ b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
Binary files differ
diff --git a/current/support/multidex/library/libs/android-support-multidex.jar b/current/support/multidex/library/libs/android-support-multidex.jar
index d80007a..3679bc1 100644
--- a/current/support/multidex/library/libs/android-support-multidex.jar
+++ b/current/support/multidex/library/libs/android-support-multidex.jar
Binary files differ
diff --git a/current/support/v13/android-support-v13.jar b/current/support/v13/android-support-v13.jar
index 757bc2c..59dfdfa 100644
--- a/current/support/v13/android-support-v13.jar
+++ b/current/support/v13/android-support-v13.jar
Binary files differ
diff --git a/current/support/v17/leanback/libs/android-support-v17-leanback.jar b/current/support/v17/leanback/libs/android-support-v17-leanback.jar
index 4387c99..36b348f 100644
--- a/current/support/v17/leanback/libs/android-support-v17-leanback.jar
+++ b/current/support/v17/leanback/libs/android-support-v17-leanback.jar
Binary files differ
diff --git a/current/support/v17/leanback/res/layout/lb_playback_controls_row.xml b/current/support/v17/leanback/res/layout/lb_playback_controls_row.xml
index d023502..395dfd1 100644
--- a/current/support/v17/leanback/res/layout/lb_playback_controls_row.xml
+++ b/current/support/v17/leanback/res/layout/lb_playback_controls_row.xml
@@ -16,7 +16,7 @@
-->
<!-- Note: clipChildren/clipToPadding false are needed to apply shadows to child
- views with no padding of their own. -->
+ views with no padding of their own. Also to allow for negative marge on description. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
@@ -56,7 +56,9 @@
android:layout_height="0dp"
android:layout_marginEnd="@dimen/lb_playback_description_margin_end"
android:layout_marginStart="@dimen/lb_playback_description_margin_start"
- android:layout_marginTop="@dimen/lb_playback_description_margin_top"
+ android:paddingTop="@dimen/lb_playback_description_margin_top"
+ android:clipToPadding="false"
+ android:clipChildren="false"
android:layout_weight="1"
android:gravity="top" />
diff --git a/current/support/v17/leanback/res/values/attrs.xml b/current/support/v17/leanback/res/values/attrs.xml
index 3afae2f..7038fff 100644
--- a/current/support/v17/leanback/res/values/attrs.xml
+++ b/current/support/v17/leanback/res/values/attrs.xml
@@ -177,7 +177,7 @@
</attr>
<!-- Text size for resized text -->
<attr name="resizedTextSize" format="dimension" />
- <!-- Whether to maintain the same line spacing when text is resized, default is true -->
+ <!-- Whether to maintain the same line spacing when text is resized, default is false -->
<attr name="maintainLineSpacing" format="boolean" />
<!-- Adjustment to top padding for resized text -->
<attr name="resizedPaddingAdjustmentTop" format="dimension" />
diff --git a/current/support/v17/leanback/res/values/dimens.xml b/current/support/v17/leanback/res/values/dimens.xml
index 574fe32..3fef5ee 100644
--- a/current/support/v17/leanback/res/values/dimens.xml
+++ b/current/support/v17/leanback/res/values/dimens.xml
@@ -28,7 +28,7 @@
<dimen name="lb_browse_title_height">60dp</dimen>
<dimen name="lb_browse_title_icon_max_width">584dp</dimen>
- <dimen name="lb_browse_title_icon_height">52dp</dimen>
+ <dimen name="lb_browse_title_icon_height">60dp</dimen>
<dimen name="lb_browse_title_text_size">44sp</dimen>
<dimen name="lb_browse_title_text_width">584dp</dimen>
diff --git a/current/support/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar
index d122e6e..a7499b7 100644
--- a/current/support/v4/android-support-v4.jar
+++ b/current/support/v4/android-support-v4.jar
Binary files differ
diff --git a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
index 2b88222..9873b38 100644
--- a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
+++ b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
Binary files differ
diff --git a/current/support/v7/cardview/libs/android-support-v7-cardview.jar b/current/support/v7/cardview/libs/android-support-v7-cardview.jar
index 44d7cfb..8364a22 100644
--- a/current/support/v7/cardview/libs/android-support-v7-cardview.jar
+++ b/current/support/v7/cardview/libs/android-support-v7-cardview.jar
Binary files differ
diff --git a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
index d350d9d..304bf4a 100644
--- a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
+++ b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
Binary files differ
diff --git a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
index 3b828ba..79e15ff 100644
--- a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
+++ b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
Binary files differ
diff --git a/current/support/v7/palette/libs/android-support-v7-palette.jar b/current/support/v7/palette/libs/android-support-v7-palette.jar
index ceea5d9..4dc66e3 100644
--- a/current/support/v7/palette/libs/android-support-v7-palette.jar
+++ b/current/support/v7/palette/libs/android-support-v7-palette.jar
Binary files differ
diff --git a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
index ec96cf7..7dee117 100644
--- a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
+++ b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
Binary files differ
diff --git a/current/uiautomator.jar b/current/uiautomator.jar
index 3f0f5d3..9534407 100644
--- a/current/uiautomator.jar
+++ b/current/uiautomator.jar
Binary files differ
diff --git a/system_current/android.jar b/system_current/android.jar
index 4f419a9..0b5eed6 100644
--- a/system_current/android.jar
+++ b/system_current/android.jar
Binary files differ
diff --git a/tools/linux/aapt b/tools/linux/aapt
index 33b7e51..b0279ba 100755
--- a/tools/linux/aapt
+++ b/tools/linux/aapt
Binary files differ