Move Account & sync settings into Settings app.
Fragmentized some of the activities and moved buttons into the menu area. Bug: 3148844
This commit is contained in:
		@@ -41,6 +41,13 @@
 | 
			
		||||
    <uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />
 | 
			
		||||
    <uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS" />
 | 
			
		||||
    <uses-permission android:name="android.permission.MOVE_PACKAGE" />
 | 
			
		||||
    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
 | 
			
		||||
    <uses-permission android:name="android.permission.BACKUP" />
 | 
			
		||||
    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
 | 
			
		||||
    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
 | 
			
		||||
    <uses-permission android:name="android.permission.READ_SYNC_STATS" />
 | 
			
		||||
    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
 | 
			
		||||
    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
 | 
			
		||||
 | 
			
		||||
    <application android:label="@string/settings_label"
 | 
			
		||||
            android:icon="@mipmap/ic_launcher_settings"
 | 
			
		||||
@@ -942,11 +949,62 @@
 | 
			
		||||
                <category android:name="android.intent.category.DEFAULT" />
 | 
			
		||||
            </intent-filter>
 | 
			
		||||
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
 | 
			
		||||
                android:value="com.android.settings.ManageAccountsSettings" />
 | 
			
		||||
                android:value="com.android.settings.accounts.ManageAccountsSettings" />
 | 
			
		||||
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
 | 
			
		||||
                android:resource="@id/sync_settings" />
 | 
			
		||||
        </activity>
 | 
			
		||||
 | 
			
		||||
        <activity android:name="Settings$AccountSyncSettingsActivity"
 | 
			
		||||
            android:label="@string/account_sync_settings_title"
 | 
			
		||||
            android:theme="@android:style/Theme.Holo">
 | 
			
		||||
            <intent-filter>
 | 
			
		||||
                <action android:name="android.intent.action.MAIN" />
 | 
			
		||||
                <action android:name="android.settings.ACCOUNT_SYNC_SETTINGS" />
 | 
			
		||||
                <category android:name="android.intent.category.DEFAULT" />
 | 
			
		||||
            </intent-filter>
 | 
			
		||||
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
 | 
			
		||||
                android:value="com.android.settings.accounts.AccountSyncSettings" />
 | 
			
		||||
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
 | 
			
		||||
                android:resource="@id/sync_settings" />
 | 
			
		||||
        </activity>
 | 
			
		||||
 | 
			
		||||
        <activity android:name="Settings$AccountSyncSettingsInAddAccountActivity"
 | 
			
		||||
            android:label="@string/account_sync_settings_title"
 | 
			
		||||
            android:theme="@android:style/Theme.Holo">
 | 
			
		||||
            <intent-filter>
 | 
			
		||||
                <action android:name="android.intent.action.MAIN" />
 | 
			
		||||
                <action android:name="android.settings.ACCOUNT_SYNC_SETTINGS_ADD_ACCOUNT" />
 | 
			
		||||
                <category android:name="android.intent.category.DEFAULT" />
 | 
			
		||||
            </intent-filter>
 | 
			
		||||
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
 | 
			
		||||
                android:value="com.android.settings.accounts.AccountSyncSettingsInAddAccount" />
 | 
			
		||||
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
 | 
			
		||||
                android:resource="@id/sync_settings" />
 | 
			
		||||
        </activity>
 | 
			
		||||
 | 
			
		||||
        <activity android:name="com.android.settings.accounts.AddAccountSettings"
 | 
			
		||||
            android:theme="@android:style/Theme.Translucent.NoTitleBar"
 | 
			
		||||
            android:label="@string/header_add_an_account">
 | 
			
		||||
            <intent-filter>
 | 
			
		||||
                <action android:name="android.intent.action.MAIN" />
 | 
			
		||||
                <action android:name="android.settings.ADD_ACCOUNT_SETTINGS" />
 | 
			
		||||
                <category android:name="android.intent.category.DEFAULT" />
 | 
			
		||||
            </intent-filter>
 | 
			
		||||
        </activity>
 | 
			
		||||
 | 
			
		||||
        <activity android:name="com.android.settings.accounts.ChooseAccountActivity"
 | 
			
		||||
            android:label="@string/header_add_an_account"
 | 
			
		||||
            android:theme="@android:style/Theme.Holo.DialogWhenLarge"/>
 | 
			
		||||
 | 
			
		||||
        <activity android:name="com.android.settings.accounts.SyncActivityTooManyDeletes"
 | 
			
		||||
                  android:theme="@android:style/Theme.Holo.Dialog"
 | 
			
		||||
                  android:label="@string/sync_too_many_deletes">
 | 
			
		||||
            <intent-filter>
 | 
			
		||||
                <action android:name="android.intent.action.MAIN" />
 | 
			
		||||
                <category android:name="android.intent.category.DEFAULT" />
 | 
			
		||||
            </intent-filter>
 | 
			
		||||
        </activity>
 | 
			
		||||
 | 
			
		||||
        <receiver android:name=".widget.SettingsAppWidgetProvider"
 | 
			
		||||
                android:label="@string/gadget_title" android:exported="false">
 | 
			
		||||
            <intent-filter>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user