From f2ef447e8e768d3d0bdd1ff88f51a4f72fcb99c0 Mon Sep 17 00:00:00 2001
From: jackqdyulei <jackqdyulei@google.com>
Date: Tue, 16 Jan 2018 19:40:36 -0800
Subject: [PATCH] Tweak bluetooth text alignment

1. Remove the placeholder summary so it won't show blank summary
2. Update settings_entity_header to make text center_vertical,
so it could align with the icon.

Bug: 71742145
Test: Screenshot
Change-Id: I185114a4e0c8d996f218075a8633e802fabf3c66
---
 res/layout-sw320dp/settings_entity_header.xml                 | 4 ++--
 .../android/settings/bluetooth/BluetoothDeviceUpdater.java    | 1 -
 .../settings/bluetooth/BluetoothDeviceUpdaterTest.java        | 2 --
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/res/layout-sw320dp/settings_entity_header.xml b/res/layout-sw320dp/settings_entity_header.xml
index 951961c53e8..481a9c4cf85 100644
--- a/res/layout-sw320dp/settings_entity_header.xml
+++ b/res/layout-sw320dp/settings_entity_header.xml
@@ -45,6 +45,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
             android:orientation="vertical">
@@ -57,8 +58,7 @@
                 android:singleLine="false"
                 android:ellipsize="marquee"
                 android:gravity="start"
-                android:textDirection="locale"
-                android:paddingTop="8dp" />
+                android:textDirection="locale" />
 
             <TextView
                 android:id="@+id/install_type"
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
index 9898c33be3c..127730ba39a 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
@@ -176,7 +176,6 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback {
                     new BluetoothDevicePreference(mPrefContext, cachedDevice,
                             mShowDeviceWithoutNames);
             btPreference.setOnGearClickListener(mDeviceProfilesListener);
-            btPreference.setSummary(R.string.summary_placeholder);
             mPreferenceMap.put(device, btPreference);
             mDevicePreferenceCallback.onDeviceAdded(btPreference);
         }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
index 823bcbe7edf..4294dfbbc76 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
@@ -95,8 +95,6 @@ public class BluetoothDeviceUpdaterTest {
 
         final Preference preference = mBluetoothDeviceUpdater.mPreferenceMap.get(mBluetoothDevice);
         assertThat(preference).isNotNull();
-        assertThat(preference.getSummary()).isEqualTo(
-                mContext.getString(R.string.summary_placeholder));
         verify(mDevicePreferenceCallback).onDeviceAdded(preference);
     }