Imported SettingsActivity and related classes

2016-06-06 19:49:39 -07:00
parent c4cd333cf7
commit a4bfce7874
11 changed files with 311 additions and 10 deletions
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.philliphsu.clock2.settings.SettingsActivity">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        app:popupTheme="@style/AppTheme.PopupOverlay"/>
+
+    <include layout="@layout/content_settings"/>
+
+</merge>
@@ -0,0 +1,6 @@
+<fragment android:id="@+id/fragment"
+          android:name="com.philliphsu.clock2.settings.SettingsFragment"
+          xmlns:android="http://schemas.android.com/apk/res/android"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"
+          android:layout_marginTop="?attr/actionBarSize" />