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

Commit 15ec2cf8 authored by sunnyshao's avatar sunnyshao Committed by Fan Zhang
Browse files

Modified the PrivacySettings and add PreferenceControllers 

- Changed the PrivacySettings to DashboardFragment.
- Added the new five related PreferenceControllers and related codes
- Modified the privacy_settings.xml
- Removed the PrivacySettingsTest test by design changed
- Moved the PrivacySettings.java from root directory to backup

Test: manual
Test: make RunSettingsRoboTests
Change-Id: Ic88e2e58a11d024d2394f75c3db5b46fe2d86dba
parent f1191f6b

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -1390,7 +1390,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.PrivacySettings" />

                android:value="com.android.settings.backup.PrivacySettings" />

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

                android:value="true" />

        </activity>

res/xml/privacy_settings.xml

+13 −6
Original line number Diff line number Diff line
@@ -14,8 +14,10 @@ 
     limitations under the License.

-->



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

<PreferenceScreen

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

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

    android:key="privacy_settings_screen"

    android:title="@string/privacy_settings_title">



    <!-- Backup settings -->
@@ -23,31 +25,36 @@ 
        android:key="backup_data"

        android:title="@string/backup_data_title"

        android:persistent="false"

        android:fragment="com.android.settings.backup.ToggleBackupSettingFragment"/>

        android:fragment="com.android.settings.backup.ToggleBackupSettingFragment"

        settings:controller="com.android.settings.backup.BackupDataPreferenceController" />



    <Preference

        android:key="configure_account"

        android:title="@string/backup_configure_account_title"

        android:persistent="false">

        android:persistent="false"

        settings:controller="com.android.settings.backup.ConfigureAccountPreferenceController">

        <!-- the Intent declared here is always overwritten by a real one -->

        <intent android:action="dummy" />

    </Preference>



    <Preference

        android:key="data_management"

        android:persistent="false">

        android:persistent="false"

        settings:controller="com.android.settings.backup.DataManagementPreferenceController">

    </Preference>



    <SwitchPreference

        android:key="auto_restore"

        android:title="@string/auto_restore_title"

        android:summary="@string/auto_restore_summary" />

        android:summary="@string/auto_restore_summary"

        settings:controller="com.android.settings.backup.AutoRestorePreferenceController" />



    <Preference

        android:key="backup_inactive"

        android:title="@string/backup_inactive_title"

        android:persistent="false"

        android:enabled="false"

        android:selectable="false" />

        android:selectable="false"

        settings:controller="com.android.settings.backup.BackupInactivePreferenceController" />



</PreferenceScreen>

src/com/android/settings/PrivacySettings.java

deleted100644 → 0
+0 −248
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009 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.

 */



package com.android.settings;



import android.app.backup.IBackupManager;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.os.Bundle;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.SearchIndexableResource;

import android.provider.Settings;

import android.support.annotation.VisibleForTesting;

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.Preference;

import android.support.v7.preference.Preference.OnPreferenceChangeListener;

import android.support.v7.preference.PreferenceScreen;

import android.util.Log;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settingslib.RestrictedLockUtils;



import java.util.ArrayList;

import java.util.Collection;

import java.util.HashSet;

import java.util.List;

import java.util.Set;



/**

 * Gesture lock pattern settings.

 */

public class PrivacySettings extends SettingsPreferenceFragment {



    // Vendor specific

    private static final String GSETTINGS_PROVIDER = "com.google.settings";

    @VisibleForTesting

    static final String BACKUP_DATA = "backup_data";

    @VisibleForTesting

    static final String AUTO_RESTORE = "auto_restore";

    @VisibleForTesting

    static final String CONFIGURE_ACCOUNT = "configure_account";

    @VisibleForTesting

    static final String DATA_MANAGEMENT = "data_management";

    private static final String BACKUP_INACTIVE = "backup_inactive";

    private static final String TAG = "PrivacySettings";

    private IBackupManager mBackupManager;

    private Preference mBackup;

    private SwitchPreference mAutoRestore;

    private Preference mConfigure;

    private Preference mManageData;

    private boolean mEnabled;



    @Override

    public int getMetricsCategory() {

        return MetricsEvent.PRIVACY;

    }



    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        // Don't allow any access if this is not an admin user.

        // TODO: backup/restore currently only works with owner user b/22760572

        mEnabled = UserManager.get(getActivity()).isAdminUser();

        if (!mEnabled) {

            return;

        }



        addPreferencesFromResource(R.xml.privacy_settings);

        final PreferenceScreen screen = getPreferenceScreen();

