summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml12
1 files changed, 11 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 09767bf..cf1f888 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1366,6 +1366,7 @@
<activity android:name="Settings$AccountSyncSettingsActivity"
android:label="@string/account_sync_settings_title"
+ android:parentActivityName="Settings"
android:uiOptions="none">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1378,6 +1379,16 @@
android:resource="@id/account_settings" />
</activity>
+ <activity android:name=".accounts.SyncSettingsActivity"
+ android:label="@string/account_sync_settings_title"
+ android:theme="@android:style/Theme.Holo.Dialog">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.settings.SYNC_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
+
<activity android:name="com.android.settings.accounts.AddAccountSettings"
android:theme="@android:style/Theme.Translucent.NoTitleBar"
android:configChanges="orientation|keyboardHidden|screenSize"
@@ -1441,7 +1452,6 @@
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
- <action android:name="android.settings.SYNC_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>