From 98b55c52141827dae230a57689bace0fbabc8617 Mon Sep 17 00:00:00 2001
From: Raff Tsai <rafftsai@google.com>
Date: Wed, 11 Sep 2019 13:08:47 +0800
Subject: [PATCH] Use TwoTargetPreference to replace customized layout

Bug: 139336138
Test: manual, robolectric
Change-Id: I0ffe90cd9ab5423b533507eeae47d5972704cf61
---
 res/drawable-hdpi/nav_divider.png             | Bin 320 -> 0 bytes
 res/drawable-mdpi/nav_divider.png             | Bin 311 -> 0 bytes
 res/drawable-xhdpi/nav_divider.png            | Bin 332 -> 0 bytes
 res/layout/wifi_display_preference.xml        |  43 ------------------
 .../settings/wfd/WifiDisplaySettings.java     |  24 ++++++----
 5 files changed, 14 insertions(+), 53 deletions(-)
 delete mode 100644 res/drawable-hdpi/nav_divider.png
 delete mode 100644 res/drawable-mdpi/nav_divider.png
 delete mode 100644 res/drawable-xhdpi/nav_divider.png
 delete mode 100644 res/layout/wifi_display_preference.xml

diff --git a/res/drawable-hdpi/nav_divider.png b/res/drawable-hdpi/nav_divider.png
deleted file mode 100644
index b1f035c93d93eb3d9767fa9e266ab62a46ff8b9b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 320
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq!2%@P^gkZ}QcOwS?k)`f+xyS#2l6-zJR*x3
z7`TN%nDNrxx<4SnvI56+APv^bpmv;dI*_B{>EaloaXvXEAUPo+;m7~J#>T*oMj+^9
z<n7@C!2=8oX^Kp3xA*gX2C5e=ag8W(E=o--$;{7F2+7P%Ww6vYGSoLT2%nI27pOoL
zq#z}+B-JVzq$-uc$iUD**T7QO$Rxzjz{=3f%D_z5z}(8f;O@75wkR5M^HVa@DsgLA
zvzo0Ds6hr~LvVgtNqJ&XDuZK6ep0G}TV_#ed45rLv4V53Y2nt#W<Yfep00i_>zopr
E046qCIRF3v

diff --git a/res/drawable-mdpi/nav_divider.png b/res/drawable-mdpi/nav_divider.png
deleted file mode 100644
index f7ed6dff8ecf1393296142e701ec454f7a44286a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 311
zcmeAS@N?(olHy`uVBq!ia0vp^tU#>5!2%=;*sERxDW)WEcNd2L?fqx=19_YU9+AZi
z4BSE>%y{W;-5-!(S%G6ZkOu2zxG<YT0?3i}ba4!kxSX64keu-2e_vonV`C>HpWDnU
zNlXl4(M)N!mZ}SZ%0x?CBTAf$QWHxu^Yau!GILWIEcJ~H^$iWeCnVhkDo_O}NJ%V7
zwMqu5N@XxIFf`CLu+%j&2{AOVGBmR?Fw-?Kw=yue`)!{siiX_$l+3hB+#1%bW@`j$
zkOA2coS#-wo>-L1;Fyx1l&avCS(I9yUzA;};2dmPxb?9aP#uG(tDnm{r-UW|s?Aib

diff --git a/res/drawable-xhdpi/nav_divider.png b/res/drawable-xhdpi/nav_divider.png
deleted file mode 100644
index 00e3852d5b61d77de5f7f230106e10971fa59974..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 332
zcmeAS@N?(olHy`uVBq!ia0vp^+(7KW!2%@HtX!FZ6jPG7y9>kr_Wm>bfjrIvkH})6
zDj^VNymYtj4@j`Az%d<2gY`1>=P;cIatu6O978NlC#M7?CnO}K{M-L=@%Q&@*Zlia
zFDd!Y*ucOrfpzgA7;JWxU@(8ezKq!^a6VA4Xo+h?iE~kEVo7Fxo<c}wZYqPNzLBB6
zp+WeBq`N=`svrd^i6yC4$skp!3`PcqhPnpEx`t*UhGtd<W>%&Kx(4P}1_qj|T69q~
z<mRVjrd8tB5b@n+B2a@2$cEtjw370~qErUQl>DSr1-Hzi)bjkI>|zDyVAH~_kIjJU
O7(8A5T-G@yGywpP8DX9P

diff --git a/res/layout/wifi_display_preference.xml b/res/layout/wifi_display_preference.xml
deleted file mode 100644
index 4532441bb8e..00000000000
--- a/res/layout/wifi_display_preference.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical">
-
-    <!-- Divider -->
-    <ImageView
-        android:id="@+id/divider"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:src="@drawable/nav_divider"
-        android:contentDescription="@null"
-         />
-
-    <!-- Details button -->
-    <ImageView
-        android:id="@+id/deviceDetails"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:padding="8dip"
-        android:background="?android:attr/selectableItemBackground"
-        android:src="@drawable/ic_settings_accent"
-        android:contentDescription="@string/wifi_display_details" />
-
-</LinearLayout>
diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java
index 981f927ee09..9aef21d6def 100755
--- a/src/com/android/settings/wfd/WifiDisplaySettings.java
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -67,6 +67,7 @@ import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.TwoTargetPreference;
 import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
@@ -661,7 +662,7 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment implem
         }
     };
 
-    private class RoutePreference extends Preference
+    private class RoutePreference extends TwoTargetPreference
             implements Preference.OnPreferenceClickListener {
         private final MediaRouter.RouteInfo mRoute;
 
@@ -705,27 +706,30 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment implem
             implements View.OnClickListener {
         private final WifiDisplay mDisplay;
 
+        @Override
+        protected int getSecondTargetResId() {
+            return R.layout.preference_widget_gear;
+        }
+
         public WifiDisplayRoutePreference(Context context, MediaRouter.RouteInfo route,
                 WifiDisplay display) {
             super(context, route);
-
             mDisplay = display;
-            setWidgetLayoutResource(R.layout.wifi_display_preference);
         }
 
         @Override
-        public void onBindViewHolder(PreferenceViewHolder view) {
-            super.onBindViewHolder(view);
+        public void onBindViewHolder(PreferenceViewHolder holder) {
+            super.onBindViewHolder(holder);
 
-            ImageView deviceDetails = (ImageView) view.findViewById(R.id.deviceDetails);
-            if (deviceDetails != null) {
-                deviceDetails.setOnClickListener(this);
+            final ImageView gear = (ImageView) holder.findViewById(R.id.settings_button);
+            if (gear != null) {
+                gear.setOnClickListener(this);
                 if (!isEnabled()) {
                     TypedValue value = new TypedValue();
                     getContext().getTheme().resolveAttribute(android.R.attr.disabledAlpha,
                             value, true);
-                    deviceDetails.setImageAlpha((int) (value.getFloat() * 255));
-                    deviceDetails.setEnabled(true); // always allow button to be pressed
+                    gear.setImageAlpha((int) (value.getFloat() * 255));
+                    gear.setEnabled(true); // always allow button to be pressed
                 }
             }
         }