From 4d8d67a02e18948f707bfe2465435c4a69459468 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Wed, 17 Jun 2015 08:10:05 -0700
Subject: Switch SettingsActivity over to use manually inserted Toolbar

---
 app/src/main/res/layout/download_activity.xml |  4 ----
 app/src/main/res/layout/settings_activity.xml | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)
 delete mode 100644 app/src/main/res/layout/download_activity.xml
 create mode 100644 app/src/main/res/layout/settings_activity.xml

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/download_activity.xml b/app/src/main/res/layout/download_activity.xml
deleted file mode 100644
index 017e4013..00000000
--- a/app/src/main/res/layout/download_activity.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fragment_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml
new file mode 100644
index 00000000..89355cb7
--- /dev/null
+++ b/app/src/main/res/layout/settings_activity.xml
@@ -0,0 +1,16 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/main_toolbar"
+        android:layout_height="?attr/actionBarSize"
+        android:layout_width="match_parent"
+        android:background="?attr/colorPrimary"
+        android:elevation="4dp"/>
+
+    <FrameLayout
+         android:id="@+id/fragment_container"
+         android:layout_width="match_parent"
+         android:layout_height="match_parent" />
+</FrameLayout>
\ No newline at end of file
-- 
cgit v1.2.3