diff options
| -rw-r--r-- | packages/SettingsLib/res/layout/settings_with_drawer.xml | 50 |
1 files changed, 22 insertions, 28 deletions
diff --git a/packages/SettingsLib/res/layout/settings_with_drawer.xml b/packages/SettingsLib/res/layout/settings_with_drawer.xml index 55c192d56a4d..e1d5c0ff01de 100644 --- a/packages/SettingsLib/res/layout/settings_with_drawer.xml +++ b/packages/SettingsLib/res/layout/settings_with_drawer.xml @@ -13,34 +13,28 @@ See the License for the specific language governing permissions and limitations under the License. --> -<android.support.v4.widget.DrawerLayout +<!-- The main content view --> +<LinearLayout + android:id="@+id/content_parent" xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/drawer_layout" android:layout_width="match_parent" - android:layout_height="match_parent"> - <!-- The main content view --> - <LinearLayout - android:id="@+id/content_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + <Toolbar + android:id="@+id/action_bar" + style="?android:attr/actionBarStyle" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:fitsSystemWindows="true"> - <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" - android:navigationContentDescription="@*android:string/action_bar_up_description"/> - <FrameLayout - android:id="@+id/content_header_container" - style="?android:attr/actionBarStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> - <FrameLayout - android:id="@+id/content_frame" - android:layout_width="match_parent" - android:layout_height="fill_parent" - android:background="?android:attr/windowBackground" /> - </LinearLayout> -</android.support.v4.widget.DrawerLayout> + android:layout_height="wrap_content" + android:theme="?android:attr/actionBarTheme" + android:navigationContentDescription="@*android:string/action_bar_up_description" /> + <FrameLayout + android:id="@+id/content_header_container" + style="?android:attr/actionBarStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + <FrameLayout + android:id="@+id/content_frame" + android:layout_width="match_parent" + android:layout_height="fill_parent" + android:background="?android:attr/windowBackground" /> +</LinearLayout> |