PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use EntityHeaderController in WifiDetailPreferenceController." into oc-dr1-dev

Browse Source 
am: 09229abbf2

Change-Id: I7a636c40515b24b7376b8ceadf969a257b2dc8d9
This commit is contained in:
Sundeep Ghuman
2017-07-05 22:30:22 +00:00
committed by android-build-merger
parent 5daad21245 09229abbf2
commit 4fd8528c2f
4 changed files with 77 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
res/layout/connection_detail_pref.xml
View File

@@ -1,51 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2017 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:id="@+id/connection_detail_layout"
android:background="?android:attr/colorAccent"
android:layout_width="match_parent"
android:layout_height="144dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_settings_widget_background"
android:layout_marginLeft="72dp"
android:elevation="2dp">
<ImageView
android:id="@android:id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
</FrameLayout>
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="false"
android:paddingLeft="20dp"
android:textAppearance="@android:style/TextAppearance.Material.Medium"
android:textColor="@android:color/white"/>
</LinearLayout>

9
res/xml/wifi_network_details_fragment.xml
View File

@@ -18,10 +18,11 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" >
<!-- Connected Network Header -->
<Preference
android:key="connection_detail"
android:layout="@layout/connection_detail_pref"/>
<com.android.settings.applications.LayoutPreference
android:key="connection_header"
android:layout="@layout/settings_entity_header"
android:selectable="false"
android:order="-10000"/>
<!-- General Details Category -->
<PreferenceCategory