Bug 1232868 - Clean up bookmark folder list item UI. r=mcomella

MozReview-Commit-ID: 4ktf2xlSKwJ

--HG--
extra : rebase_source : b8082ade978334974068e974a621a2c0dd513e02
extra : histedit_source : 602d8e85bc251f248b04bcea5d1f25fe1b323b90

mobile/android/base/java/org/mozilla/gecko/home/PanelBackItemView.java

@@ -31,11 +31,11 @@ class PanelBackItemView extends LinearLayout {
         final ImageView image = (ImageView) findViewById(R.id.image);
 
         if (TextUtils.isEmpty(backImageUrl)) {
-            image.setImageResource(R.drawable.folder_up);
+            image.setImageResource(R.drawable.arrow_up);
         } else {
             ImageLoader.with(getContext())
                        .load(backImageUrl)
-                       .placeholder(R.drawable.folder_up)
+                       .placeholder(R.drawable.arrow_up)
                        .into(image);
         }
     }

mobile/android/base/java/org/mozilla/gecko/home/TwoLinePageRow.java

@@ -92,7 +92,7 @@ public class TwoLinePageRow extends LinearLayout
 
         LayoutInflater.from(context).inflate(R.layout.two_line_page_row, this);
         // Merge layouts lose their padding, so set it dynamically.
-        setPadding(0, 0, (int) getResources().getDimension(R.dimen.page_row_padding_right), 0);
+        setPadding(0, 0, (int) getResources().getDimension(R.dimen.page_row_edge_padding), 0);
 
         mTitle = (TextView) findViewById(R.id.title);
         mUrl = (TextView) findViewById(R.id.url);

mobile/android/base/resources/drawable/bookmark_folder.xml

@@ -8,9 +8,9 @@
 
     <!-- state open -->
     <item gecko:state_open="true"
-          android:drawable="@drawable/folder_up"/>
+          android:drawable="@drawable/bookmark_folder_arrow_up"/>
 
     <!-- state close -->
-    <item android:drawable="@drawable/bookmark_folder_closed"/>
+    <item android:drawable="@drawable/folder_closed"/>
 
 </selector>

mobile/android/base/resources/drawable/bookmark_folder_arrow_up.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- State drawables will stretch drawables to be the same size and neither
+     android:constantSize nor variablePadding fix this, so we hard-code padding
+     in to ensure that they display at their true size. -->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+       android:drawable="@drawable/arrow_up"
+       android:insetTop="3dp"
+       android:insetRight="3dp"
+       android:insetBottom="3dp"
+       android:insetLeft="3dp" />

mobile/android/base/resources/values-large-land-v11/styles.xml

@@ -9,19 +9,6 @@
          <item name="android:scrollbars">vertical</item>
     </style>
 
-    <style name="Widget.BookmarkFolderView" parent="Widget.TwoLinePageRow.Title">
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">none</item>
-        <item name="android:paddingLeft">60dip</item>
-        <item name="android:drawablePadding">10dip</item>
-        <item name="android:drawableLeft">@drawable/bookmark_folder</item>
-    </style>
-
-    <style name="Widget.BookmarkItemView" parent="Widget.TwoLinePageRow">
-        <item name="android:paddingLeft">50dp</item>
-        <item name="android:paddingRight">50dp</item>
-    </style>
-
     <style name="Widget.BookmarksListView" parent="Widget.HomeListView">
         <item name="android:scrollbarStyle">outsideOverlay</item>
     </style>

mobile/android/base/resources/values/dimens.xml

@@ -79,7 +79,7 @@
     <dimen name="site_security_unknown_inset_top">1dp</dimen>
     <dimen name="site_security_unknown_inset_bottom">-1dp</dimen>
 
-    <dimen name="page_row_padding_right">15dp</dimen>
+    <dimen name="page_row_edge_padding">16dp</dimen>
 
     <!-- Regular page row on about:home -->
     <dimen name="page_row_height">64dp</dimen>

mobile/android/base/resources/values/styles.xml

@@ -166,8 +166,9 @@
     <style name="Widget.BookmarkFolderView" parent="Widget.TwoLinePageRow.Title">
         <item name="android:singleLine">true</item>
         <item name="android:ellipsize">none</item>
-        <item name="android:paddingLeft">10dip</item>
-        <item name="android:drawablePadding">10dip</item>
+        <item name="android:background">@color/about_page_header_grey</item>
+        <item name="android:paddingLeft">@dimen/page_row_edge_padding</item>
+        <item name="android:drawablePadding">@dimen/page_row_edge_padding</item>
         <item name="android:drawableLeft">@drawable/bookmark_folder</item>
     </style>