Merge "Import translations. DO NOT MERGE"
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 8b512fc..56c17f9 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -18,10 +18,6 @@
xmlns:android="http://schemas.android.com/apk/res/android">
- <!-- WIRELESS and NETWORKS -->
- <header android:id="@+id/wireless_section"
- android:title="@string/header_category_wireless_networks" />
-
<!-- Dashboard -->
<!--TODO: android:icon="@drawable/ic_settings_dashboard"-->
<header
@@ -29,6 +25,10 @@
android:fragment="com.android.settings.dashboard.DashboardSummary"
android:title="@string/dashboard_title" />
+ <!-- WIRELESS and NETWORKS -->
+ <header android:id="@+id/wireless_section"
+ android:title="@string/header_category_wireless_networks" />
+
<!-- Wifi -->
<header
android:id="@+id/wifi_settings"
diff --git a/src/com/android/settings/accounts/SyncSettingsActivity.java b/src/com/android/settings/accounts/SyncSettingsActivity.java
index bbd9f91..9b1bc32 100644
--- a/src/com/android/settings/accounts/SyncSettingsActivity.java
+++ b/src/com/android/settings/accounts/SyncSettingsActivity.java
@@ -27,7 +27,7 @@
public class SyncSettingsActivity extends SettingsActivity {
@Override
public Intent getIntent() {
- Intent modIntent = new Intent(getIntent());
+ Intent modIntent = new Intent(super.getIntent());
modIntent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT, SyncSettings.class.getName());
modIntent.putExtra(SettingsActivity.EXTRA_NO_HEADERS, true);
return modIntent;