From cca938e993da1b13ff346eb8f0231e0b011b21c7 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Fri, 14 Apr 2017 12:27:18 -0700
Subject: [PATCH] Remove FrameLayout around toolbar

The FrameLayout is useless, and cause problems if dev needs to customize
actionbar in code.

Change-Id: Iae6861e1e60576f4b4e175d01c7cd57c0775ecd7
Fix: 37207527
Test: visual
---
 .../SettingsLib/res/layout/settings_with_drawer.xml  | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/packages/SettingsLib/res/layout/settings_with_drawer.xml b/packages/SettingsLib/res/layout/settings_with_drawer.xml
index e9c175f6fed00..55c192d56a4dc 100644
--- a/packages/SettingsLib/res/layout/settings_with_drawer.xml
+++ b/packages/SettingsLib/res/layout/settings_with_drawer.xml
@@ -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"