Use custom preference.xml in XL.

A spacer are added on the left side of each preference, which isn't
needed in XL setup screen.

Change-Id: Ie3b8e04b492b4a4840ba1bbda4a413673734fbaa
This commit is contained in:
Daisuke Miyakawa
2010-11-08 12:17:19 -08:00
parent 38f8a1d0fa
commit 3dd06301fa
2 changed files with 66 additions and 0 deletions

View File

@@ -0,0 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 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.
-->
<!-- Custom layout almost same as original preference.xml in framework.
One (current) only difference is this layout doesn't have a spacer
on the left side of the preference. -->
<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:gravity="center_vertical"
android:paddingRight="?android:attr/scrollbarSize">
<!-- <View
android:layout_width="@dimen/preference_widget_width"
android:layout_height="match_parent" /> -->
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="6dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">
<TextView android:id="@+android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:ellipsize="marquee"
android:fadingEdge="horizontal" />
<TextView android:id="@+android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
android:layout_alignLeft="@android:id/title"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="4" />
</RelativeLayout>
<!-- Preference should place its actual preference widget here. -->
<LinearLayout android:id="@+android:id/widget_frame"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="vertical" />
</LinearLayout>

View File

@@ -463,6 +463,7 @@ public class WifiSettings extends SettingsPreferenceFragment
//limit access points on set up wizard //limit access points on set up wizard
int count = MAX_MENU_COUNT_IN_XL; int count = MAX_MENU_COUNT_IN_XL;
for (AccessPoint accessPoint : accessPoints) { for (AccessPoint accessPoint : accessPoints) {
accessPoint.setLayoutResource(R.layout.custom_preference);
mAccessPoints.addPreference(accessPoint); mAccessPoints.addPreference(accessPoint);
count--; count--;
if (count <= 0) { if (count <= 0) {