ImageCardView Badge visibility and
viewType issues fixed.

b/22885101
b/22884912

Change-Id: I1bdececde8e65b7a267635ff44857e564818526e
diff --git a/v17/leanback/res/layout/lb_image_card_view.xml b/v17/leanback/res/layout/lb_image_card_view.xml
index ac7413f..1bc23f8 100644
--- a/v17/leanback/res/layout/lb_image_card_view.xml
+++ b/v17/leanback/res/layout/lb_image_card_view.xml
@@ -24,8 +24,7 @@
 
     <android.support.v17.leanback.widget.NonOverlappingRelativeLayout
         android:id="@+id/info_field"
-        style="?attr/lbImageCardViewInfoAreaStyle"
-        lb:layout_viewType="info" >
+        style="?attr/lbImageCardViewInfoAreaStyle">
     </android.support.v17.leanback.widget.NonOverlappingRelativeLayout>
 
 </merge>
\ No newline at end of file
diff --git a/v17/leanback/res/values/styles.xml b/v17/leanback/res/values/styles.xml
index 8cbf9c6..ce0984c 100644
--- a/v17/leanback/res/values/styles.xml
+++ b/v17/leanback/res/values/styles.xml
@@ -101,6 +101,8 @@
         <item name="cardType">infoUnder</item>
         <item name="infoVisibility">activated</item>
         <item name="android:background">@color/lb_basic_card_bg_color</item>
+        <item name="android:focusable">true</item>
+        <item name="android:focusableInTouchMode">true</item>
         <!-- In order to keep backward compatibility we have to create an icon on right. -->
         <item name="lbImageCardViewType">Title|Content|IconOnRight</item>
         <item name="lbImageCardViewImageStyle">@style/Widget.Leanback.ImageCardView.ImageStyle</item>
@@ -112,8 +114,7 @@
         <item name="infoAreaBackground">@null</item>
     </style>
 
-    <style name="Widget.Leanback.ImageCardView" >
-    </style>
+    <style name="Widget.Leanback.ImageCardView" />
 
     <style name="Widget.Leanback.ImageCardView.ImageStyle">
         <item name="android:layout_width">wrap_content</item>
@@ -122,6 +123,7 @@
         <item name="android:contentDescription">@null</item>
         <item name="android:scaleType">centerCrop</item>
         <item name="layout_viewType">main</item>
+        <item name="android:background">@null</item>
     </style>
 
     <style name="Widget.Leanback.ImageCardView.InfoAreaStyle">
@@ -170,7 +172,6 @@
         <item name="android:layout_height">@dimen/lb_basic_card_info_badge_size</item>
         <item name="android:contentDescription">@null</item>
         <item name="android:scaleType">fitCenter</item>
-        <item name="android:visibility">gone</item>
         <item name="android:background">@null</item>
     </style>