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

Merge "Fix window insets for settings activities" into nyc-dev

Browse Source 
am: cea711916d

* commit 'cea711916d8c59de7174ec949360f0331c6e98ce':
  Fix window insets for settings activities
This commit is contained in:
Jason Monk
2016-03-07 17:36:43 +00:00
committed by android-build-merger
parent c2637be773 cea711916d
commit 7aeb2b058a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,14 +17,15 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/drawer_layout" android:id="@+id/drawer_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:background="?android:attr/colorPrimaryDark">
<!-- The main content view --> <!-- The main content view -->
<LinearLayout <LinearLayout
android:id="@+id/content_parent" android:id="@+id/content_parent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:fitsSystemWindows="false" > android:fitsSystemWindows="true" >
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -36,14 +37,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:navigationContentDescription="@*android:string/action_bar_up_description" android:navigationContentDescription="@*android:string/action_bar_up_description"
android:theme="?android:attr/actionBarTheme" android:theme="?android:attr/actionBarTheme"
android:paddingTop="@*android:dimen/status_bar_height"
style="?android:attr/toolbarStyle" style="?android:attr/toolbarStyle"
android:background="?android:attr/colorPrimary" /> android:background="?android:attr/colorPrimary" />
</FrameLayout> </FrameLayout>
<FrameLayout <FrameLayout
android:id="@+id/content_frame" android:id="@+id/content_frame"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" /> android:layout_height="fill_parent"
android:background="?android:attr/windowBackground" />
</LinearLayout> </LinearLayout>
<!-- The navigation drawer --> <!-- The navigation drawer -->
<ListView android:id="@+id/left_drawer" <ListView android:id="@+id/left_drawer"