summaryrefslogtreecommitdiffstats
path: root/res/layout/preference_progress_category.xml
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2010-11-22 14:21:09 -0800
committerAmith Yamasani <yamasani@google.com>2010-11-23 11:43:19 -0800
commit78019ea80d2fee9c491a94c46ed29df5cf047a0c (patch)
tree9ca6153fbd86d3373cc72ca7d3ef7b75c724bafe /res/layout/preference_progress_category.xml
parent52322a9173fc167d3011017b396d1c7419fc280b (diff)
downloadpackages_apps_settings-78019ea80d2fee9c491a94c46ed29df5cf047a0c.zip
packages_apps_settings-78019ea80d2fee9c491a94c46ed29df5cf047a0c.tar.gz
packages_apps_settings-78019ea80d2fee9c491a94c46ed29df5cf047a0c.tar.bz2
Update wifi preference layout and progress category layout.
Diffstat (limited to 'res/layout/preference_progress_category.xml')
-rw-r--r--res/layout/preference_progress_category.xml53
1 files changed, 27 insertions, 26 deletions
diff --git a/res/layout/preference_progress_category.xml b/res/layout/preference_progress_category.xml
index 6528e54..5956296 100644
--- a/res/layout/preference_progress_category.xml
+++ b/res/layout/preference_progress_category.xml
@@ -4,9 +4,9 @@
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.
@@ -15,43 +15,44 @@
-->
<!-- Layout used for ProgressCategory in bluetooth settings. -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- style="?android:attr/listSeparatorTextViewStyle">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ style="?android:attr/listSeparatorTextViewStyle"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ >
<!-- This and the other text view have the style of the list separator text view without the background and padding -->
- <TextView
+ <TextView
style="?android:attr/listSeparatorTextViewStyle"
android:background="@null"
- android:paddingLeft="0dip"
+ android:paddingLeft="32dip"
android:id="@+android:id/title"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_centerVertical="true"
+ android:layout_weight="1"
+ android:layout_gravity="center_vertical"
/>
-
- <ProgressBar
- android:id="@+id/scanning_progress"
- android:text="@string/progress_scanning"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:layout_marginRight="?android:attr/scrollbarSize"
- style="?android:attr/progressBarStyleSmallTitle"
- />
-
- <TextView
+
+ <TextView
style="?android:attr/listSeparatorTextViewStyle"
android:background="@null"
android:paddingLeft="0dip"
android:id="@+id/scanning_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_toLeftOf="@id/scanning_progress"
+ android:layout_gravity="center_vertical"
android:layout_marginRight="5sp"
android:text="@string/progress_scanning"
/>
-
-</RelativeLayout>
+
+ <ProgressBar
+ android:id="@+id/scanning_progress"
+ android:text="@string/progress_scanning"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_marginRight="16dip"
+ style="?android:attr/progressBarStyleSmallTitle"
+ />
+
+</LinearLayout>