Merge "Fix build break 2" into mnc-dev
diff --git a/current/android.jar b/current/android.jar
index 51df55a..5fe98d9 100644
--- a/current/android.jar
+++ b/current/android.jar
Binary files differ
diff --git a/current/framework.aidl b/current/framework.aidl
index e25a5e9..0efac89 100644
--- a/current/framework.aidl
+++ b/current/framework.aidl
@@ -9,7 +9,6 @@
parcelable android.location.Criteria;
parcelable android.media.MediaMetadata;
parcelable android.media.MediaDescription;
-parcelable android.media.routing.MediaRouteSelector;
parcelable android.media.Rating;
parcelable android.media.AudioAttributes;
parcelable android.media.AudioFocusInfo;
diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar
index b896345..e3b9d59 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 ddb0849..b2d2482 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 2c34a9b..e2afe99 100644
--- a/current/support/design/res/values/attrs.xml
+++ b/current/support/design/res/values/attrs.xml
@@ -46,7 +46,8 @@
<attr name="elevation"/>
<!-- The menu resource to inflate and populate items from. -->
<attr name="menu" format="reference"/>
- <attr name="itemTint" format="color|reference"/>
+ <attr name="itemIconTint" format="color"/>
+ <attr name="itemTextColor" format="color"/>
<attr name="itemBackground" format="reference"/>
<!-- Layout resource to inflate as the header -->
<attr name="headerLayout" format="reference"/>
@@ -93,6 +94,8 @@
layout_keyline="index" where index is a 0-based index into
this array. -->
<attr name="keylines" format="reference"/>
+ <!-- Drawable to display behind the status bar when the view is set to draw behind it. -->
+ <attr name="statusBarBackground" format="reference"/>
</declare-styleable>
<declare-styleable name="CoordinatorLayout_LayoutParams">
@@ -206,9 +209,19 @@
<attr name="expandedTitleMarginStart" format="dimension"/>
<attr name="expandedTitleMarginBottom" format="dimension"/>
<attr name="expandedTitleMarginEnd" format="dimension"/>
+ <!-- The text appearance of the CollapsingToolbarLayouts title when it is fully
+ 'expanded' -->
<attr name="expandedTitleTextAppearance" format="reference"/>
+ <!-- The text appearance of the CollapsingToolbarLayouts title when it is fully
+ 'collapsed' -->
<attr name="collapsedTitleTextAppearance" format="reference"/>
- <attr name="foregroundScrimColor" format="color"/>
+ <!-- The drawable to use as a scrim on top of the CollapsingToolbarLayouts content when
+ it has been scrolled sufficiently off screen. -->
+ <attr name="contentScrim" format="color"/>
+ <!-- The drawable to use as a scrim for the status bar content when the
+ CollapsingToolbarLayout has been scrolled sufficiently off screen. Only works on
+ Lollipop with the correct setup. -->
+ <attr name="statusBarScrim" format="color" />
</declare-styleable>
<declare-styleable name="CollapsingAppBarLayout_LayoutParams">
diff --git a/current/support/design/res/values/styles.xml b/current/support/design/res/values/styles.xml
index c3fb502..e083f04 100644
--- a/current/support/design/res/values/styles.xml
+++ b/current/support/design/res/values/styles.xml
@@ -97,7 +97,7 @@
<item name="expandedTitleMarginBottom">20dp</item>
<item name="expandedTitleTextAppearance">@style/TextAppearance.AppCompat.Headline</item>
<item name="collapsedTitleTextAppearance">@style/TextAppearance.AppCompat.Widget.ActionBar.Title</item>
- <item name="foregroundScrimColor">@android:color/transparent</item>
+ <item name="statusBarScrim">?attr/colorPrimaryDark</item>
</style>
<style name="Widget.Design.AppBarLayout" parent="android:Widget">
@@ -105,5 +105,9 @@
<item name="android:background">?attr/colorPrimary</item>
</style>
+ <style name="Widget.Design.CoordinatorLayout" parent="android:Widget">
+ <item name="statusBarBackground">?attr/colorPrimaryDark</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 0dbb70a..30e1faa 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 f97cd83..f5a207d 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 8bf593e..c509f81 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 a05458a..5d0b7b9 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/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar
index a671a57..85cd42a 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/v4/src/api/current.txt b/current/support/v4/src/api/current.txt
index 2bc5d17..274a7b3 100644
--- a/current/support/v4/src/api/current.txt
+++ b/current/support/v4/src/api/current.txt
@@ -2449,9 +2449,11 @@
public class ViewPager extends android.view.ViewGroup {
ctor public ViewPager(android.content.Context);
ctor public ViewPager(android.content.Context, android.util.AttributeSet);
+ method public void addOnPageChangeListener(android.support.v4.view.ViewPager.OnPageChangeListener);
method public boolean arrowScroll(int);
method public boolean beginFakeDrag();
method protected boolean canScroll(android.view.View, boolean, int, int, int);
+ method public void clearOnPageChangeListeners();
method public void endFakeDrag();
method public boolean executeKeyEvent(android.view.KeyEvent);
method public void fakeDragBy(float);
@@ -2464,11 +2466,12 @@
method protected void onPageScrolled(int, float, int);
method public void onRestoreInstanceState(android.os.Parcelable);
method public android.os.Parcelable onSaveInstanceState();
+ method public void removeOnPageChangeListener(android.support.v4.view.ViewPager.OnPageChangeListener);
method public void setAdapter(android.support.v4.view.PagerAdapter);
method public void setCurrentItem(int);
method public void setCurrentItem(int, boolean);
method public void setOffscreenPageLimit(int);
- method public void setOnPageChangeListener(android.support.v4.view.ViewPager.OnPageChangeListener);
+ method public deprecated void setOnPageChangeListener(android.support.v4.view.ViewPager.OnPageChangeListener);
method public void setPageMargin(int);
method public void setPageMarginDrawable(android.graphics.drawable.Drawable);
method public void setPageMarginDrawable(int);
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 5ddcd99..e173846 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/drawable-hdpi/abc_text_cursor_mtrl_alpha.9.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_text_cursor_mtrl_alpha.9.png
deleted file mode 100644
index 5e0bf84..0000000
--- a/current/support/v7/appcompat/res/drawable-hdpi/abc_text_cursor_mtrl_alpha.9.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_text_cursor_mtrl_alpha.9.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_text_cursor_mtrl_alpha.9.png
deleted file mode 100644
index 36348a8..0000000
--- a/current/support/v7/appcompat/res/drawable-mdpi/abc_text_cursor_mtrl_alpha.9.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_text_cursor_mtrl_alpha.9.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_text_cursor_mtrl_alpha.9.png
deleted file mode 100644
index 666b10a..0000000
--- a/current/support/v7/appcompat/res/drawable-xhdpi/abc_text_cursor_mtrl_alpha.9.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_text_cursor_mtrl_alpha.9.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_text_cursor_mtrl_alpha.9.png
deleted file mode 100644
index 08ee2b4..0000000
--- a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_text_cursor_mtrl_alpha.9.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable/abc_text_cursor_material.xml b/current/support/v7/appcompat/res/drawable/abc_text_cursor_material.xml
new file mode 100644
index 0000000..885670c
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable/abc_text_cursor_material.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2015 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <size android:height="2dp"
+ android:width="2dp"/>
+ <solid android:color="@android:color/white"/>
+</shape>
\ No newline at end of file
diff --git a/current/support/v7/appcompat/res/values-v12/themes_base.xml b/current/support/v7/appcompat/res/values-v12/themes_base.xml
index c912434..ddf752a 100644
--- a/current/support/v7/appcompat/res/values-v12/themes_base.xml
+++ b/current/support/v7/appcompat/res/values-v12/themes_base.xml
@@ -20,11 +20,11 @@
<style name="Platform.AppCompat.Light" parent="Platform.V12.AppCompat.Light" />
<style name="Platform.V12.AppCompat" parent="Platform.V11.AppCompat">
- <item name="android:textCursorDrawable">@drawable/abc_text_cursor_mtrl_alpha</item>
+ <item name="android:textCursorDrawable">@drawable/abc_text_cursor_material</item>
</style>
<style name="Platform.V12.AppCompat.Light" parent="Platform.V11.AppCompat.Light">
- <item name="android:textCursorDrawable">@drawable/abc_text_cursor_mtrl_alpha</item>
+ <item name="android:textCursorDrawable">@drawable/abc_text_cursor_material</item>
</style>
</resources>
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 a2627a8..056ed85 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 04f147b..b37b495 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 babdda8..1f29954 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 5e91bd2..2f3c87c 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 dd18a5a..fdfa093 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 62594a0..1b8a91f 100644
--- a/current/uiautomator.jar
+++ b/current/uiautomator.jar
Binary files differ
diff --git a/system-api/23.txt b/system-api/23.txt
index 445c810..75abb13 100644
--- a/system-api/23.txt
+++ b/system-api/23.txt
@@ -30130,12 +30130,12 @@
method public android.telecom.PhoneAccount.Builder setSupportedUriSchemes(java.util.List<java.lang.String>);
}
- public class PhoneAccountHandle implements android.os.Parcelable {
+ public final class PhoneAccountHandle implements android.os.Parcelable {
ctor public PhoneAccountHandle(android.content.ComponentName, java.lang.String);
- method public int describeContents();
- method public android.content.ComponentName getComponentName();
- method public java.lang.String getId();
- method public void writeToParcel(android.os.Parcel, int);
+ method public final int describeContents();
+ method public final android.content.ComponentName getComponentName();
+ method public final java.lang.String getId();
+ method public final void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.telecom.PhoneAccountHandle> CREATOR;
}
