Merge "Fix sub-header height to follow drawable. Floating panels for Preference screens." (29ab7d85) · Commits · e / os / android_frameworks_base

core/java/android/preference/PreferenceFragment.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -151,7 +151,7 @@ public abstract class PreferenceFragment extends Fragment implements
		@Override
		public View onCreateView(LayoutInflater inflater, ViewGroup container,
		Bundle savedInstanceState) {
		return inflater.inflate(com.android.internal.R.layout.preference_list_content,
		return inflater.inflate(com.android.internal.R.layout.preference_list_fragment,
		container, false);
		}

core/res/res/layout-port/preference_header_item.xml

deleted100644 → 0

+0 −62

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2006 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<!-- Layout of a header item in PreferenceActivity. -->
		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:minHeight="96dp"
		android:background="?android:attr/activatedBackgroundIndicator"
		android:paddingRight="?android:attr/scrollbarSize">

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:layout_gravity="center"
		android:paddingLeft="4dip"
		android:paddingRight="4dip"
		android:paddingTop="4dip"
		android:paddingBottom="4dip">

		<ImageView
		android:id="@+id/icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:layout_marginBottom="2dip" />

		<TextView android:id="@+android:id/title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:layout_marginBottom="2dip"
		android:singleLine="true"
		android:textAppearance="?android:attr/textAppearanceLarge"
		android:ellipsize="marquee"
		android:fadingEdge="horizontal" />

		<TextView android:id="@+android:id/summary"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:gravity="center"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:ellipsize="end"
		android:maxLines="2" />

		</LinearLayout>
		</FrameLayout>

core/res/res/layout/preference_header_item.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:minHeight="?android:attr/listPreferredItemHeight"
		android:minHeight="48dp"
		android:background="?android:attr/activatedBackgroundIndicator"
		android:gravity="center_vertical"
		android:paddingRight="?android:attr/scrollbarSize">

core/res/res/layout/preference_list_content.xml

+15 −2

Original line number	Diff line number	Diff line
		@@ -21,7 +21,8 @@
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:orientation="vertical"
		android:layout_height="match_parent"
		android:layout_width="match_parent">
		android:layout_width="match_parent"
		android:background="@android:color/transparent">

		<LinearLayout
		android:orientation="horizontal"
		@@ -34,6 +35,10 @@
		android:orientation="vertical"
		android:layout_width="0px"
		android:layout_height="match_parent"
		android:layout_marginLeft="32dp"
		android:layout_marginTop="32dp"
		android:layout_marginRight="16dp"
		android:layout_marginBottom="32dp"
		android:layout_weight="10">

		<ListView android:id="@android:id/list"
		@@ -41,6 +46,9 @@
		android:layout_height="0px"
		android:layout_weight="1"
		android:drawSelectorOnTop="false"
		android:background="#40404040"
		android:cacheColorHint="@android:color/transparent"
		android:listPreferredItemHeight="48dp"
		android:scrollbarAlwaysDrawVerticalTrack="true" />

		<FrameLayout android:id="@+id/list_footer"
		@@ -53,7 +61,12 @@
		<FrameLayout android:id="@+id/prefs"
		android:layout_width="0px"
		android:layout_height="match_parent"
		android:layout_weight="33"
		android:layout_weight="25"
		android:layout_marginLeft="16dp"
		android:layout_marginRight="16dp"
		android:layout_marginTop="16dp"
		android:layout_marginBottom="16dp"
		android:background="#60202040"
		android:visibility="gone" />
		</LinearLayout>

core/res/res/layout/preference_list_fragment.xml

0 → 100644

+74 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		** Copyright 2010, The Android Open Source Project
		**
		** Licensed under the Apache License, Version 2.0 (the "License");
		** you may not use this file except in compliance with the License.
		** You may obtain a copy of the License at
		**
		** http://www.apache.org/licenses/LICENSE-2.0
		**
		** Unless required by applicable law or agreed to in writing, software
		** distributed under the License is distributed on an "AS IS" BASIS,
		** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		** See the License for the specific language governing permissions and
		** limitations under the License.
		*/
		-->

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:orientation="vertical"
		android:layout_height="match_parent"
		android:layout_width="match_parent"
		android:background="@android:color/transparent">

		<ListView android:id="@android:id/list"
		android:layout_width="match_parent"
		android:layout_height="0px"
		android:layout_weight="1"
		android:drawSelectorOnTop="false"
		android:cacheColorHint="@android:color/transparent"
		android:scrollbarAlwaysDrawVerticalTrack="true" />

		<RelativeLayout android:id="@+id/button_bar"
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		android:layout_weight="0"
		android:background="@android:drawable/bottom_bar"
		android:visibility="gone">

		<Button android:id="@+id/back_button"
		android:layout_width="150dip"
		android:layout_height="wrap_content"
		android:layout_margin="5dip"
		android:layout_alignParentLeft="true"
		android:drawableLeft="@drawable/ic_btn_back"
		android:drawablePadding="3dip"
		android:text="@string/back_button_label"
		/>
		<LinearLayout
		android:orientation="horizontal"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentRight="true">

		<Button android:id="@+id/skip_button"
		android:layout_width="150dip"
		android:layout_height="wrap_content"
		android:layout_margin="5dip"
		android:text="@string/skip_button_label"
		android:visibility="gone"
		/>

		<Button android:id="@+id/next_button"
		android:layout_width="150dip"
		android:layout_height="wrap_content"
		android:layout_margin="5dip"
		android:drawableRight="@drawable/ic_btn_next"
		android:drawablePadding="3dip"
		android:text="@string/next_button_label"
		/>
		</LinearLayout>
		</RelativeLayout>
		</LinearLayout>