diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-07-21 23:19:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-21 15:43:35 +0000 |
| commit | aed4c7284ecdeb4353da0b5a90c11e2f598d733a (patch) | |
| tree | 1ab61beca155f68bdf2a841e8646944f11319962 /res/layout | |
| parent | 40aeac90f10c7ab6bd52e7200513b2eda7129904 (diff) | |
| parent | 86159283c98fd862723ce317f1621bcb16d451ce (diff) | |
| download | packages_apps_Settings-aed4c7284ecdeb4353da0b5a90c11e2f598d733a.zip packages_apps_Settings-aed4c7284ecdeb4353da0b5a90c11e2f598d733a.tar.gz packages_apps_Settings-aed4c7284ecdeb4353da0b5a90c11e2f598d733a.tar.bz2 | |
Merge "Add the capability to set a pinned header to SettingsPreferenceFragment" into lmp-dev
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/preference_list_fragment.xml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/res/layout/preference_list_fragment.xml b/res/layout/preference_list_fragment.xml index 8391641..a44535f 100644 --- a/res/layout/preference_list_fragment.xml +++ b/res/layout/preference_list_fragment.xml @@ -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> |