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

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

Browse Source
This commit is contained in:
Jeff Sharkey
2013-02-20 20:36:20 +00:00
committed by Android (Google) Code Review
parent a4a81ff4ce 0c3634c97a
commit 2f0420be95
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AndroidManifest.xml
View File

@@ -1238,6 +1238,7 @@
</activity> </activity>
<activity android:name="Settings$WifiDisplaySettingsActivity" <activity android:name="Settings$WifiDisplaySettingsActivity"
android:uiOptions="splitActionBarWhenNarrow"
android:label="@string/wifi_display_settings_title" android:label="@string/wifi_display_settings_title"
android:taskAffinity="" android:taskAffinity=""
android:excludeFromRecents="true"> android:excludeFromRecents="true">

2
src/com/android/settings/Settings.java
View File

@@ -56,6 +56,7 @@ import com.android.settings.accounts.AuthenticatorHelper;
import com.android.settings.accounts.ManageAccountsSettings; import com.android.settings.accounts.ManageAccountsSettings;
import com.android.settings.bluetooth.BluetoothEnabler; import com.android.settings.bluetooth.BluetoothEnabler;
import com.android.settings.bluetooth.BluetoothSettings; import com.android.settings.bluetooth.BluetoothSettings;
import com.android.settings.wfd.WifiDisplaySettings;
import com.android.settings.wifi.WifiEnabler; import com.android.settings.wifi.WifiEnabler;
import com.android.settings.wifi.WifiSettings; import com.android.settings.wifi.WifiSettings;
import com.android.settings.wifi.p2p.WifiP2pSettings; 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. // uiOptions for fragments also defined as activities in manifest.
if (WifiSettings.class.getName().equals(fragmentName) || if (WifiSettings.class.getName().equals(fragmentName) ||
WifiP2pSettings.class.getName().equals(fragmentName) || WifiP2pSettings.class.getName().equals(fragmentName) ||
WifiDisplaySettings.class.getName().equals(fragmentName) ||
BluetoothSettings.class.getName().equals(fragmentName) || BluetoothSettings.class.getName().equals(fragmentName) ||
DreamSettings.class.getName().equals(fragmentName) || DreamSettings.class.getName().equals(fragmentName) ||
ToggleAccessibilityServicePreferenceFragment.class.getName().equals(fragmentName)) { ToggleAccessibilityServicePreferenceFragment.class.getName().equals(fragmentName)) {