aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2015-06-17 08:10:05 -0700
committerScott Jackson <daneren2005@gmail.com>2015-06-17 08:10:05 -0700
commit4d8d67a02e18948f707bfe2465435c4a69459468 (patch)
tree6f298edcea5b0e46cb6de7adf9596f7f7ef8577e /app/src/main/res
parent111757497f4e7ba13a04ebf75b4e0e9bf9a2d011 (diff)
downloaddsub-4d8d67a02e18948f707bfe2465435c4a69459468.tar.gz
dsub-4d8d67a02e18948f707bfe2465435c4a69459468.tar.bz2
dsub-4d8d67a02e18948f707bfe2465435c4a69459468.zip
Switch SettingsActivity over to use manually inserted Toolbar
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/download_activity.xml4
-rw-r--r--app/src/main/res/layout/settings_activity.xml16
2 files changed, 16 insertions, 4 deletions
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