----------------------------- AndroidManifest.xml -----------------------------
index b19f5ff..c3b09ad 100644
@@ -499,4 +499,26 @@
</activity-alias>
+
+ <activity android:name="Settings$EthernetSettingsActivity"
+ android:label="@string/ethernet_settings"
+ android:icon="@drawable/ic_ethernet"
+ android:configChanges="orientation|keyboardHidden|screenSize|mcc|mnc"
+ android:launchMode="singleInstance"
+ android:parentActivityName="Settings">
+ <intent-filter android:priority="6">
+ <action android:name="android.settings.ETHERNET_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.VOICE_LAUNCH" />
+ <category android:name="com.android.settings.SHORTCUT" />
+ </intent-filter>
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.ethernet.EthernetSettings" />
+ <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+ android:value="true" />
+ </activity>
<activity android:name="Settings$WifiP2pSettingsActivity"
android:taskAffinity="com.android.settings"
------------------------- res/drawable/ic_ethernet.xml -------------------------
new file mode 100755
index 0000000..6431a00
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 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
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M7.77,6.76L6.23,5.48 0.82,12l5.41,6.52 1.54,-1.28L3.42,12l4.35,-5.24zM7,13h2v-2L7,11v2zM17,11h-2v2h2v-2zM11,13h2v-2h-2v2zM17.77,5.48l-1.54,1.28L20.58,12l-4.35,5.24 1.54,1.28L23.18,12l-5.41,-6.52z"/>
+</vector>
\ No newline at end of file
----------------------- res/layout/static_ip_dialog.xml -----------------------
new file mode 100755
index 0000000..658c881
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2010 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.
+-->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fadeScrollbars="false" >
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingBottom="8dip" >
+
+ <LinearLayout
+ android:id="@+id/wifi_advanced_fields"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical" >
+
+ <LinearLayout
+ android:id="@+id/proxy_fields"
+ style="@style/wifi_section"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" >
+
+ <LinearLayout
+ android:id="@+id/staticip"
+ style="@style/wifi_section"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" >
+
+ <LinearLayout
+ style="@style/wifi_item"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" >
+
+ <TextView
+ style="@style/wifi_item_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/wifi_ip_address" />
+
+ <EditText
+ android:id="@+id/ipaddress"
+ style="@style/wifi_item_edit_content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/wifi_ip_address_hint"
+ android:inputType="textNoSuggestions"
+ android:singleLine="true" />
+ </LinearLayout>
+
+ <LinearLayout
+ style="@style/wifi_item"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" >
+
+ <TextView
+ style="@style/wifi_item_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/wifi_gateway" />
+
+ <EditText
+ android:id="@+id/gateway"
+ style="@style/wifi_item_edit_content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/wifi_gateway_hint"
+ android:inputType="textNoSuggestions"
+ android:singleLine="true" />
+ </LinearLayout>
+
+ <LinearLayout
+ style="@style/wifi_item"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" >
+
+ <TextView
+ style="@style/wifi_item_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/ethernet_netmask" />
+
+ <EditText
+ android:id="@+id/network_prefix_length"
+ style="@style/wifi_item_edit_content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/ethernet_netmask_hint"
+ android:inputType="textNoSuggestions"
+ android:singleLine="true" />
+ </LinearLayout>
+
+ <LinearLayout
+ style="@style/wifi_item"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" >
+
+ <TextView
+ style="@style/wifi_item_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/wifi_dns1" />
+
+ <EditText
+ android:id="@+id/dns1"
+ style="@style/wifi_item_edit_content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/wifi_dns1_hint"
+ android:inputType="textNoSuggestions"
+ android:singleLine="true" />
+ </LinearLayout>
+
+ <LinearLayout
+ style="@style/wifi_item"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" >
+
+ <TextView
+ style="@style/wifi_item_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/wifi_dns2" />
+
+ <EditText
+ android:id="@+id/dns2"
+ style="@style/wifi_item_edit_content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/wifi_dns2_hint"
+ &