Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f0420be authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Give Wi-Fi Display settings split actionbar."

parents a4a81ff4 0c3634c9

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -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">

src/com/android/settings/Settings.java

+2 −0
Original line number Diff line number Diff line
@@ -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)) {