billing changes

res/drawable/metro_button_green_shape.xml

@@ -15,6 +15,6 @@
 -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient android:startColor="#667e22" android:endColor="#667e22"/>
+    <gradient android:startColor="#088e3a" android:endColor="#088e3a"/>
     <corners android:radius="1dp" />
 </shape>

res/values-ru/text_strings.xml

@@ -113,8 +113,8 @@
 	<string name="c_calc_multiplication_sign_summary">Устанавливает знак произведения</string>
 
 	<string name="c_calc_layout">Раскладка</string>
-	<string name="p_layout_cellphone">Телефон</string>
-	<string name="p_layout_calculator">Калькулятор</string>
+	<string name="p_layout_cellphone">Научная (телефон)</string>
+	<string name="p_layout_calculator">Научная</string>
 	<string name="p_layout_simple">Простая</string>
 	<string name="c_calc_layout_summary">Устанавливает раскладку кнопок</string>
 
@@ -172,6 +172,9 @@
 	<string name="c_calc_use_back_button_as_prev_summary">Устанавливает поведение по нажатию на кнопку Назад</string>
 	<string name="c_calc_use_back_button_as_prev_title">Использовать кнопку назад как назад по истории</string>
 
+	<string name="c_clear_billing_info_summary">Информация о покупках будет обновлена с сервера</string>
+	<string name="c_clear_billing_info_title">Очистить информация о покупках</string>
+
 	<string name="c_warning">Внимание</string>
 	<string name="c_error">Ошибка</string>
 	<string name="c_billing_error">Биллинг не поддерживается: вы должны иметь Google Checkout аккаунт привязанный в вашему Google аккаунту и должны быть подключены к интернету.</string>
@@ -181,6 +184,7 @@
 
 	<string name="c_calc_already_purchased">Опция уже была куплена!</string>
 	<string name="c_calc_purchasing">Покупаем...</string>
+	<string name="c_calc_clearing">Очищаем...</string>
 
 	<string name="c_feedback_title">Отзыв</string>
 	<string name="c_feedback_text">Вы используете Калькулятор++ некоторое время\n

res/values/preferences.xml

@@ -30,6 +30,8 @@
 	<string name="p_calc_use_back_button_as_prev_key">org.solovyev.android.calculator.CalculatorActivity_use_back_button_as_prev</string>
 	<string name="p_calc_use_back_button_as_prev">false</string>
 
+	<string name="p_clear_billing_info_key">clear_billing_info</string>
+
 	<string name="p_calc_show_release_notes_key">org.solovyev.android.calculator.CalculatorActivity_show_release_notes</string>
 	<string name="p_calc_show_release_notes">true</string>
 

res/values/text_strings.xml

@@ -113,8 +113,8 @@
 	<string name="c_calc_multiplication_sign_summary">Sets multiplication sign</string>
 
 	<string name="c_calc_layout">Layout</string>
-	<string name="p_layout_cellphone">Cellphone</string>
-	<string name="p_layout_calculator">Calculator</string>
+	<string name="p_layout_cellphone">Scientific (cellphone)</string>
+	<string name="p_layout_calculator">Scientific</string>
 	<string name="p_layout_simple">Simple</string>
 	<string name="c_calc_layout_summary">Sets layout of buttons</string>
 
@@ -172,6 +172,9 @@
 	<string name="c_calc_use_back_button_as_prev_summary">Defines the behaviour of the Back button</string>
 	<string name="c_calc_use_back_button_as_prev_title">Use Back button as history prev</string>
 
+	<string name="c_clear_billing_info_summary">Billing information will be reloaded from the server</string>
+	<string name="c_clear_billing_info_title">Clear billing information</string>
+
 	<string name="c_warning">Warning</string>
 	<string name="c_error">Error</string>
 	<string name="c_billing_error">Billing is not supported: you must have Google Checkout account linked to your Google account and must be connected to the internet.</string>
@@ -181,6 +184,7 @@
 
 	<string name="c_calc_already_purchased">Ad free option was already purchased!</string>
 	<string name="c_calc_purchasing">Purchasing...</string>
+	<string name="c_calc_clearing">Clearing...</string>
 
 	<string name="c_feedback_title">Feedback</string>
 	<string name="c_feedback_text">You have been using Calculator++ for some time \n

res/xml/preferences.xml

@@ -10,10 +10,6 @@
 			a:defaultValue="false"
 			/>
 
-	<org.solovyev.android.ads.AdViewPreference
-			a:key="admob_01"
-			a:layout="@layout/admob_pref"/>
-
 	<PreferenceScreen a:title="@string/c_prefs_calculations_category">
 
 		<android.preference.CheckBoxPreference
@@ -143,6 +139,11 @@
 				a:title="@string/c_calc_use_back_button_as_prev_title"
 				a:defaultValue="false"/>
 
+		<Preference
+				a:key="@string/p_clear_billing_info_key"
+				a:summary="@string/c_clear_billing_info_summary"
+				a:title="@string/c_clear_billing_info_title"/>
+
 	</PreferenceScreen>
 
 </PreferenceScreen>