merge in master-release history after reset to master

[android-x86/packages-apps-Settings.git] / AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9c9b237..9a85dc0 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -80,7 +80,6 @@
         <!-- Settings -->
 
         <activity android:name="Settings"
-                  android:uiOptions="splitActionBarWhenNarrow"
                 android:taskAffinity="com.android.settings"
                 android:label="@string/settings_label_launcher"
                 android:launchMode="singleTask">
@@ -129,7 +128,6 @@
         <!-- Top-level settings -->
 
         <activity android:name="Settings$WifiSettingsActivity"
-                android:uiOptions="splitActionBarWhenNarrow"
                 android:taskAffinity=""
                 android:label="@string/wifi_settings"
                 android:configChanges="orientation|keyboardHidden|screenSize"
@@ -149,7 +147,6 @@
 
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name=".wifi.WifiSettings"
-                android:uiOptions="splitActionBarWhenNarrow"
                 android:taskAffinity="com.android.settings"
                 android:label="@string/wifi_settings"
                 android:targetActivity="Settings$WifiSettingsActivity"
@@ -162,7 +159,6 @@
         </activity-alias>
 
         <activity android:name=".wifi.WifiPickerActivity"
-                android:uiOptions="splitActionBarWhenNarrow"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
@@ -173,7 +169,6 @@
         </activity>
 
         <activity android:name=".wifi.WifiSetupActivity"
-                android:uiOptions="splitActionBarWhenNarrow"
                 android:theme="@style/SetupWizardWifiTheme"
                 android:label="@string/wifi_setup_wizard_title"
                 android:icon="@drawable/empty_icon"
@@ -186,7 +181,6 @@
         </activity>
 
         <activity android:name=".wifi.WifiSettingsForSetupWizardXL"
-                android:uiOptions="splitActionBarWhenNarrow"
                 android:theme="@android:style/Theme.Holo.NoActionBar"
                 android:screenOrientation="behind"
                 android:clearTaskOnLaunch="true"
@@ -274,7 +268,6 @@
         </activity>
 
         <activity android:name="Settings$BluetoothSettingsActivity"
-                android:uiOptions="splitActionBarWhenNarrow"
                 android:label="@string/bluetooth_settings_title"
                 android:taskAffinity=""
                 android:excludeFromRecents="true">
@@ -293,7 +286,6 @@
 
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name=".bluetooth.BluetoothSettings"
-                android:uiOptions="splitActionBarWhenNarrow"
                 android:label="@string/bluetooth_settings_title"
                 android:targetActivity="Settings$BluetoothSettingsActivity"
                 android:exported="true"
@@ -305,7 +297,6 @@
         </activity-alias>
 
         <activity android:name=".bluetooth.DevicePickerActivity"
-                android:uiOptions="splitActionBarWhenNarrow"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge"
                 android:label="@string/device_picker"
                 android:clearTaskOnLaunch="true">
@@ -344,7 +335,6 @@
         </activity-alias>
 
         <activity android:name="Settings$WifiP2pSettingsActivity"
-                android:uiOptions="splitActionBarWhenNarrow"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$WifiSettingsActivity">
             <intent-filter>
@@ -806,7 +796,6 @@
         -->
 
         <activity android:name="Settings$LocationSettingsActivity"
-                android:uiOptions="splitActionBarWhenNarrow"
                 android:label="@string/location_settings_title"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:taskAffinity=""
@@ -1617,7 +1606,6 @@
         </activity>
 
         <activity android:name="Settings$DreamSettingsActivity"
-                android:uiOptions="splitActionBarWhenNarrow"
                 android:label="@string/screensaver_settings_title"
                 android:taskAffinity=""
                 android:excludeFromRecents="true">
@@ -1634,7 +1622,6 @@
         </activity>
 
         <activity android:name="Settings$UserSettingsActivity"
-                android:uiOptions="splitActionBarWhenNarrow"
                 android:label="@string/user_settings_title"
                 android:taskAffinity=""
                 android:excludeFromRecents="true">
@@ -1650,7 +1637,6 @@
         </activity>
 
         <activity android:name="Settings$PaymentSettingsActivity"
-                android:uiOptions="splitActionBarWhenNarrow"
                 android:label="@string/nfc_payment_settings_title"
                 android:taskAffinity=""
                 android:excludeFromRecents="true">