Use toolbar instead of action bar in main activity

app/src/main/res/layout/activity_main.xml

@@ -23,19 +23,14 @@
   -->
 
 <LinearLayout
-    xmlns:a="http://schemas.android.com/apk/res/android"
     a:id="@+id/main"
     style="@style/CppMain"
+    xmlns:a="http://schemas.android.com/apk/res/android"
     a:layout_width="match_parent"
     a:layout_height="match_parent"
     a:orientation="vertical">
 
-    <LinearLayout
-        a:id="@+id/editor"
-        a:layout_width="match_parent"
-        a:layout_height="0dp"
-        a:layout_weight="2"
-        a:orientation="horizontal" />
+    <include layout="@layout/activity_main_editor_with_toolbar"/>
 
     <LinearLayout
         a:id="@+id/partial_keyboard"

app/src/main/res/layout/activity_main_editor_with_toolbar.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:a="http://schemas.android.com/apk/res/android"
+    a:layout_width="match_parent"
+    a:layout_height="0dp"
+    a:layout_weight="2">
+
+    <FrameLayout
+        a:id="@+id/editor"
+        a:layout_width="match_parent"
+        a:layout_height="match_parent" />
+
+    <android.support.v7.widget.Toolbar
+        a:id="@+id/toolbar"
+        a:layout_width="wrap_content"
+        a:layout_height="?actionBarSize"
+        a:layout_gravity="top|right" />
+</FrameLayout>

app/src/main/res/layout/cpp_app_editor.xml

@@ -21,21 +21,11 @@
   ~ Email: se.solovyev@gmail.com
   ~ Site:  http://se.solovyev.org
   -->
-
-<LinearLayout
+<org.solovyev.android.calculator.EditorView a:id="@+id/calculator_editor"
+    style="@style/CppText.Editor"
     xmlns:a="http://schemas.android.com/apk/res/android"
-    a:id="@+id/main_fragment_layout"
-    style="@style/CppFragment"
-    a:layout_width="match_parent"
-    a:layout_height="match_parent"
-    a:padding="@dimen/cpp_editor_padding">
-
-    <org.solovyev.android.calculator.EditorView
-        a:id="@+id/calculator_editor"
-        style="@style/CppText.Editor"
-        a:hint="@string/c_calc_editor_hint"
-        a:scrollbars="vertical"
-        a:singleLine="false"
-        a:textIsSelectable="true" />
-
-</LinearLayout>
+    a:hint="@string/c_calc_editor_hint"
+    a:padding="@dimen/cpp_editor_padding"
+    a:scrollbars="vertical"
+    a:singleLine="false"
+    a:textIsSelectable="true" />