Renamed toolbar height variable to avoid confusion and priority issues in client apps.

Author: khaykov

app/src/main/res/layout-v17/activity_main.xml

@@ -8,7 +8,7 @@
     <org.wordpress.aztec.toolbar.AztecToolbar
         android:id="@+id/formatting_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/format_bar_height"
+        android:layout_height="@dimen/aztec_format_bar_height"
         android:layout_alignParentBottom="true">
     </org.wordpress.aztec.toolbar.AztecToolbar>
 

app/src/main/res/layout/activity_main.xml

@@ -8,7 +8,7 @@
     <org.wordpress.aztec.toolbar.AztecToolbar
         android:id="@+id/formatting_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/format_bar_height"
+        android:layout_height="@dimen/aztec_format_bar_height"
         android:layout_alignParentBottom="true">
     </org.wordpress.aztec.toolbar.AztecToolbar>
 

aztec/src/main/res/layout/aztec_format_bar_advanced.xml

@@ -20,11 +20,11 @@
     <HorizontalScrollView
         android:id="@+id/format_bar_button_scroll"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/format_bar_height"
+        android:layout_height="@dimen/aztec_format_bar_height"
         android:layout_gravity="bottom"
         android:clipToPadding="false"
         android:fillViewport="true"
-        android:paddingRight="@dimen/format_bar_right_margin"
+        android:paddingRight="@dimen/aztec_format_bar_right_margin"
         tools:ignore="RtlHardcoded,RtlSymmetry">
 
         <LinearLayout
@@ -162,7 +162,7 @@
                                 style="@style/FormatBarButton"
                                 android:layout_width="wrap_content"
                                 android:layout_height="fill_parent"
-                                android:layout_marginLeft="@dimen/format_bar_left_margin"
+                                android:layout_marginLeft="@dimen/aztec_format_bar_left_margin"
                                 android:background="@drawable/format_bar_button_heading_selector"
                                 android:contentDescription="@string/format_bar_description_heading">
                             </org.wordpress.aztec.toolbar.RippleToggleButton>

aztec/src/main/res/layout/aztec_format_bar_basic.xml

@@ -19,19 +19,19 @@
 
     <HorizontalScrollView
         android:layout_width="match_parent"
-        android:layout_height="@dimen/format_bar_height"
+        android:layout_height="@dimen/aztec_format_bar_height"
         android:layout_gravity="bottom"
         android:clipToPadding="false"
         android:fillViewport="true"
-        android:paddingRight="@dimen/format_bar_right_margin"
+        android:paddingRight="@dimen/aztec_format_bar_right_margin"
         tools:ignore="RtlHardcoded,RtlSymmetry">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:clipToPadding="false"
             android:orientation="horizontal"
-            android:paddingRight="@dimen/format_bar_right_margin"
+            android:paddingRight="@dimen/aztec_format_bar_right_margin"
             tools:ignore="RtlHardcoded,RtlSymmetry">
 
             <LinearLayout
@@ -97,7 +97,7 @@
                             style="@style/FormatBarButton"
                             android:layout_width="wrap_content"
                             android:layout_height="fill_parent"
-                            android:layout_marginLeft="@dimen/format_bar_left_margin"
+                            android:layout_marginLeft="@dimen/aztec_format_bar_left_margin"
                             android:background="@drawable/format_bar_button_heading_selector"
                             android:contentDescription="@string/format_bar_description_heading">
                         </org.wordpress.aztec.toolbar.RippleToggleButton>

aztec/src/main/res/values/dimens.xml

@@ -25,9 +25,9 @@
     <item type="dimen" format="string" name="spacing_multiplier">1.0</item>
 
     <!-- TOOLBAR -->
-    <dimen name="format_bar_height">48dp</dimen>
-    <dimen name="format_bar_left_margin">5dp</dimen>
-    <dimen name="format_bar_right_margin">5dp</dimen>
+    <dimen name="aztec_format_bar_height">48dp</dimen>
+    <dimen name="aztec_format_bar_left_margin">5dp</dimen>
+    <dimen name="aztec_format_bar_right_margin">5dp</dimen>
 
     <dimen name="format_bar_horizontal_divider_height">1dp</dimen>
     <dimen name="format_bar_vertical_divider_width">0.6dp</dimen>

aztec/src/main/res/values/styles.xml

@@ -2,8 +2,8 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="FormatBarButton">
-        <item name="android:minWidth">@dimen/format_bar_height</item>
-        <item name="android:minHeight">@dimen/format_bar_height</item>
+        <item name="android:minWidth">@dimen/aztec_format_bar_height</item>
+        <item name="android:minHeight">@dimen/aztec_format_bar_height</item>
         <item name="android:textOn">@null</item>
         <item name="android:textOff">@null</item>
     </style>