From: Jeff Sharkey <jsharkey@android.com>
Date: Wed, 20 Feb 2013 20:35:16 +0000 (-0800)
Subject: Give Wi-Fi Display settings split actionbar.
X-Git-Tag: android-x86-4.4-r1~639^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0c3634c97a53fd756b86fe16aeaf935d721941d2;p=android-x86%2Fpackages-apps-Settings.git

Give Wi-Fi Display settings split actionbar.

Bug: 8156190
Change-Id: I120398e33cfbbce001a528de04d62cc92fe2f9d9
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e68a068ab1..4668dd97ac 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1238,6 +1238,7 @@
         </activity>
 
         <activity android:name="Settings$WifiDisplaySettingsActivity"
+                android:uiOptions="splitActionBarWhenNarrow"
                 android:label="@string/wifi_display_settings_title"
                 android:taskAffinity=""
                 android:excludeFromRecents="true">
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 24a7d59707..962d042332 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -56,6 +56,7 @@ import com.android.settings.accounts.AuthenticatorHelper;
 import com.android.settings.accounts.ManageAccountsSettings;
 import com.android.settings.bluetooth.BluetoothEnabler;
 import com.android.settings.bluetooth.BluetoothSettings;
+import com.android.settings.wfd.WifiDisplaySettings;
 import com.android.settings.wifi.WifiEnabler;
 import com.android.settings.wifi.WifiSettings;
 import com.android.settings.wifi.p2p.WifiP2pSettings;
@@ -381,6 +382,7 @@ public class Settings extends PreferenceActivity
         // uiOptions for fragments also defined as activities in manifest.
         if (WifiSettings.class.getName().equals(fragmentName) ||
                 WifiP2pSettings.class.getName().equals(fragmentName) ||
+                WifiDisplaySettings.class.getName().equals(fragmentName) ||
                 BluetoothSettings.class.getName().equals(fragmentName) ||
                 DreamSettings.class.getName().equals(fragmentName) ||
                 ToggleAccessibilityServicePreferenceFragment.class.getName().equals(fragmentName)) {