PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Revert "Make subsettings display edge-to-edge""" into qt-dev am: 17521d0ac7

Browse Source 
am: d32e9b5229

Change-Id: Icf5c8c48bb2ea7375cc03d3cec9d9879b6db7249
This commit is contained in:
Fan Zhang
2019-05-14 18:15:28 -07:00
committed by android-build-merger
parent e43660a00d d32e9b5229
commit ff8a733f63
9 changed files with 166 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/preference_list_fragment.xml
View File

@@ -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"

4
res/layout/settings_base_layout.xml
View File

@@ -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>

32
res/layout/settings_main_prefs.xml
View File

@@ -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>