Fix breadcrumb item divider

Fix icon used for breadcrumb divider.
This patch also removes reliance on CMFM internal theme manager for the
breadcrumb items.

Change-Id: Ia2bf6a54ce1cc196ee0a34bb8bd28530329e122a

5 files changed, 10 insertions, 27 deletions

diff --git a/res/drawable/ic_breadcrumb.xml b/res/drawable/ic_breadcrumb.xml
index fa592134..a9edf61a 100644
--- a/res/drawable/ic_breadcrumb.xml
+++ b/res/drawable/ic_breadcrumb.xml
@@ -15,14 +15,13 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="15dp"
+    android:width="16dp"
     android:height="32dp"
-    android:viewportWidth="15"
+    android:viewportWidth="16"
     android:viewportHeight="32">
 
     <path
         android:fillColor="#FFFFFF"
-        android:fillAlpha="0.26"
-        android:strokeAlpha="0.26"
-        android:pathData="M-7.5,13l8,8l-8,8V13z" />
+        android:fillAlpha=".26"
+        android:pathData="M6.5,21V11l5,5L6.5,21z" />
 </vector>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index a129ff9b..f0056ee8 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -47,6 +47,11 @@
     <!-- A derivated blue from @color/material_palette_blue_primary with some transparency -->
     <color name="blue_transparent">#9933b5e5</color>
 
+    <!-- The text color of the ActionBar -->
+    <color name="action_bar_text_color">@android:color/white</color>
+
+    <!-- Breadcrumb text color -->
+    <color name="breadcrumb_text_color">#deffffff</color>
     <!-- Navigation Drawer Background Color -->
     <color name="navigation_drawer_background">#fafafa</color>
     <!-- Navigation Drawer Selected Item Background Color -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 78d854a2..a67cbb4b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -181,6 +181,7 @@
     <!-- Breadcrumb item -->
     <style name="breadcrumb_item" parent="@style/breadcrumb_elemement">
         <item name="android:textAppearance">@style/primary_text_appearance</item>
+        <item name="android:textColor">@color/breadcrumb_text_color</item>
         <item name="android:singleLine">true</item>
         <item name="android:paddingStart">@dimen/breadcrumb_item_margin_space</item>
         <item name="android:paddingEnd">@dimen/breadcrumb_item_margin_space</item>
diff --git a/res/values/theme.xml b/res/values/theme.xml
index 667623ef..f64b7c85 100644
--- a/res/values/theme.xml
+++ b/res/values/theme.xml
@@ -84,9 +84,6 @@
     <!-- The text color of TextView controls -->
     <color name="text_color">@color/black_transparent</color>
 
-    <!-- The text color of the ActionBar -->
-    <color name="action_bar_text_color">@android:color/white</color>
-
     <!-- The text color of Dialog -->
     <color name="dialog_text_color">@color/material_palette_blue_primary_dark</color>
 
diff --git a/src/com/cyanogenmod/filemanager/ui/widgets/BreadcrumbView.java b/src/com/cyanogenmod/filemanager/ui/widgets/BreadcrumbView.java
index e47da98f..0d3ef564 100644
--- a/src/com/cyanogenmod/filemanager/ui/widgets/BreadcrumbView.java
+++ b/src/com/cyanogenmod/filemanager/ui/widgets/BreadcrumbView.java
@@ -351,25 +351,6 @@ public class BreadcrumbView extends RelativeLayout implements Breadcrumb, OnClic
     @Override
     public void applyTheme() {
         Theme theme = ThemeManager.getCurrentTheme(getContext());
-
-        //- Breadcrumb
-        if (this.mBreadcrumbBar != null) {
-            int cc = this.mBreadcrumbBar.getChildCount();
-            for (int i = 0; i < cc; i++) {
-                // There are 2 types: Breadcrumb items and separators
-                View v = this.mBreadcrumbBar.getChildAt(i);
-                if (v instanceof BreadcrumbItem) {
-                    // Breadcrumb item
-                    theme.setTextColor(
-                            getContext(), (BreadcrumbItem)v, "action_bar_text_color"); //$NON-NLS-1$
-                } else if (v instanceof ImageView) {
-                    // Divider drawable
-                    theme.setImageDrawable(
-                            getContext(),
-                            (ImageView)v, "breadcrumb_divider_drawable"); //$NON-NLS-1$
-                }
-            }
-        }
         if (this.mDiskUsageInfo != null) {
             Drawable dw = theme.getDrawable(getContext(), "horizontal_progress_bar"); //$NON-NLS-1$
             this.mDiskUsageInfo.setProgressDrawable(dw);