summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/preference_widget_wifi_signal.xml4
-rw-r--r--res/layout/process_stats_details.xml76
-rwxr-xr-xres/layout/regulatory_info.xml1
-rw-r--r--res/layout/setup_preference.xml5
-rw-r--r--res/layout/wifi_wps_dialog.xml2
5 files changed, 82 insertions, 6 deletions
diff --git a/res/layout/preference_widget_wifi_signal.xml b/res/layout/preference_widget_wifi_signal.xml
index 6df203c..c2541a5 100644
--- a/res/layout/preference_widget_wifi_signal.xml
+++ b/res/layout/preference_widget_wifi_signal.xml
@@ -15,8 +15,8 @@
-->
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/signal"
+ android:id="@+id/signal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/wifi_signal"
+ android:src="?attr/wifi_signal"
android:contentDescription="@null" />
diff --git a/res/layout/process_stats_details.xml b/res/layout/process_stats_details.xml
new file mode 100644
index 0000000..0de1054
--- /dev/null
+++ b/res/layout/process_stats_details.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<ScrollView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clipToPadding="false"
+ android:scrollbarStyle="@integer/preference_scrollbar_style">
+
+ <LinearLayout
+ android:id="@+id/all_details"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingTop="5dip"
+ android:paddingBottom="5dip"
+ android:orientation="vertical">
+
+ <include layout="@layout/app_percentage_item" />
+
+ <!-- Force stop and report buttons -->
+ <LinearLayout
+ android:id="@+id/two_buttons_panel"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingBottom="6dip"
+ android:orientation="vertical">
+ <include
+ layout="@layout/two_buttons_panel"/>
+ </LinearLayout>
+
+ <TextView
+ style="?android:attr/listSeparatorTextViewStyle"
+ android:text="@string/details_subtitle" />
+
+ <LinearLayout
+ android:id="@+id/details"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="6dip"
+ android:orientation="vertical">
+
+ <!-- Insert detail items here -->
+
+ </LinearLayout>
+
+ <TextView
+ style="?android:attr/listSeparatorTextViewStyle"
+ android:text="@string/services_subtitle" />
+
+ <LinearLayout
+ android:id="@+id/services"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="6dip"
+ android:orientation="vertical">
+
+ <!-- Insert service items here -->
+
+ </LinearLayout>
+
+ </LinearLayout>
+</ScrollView>
diff --git a/res/layout/regulatory_info.xml b/res/layout/regulatory_info.xml
index 478eaab..8cd4157 100755
--- a/res/layout/regulatory_info.xml
+++ b/res/layout/regulatory_info.xml
@@ -17,6 +17,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
+ android:id="@+id/regulatoryInfo"
android:adjustViewBounds="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
index 7e917d8..d0cbc02 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -33,7 +33,6 @@
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignBottom="@id/title"
android:gravity="bottom"
android:orientation="horizontal">
<TextView
@@ -52,7 +51,7 @@
android:layout_marginStart="8dip"
android:layout_marginEnd="8dip"
android:layout_marginBottom="8dip"
- android:src="@*android:drawable/ic_menu_moreoverflow_holo_dark"
+ android:src="?attr/ic_menu_moreoverflow"
android:background="?android:attr/actionBarItemBackground"
android:contentDescription="@string/wifi_menu_more_options" />
@@ -124,7 +123,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:src="@drawable/ic_menu_add" />
+ android:src="?attr/ic_menu_add" />
<TextView
android:id="@+id/other"
diff --git a/res/layout/wifi_wps_dialog.xml b/res/layout/wifi_wps_dialog.xml
index 1c5713a..a86823d 100644
--- a/res/layout/wifi_wps_dialog.xml
+++ b/res/layout/wifi_wps_dialog.xml
@@ -35,7 +35,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="8dip"
- android:src="@drawable/ic_wps" />
+ android:src="?attr/ic_wps" />
<ProgressBar
android:id="@+id/wps_timeout_bar"