commit eb4ad6f05d71247cd7fc453ab73b8cea7ee6e86d
author Heemin Seog <hseog@google.com> Tue Apr 30 21:52:00 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Apr 30 21:52:00 2019 -0700
tree 675e04c92f87cf1849f2d25577433ba8e69a0c76
parent 19675385710c7e82e149070a9510a736f87cedbf
parent a224ae40ddb791378a3a0f284d37ca2988b764e0

Merge changes from topic "reorganize_intent" into pi-car-dev
am: a224ae40dd

Change-Id: If628a878893be5e1267c5031a63c61c1e70b6b0f

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4944e33..54baafb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -105,6 +105,11 @@
             </intent-filter>
 
             <intent-filter android:priority="100">
+                <action android:name="android.settings.WIFI_IP_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+
+            <intent-filter android:priority="100">
                 <action android:name="android.settings.DATA_USAGE_SETTINGS" />
                 <action android:name="android.settings.MOBILE_DATA_USAGE" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -140,6 +145,7 @@
 
             <intent-filter android:priority="100">
                 <action android:name="android.settings.APPLICATION_DETAILS_SETTINGS" />
+                <action android:name="android.settings.NOTIFICATION_SETTINGS" />
                 <action android:name="android.settings.CHANNEL_NOTIFICATION_SETTINGS" />
                 <action android:name="android.settings.APP_NOTIFICATION_SETTINGS" />
                 <data android:scheme="package" />

src/com/android/car/settings/common/FragmentResolver.java

diff --git a/src/com/android/car/settings/common/FragmentResolver.java b/src/com/android/car/settings/common/FragmentResolver.java
index 8e0d467..3b70dfb 100644
--- a/src/com/android/car/settings/common/FragmentResolver.java
+++ b/src/com/android/car/settings/common/FragmentResolver.java
@@ -49,6 +49,7 @@
 import com.android.car.settings.system.AboutSettingsFragment;
 import com.android.car.settings.users.UsersListFragment;
 import com.android.car.settings.wifi.WifiSettingsFragment;
+import com.android.car.settings.wifi.preferences.WifiPreferencesFragment;
 
 
 /**
@@ -93,6 +94,9 @@
             case Settings.ACTION_WIRELESS_SETTINGS:
                 return new WifiSettingsFragment();
 
+            case Settings.ACTION_WIFI_IP_SETTINGS:
+                return new WifiPreferencesFragment();
+
             case Settings.ACTION_DATA_USAGE_SETTINGS:
             case Settings.ACTION_MOBILE_DATA_USAGE:
                 return new DataUsageFragment();
@@ -116,6 +120,7 @@
                 return new ApplicationsSettingsFragment();
 
             case Settings.ACTION_APPLICATION_DETAILS_SETTINGS:
+            case Settings.ACTION_NOTIFICATION_SETTINGS:
             case Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS:
             case Settings.ACTION_APP_NOTIFICATION_SETTINGS:
                 String pkg = intent.getStringExtra(Settings.EXTRA_APP_PACKAGE);