diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/custom_list_item.xml | 43 | ||||
| -rw-r--r-- | res/layout/custom_preference.xml | 1 | ||||
| -rw-r--r-- | res/layout/custom_preference_list_fragment.xml | 39 | ||||
| -rw-r--r-- | res/layout/wifi_config_ui_for_setup_wizard.xml | 7 |
4 files changed, 87 insertions, 3 deletions
diff --git a/res/layout/custom_list_item.xml b/res/layout/custom_list_item.xml new file mode 100644 index 0000000..afcbc8c --- /dev/null +++ b/res/layout/custom_list_item.xml @@ -0,0 +1,43 @@ +<?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. +--> + +<!-- Based on simple_list_item_2.xml in framework --> +<TwoLineListItem 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:mode="twoLine" + android:gravity="center_vertical" +> + + <TextView android:id="@android:id/text1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="16dip" + android:layout_marginLeft="10dip" + android:textAppearance="?android:attr/textAppearanceMedium" + /> + + <TextView android:id="@android:id/text2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="10dip" + android:layout_below="@android:id/text1" + android:layout_alignLeft="@android:id/text1" + android:textAppearance="?android:attr/textAppearanceSmall" + /> + +</TwoLineListItem> diff --git a/res/layout/custom_preference.xml b/res/layout/custom_preference.xml index cec8eba..fcdc9f5 100644 --- a/res/layout/custom_preference.xml +++ b/res/layout/custom_preference.xml @@ -31,6 +31,7 @@ <RelativeLayout android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginLeft="6dip" android:layout_marginRight="6dip" android:layout_marginTop="6dip" android:layout_marginBottom="6dip" diff --git a/res/layout/custom_preference_list_fragment.xml b/res/layout/custom_preference_list_fragment.xml new file mode 100644 index 0000000..f0bf010 --- /dev/null +++ b/res/layout/custom_preference_list_fragment.xml @@ -0,0 +1,39 @@ +<?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. +*/ +--> + +<!-- Based on preference_list_fragment.xml in framework --> +<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:paddingTop="0dip" + android:paddingBottom="0dip" + android:paddingLeft="0dip" + android:paddingRight="0dip" + android:clipToPadding="false" + android:drawSelectorOnTop="false" + android:cacheColorHint="@android:color/transparent" + android:scrollbarAlwaysDrawVerticalTrack="true" /> +</LinearLayout> diff --git a/res/layout/wifi_config_ui_for_setup_wizard.xml b/res/layout/wifi_config_ui_for_setup_wizard.xml index c32920a..f358bab 100644 --- a/res/layout/wifi_config_ui_for_setup_wizard.xml +++ b/res/layout/wifi_config_ui_for_setup_wizard.xml @@ -108,13 +108,14 @@ <LinearLayout android:id="@+id/eap_not_supported" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_marginTop="20dip" + android:layout_marginTop="32dip" android:orientation="vertical" android:visibility="gone"> <TextView android:layout_width="match_parent" android:layout_height="wrap_content" - android:textSize="22sp" - android:text="@string/wifi_setup_eap_not_supported" /> + android:lineSpacingExtra="12dip" + android:text="@string/wifi_setup_eap_not_supported" + android:textAppearance="?android:attr/textAppearanceMedium" /> </LinearLayout> <!-- All the views below are "gone". |