        mBackupManager = IBackupManager.Stub.asInterface(

                ServiceManager.getService(Context.BACKUP_SERVICE));



        setPreferenceReferences(screen);



        Set<String> keysToRemove = new HashSet<>();

        getNonVisibleKeys(getActivity(), keysToRemove);

        final int screenPreferenceCount = screen.getPreferenceCount();

        for (int i = screenPreferenceCount - 1; i >= 0; --i) {

            Preference preference = screen.getPreference(i);

            if (keysToRemove.contains(preference.getKey())) {

                screen.removePreference(preference);

            }

        }



        updateToggles();

    }



    @Override

    public void onResume() {

        super.onResume();



        // Refresh UI

        if (mEnabled) {

            updateToggles();

        }

    }



    @VisibleForTesting

    void setPreferenceReferences(PreferenceScreen screen) {

        mBackup = screen.findPreference(BACKUP_DATA);



        mAutoRestore = (SwitchPreference) screen.findPreference(AUTO_RESTORE);

        mAutoRestore.setOnPreferenceChangeListener(preferenceChangeListener);



        mConfigure = screen.findPreference(CONFIGURE_ACCOUNT);

        mManageData = screen.findPreference(DATA_MANAGEMENT);

    }



    private OnPreferenceChangeListener preferenceChangeListener = new OnPreferenceChangeListener() {

        @Override

        public boolean onPreferenceChange(Preference preference, Object newValue) {

            if (!(preference instanceof SwitchPreference)) {

                return true;

            }

            boolean nextValue = (Boolean) newValue;

            boolean result = false;

            if (preference == mAutoRestore) {

                try {

                    mBackupManager.setAutoRestore(nextValue);

                    result = true;

                } catch (RemoteException e) {

                    mAutoRestore.setChecked(!nextValue);

                }

            }

            return result;

        }

    };





    /*

     * Creates toggles for each backup/reset preference.

     */

    private void updateToggles() {

        ContentResolver res = getContentResolver();



        boolean backupEnabled = false;

        Intent configIntent = null;

        String configSummary = null;

        Intent manageIntent = null;

        String manageLabel = null;

        try {

            backupEnabled = mBackupManager.isBackupEnabled();

            String transport = mBackupManager.getCurrentTransport();

            configIntent = validatedActivityIntent(

                    mBackupManager.getConfigurationIntent(transport), "config");

            configSummary = mBackupManager.getDestinationString(transport);

            manageIntent = validatedActivityIntent(

                    mBackupManager.getDataManagementIntent(transport), "management");

            manageLabel = mBackupManager.getDataManagementLabel(transport);



            mBackup.setSummary(backupEnabled

                    ? R.string.accessibility_feature_state_on

                    : R.string.accessibility_feature_state_off);

        } catch (RemoteException e) {

            // leave it 'false' and disable the UI; there's no backup manager

            mBackup.setEnabled(false);

        }



        mAutoRestore.setChecked(Settings.Secure.getInt(res,

                Settings.Secure.BACKUP_AUTO_RESTORE, 1) == 1);

        mAutoRestore.setEnabled(backupEnabled);



        final boolean configureEnabled = (configIntent != null) && backupEnabled;

        mConfigure.setEnabled(configureEnabled);

        mConfigure.setIntent(configIntent);

        setConfigureSummary(configSummary);



        final boolean manageEnabled = (manageIntent != null) && backupEnabled;

        if (manageEnabled) {

            mManageData.setIntent(manageIntent);

            if (manageLabel != null) {

                mManageData.setTitle(manageLabel);

            }

        } else {

            // Hide the item if data management intent is not supported by transport.

            getPreferenceScreen().removePreference(mManageData);

        }

    }



    private Intent validatedActivityIntent(Intent intent, String logLabel) {

        if (intent != null) {

            PackageManager pm = getPackageManager();

            List<ResolveInfo> resolved = pm.queryIntentActivities(intent, 0);

            if (resolved == null || resolved.isEmpty()) {

                intent = null;

                Log.e(TAG, "Backup " + logLabel + " intent " + intent

                        + " fails to resolve; ignoring");

            }

        }

        return intent;

    }



    private void setConfigureSummary(String summary) {

        if (summary != null) {

            mConfigure.setSummary(summary);

        } else {

            mConfigure.setSummary(R.string.backup_configure_account_default_summary);

        }

    }



    @Override

    public int getHelpResource() {

        return R.string.help_url_backup_reset;

    }



    private static void getNonVisibleKeys(Context context, Collection<String> nonVisibleKeys) {

        final IBackupManager backupManager = IBackupManager.Stub.asInterface(

                ServiceManager.getService(Context.BACKUP_SERVICE));

        boolean isServiceActive = false;

        try {

            isServiceActive = backupManager.isBackupServiceActive(UserHandle.myUserId());

        } catch (RemoteException e) {

            Log.w(TAG, "Failed querying backup manager service activity status. " +

                    "Assuming it is inactive.");

        }

        boolean vendorSpecific = context.getPackageManager().

                resolveContentProvider(GSETTINGS_PROVIDER, 0) == null;

        if (vendorSpecific || isServiceActive) {

            nonVisibleKeys.add(BACKUP_INACTIVE);

        }

        if (vendorSpecific || !isServiceActive) {

            nonVisibleKeys.add(BACKUP_DATA);

            nonVisibleKeys.add(AUTO_RESTORE);

            nonVisibleKeys.add(CONFIGURE_ACCOUNT);

        }

    }

}

