From 8155ab5d2ae7cba66f93d1f21f52c51d29d43c45 Mon Sep 17 00:00:00 2001
From: Dmitry Kunin <dkunin@mapswith.me>
Date: Thu, 4 Jul 2013 14:16:16 +0300
Subject: [PATCH] [android] mystically missing bar fix.

---
 android/MapsWithMeLite.Samsung/AndroidManifest.xml |  4 ++--
 android/MapsWithMeLite/AndroidManifest.xml         |  4 ++--
 android/MapsWithMePro/AndroidManifest.xml          |  6 +++---
 android/MapsWithMePro/res/values-v13/styles.xml    |  4 ++++
 android/res/values-v11/styles.xml                  |  4 ++++
 android/res/values/styles.xml                      | 12 +++++++++---
 android/res/values/titleless_theme.xml             |  5 -----
 7 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 android/MapsWithMePro/res/values-v13/styles.xml
 create mode 100644 android/res/values-v11/styles.xml
 delete mode 100644 android/res/values/titleless_theme.xml

diff --git a/android/MapsWithMeLite.Samsung/AndroidManifest.xml b/android/MapsWithMeLite.Samsung/AndroidManifest.xml
index fdb2d33b0b..8327ec4a9d 100644
--- a/android/MapsWithMeLite.Samsung/AndroidManifest.xml
+++ b/android/MapsWithMeLite.Samsung/AndroidManifest.xml
@@ -32,7 +32,7 @@
         <activity android:name="com.mapswithme.maps.DownloadResourcesActivity"
                   android:label="@string/app_name"
                   android:screenOrientation="behind"
-                  android:theme="@style/MWMNoTitle"
+                  android:theme="@style/MWMMain"
                   android:configChanges="orientation|screenLayout|screenSize">
 
             <intent-filter>
@@ -72,7 +72,7 @@
         <activity android:name="com.mapswithme.maps.MWMActivity"
                   android:label="@string/app_name"
                   android:screenOrientation="behind"
-                  android:theme="@style/MWMNoTitle"
+                  android:theme="@style/MWMMain.NoBar"
                   android:launchMode="singleTask"
                   android:configChanges="orientation|screenLayout|screenSize">
         </activity>
diff --git a/android/MapsWithMeLite/AndroidManifest.xml b/android/MapsWithMeLite/AndroidManifest.xml
index c5ac718081..53cf7df477 100644
--- a/android/MapsWithMeLite/AndroidManifest.xml
+++ b/android/MapsWithMeLite/AndroidManifest.xml
@@ -32,7 +32,7 @@
         <activity android:name="com.mapswithme.maps.DownloadResourcesActivity"
                   android:label="@string/app_name"
                   android:screenOrientation="behind"
-                  android:theme="@style/MWMNoTitle"
+                  android:theme="@style/MWMMain"
                   android:configChanges="orientation|screenLayout|screenSize">
 
             <!-- standard "geo" scheme -->
@@ -72,7 +72,7 @@
         <activity android:name="com.mapswithme.maps.MWMActivity"
                   android:label="@string/app_name"
                   android:screenOrientation="behind"
-                  android:theme="@style/MWMNoTitle"
+                  android:theme="@style/MWMMain.NoBar"
                   android:launchMode="singleTask"
                   android:configChanges="orientation|screenLayout|screenSize">
         </activity>
diff --git a/android/MapsWithMePro/AndroidManifest.xml b/android/MapsWithMePro/AndroidManifest.xml
index 759176bd3e..94a176f798 100644
--- a/android/MapsWithMePro/AndroidManifest.xml
+++ b/android/MapsWithMePro/AndroidManifest.xml
@@ -46,13 +46,13 @@
         android:name="com.mapswithme.maps.MWMApplication"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/Holo.Theme.Light" >
+        android:theme="@style/MWMMain" >
         <activity
             android:name="com.mapswithme.maps.DownloadResourcesActivity"
             android:configChanges="orientation|screenLayout|screenSize"
             android:label="@string/app_name"
             android:screenOrientation="behind"
-            android:theme="@style/MWMNoTitle" >
+            android:theme="@style/MWMMain.NoBar" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -141,7 +141,7 @@
             android:label="@string/app_name"
             android:launchMode="singleTask"
             android:screenOrientation="behind"
-            android:theme="@style/MWMNoTitle" >
+            android:theme="@style/MWMMain.NoBar" >
         </activity>
         <activity
             android:name="com.mapswithme.maps.DownloadUI"
diff --git a/android/MapsWithMePro/res/values-v13/styles.xml b/android/MapsWithMePro/res/values-v13/styles.xml
new file mode 100644
index 0000000000..2868a579bc
--- /dev/null
+++ b/android/MapsWithMePro/res/values-v13/styles.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="MWMMain.NoBar" parent="@android:style/Theme.Holo.Light.NoActionBar"/>
+</resources>
diff --git a/android/res/values-v11/styles.xml b/android/res/values-v11/styles.xml
new file mode 100644
index 0000000000..1d95d09c6a
--- /dev/null
+++ b/android/res/values-v11/styles.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="MWMMain" parent="@android:style/Theme.Holo.Light"></style>
+</resources>
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index 88cd43dfac..6e96a1f996 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -39,7 +39,7 @@
         <item name="android:fontFamily" tools:targetApi="jelly_bean">sans-serif-light</item>
     </style>
 
-     <style name="tagGreenText.Mid" parent="@style/tagGreenText">
+    <style name="tagGreenText.Mid" parent="@style/tagGreenText">
         <item name="android:textSize">@dimen/sp_x_4</item>
     </style>
 
@@ -54,14 +54,19 @@
         <item name="android:textSize">@dimen/sp_x_3</item>
         <item name="android:textStyle">bold</item>
     </style>
+
     <style name="pinEditableParam" parent="Holo.EditText.Light">
         <item name="android:imeOptions">actionDone</item>
         <item name="android:layout_marginBottom">@dimen/dp_x_4</item>
         <item name="android:textSize">@dimen/sp_x_4</item>
     </style>
 
+
+    <style name="MWMMain" parent="@style/Holo.Theme.Light"></style>
+    <style name="MWMMain.NoBar" parent="@style/Holo.Theme.Light.NoActionBar"></style>
+
     <!-- Dialog Holo.Light theme for Activity -->
-    <style name="MWMTheme.Dialog.Light" parent="@style/Holo.Theme.Light">
+    <style name="MWMTheme.Dialog.Light" parent="@style/MWMMain">
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowFrame">@null</item>
@@ -79,5 +84,6 @@
         <item name="borderlessButtonStyle">@style/Holo.Button.Borderless.Small.Light</item>
         <item name="listPreferredItemPaddingLeft">16dip</item>
         <item name="listPreferredItemPaddingRight">16dip</item>
-  </style>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/android/res/values/titleless_theme.xml b/android/res/values/titleless_theme.xml
deleted file mode 100644
index cf643fa503..0000000000
--- a/android/res/values/titleless_theme.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="MWMNoTitle" parent="@style/Holo.Theme.Light.NoActionBar">
-    </style>
-</resources>
\ No newline at end of file