Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7c595a6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Removed AccountSettings used in old IA only."

parents 7450c358 f074f0f6

AndroidManifest.xml

+3 −21
Original line number Diff line number Diff line
@@ -2254,26 +2254,6 @@ 
            </intent-filter>

        </activity>



        <activity android:name="Settings$AccountSettingsActivity"

            android:label="@string/account_settings_title"

            android:icon="@drawable/ic_settings_accounts"

            android:taskAffinity=""

            android:parentActivityName="Settings">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter android:priority="1">

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

                android:value="com.android.settings.category.personal" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.accounts.AccountSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>



        <activity android:name="Settings$AccountSyncSettingsActivity"

            android:label="@string/account_sync_settings_title"

            android:taskAffinity=""
@@ -2309,7 +2289,7 @@ 
            android:configChanges="orientation|keyboardHidden|screenSize"

            android:label="@string/header_add_an_account"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings$ManageAccountsSettingsActivity">

            android:parentActivityName="Settings$UserAndAccountDashboardActivity">

            <intent-filter android:priority="1">

                <action android:name="android.settings.ADD_ACCOUNT_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -3146,6 +3126,8 @@ 
                       android:value="com.android.settings.accounts.UserAndAccountDashboardFragment"/>

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.ia.homepage"/>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

              android:value="true" />

        </activity>



        <activity-alias android:name="AccessibilityDashboardAlias"

res/xml/account_settings.xml

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

        android:key="account"

        android:title="@string/account_settings_title"

        settings:keywords="@string/keywords_accounts">

</PreferenceScreen>

res/xml/manage_accounts_settings.xml

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

    <PreferenceCategory android:title="@string/account_settings" />

</PreferenceScreen>

src/com/android/settings/Settings.java

+0 −2
Original line number Diff line number Diff line
@@ -83,11 +83,9 @@ public class Settings extends SettingsActivity { 
    public static class PrivacySettingsActivity extends SettingsActivity { /* empty */ }

    public static class FactoryResetActivity extends SettingsActivity { /* empty */ }

    public static class RunningServicesActivity extends SettingsActivity { /* empty */ }

    public static class ManageAccountsSettingsActivity extends SettingsActivity { /* empty */ }

    public static class PowerUsageSummaryActivity extends SettingsActivity { /* empty */ }

    public static class BatterySaverSettingsActivity extends SettingsActivity { /* empty */ }

    public static class AccountSyncSettingsActivity extends SettingsActivity { /* empty */ }

    public static class AccountSettingsActivity extends SettingsActivity { /* empty */ }

    public static class AccountSyncSettingsInAddAccountActivity extends SettingsActivity { /* empty */ }

    public static class GestureSettingsActivity extends SettingsActivity { /* empty */ }

    public static class CryptKeeperSettingsActivity extends SettingsActivity { /* empty */ }

src/com/android/settings/accounts/AccountPreferenceBase.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ import java.util.Date; 
abstract class AccountPreferenceBase extends SettingsPreferenceFragment

        implements AuthenticatorHelper.OnAccountsUpdateListener {



    protected static final String TAG = "AccountSettings";

    protected static final String TAG = "AccountPreferenceBase";

    protected static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);



    public static final String AUTHORITIES_FILTER_KEY = "authorities";