From 43d93289ba172cb52f3c5a47421cd7c0c91f3ffa Mon Sep 17 00:00:00 2001
From: shwetachahar <shwetachahar@google.com>
Date: Fri, 29 Apr 2016 17:14:03 +0100
Subject: [PATCH] Modify the TTS engine preference UI so that the radio button
 and the TTS engine name are a single focusable element.

Bug: 27136946
Change-Id: I502634e0942b9fe30e290ce9de6ba293f33bf863
---
 res/layout/preference_tts_engine.xml          | 71 +++----------------
 .../settings/tts/TtsEnginePreference.java     | 11 +--
 2 files changed, 13 insertions(+), 69 deletions(-)

diff --git a/res/layout/preference_tts_engine.xml b/res/layout/preference_tts_engine.xml
index db0febe6766..fe8e967157f 100644
--- a/res/layout/preference_tts_engine.xml
+++ b/res/layout/preference_tts_engine.xml
@@ -17,83 +17,34 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="?android:attr/listPreferredItemHeight"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center_vertical">
+    android:layout_gravity="center_vertical">
 
-    <LinearLayout
-        android:id="@+id/tts_engine_pref"
+    <RadioButton
+        android:id="@+id/tts_engine_radiobutton"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center_vertical"
         android:clickable="true"
-        android:focusable="true"
-        android:background="?android:attr/selectableItemBackground">
-
-        <RadioButton
-            android:id="@+id/tts_engine_radiobutton"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_vertical"
-            android:orientation="vertical"
-            android:clickable="true" />
-
-        <RelativeLayout
-            android:id="@+id/tts_engine_pref_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="15dip"
-            android:layout_marginEnd="6dip"
-            android:layout_marginTop="6dip"
-            android:layout_marginBottom="6dip"
-            android:layout_weight="1">
-
-            <TextView
-                android:id="@android:id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal"/>
-
-            <TextView
-                android:id="@android:id/summary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@android:id/title"
-                android:layout_alignStart="@android:id/title"
-                android:visibility="gone"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textSize="13sp"
-                android:textColor="?android:attr/textColorSecondary"
-                android:maxLines="4" />
-
-        </RelativeLayout>
-
-    </LinearLayout>
+        android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <View
-        android:layout_width="2dip"
+        android:layout_width="0dp"
         android:layout_height="match_parent"
-        android:layout_marginTop="5dip"
-        android:layout_marginBottom="5dip"
+        android:layout_weight="1"
         android:background="@android:drawable/divider_horizontal_dark" />
 
     <ImageView
         android:id="@+id/tts_engine_settings"
         android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:paddingStart="15dip"
-        android:paddingEnd="?android:attr/scrollbarSize"
+        android:layout_height="match_parent"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
         android:src="@drawable/ic_sysbar_quicksettings"
         android:contentDescription="@string/tts_engine_settings_button"
-        android:layout_gravity="center"
+        android:layout_centerVertical="true"
         android:clickable="true"
         android:focusable="true"
         android:background="?android:attr/selectableItemBackground" />
-
 </LinearLayout>
diff --git a/src/com/android/settings/tts/TtsEnginePreference.java b/src/com/android/settings/tts/TtsEnginePreference.java
index 35ecf86dd17..385b8617ba8 100644
--- a/src/com/android/settings/tts/TtsEnginePreference.java
+++ b/src/com/android/settings/tts/TtsEnginePreference.java
@@ -106,7 +106,7 @@ public class TtsEnginePreference extends Preference {
         setKey(mEngineInfo.name);
         setTitle(mEngineInfo.label);
     }
-    
+
     @Override
     public void onBindViewHolder(PreferenceViewHolder view) {
         super.onBindViewHolder(view);
@@ -118,6 +118,7 @@ public class TtsEnginePreference extends Preference {
 
         final RadioButton rb = (RadioButton) view.findViewById(R.id.tts_engine_radiobutton);
         rb.setOnCheckedChangeListener(mRadioChangeListener);
+        rb.setText(mEngineInfo.label);
 
         boolean isChecked = getKey().equals(mSharedState.getCurrentKey());
         if (isChecked) {
@@ -130,14 +131,6 @@ public class TtsEnginePreference extends Preference {
 
         mRadioButton = rb;
 
-        View textLayout = view.findViewById(R.id.tts_engine_pref_text);
-        textLayout.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                onRadioButtonClicked(rb, !rb.isChecked());
-            }
-        });
-
         mSettingsIcon = view.findViewById(R.id.tts_engine_settings);
         // Will be enabled only the engine has passed the voice check, and
         // is currently enabled.