From 062e9ff8359a4eccba741d0c8c799f3ca3535d83 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 28 七月 2017 11:06:44 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/design_layout_snackbar_include.xml | 58 +++++++++++++++++++++++++++-------------------------------
1 files changed, 27 insertions(+), 31 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/design_layout_snackbar_include.xml b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/design_layout_snackbar_include.xml
index fe11d8e..f63f3b1 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/design_layout_snackbar_include.xml
+++ b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/design_layout_snackbar_include.xml
@@ -15,39 +15,35 @@
~ limitations under the License.
-->
-<view
- xmlns:android="http://schemas.android.com/apk/res/android"
- class="android.support.design.internal.SnackbarContentLayout"
- android:theme="@style/ThemeOverlay.AppCompat.Dark"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom">
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
<TextView
- android:id="@+id/snackbar_text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- 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:textAppearance="@style/TextAppearance.Design.Snackbar.Message"
- android:maxLines="@integer/design_snackbar_text_max_lines"
- android:layout_gravity="center_vertical|left|start"
- android:ellipsize="end"
- android:textAlignment="viewStart"/>
+ android:id="@+id/snackbar_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ 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:textAppearance="@style/TextAppearance.Design.Snackbar.Message"
+ android:maxLines="@integer/design_snackbar_text_max_lines"
+ android:layout_gravity="center_vertical|left|start"
+ android:ellipsize="end"/>
<Button
- 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:minWidth="48dp"
- android:visibility="gone"
- android:textColor="?attr/colorAccent"
- style="?attr/borderlessButtonStyle"/>
+ 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: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"/>
-</view>
\ No newline at end of file
+</merge><!-- From: file:/usr/local/google/buildbot/repo_clients/https___googleplex-android.googlesource.com_a_platform_manifest.git/mnc-supportlib-release/frameworks/support/design/res/layout/design_layout_snackbar_include.xml -->
\ No newline at end of file
--
Gitblit v1.8.0