From 5ead10d129c7348314fb490b660eb6f9da84a023 Mon Sep 17 00:00:00 2001
From: Ricky Barrette <rickbarrette@gmail.com>
Date: Sat, 26 May 2012 10:53:28 -0400
Subject: [PATCH] Updated XML of ringtone fragment, toggle button fragment, and
 volume fragment to use the new feature title bar.

I also deleted list.xml because it is no longer used.

Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
---
 LocationRinger/res/layout/list.xml                   | 5 -----
 LocationRinger/res/layout/ringtone_fragment.xml      | 8 +++-----
 LocationRinger/res/layout/toggle_button_fragment.xml | 8 +++-----
 LocationRinger/res/layout/volume_fragment.xml        | 8 +++-----
 4 files changed, 9 insertions(+), 20 deletions(-)
 delete mode 100644 LocationRinger/res/layout/list.xml

diff --git a/LocationRinger/res/layout/list.xml b/LocationRinger/res/layout/list.xml
deleted file mode 100644
index d169124..0000000
--- a/LocationRinger/res/layout/list.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ListView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/list"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
diff --git a/LocationRinger/res/layout/ringtone_fragment.xml b/LocationRinger/res/layout/ringtone_fragment.xml
index bde96f1..aaa1c72 100644
--- a/LocationRinger/res/layout/ringtone_fragment.xml
+++ b/LocationRinger/res/layout/ringtone_fragment.xml
@@ -4,14 +4,12 @@
     android:layout_height="wrap_content"
     android:orientation="vertical" >
 
-    <TextView
-        android:id="@+id/label"
+    <include
+        android:id="@+id/title_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dip"
-        android:background="@android:drawable/title_bar"
-        android:text="@string/ringtone_options"
-        android:textColor="#FFFFFF" />
+        layout="@layout/feature_title_bar" />
 
     <EditText
         android:id="@+id/ringtone"
diff --git a/LocationRinger/res/layout/toggle_button_fragment.xml b/LocationRinger/res/layout/toggle_button_fragment.xml
index ad94fee..00e0659 100644
--- a/LocationRinger/res/layout/toggle_button_fragment.xml
+++ b/LocationRinger/res/layout/toggle_button_fragment.xml
@@ -4,14 +4,12 @@
     android:layout_height="match_parent"
     android:orientation="vertical" >
 
-    <TextView
-        android:id="@+id/label"
+    <include
+        android:id="@+id/title_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dip"
-        android:background="@android:drawable/title_bar"
-        android:text="@string/ringtone_options"
-        android:textColor="#FFFFFF" />
+        layout="@layout/feature_title_bar" />
 
     <ToggleButton
         android:id="@+id/toggle"
diff --git a/LocationRinger/res/layout/volume_fragment.xml b/LocationRinger/res/layout/volume_fragment.xml
index 9f79cd5..3588a08 100644
--- a/LocationRinger/res/layout/volume_fragment.xml
+++ b/LocationRinger/res/layout/volume_fragment.xml
@@ -4,14 +4,12 @@
     android:layout_height="wrap_content"
     android:orientation="vertical" >
 
-    <TextView
-        android:id="@+id/volume_label"
+    <include
+        android:id="@+id/title_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dip"
-        android:background="@android:drawable/title_bar"
-        android:text="@string/volume"
-        android:textColor="#FFFFFF" />
+        layout="@layout/feature_title_bar" />
 
     <SeekBar
         android:id="@+id/volume"