Merge "Add the capability to set a pinned header to SettingsPreferenceFragment" into lmp-dev

This commit is contained in:
Fabrice Di Meglio
2014-07-21 23:19:28 +00:00
committed by Android (Google) Code Review
3 changed files with 31 additions and 4 deletions

View File

@@ -20,10 +20,15 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/container_material"
android:orientation="vertical"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/transparent">
<FrameLayout android:id="@+id/pinned_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone" />
<ListView android:id="@android:id/list"
style="@style/PreferenceFragmentListSinglePane"
android:layout_width="match_parent"
@@ -59,6 +64,7 @@
android:layout_alignParentStart="true"
android:text="@*android:string/back_button_label"
/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content"
@@ -79,6 +85,7 @@
android:layout_margin="5dip"
android:text="@*android:string/next_button_label"
/>
</LinearLayout>
</RelativeLayout>