From 93af75a6112f60338b239c24b11389072ad6b2e5 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Tue, 3 Jan 2017 09:42:12 -0800
Subject: [PATCH] Use standard preference for mac/IP info in config wifi UI

Change-Id: I3a611d9e4552b6c764e78daa54e9f504daec1cb9
Fixes: 33967401
Test: Visual
---
 res/layout/wifi_advance_layout.xml  | 64 -----------------------------
 res/xml/wifi_configure_settings.xml | 10 ++---
 2 files changed, 3 insertions(+), 71 deletions(-)
 delete mode 100644 res/layout/wifi_advance_layout.xml

diff --git a/res/layout/wifi_advance_layout.xml b/res/layout/wifi_advance_layout.xml
deleted file mode 100644
index 85f7a5ff9d8..00000000000
--- a/res/layout/wifi_advance_layout.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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:minHeight="48dip"
-    android:gravity="center_vertical"
-    android:background="?android:attr/selectableItemBackground">
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingTop="6dip"
-        android:paddingBottom="6dip">
-
-        <TextView
-            android:id="@android:id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="16dip"
-            android:paddingEnd="16dip"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            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:paddingStart="16dip"
-            android:layout_marginEnd="16dip"
-            android:visibility="gone"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary"
-            android:maxLines="4" />
-
-    </RelativeLayout>
-
-    <LinearLayout
-        android:id="@android:id/widget_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        android:orientation="vertical" />
-
-</LinearLayout>
diff --git a/res/xml/wifi_configure_settings.xml b/res/xml/wifi_configure_settings.xml
index 53fda7189db..91df2fe7edc 100644
--- a/res/xml/wifi_configure_settings.xml
+++ b/res/xml/wifi_configure_settings.xml
@@ -15,7 +15,6 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="@string/wifi_configure_titlebar">
 
     <Preference
@@ -45,15 +44,12 @@
         android:title="@string/wifi_cellular_data_fallback_title"
         android:summary="@string/wifi_cellular_data_fallback_summary"/>
 
-    <com.android.settings.DividerPreference
+    <Preference
         android:key="mac_address"
-        android:title="@string/wifi_advanced_mac_address_title"
-        android:layout="@layout/wifi_advance_layout"
-        settings:allowDividerAbove="true" />
+        android:title="@string/wifi_advanced_mac_address_title"/>
 
     <Preference
         android:key="current_ip_address"
-        android:title="@string/wifi_advanced_ip_address_title"
-        android:layout="@layout/wifi_advance_layout" />
+        android:title="@string/wifi_advanced_ip_address_title"/>
 
 </PreferenceScreen>