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/abc_screen_toolbar.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/abc_screen_toolbar.xml b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/abc_screen_toolbar.xml
index 96412c1..a131efb 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/abc_screen_toolbar.xml
+++ b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/abc_screen_toolbar.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<android.support.v7.widget.ActionBarOverlayLayout
+<android.support.v7.internal.widget.ActionBarOverlayLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/decor_content_parent"
@@ -24,7 +24,7 @@
<include layout="@layout/abc_screen_content_include"/>
- <android.support.v7.widget.ActionBarContainer
+ <android.support.v7.internal.widget.ActionBarContainer
android:id="@+id/action_bar_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -40,7 +40,7 @@
app:navigationContentDescription="@string/abc_action_bar_up_description"
style="?attr/toolbarStyle"/>
- <android.support.v7.widget.ActionBarContextView
+ <android.support.v7.internal.widget.ActionBarContextView
android:id="@+id/action_context_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -48,6 +48,7 @@
android:theme="?attr/actionBarTheme"
style="?attr/actionModeStyle"/>
- </android.support.v7.widget.ActionBarContainer>
+ </android.support.v7.internal.widget.ActionBarContainer>
-</android.support.v7.widget.ActionBarOverlayLayout>
+</android.support.v7.internal.widget.ActionBarOverlayLayout>
+<!-- From: file:/usr/local/google/buildbot/repo_clients/https___googleplex-android.googlesource.com_a_platform_manifest.git/mnc-supportlib-release/frameworks/support/v7/appcompat/res/layout/abc_screen_toolbar.xml -->
\ No newline at end of file
--
Gitblit v1.8.0