From b81d55b8ef2239b42c94743ee0096b393966ca35 Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Tue, 27 Jan 2015 19:55:27 +0100
Subject: [PATCH] Attributes removed

---
 android-app/src/main/res/layout/cpp_dialog.xml              | 2 +-
 .../src/main/res/layout/cpp_fixable_messages_dialog.xml     | 2 +-
 .../main/res/layout/cpp_plot_function_settings_dialog.xml   | 2 +-
 android-app/src/main/res/layout/cpp_wizard.xml              | 2 +-
 android-app/src/main/res/values/attributes.xml              | 1 -
 android-app/src/main/res/values/theme_gray.xml              | 6 +-----
 6 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/android-app/src/main/res/layout/cpp_dialog.xml b/android-app/src/main/res/layout/cpp_dialog.xml
index 98b27b29..c77c2a56 100644
--- a/android-app/src/main/res/layout/cpp_dialog.xml
+++ b/android-app/src/main/res/layout/cpp_dialog.xml
@@ -24,7 +24,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/dialog_layout"
-			  style="?cpp_dialog_style"
+			  style="@style/cpp_dialog"
 			  a:orientation="vertical">
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_fixable_messages_dialog.xml b/android-app/src/main/res/layout/cpp_fixable_messages_dialog.xml
index 77f3f036..36365207 100644
--- a/android-app/src/main/res/layout/cpp_fixable_messages_dialog.xml
+++ b/android-app/src/main/res/layout/cpp_fixable_messages_dialog.xml
@@ -23,7 +23,7 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  style="?cpp_dialog_style">
+			  style="@style/cpp_dialog">
 
 	<LinearLayout
 			a:id="@+id/cpp_fixable_messages_container"
diff --git a/android-app/src/main/res/layout/cpp_plot_function_settings_dialog.xml b/android-app/src/main/res/layout/cpp_plot_function_settings_dialog.xml
index 74e99ffb..9063d3a1 100644
--- a/android-app/src/main/res/layout/cpp_plot_function_settings_dialog.xml
+++ b/android-app/src/main/res/layout/cpp_plot_function_settings_dialog.xml
@@ -24,6 +24,6 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/dialog_layout"
-			  style="?cpp_dialog_style">
+			  style="@style/cpp_dialog">
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_wizard.xml b/android-app/src/main/res/layout/cpp_wizard.xml
index d04e84a7..6bf89d8b 100644
--- a/android-app/src/main/res/layout/cpp_wizard.xml
+++ b/android-app/src/main/res/layout/cpp_wizard.xml
@@ -24,7 +24,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 	a:id="@+id/wizard_layout"
-	style="?cpp_dialog_style"
+	style="@style/cpp_dialog"
 	a:orientation="vertical">
 
 	<FrameLayout
diff --git a/android-app/src/main/res/values/attributes.xml b/android-app/src/main/res/values/attributes.xml
index 5bf830a5..343bf861 100644
--- a/android-app/src/main/res/values/attributes.xml
+++ b/android-app/src/main/res/values/attributes.xml
@@ -23,7 +23,6 @@
 
 <resources>
 
-	<attr name="cpp_dialog_style" format="reference"/>
 	<attr name="cpp_digit_button_style" format="reference"/>
 	<attr name="cpp_control_button_style" format="reference"/>
 	<attr name="cpp_control_image_button_style" format="reference"/>
diff --git a/android-app/src/main/res/values/theme_gray.xml b/android-app/src/main/res/values/theme_gray.xml
index 7734b1f9..36166b77 100644
--- a/android-app/src/main/res/values/theme_gray.xml
+++ b/android-app/src/main/res/values/theme_gray.xml
@@ -26,7 +26,7 @@
 		<item name="android:background">@drawable/gray_button</item>
 	</style>
 
-	<style name="cpp_default_dialog_style">
+	<style name="cpp_dialog">
 		<item name="android:padding">6dp</item>
 		<item name="android:minWidth">200dp</item>
 		<item name="android:layout_width">match_parent</item>
@@ -135,8 +135,6 @@
 
 		<item name="cpp_fragment_layout_style">@style/cpp_default_fragment_layout_style</item>
 
-		<item name="cpp_dialog_style">@style/cpp_default_dialog_style</item>
-
 		<item name="cpp_pane_style">@style/cpp_default_pane_style</item>
 		<item name="cpp_pane_style_transparent">@style/cpp_default_pane_style_transparent</item>
 	</style>
@@ -160,8 +158,6 @@
 
 		<item name="cpp_fragment_layout_style">@style/cpp_default_fragment_layout_style</item>
 
-		<item name="cpp_dialog_style">@style/cpp_default_dialog_style</item>
-
 		<item name="cpp_pane_style">@style/cpp_default_pane_style</item>
 		<item name="cpp_pane_style_transparent">@style/cpp_default_pane_style_transparent</item>
 	</style>