Merge "Infrastructure for showing instant app metadata in app header"

diff --cc res/layout/app_details.xml
index 9f349de,649d908..3088865
--- 1/res/layout/app_details.xml
--- 2/res/layout/app_details.xml
+++ b/res/layout/app_details.xml
@@@ -24,57 -24,72 +24,92 @@@
      android:layout_gravity="center_horizontal|top"
      android:orientation="vertical"
      android:paddingStart="?android:attr/listPreferredItemPaddingStart"
 -    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
 +    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
 +    android:paddingTop="24dp"
 +    android:paddingBottom="24dp" >
  
      <!-- App snippet with buttons -->
 -    <ImageView
 -        android:id="@android:id/icon"
 -        android:layout_width="80dp"
 -        android:layout_height="80dp"
 -        android:scaleType="fitXY"
 -        android:layout_gravity="center_horizontal"
 -        android:antialias="true"/>
 -
 -    <TextView
 -        android:id="@android:id/title"
 -        style="@style/TextAppearance.EntityHeaderTitle"
 +    <LinearLayout
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
 -        android:singleLine="true"
 -        android:ellipsize="marquee"
 -        android:gravity="center_horizontal"
 -        android:paddingTop="8dp"/>
 +        android:paddingStart="8dp"
 +        android:paddingEnd="8dp"
 +        android:orientation="horizontal">
  
 -    <TextView
 -        android:id="@android:id/summary"
 -        android:layout_width="wrap_content"
 -        android:layout_height="wrap_content"
 -        android:gravity="center_horizontal"
 -        android:singleLine="true"
 -        android:ellipsize="marquee"
 -        android:textAppearance="@android:style/TextAppearance.Material.Body1"
 -        android:textColor="?android:attr/textColorSecondary"/>
 +        <ImageView
 +            android:id="@android:id/icon"
 +            android:layout_width="80dp"
 +            android:layout_height="80dp"
 +            android:scaleType="fitXY"
 +            android:layout_gravity="center_horizontal"
 +            android:antialias="true"/>
 +
 +        <LinearLayout
 +            android:layout_width="match_parent"
 +            android:layout_height="wrap_content"
 +            android:paddingStart="24dp"
 +            android:paddingEnd="24dp"
 +            android:orientation="vertical">
 +
 +            <TextView
 +                android:id="@android:id/title"
 +                style="@style/TextAppearance.EntityHeaderTitle"
 +                android:layout_width="match_parent"
 +                android:layout_height="wrap_content"
 +                android:singleLine="true"
 +                android:ellipsize="marquee"
 +                android:gravity="start"
 +                android:paddingTop="8dp"/>
 +
 +            <TextView
 +                android:id="@android:id/summary"
 +                android:layout_width="match_parent"
 +                android:layout_height="wrap_content"
 +                android:gravity="start"
 +                android:singleLine="true"
 +                android:ellipsize="marquee"
 +                android:textAppearance="@android:style/TextAppearance.Material.Body1"
 +                android:textColor="?android:attr/textColorSecondary"/>
 +
 +        </LinearLayout>
 +
 +    </LinearLayout>
  
+     <TextView
+         android:id="@+id/instant_app_developer_title"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:gravity="center_horizontal"
+         android:visibility="gone"/>
+ 
+     <LinearLayout
+         android:id="@+id/instant_app_maturity"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:orientation="horizontal"
+         android:gravity="center_vertical"
+         android:visibility="gone">
+ 
+         <ImageView
+             android:id="@+id/instant_app_maturity_icon"
+             android:layout_width="40dp"
+             android:layout_height="40dp"
+             android:scaleType="fitXY"/>
+         <TextView
+             android:id="@+id/instant_app_maturity_text"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"/>
+ 
+     </LinearLayout>
+ 
+     <TextView
+         android:id="@+id/instant_app_monetization"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:gravity="center_horizontal"
+         android:visibility="gone"/>
+ 
+ 
      <LinearLayout
          android:id="@+id/app_detail_links"
          android:layout_width="match_parent"