Merge "Revert "Revert "Make subsettings display edge-to-edge""" into qt-dev

res/layout/preference_list_fragment.xml

@@ -27,7 +27,9 @@
     <FrameLayout android:id="@+id/pinned_header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone" />
+        android:background="?android:attr/windowBackground"
+        android:elevation="1dp"
+        android:visibility="gone"/>
 
     <FrameLayout
         android:id="@android:id/list_container"

res/layout/settings_base_layout.xml

@@ -19,6 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
     <Toolbar
         android:id="@+id/action_bar"
@@ -30,6 +31,5 @@
     <FrameLayout
         android:id="@+id/content_frame"
         android:layout_width="match_parent"
-        android:layout_height="fill_parent"
-        android:background="?android:attr/windowBackground" />
+        android:layout_height="match_parent"/>
 </LinearLayout>

res/layout/settings_main_prefs.xml

@@ -22,23 +22,17 @@
               android:layout_height="match_parent"
               android:layout_width="match_parent">
 
-    <LinearLayout
-            android:orientation="vertical"
-            android:layout_height="0px"
-            android:layout_width="match_parent"
-            android:layout_weight="1">
+    <com.android.settings.widget.SwitchBar
+        android:id="@+id/switch_bar"
+        android:layout_height="?android:attr/actionBarSize"
+        android:layout_width="match_parent"
+        android:theme="?attr/switchBarTheme"/>
 
-        <com.android.settings.widget.SwitchBar android:id="@+id/switch_bar"
-                  android:layout_height="?android:attr/actionBarSize"
-                  android:layout_width="match_parent"
-                  android:theme="?attr/switchBarTheme" />
-
-        <FrameLayout
-                android:id="@+id/main_content"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-    </LinearLayout>
+    <FrameLayout
+        android:id="@+id/main_content"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
 
     <RelativeLayout android:id="@+id/button_bar"
                     android:layout_height="wrap_content"
@@ -51,7 +45,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="5dip"
                 android:layout_alignParentStart="true"
-                android:text="@*android:string/back_button_label" />
+                android:text="@*android:string/back_button_label"/>
 
         <LinearLayout
                 android:orientation="horizontal"
@@ -64,13 +58,13 @@
                     android:layout_height="wrap_content"
                     android:layout_margin="5dip"
                     android:text="@*android:string/skip_button_label"
-                    android:visibility="gone" />
+                    android:visibility="gone"/>
 
             <Button android:id="@+id/next_button"
                     android:layout_width="150dip"
                     android:layout_height="wrap_content"
                     android:layout_margin="5dip"
-                    android:text="@*android:string/next_button_label" />
+                    android:text="@*android:string/next_button_label"/>
 
         </LinearLayout>
 

res/values/themes.xml

@@ -27,8 +27,11 @@
 
     <style name="Theme.Settings" parent="Theme.SettingsBase">
         <item name="preferenceTheme">@style/PreferenceTheme</item>
+        <item name="android:clipToPadding">false</item>
+        <item name="android:clipChildren">false</item>
         <item name="android:listPreferredItemHeight">72dip</item>
         <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
 
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="face_layout_theme">@style/FaceLayoutTheme</item>
@@ -88,6 +91,7 @@
     </style>
 
     <style name="ThemeOverlay.SwitchBar.Settings" parent="@*android:style/ThemeOverlay.DeviceDefault.ActionBar">
+        <item name="android:elevation">1dp</item>
         <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
         <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
         <item name="switchBarBackgroundColor">@color/switchbar_background_color</item>