src/com/android/settings/backup/AutoRestorePreferenceController.java

0 → 100644
+89 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 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

 */



package com.android.settings.backup;



import android.app.backup.IBackupManager;

import android.content.ContentResolver;

import android.content.Context;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.provider.Settings;

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.Preference;

import android.util.Log;



import com.android.settings.core.TogglePreferenceController;



public class AutoRestorePreferenceController extends TogglePreferenceController {

    private static final String TAG = "AutoRestorePrefCtrler";



    private PrivacySettingsConfigData mPSCD;

    private Preference mPreference;



    public AutoRestorePreferenceController(Context context, String key) {

        super(context, key);

    }



    public void setPrivacySettingsConfigData(final PrivacySettingsConfigData pData) {

        mPSCD = pData;

    }



    @Override

    public int getAvailabilityStatus() {

        if (!PrivacySettingsUtils.isAdminUser(mContext)) {

            return DISABLED_FOR_USER;

        }

        if (PrivacySettingsUtils.isInvisibleKey(mContext, PrivacySettingsUtils.AUTO_RESTORE)) {

            return DISABLED_UNSUPPORTED;

        }

        return AVAILABLE;

    }



    @Override

    public void updateState(Preference preference) {

        super.updateState(preference);

        mPreference = preference;

        preference.setEnabled(mPSCD.isBackupEnabled());

    }



    @Override

    public boolean isChecked() {

        final ContentResolver res = mContext.getContentResolver();



        return Settings.Secure.getInt(res,

                Settings.Secure.BACKUP_AUTO_RESTORE, 1) == 1;

    }



    @Override

    public boolean setChecked(boolean isChecked) {

        final boolean nextValue = isChecked;

        boolean result = false;



        final IBackupManager backupManager = IBackupManager.Stub.asInterface(

                ServiceManager.getService(Context.BACKUP_SERVICE));



        try {

            backupManager.setAutoRestore(nextValue);

            result = true;

        } catch (RemoteException e) {

            ((SwitchPreference) mPreference).setChecked(!nextValue);

            Log.e(TAG, "Error can't set setAutoRestore", e);

        }



        return result;

    }

}
 
 No newline at end of file

src/com/android/settings/backup/BackupDataPreferenceController.java

0 → 100644
+64 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 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

 */



package com.android.settings.backup;



import android.content.Context;

import android.support.v7.preference.Preference;



import com.android.settings.core.BasePreferenceController;

import com.android.settings.R;



public class BackupDataPreferenceController extends BasePreferenceController {

    private PrivacySettingsConfigData mPSCD;



    public BackupDataPreferenceController(Context context, String key) {

        super(context, key);

    }



    public void setPrivacySettingsConfigData(final PrivacySettingsConfigData pData) {

        mPSCD = pData;

    }



    @Override

    public int getAvailabilityStatus() {

        if (!PrivacySettingsUtils.isAdminUser(mContext)) {

            return DISABLED_FOR_USER;

        }

        if (PrivacySettingsUtils.isInvisibleKey(mContext, PrivacySettingsUtils.BACKUP_DATA)) {

            return DISABLED_UNSUPPORTED;

        }

        return AVAILABLE;

    }



    @Override

    public void updateState(Preference preference) {

        super.updateState(preference);

        if (mPSCD.isBackupGray()) {

            preference.setEnabled(false);

        }

    }



    @Override

    public CharSequence getSummary() {

        if (!mPSCD.isBackupGray()) {

            return mPSCD.isBackupEnabled()

                    ? mContext.getText(R.string.accessibility_feature_state_on)

                    : mContext.getText(R.string.accessibility_feature_state_off);

        }

        return null;

    }

}
 
 No newline at end of file