Merge "Import Jack and Jill Brest 1.1-a8"
diff --git a/current/android.jar b/current/android.jar
index b0ee7fd..81c4369 100644
--- a/current/android.jar
+++ b/current/android.jar
Binary files differ
diff --git a/current/framework.aidl b/current/framework.aidl
index 499a74c..9d89828 100644
--- a/current/framework.aidl
+++ b/current/framework.aidl
@@ -103,6 +103,7 @@
parcelable android.view.textservice.SuggestionsInfo;
parcelable android.service.carrier.MessagePdu;
parcelable android.service.notification.StatusBarNotification;
+parcelable android.service.chooser.ChooserTarget;
parcelable android.speech.tts.Voice;
parcelable android.app.usage.UsageEvents;
parcelable android.app.Notification;
diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar
index bbab120..25dcd48 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/design/libs/android-support-design.jar b/current/support/design/libs/android-support-design.jar
index 21bdaa1..6e69c67 100644
--- a/current/support/design/libs/android-support-design.jar
+++ b/current/support/design/libs/android-support-design.jar
Binary files differ
diff --git a/current/support/design/res/values/attrs.xml b/current/support/design/res/values/attrs.xml
index 7a5582e..62fb2cd 100644
--- a/current/support/design/res/values/attrs.xml
+++ b/current/support/design/res/values/attrs.xml
@@ -141,5 +141,16 @@
<flag name="end" value="0x00800005" />
</attr>
</declare-styleable>
+
+ <declare-styleable name="TextInputLayout">
+ <attr name="hintTextAppearance" format="reference" />
+ <!-- The hint to display in the floating label -->
+ <attr name="android:hint" />
+ <!-- Whether the layout is laid out as if an error will be displayed -->
+ <attr name="errorEnabled" format="boolean" />
+ <!-- TextAppearance of any error message displayed -->
+ <attr name="errorTextAppearance" format="reference" />
+ </declare-styleable>
+
</resources>
diff --git a/current/support/design/res/values/colors.xml b/current/support/design/res/values/colors.xml
index fdd5127..c005c91 100644
--- a/current/support/design/res/values/colors.xml
+++ b/current/support/design/res/values/colors.xml
@@ -24,4 +24,6 @@
<!-- Shadow color for the furthest pixels of a shadow -->
<color name="shadow_end_color">@android:color/transparent</color>
+ <color name="error_color">#FFDD2C00</color>
+
</resources>
\ No newline at end of file
diff --git a/current/support/design/res/values/styles.xml b/current/support/design/res/values/styles.xml
index f00293b..e3ca35d 100644
--- a/current/support/design/res/values/styles.xml
+++ b/current/support/design/res/values/styles.xml
@@ -59,5 +59,18 @@
<item name="textAllCaps">true</item>
</style>
+ <style name="Widget.Design.TextInputLayout" parent="android:Widget">
+ <item name="hintTextAppearance">@style/TextAppearance.Design.Hint</item>
+ <item name="errorTextAppearance">@style/TextAppearance.Design.Error</item>
+ </style>
+
+ <style name="TextAppearance.Design.Hint" parent="TextAppearance.AppCompat.Caption">
+ <item name="android:textColor">?attr/colorControlActivated</item>
+ </style>
+
+ <style name="TextAppearance.Design.Error" parent="TextAppearance.AppCompat.Caption">
+ <item name="android:textColor">@color/error_color</item>
+ </style>
+
</resources>
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 49b9b05..c87c67f 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 ae1f975..a4143b7 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 9bd4baa..fb915b3 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 e17ac3c..9310717 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_details_fragment.xml b/current/support/v17/leanback/res/layout/lb_details_fragment.xml
index 92cf4b4..578e269 100644
--- a/current/support/v17/leanback/res/layout/lb_details_fragment.xml
+++ b/current/support/v17/leanback/res/layout/lb_details_fragment.xml
@@ -19,8 +19,21 @@
android:layout_width="match_parent"
android:layout_height="match_parent" >
- <FrameLayout
- android:id="@+id/fragment_dock"
- android:layout_width="wrap_content"
- android:layout_height="match_parent" />
+ <android.support.v17.leanback.widget.BrowseFrameLayout
+ android:id="@+id/details_frame"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ android:descendantFocusability="afterDescendants"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <FrameLayout
+ android:id="@+id/details_rows_dock"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent" />
+
+ <include layout="@layout/lb_browse_title" />
+
+ </android.support.v17.leanback.widget.BrowseFrameLayout>
+
</FrameLayout>
diff --git a/current/support/v17/leanback/res/layout/lb_shadow.xml b/current/support/v17/leanback/res/layout/lb_shadow.xml
index b0aa0b1..af4e4aa 100644
--- a/current/support/v17/leanback/res/layout/lb_shadow.xml
+++ b/current/support/v17/leanback/res/layout/lb_shadow.xml
@@ -15,13 +15,12 @@
limitations under the License.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
- <View
+ <android.support.v17.leanback.widget.NonOverlappingView
android:id="@+id/lb_shadow_normal"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/lb_card_shadow_normal" />
- <View
+ <android.support.v17.leanback.widget.NonOverlappingView
android:id="@+id/lb_shadow_focused"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/current/support/v17/leanback/res/layout/lb_title_view.xml b/current/support/v17/leanback/res/layout/lb_title_view.xml
index e82621e..e1c79ef 100644
--- a/current/support/v17/leanback/res/layout/lb_title_view.xml
+++ b/current/support/v17/leanback/res/layout/lb_title_view.xml
@@ -17,7 +17,7 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android" >
<ImageView
- android:id="@+id/browse_badge"
+ android:id="@+id/title_badge"
android:layout_width="wrap_content"
android:maxWidth="@dimen/lb_browse_title_icon_max_width"
android:adjustViewBounds="true"
@@ -28,14 +28,14 @@
style="?attr/browseTitleIconStyle"/>
<TextView
- android:id="@+id/browse_title"
+ android:id="@+id/title_text"
android:layout_width="@dimen/lb_browse_title_text_width"
android:layout_height="@dimen/lb_browse_title_height"
android:layout_gravity="center_vertical|end"
style="?attr/browseTitleTextStyle"/>
<android.support.v17.leanback.widget.SearchOrbView
- android:id="@+id/browse_orb"
+ android:id="@+id/title_orb"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:transitionGroup="true"
diff --git a/current/support/v17/leanback/res/layout/lb_vertical_grid_fragment.xml b/current/support/v17/leanback/res/layout/lb_vertical_grid_fragment.xml
index b287986..118b0a9 100644
--- a/current/support/v17/leanback/res/layout/lb_vertical_grid_fragment.xml
+++ b/current/support/v17/leanback/res/layout/lb_vertical_grid_fragment.xml
@@ -20,19 +20,19 @@
android:layout_height="match_parent" >
<android.support.v17.leanback.widget.BrowseFrameLayout
- android:id="@+id/browse_frame"
+ android:id="@+id/grid_frame"
android:focusable="true"
android:focusableInTouchMode="true"
android:descendantFocusability="afterDescendants"
android:layout_width="match_parent"
android:layout_height="match_parent" >
- <include layout="@layout/lb_browse_title" />
-
<FrameLayout
android:id="@+id/browse_grid_dock"
android:layout_width="match_parent"
android:layout_height="match_parent" />
+ <include layout="@layout/lb_browse_title" />
+
</android.support.v17.leanback.widget.BrowseFrameLayout>
</FrameLayout>
diff --git a/current/support/v17/leanback/res/transition-v21/lb_browse_return_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_browse_return_transition.xml
index ee88fff..84ae993 100644
--- a/current/support/v17/leanback/res/transition-v21/lb_browse_return_transition.xml
+++ b/current/support/v17/leanback/res/transition-v21/lb_browse_return_transition.xml
@@ -21,7 +21,7 @@
android:slideEdge="left">
<targets>
<target android:targetId="@id/browse_headers_root" />
- <target android:targetId="@id/browse_orb" />
+ <target android:targetId="@id/title_orb" />
</targets>
</slide>
<slide
@@ -30,7 +30,7 @@
android:slideEdge="right">
<targets>
<target android:excludeId="@+id/browse_headers_root" />
- <target android:excludeId="@+id/browse_orb" />
+ <target android:excludeId="@+id/title_orb" />
</targets>
</slide>
<fade
diff --git a/current/support/v17/leanback/res/transition-v21/lb_details_enter_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_details_enter_transition.xml
index 240d4bc..633acc2 100644
--- a/current/support/v17/leanback/res/transition-v21/lb_details_enter_transition.xml
+++ b/current/support/v17/leanback/res/transition-v21/lb_details_enter_transition.xml
@@ -20,5 +20,10 @@
android:duration="500"
android:interpolator="@android:interpolator/linear_out_slow_in"
android:slideEdge="bottom">
- </transition>
+ <targets>
+ <target android:excludeId="@id/title_badge" />
+ <target android:excludeId="@id/title_text" />
+ <target android:excludeId="@id/title_orb" />
+ </targets>
+ </transition>
</transitionSet>
\ No newline at end of file
diff --git a/current/support/v17/leanback/res/transition-v21/lb_details_return_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_details_return_transition.xml
index f555533..f31ebcb 100644
--- a/current/support/v17/leanback/res/transition-v21/lb_details_return_transition.xml
+++ b/current/support/v17/leanback/res/transition-v21/lb_details_return_transition.xml
@@ -19,6 +19,11 @@
android:interpolator="@android:interpolator/fast_out_linear_in"
android:duration="350"
android:slideEdge="bottom">
+ <targets>
+ <target android:excludeId="@id/title_badge" />
+ <target android:excludeId="@id/title_text" />
+ <target android:excludeId="@id/title_orb" />
+ </targets>
</transition>
<fade
android:interpolator="@android:interpolator/fast_out_linear_in"
diff --git a/current/support/v17/leanback/res/transition-v22/lb_browse_return_transition.xml b/current/support/v17/leanback/res/transition-v22/lb_browse_return_transition.xml
index 62a273e..e8dbee0 100644
--- a/current/support/v17/leanback/res/transition-v22/lb_browse_return_transition.xml
+++ b/current/support/v17/leanback/res/transition-v22/lb_browse_return_transition.xml
@@ -21,7 +21,7 @@
android:slideEdge="start">
<targets>
<target android:targetId="@id/browse_headers_root" />
- <target android:targetId="@id/browse_orb" />
+ <target android:targetId="@id/title_orb" />
</targets>
</slide>
<slide
@@ -30,7 +30,7 @@
android:slideEdge="end">
<targets>
<target android:excludeId="@+id/browse_headers_root" />
- <target android:excludeId="@+id/browse_orb" />
+ <target android:excludeId="@+id/title_orb" />
</targets>
</slide>
<fade
diff --git a/current/support/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar
index 43e5ea8..fbaff1d 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 04ddfee..afd7d35 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/appcompat/res/layout/abc_alert_dialog_material.xml b/current/support/v7/appcompat/res/layout/abc_alert_dialog_material.xml
index 7335572..86d59f7 100644
--- a/current/support/v7/appcompat/res/layout/abc_alert_dialog_material.xml
+++ b/current/support/v7/appcompat/res/layout/abc_alert_dialog_material.xml
@@ -127,7 +127,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
- <View
+ <android.support.v4.widget.Space
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"
diff --git a/current/support/v7/appcompat/res/layout/abc_select_dialog_material.xml b/current/support/v7/appcompat/res/layout/abc_select_dialog_material.xml
index d8f8135..12bcbf1 100644
--- a/current/support/v7/appcompat/res/layout/abc_select_dialog_material.xml
+++ b/current/support/v7/appcompat/res/layout/abc_select_dialog_material.xml
@@ -25,10 +25,11 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:cacheColorHint="@null"
- android:listSelector="?attr/listDividerAlertDialog"
+ android:divider="?attr/listDividerAlertDialog"
android:scrollbars="vertical"
android:overScrollMode="ifContentScrolls"
android:fadingEdge="none"
android:paddingTop="@dimen/abc_dialog_list_padding_vertical_material"
android:paddingBottom="@dimen/abc_dialog_list_padding_vertical_material"
- android:clipToPadding="false" />
\ No newline at end of file
+ android:clipToPadding="false"
+ style="@style/Widget.AppCompat.ListView" />
\ No newline at end of file
diff --git a/current/support/v7/appcompat/res/layout/select_dialog_multichoice_material.xml b/current/support/v7/appcompat/res/layout/select_dialog_multichoice_material.xml
index d264210..8f75bd3 100644
--- a/current/support/v7/appcompat/res/layout/select_dialog_multichoice_material.xml
+++ b/current/support/v7/appcompat/res/layout/select_dialog_multichoice_material.xml
@@ -23,7 +23,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?attr/textColorAlertDialogListItem"
android:gravity="center_vertical"
- android:paddingStart="?attr/dialogPreferredPadding"
- android:paddingEnd="?attr/dialogPreferredPadding"
+ android:paddingLeft="?attr/dialogPreferredPadding"
+ android:paddingRight="?attr/dialogPreferredPadding"
android:checkMark="?android:attr/listChoiceIndicatorMultiple"
android:ellipsize="marquee" />
diff --git a/current/support/v7/appcompat/res/layout/select_dialog_singlechoice_material.xml b/current/support/v7/appcompat/res/layout/select_dialog_singlechoice_material.xml
index 789c60b..3c2264c 100644
--- a/current/support/v7/appcompat/res/layout/select_dialog_singlechoice_material.xml
+++ b/current/support/v7/appcompat/res/layout/select_dialog_singlechoice_material.xml
@@ -23,7 +23,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?attr/textColorAlertDialogListItem"
android:gravity="center_vertical"
- android:paddingStart="?attr/dialogPreferredPadding"
- android:paddingEnd="?attr/dialogPreferredPadding"
+ android:paddingLeft="?attr/dialogPreferredPadding"
+ android:paddingRight="?attr/dialogPreferredPadding"
android:checkMark="?android:attr/listChoiceIndicatorSingle"
android:ellipsize="marquee" />
diff --git a/current/support/v7/appcompat/res/values-v21/styles_base.xml b/current/support/v7/appcompat/res/values-v21/styles_base.xml
index aac01dc..1bf90ef 100644
--- a/current/support/v7/appcompat/res/values-v21/styles_base.xml
+++ b/current/support/v7/appcompat/res/values-v21/styles_base.xml
@@ -121,8 +121,8 @@
<item name="popupPromptView">@layout/abc_simple_dropdown_hint</item>
</style>
- <style name="Base.Widget.AppCompat.ListView.Menu"
- parent="android:Widget.Material.ListView" />
+ <style name="Base.Widget.AppCompat.ListView" parent="android:Widget.Material.ListView" />
+ <style name="Base.Widget.AppCompat.ListView.Menu" />
<!-- Popup Menu -->
diff --git a/current/support/v7/appcompat/res/values/styles.xml b/current/support/v7/appcompat/res/values/styles.xml
index 6215eb1..1f30314 100644
--- a/current/support/v7/appcompat/res/values/styles.xml
+++ b/current/support/v7/appcompat/res/values/styles.xml
@@ -128,9 +128,8 @@
<!-- This style has an extra indirection to properly set RTL attributes. See styles_rtl.xml -->
<style name="Widget.AppCompat.DropDownItem.Spinner" parent="RtlOverlay.Widget.AppCompat.Search.DropDown.Text" />
- <style name="Widget.AppCompat.ListView.DropDown"
- parent="Base.Widget.AppCompat.ListView.DropDown">
- </style>
+ <style name="Widget.AppCompat.ListView" parent="Base.Widget.AppCompat.ListView" />
+ <style name="Widget.AppCompat.ListView.DropDown" parent="Base.Widget.AppCompat.ListView.DropDown" />
<style name="TextAppearance.Widget.AppCompat.ExpandedMenu.Item"
parent="Base.TextAppearance.Widget.AppCompat.ExpandedMenu.Item">
diff --git a/current/support/v7/appcompat/res/values/styles_base.xml b/current/support/v7/appcompat/res/values/styles_base.xml
index aab89b6..4768fc8 100644
--- a/current/support/v7/appcompat/res/values/styles_base.xml
+++ b/current/support/v7/appcompat/res/values/styles_base.xml
@@ -213,8 +213,12 @@
<item name="android:gravity">center_vertical</item>
</style>
- <style name="Base.Widget.AppCompat.ListView.DropDown" parent="android:Widget.ListView">
+ <style name="Base.Widget.AppCompat.ListView" parent="android:Widget.ListView">
<item name="android:listSelector">?attr/listChoiceBackgroundIndicator</item>
+ <item name="android:divider">?attr/dividerHorizontal</item>
+ </style>
+
+ <style name="Base.Widget.AppCompat.ListView.DropDown">
<item name="android:divider">@null</item>
</style>
diff --git a/current/support/v7/appcompat/res/values/themes_base.xml b/current/support/v7/appcompat/res/values/themes_base.xml
index 5b45584..2ea8eff 100644
--- a/current/support/v7/appcompat/res/values/themes_base.xml
+++ b/current/support/v7/appcompat/res/values/themes_base.xml
@@ -247,6 +247,13 @@
<item name="alertDialogCenterButtons">false</item>
<item name="textColorAlertDialogListItem">@color/abc_primary_text_material_dark</item>
<item name="listDividerAlertDialog">@null</item>
+
+ <!-- Define these here; ContextThemeWrappers around themes that define them should
+ always clear these values. -->
+ <item name="windowFixedWidthMajor">0dp</item>
+ <item name="windowFixedWidthMinor">0dp</item>
+ <item name="windowFixedHeightMajor">0dp</item>
+ <item name="windowFixedHeightMinor">0dp</item>
</style>
<!-- Base platform-dependent theme providing an action bar in a light-themed activity. -->
@@ -387,6 +394,13 @@
<item name="alertDialogCenterButtons">false</item>
<item name="textColorAlertDialogListItem">@color/abc_primary_text_material_light</item>
<item name="listDividerAlertDialog">@null</item>
+
+ <!-- Define these here; ContextThemeWrappers around themes that define them should
+ always clear these values. -->
+ <item name="windowFixedWidthMajor">0dp</item>
+ <item name="windowFixedWidthMinor">0dp</item>
+ <item name="windowFixedHeightMajor">0dp</item>
+ <item name="windowFixedHeightMinor">0dp</item>
</style>
<style name="Base.Theme.AppCompat" parent="Base.V7.Theme.AppCompat">
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 7af8850..150a9f3 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 43147f8..15e989a 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/gridlayout/res/values/dimens.xml b/current/support/v7/gridlayout/res/values/dimens.xml
index 963ecb5..189f409 100644
--- a/current/support/v7/gridlayout/res/values/dimens.xml
+++ b/current/support/v7/gridlayout/res/values/dimens.xml
@@ -2,6 +2,6 @@
<resources>
<!-- The default gap between components in a layout. -->
- <dimen name="default_gap">16dip</dimen>
+ <dimen name="default_gap">8dip</dimen>
</resources>
\ No newline at end of file
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 a981b31..cea0b54 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 d4d263f..958e811 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 1b111d9..492419b 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 5173917..084520b 100644
--- a/current/uiautomator.jar
+++ b/current/uiautomator.jar
Binary files differ