Merge "Remove unused string reference."
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4b41c7c..9b2391a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -56,6 +56,7 @@
android:icon="@mipmap/ic_launcher_settings"
android:taskAffinity=""
android:theme="@android:style/Theme.Holo"
+ android:uiOptions="splitActionBarWhenNarrow"
android:hardwareAccelerated="true">
<!-- Settings -->
@@ -278,7 +279,7 @@
<category android:name="android.intent.category.VOICE_LAUNCH" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.WifiP2pSettings" />
+ android:value="com.android.settings.wifi.p2p.WifiP2pSettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/wireless_settings" />
<meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 638f4c1..7315863 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1395,6 +1395,8 @@
<!-- Sound and alerts settings -->
<skip/>
+ <!-- Main Settings screen setting option name to go into the display settings screen -->
+ <string name="display_settings_title">Display</string>
<!-- Sound settings screen heading -->
<string name="sound_settings">Sound</string>
<!-- Sound settings screen, setting option name checkbox -->
@@ -2633,6 +2635,8 @@
<!-- Settings title in main settings screen for accessibility settings -->
<string name="accessibility_settings">Accessibility</string>
+ <!-- Settings title for accessibility settings screen -->
+ <string name="accessibility_settings_title">Accessibility settings</string>
<!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
<string name="accessibility_services_title">Services</string>
@@ -2705,6 +2709,8 @@
<string name="accessibility_service_default_description">This accessibility service has no
description.\n\nAccessibility services provide various types of feedback when you interact
with the device. </string>
+ <!-- Accessibility settings: button for lauching settings for an accessibility service -->
+ <string name="settings_button">Settings</string>
<!-- App Fuel Gauge strings -->
<skip />
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 1f72a93..1e85b9a 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -46,7 +46,7 @@
</PreferenceScreen>
<PreferenceScreen
- android:fragment="com.android.settings.WifiP2pSettings"
+ android:fragment="com.android.settings.wifi.p2p.WifiP2pSettings"
android:key="wifi_p2p_settings"
android:title="@string/wifi_p2p_settings_title"
android:summary="@string/wifi_p2p_settings_summary">
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 2ab99e8..5fe6426 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -425,7 +425,7 @@
}
VpnConfig config = new VpnConfig();
- config.packagz = profile.key;
+ config.user = profile.key;
config.interfaze = interfaze;
config.session = profile.name;
config.routes = profile.routes;
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index 2e05595..6ec3a1a 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings;
+package com.android.settings.wifi.p2p;
import android.app.ActionBar;
import android.app.Activity;
@@ -43,9 +43,8 @@
import android.view.MenuItem;
import android.widget.Switch;
-import com.android.settings.wifi.p2p.WifiP2pDialog;
-import com.android.settings.wifi.p2p.WifiP2pEnabler;
-import com.android.settings.wifi.p2p.WifiP2pPeer;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
import java.util.Arrays;
import java.util.List;