am c95caf2f: (-s ours) DO NOT MERGE ANYWHERE. update sdk and support library to 2066577 from mnc-sdk-release branch, this has the finalized resource id.
* commit 'c95caf2f51f9b15016aecd3573b30a134ce0749e':
DO NOT MERGE ANYWHERE. update sdk and support library to 2066577 from mnc-sdk-release branch, this has the finalized resource id.
diff --git a/current/android.jar b/current/android.jar
index 1140d60..61caf3d 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 b5ee897..ef3c648 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 ae01fde..b49f0e1 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/layout/design_layout_snackbar_include.xml b/current/support/design/res/layout/design_layout_snackbar_include.xml
index 0e0cde4..f1fd08e 100644
--- a/current/support/design/res/layout/design_layout_snackbar_include.xml
+++ b/current/support/design/res/layout/design_layout_snackbar_include.xml
@@ -31,19 +31,19 @@
android:layout_gravity="center_vertical|left|start"
android:ellipsize="end"/>
- <Button
+ <TextView
android:id="@+id/snackbar_action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/design_snackbar_extra_spacing_horizontal"
android:layout_marginStart="@dimen/design_snackbar_extra_spacing_horizontal"
android:layout_gravity="center_vertical|right|end"
+ android:background="?attr/selectableItemBackground"
android:paddingTop="@dimen/design_snackbar_padding_vertical"
android:paddingBottom="@dimen/design_snackbar_padding_vertical"
android:paddingLeft="@dimen/design_snackbar_padding_horizontal"
android:paddingRight="@dimen/design_snackbar_padding_horizontal"
android:visibility="gone"
- android:textColor="?attr/colorAccent"
- style="?attr/borderlessButtonStyle"/>
+ android:textAppearance="@style/TextAppearance.Design.Snackbar.Action"/>
</merge>
\ No newline at end of file
diff --git a/current/support/design/res/values/dimens.xml b/current/support/design/res/values/dimens.xml
index c7f8cef..034809d 100644
--- a/current/support/design/res/values/dimens.xml
+++ b/current/support/design/res/values/dimens.xml
@@ -16,7 +16,7 @@
-->
<resources>
- <dimen name="design_fab_elevation">6dp</dimen>
+ <dimen name="design_fab_elevation">8dp</dimen>
<dimen name="design_fab_translation_z_pressed">6dp</dimen>
<dimen name="design_fab_content_size">24dp</dimen>
<dimen name="design_fab_size_normal">56dp</dimen>
@@ -24,7 +24,7 @@
<dimen name="design_fab_border_width">0.5dp</dimen>
<dimen name="design_navigation_max_width">320dp</dimen>
- <dimen name="design_navigation_elevation">16dp</dimen>
+ <dimen name="design_navigation_elevation">12dp</dimen>
<dimen name="design_navigation_icon_padding">32dp</dimen>
<dimen name="design_navigation_icon_size">24dp</dimen>
<dimen name="design_navigation_separator_vertical_padding">8dp</dimen>
@@ -36,7 +36,7 @@
<dimen name="design_snackbar_min_width">-1px</dimen>
<dimen name="design_snackbar_max_width">-1px</dimen>
- <dimen name="design_snackbar_elevation">6dp</dimen>
+ <dimen name="design_snackbar_elevation">2dp</dimen>
<dimen name="design_snackbar_background_corner_radius">0dp</dimen>
<dimen name="design_snackbar_padding_horizontal">12dp</dimen>
diff --git a/current/support/design/res/values/styles.xml b/current/support/design/res/values/styles.xml
index 6624894..8736183 100644
--- a/current/support/design/res/values/styles.xml
+++ b/current/support/design/res/values/styles.xml
@@ -77,6 +77,10 @@
<item name="android:textColor">?android:textColorPrimary</item>
</style>
+ <style name="TextAppearance.Design.Snackbar.Action" parent="TextAppearance.AppCompat.Button">
+ <item name="android:textColor">?colorAccent</item>
+ </style>
+
<style name="Widget.Design.Snackbar" parent="android:Widget">
<item name="android:theme">@style/ThemeOverlay.AppCompat.Dark</item>
<item name="android:minWidth">@dimen/design_snackbar_min_width</item>
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 a3a4c52..9c044b1 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 0d0bd2b..af7c4f1 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/percent/libs/android-support-percent.jar b/current/support/percent/libs/android-support-percent.jar
index 5de9634..ddd9a91 100644
--- a/current/support/percent/libs/android-support-percent.jar
+++ b/current/support/percent/libs/android-support-percent.jar
Binary files differ
diff --git a/current/support/v13/android-support-v13.jar b/current/support/v13/android-support-v13.jar
index 08e82ad..1279883 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 8b81c6d..c66f40c 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 16b6add..431b748 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 27f8576..17a1c4e 100644
--- a/current/support/v4/src/api/current.txt
+++ b/current/support/v4/src/api/current.txt
@@ -122,7 +122,6 @@
public class AppOpsManagerCompat {
ctor public AppOpsManagerCompat();
method public static int noteOp(android.content.Context, java.lang.String, int, java.lang.String);
- method public static int noteProxyOp(android.content.Context, java.lang.String, java.lang.String);
method public static java.lang.String permissionToOp(java.lang.String);
field public static final int MODE_ALLOWED = 0; // 0x0
field public static final int MODE_DEFAULT = 3; // 0x3
@@ -1171,10 +1170,8 @@
method public final android.graphics.Paint getPaint();
method public boolean hasAntiAlias();
method public boolean hasMipMap();
- method public boolean isCircular();
method public void setAlpha(int);
method public void setAntiAlias(boolean);
- method public void setCircular(boolean);
method public void setColorFilter(android.graphics.ColorFilter);
method public void setCornerRadius(float);
method public void setGravity(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 851ad0e..ae3a1a5 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 fc703f6..b19ec34 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 3b2f31a..5cf40b9 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 f345104..6c0aa2c 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 f341d95..78e3036 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 e9f5712..2c4af25 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 48f0241..cec157e 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 4b69b6a..822dd4c 100644
--- a/system_current/android.jar
+++ b/system_current/android.jar
Binary files differ