From 070d0a12d12692534cf24f6b84e5910ec8ff0789 Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Wed, 28 Jan 2015 21:43:26 +0100
Subject: [PATCH] Action bar is shown in the Settings again

---
 android-app/src/main/AndroidManifest.xml      |  2 +-
 .../preferences/BasePreferencesActivity.java  | 25 +++++++++++++++++++
 .../main/res/layout/cpp_activity_settings.xml | 19 ++++++++++++++
 android-app/src/main/res/values/theme.xml     | 14 +++++++++++
 4 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 android-app/src/main/res/layout/cpp_activity_settings.xml

diff --git a/android-app/src/main/AndroidManifest.xml b/android-app/src/main/AndroidManifest.xml
index e5581a6d..886987cb 100644
--- a/android-app/src/main/AndroidManifest.xml
+++ b/android-app/src/main/AndroidManifest.xml
@@ -46,7 +46,7 @@
 		<activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:launchMode="singleTop" android:name=".CalculatorActivityMobile" android:windowSoftInputMode="adjustPan"/>
 
 		<!-- settings must use action bar icon-->
-		<activity android:icon="@drawable/ab_icon" android:label="@string/c_app_settings" android:name=".preferences.PreferencesActivity"/>
+		<activity android:icon="@drawable/ab_icon" android:label="@string/c_app_settings" android:name=".preferences.PreferencesActivity" android:theme="@style/Theme.Settings"/>
 
 		<activity android:label="@string/c_history" android:name=".history.CalculatorHistoryActivity"/>
 
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/preferences/BasePreferencesActivity.java b/android-app/src/main/java/org/solovyev/android/calculator/preferences/BasePreferencesActivity.java
index 10b5e67b..0679bfa3 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/preferences/BasePreferencesActivity.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/preferences/BasePreferencesActivity.java
@@ -3,7 +3,11 @@ package org.solovyev.android.calculator.preferences;
 import android.content.Intent;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
+import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
 import org.solovyev.android.calculator.ActivityUi;
 import org.solovyev.android.calculator.AdView;
 import org.solovyev.android.calculator.App;
@@ -20,15 +24,36 @@ public abstract class BasePreferencesActivity extends PreferenceActivity {
 	private final ActivityCheckout checkout = Checkout.forActivity(this, App.getBilling(), App.getProducts());
 	private Inventory inventory;
 	private AdView adView;
+	private Toolbar actionBar;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
+		actionBar.setTitle(getTitle());
+
 		checkout.start();
 		inventory = checkout.loadInventory();
 	}
 
+	@Override
+	public void setContentView(int layout) {
+		final ViewGroup contentView = (ViewGroup) LayoutInflater.from(this).inflate(R.layout.cpp_activity_settings, new LinearLayout(this), true);
+
+		actionBar = (Toolbar) contentView.findViewById(R.id.action_bar);
+		actionBar.setNavigationOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				finish();
+			}
+		});
+
+		final ViewGroup contentWrapper = (ViewGroup) contentView.findViewById(R.id.content_wrapper);
+		LayoutInflater.from(this).inflate(layout, contentWrapper, true);
+
+		getWindow().setContentView(contentView);
+	}
+
 
 	private class InventoryListener implements Inventory.Listener {
 		@Override
diff --git a/android-app/src/main/res/layout/cpp_activity_settings.xml b/android-app/src/main/res/layout/cpp_activity_settings.xml
new file mode 100644
index 00000000..d92c5661
--- /dev/null
+++ b/android-app/src/main/res/layout/cpp_activity_settings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<android.support.v7.widget.Toolbar
+		android:id="@+id/action_bar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:minHeight="?attr/actionBarSize" />
+
+	<FrameLayout
+		android:id="@+id/content_wrapper"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/values/theme.xml b/android-app/src/main/res/values/theme.xml
index c50fcf30..2f67786e 100644
--- a/android-app/src/main/res/values/theme.xml
+++ b/android-app/src/main/res/values/theme.xml
@@ -28,4 +28,18 @@
 	<style name="Theme.Base" parent="@style/Theme.AppCompat"></style>
 	<style name="Theme.Base.Dialog" parent="@style/Theme.AppCompat.Dialog"></style>
 
+	<style name="Theme.Settings" parent="@style/cpp_metro_blue_theme">
+		<item name="android:windowNoTitle">true</item>
+		<item name="android:windowActionBar">false</item>
+
+		<item name="toolbarStyle">@style/Widget.Toolbar</item>
+	</style>
+
+	<style name="Widget.Toolbar" parent="@style/Widget.AppCompat.Toolbar">
+		<item name="android:background">?attr/colorPrimary</item>
+		<item name="android:navigationIcon">?attr/homeAsUpIndicator</item>
+		<item name="navigationIcon">?attr/homeAsUpIndicator</item>
+	</style>
+
+
 </resources>
\ No newline at end of file