Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove FrameLayout around toolbar" into oc-dev

Browse Source 
am: 46f6e69e1b

Change-Id: I2129c87b83a2346feff73cffcf26a2359f84e197
This commit is contained in:
Fan Zhang
2017-04-17 18:37:45 +00:00
committed by android-build-merger
parent 2439e19d41 46f6e69e1b
commit 215cc7914e
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SettingsLib/res/layout/settings_with_drawer.xml
View File

@@ -25,17 +25,13 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:fitsSystemWindows="true">
<FrameLayout
<Toolbar
android:id="@+id/action_bar"
style="?android:attr/actionBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?android:attr/actionBarTheme">
<Toolbar
android:id="@+id/action_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:navigationContentDescription="@*android:string/action_bar_up_description"/>
</FrameLayout>
android:theme="?android:attr/actionBarTheme"
android:navigationContentDescription="@*android:string/action_bar_up_description"/>
<FrameLayout
android:id="@+id/content_header_container"
style="?android:attr/actionBarStyle"