Merge "Show only 1 entry for hearing aid devices without killing the activity." into pi-dev

am: d87acaf3cf

Change-Id: Id0d3f2912feff75a572c57230715ffeed0a68d80
This commit is contained in:
Isha Bobra
2018-04-16 09:56:17 -07:00
committed by android-build-merger
9 changed files with 88 additions and 7 deletions

View File

@@ -81,6 +81,17 @@
android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary" />
<TextView
android:id="@+id/entity_header_second_summary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start"
android:singleLine="true"
android:ellipsize="marquee"
android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary" />
</LinearLayout>
</LinearLayout>

View File

@@ -75,6 +75,17 @@
android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary" />
<TextView
android:id="@+id/entity_header_second_summary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start"
android:singleLine="true"
android:ellipsize="marquee"
android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary" />
</LinearLayout>
<LinearLayout