From d1cdbcd973ad357e92308c5c5c23714545473ef7 Mon Sep 17 00:00:00 2001
From: Dmitry Yunitsky <yunik@mapswithme.com>
Date: Thu, 21 Jan 2016 20:25:52 +0300
Subject: [PATCH] [android] Fixed merge error with styles.

---
 android/res/layout/tab.xml            |  2 +-
 android/res/layout/tab_timepicker.xml |  2 +-
 android/res/values/styles.xml         | 10 ++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/android/res/layout/tab.xml b/android/res/layout/tab.xml
index 21466d9b58..82c207f20f 100644
--- a/android/res/layout/tab.xml
+++ b/android/res/layout/tab.xml
@@ -2,7 +2,7 @@
 <TextView
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
+  style="@style/MwmWidget.Tab"
   android:textAppearance="@style/MwmTextAppearance.Body4"
   tools:drawableLeft="@drawable/ic_menu_open"
   tools:text="Some tab"/>
-    <!--style="@style/MwmWidget.Tab"-->
diff --git a/android/res/layout/tab_timepicker.xml b/android/res/layout/tab_timepicker.xml
index 1df5d2a0f8..23da60db86 100644
--- a/android/res/layout/tab_timepicker.xml
+++ b/android/res/layout/tab_timepicker.xml
@@ -2,8 +2,8 @@
 <TextView
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
+  style="@style/MwmWidget.Tab"
   android:textAppearance="@style/MwmTextAppearance.Body3"
   android:textColor="@color/color_timepicker_tab"
   tools:drawableLeft="@drawable/ic_menu_open"
   tools:text="Some tab"/>
-    <!--style="@style/MwmWidget.Tab"-->
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index b17a6dc9c2..a3056a426b 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -157,4 +157,14 @@
     <item name="android:textAppearance">@style/MwmTextAppearance.Body3.Light</item>
     <item name="android:textColor">@color/text_light</item>
   </style>
+
+
+  <style name="MwmWidget.Tab">
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">@dimen/tabs_height</item>
+    <item name="android:textAllCaps">true</item>
+    <item name="android:textAppearance">@style/MwmTextAppearance.Body3</item>
+    <item name="android:gravity">center</item>
+  </style>
+
 </resources>
\ No newline at end of file