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

Commit ed3a2bd2 authored by Fan Zhang's avatar Fan Zhang
Browse files

Clean up: move speciall access stuff into single package 

Bug: 110207366
Test: robotests
Change-Id: I17ad7a15d1e44bb7690d2b18ed6e2b6b17b46d8a
parent 04233df5

res/xml/app_and_notification.xml

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 


    <Preference

        android:key="special_access"

        android:fragment="com.android.settings.applications.SpecialAccessSettings"

        android:fragment="com.android.settings.applications.specialaccess.SpecialAccessSettings"

        android:title="@string/special_access"

        android:order="20" />

res/xml/special_access.xml

+20 −12
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ 
        android:key="high_power_apps"

        android:title="@string/high_power_apps"

        android:fragment="com.android.settings.applications.manageapplications.ManageApplications"

        settings:keywords="@string/keywords_ignore_optimizations">

        settings:keywords="@string/keywords_ignore_optimizations"

        settings:controller="com.android.settings.applications.specialaccess.HighPowerAppsController">

        <extra

            android:name="classname"

            android:value="com.android.settings.Settings$HighPowerApplicationsActivity" />
@@ -33,7 +34,8 @@ 
    <Preference

        android:key="device_administrators"

        android:title="@string/manage_device_admin"

        android:fragment="com.android.settings.DeviceAdminSettings" />

        android:fragment="com.android.settings.DeviceAdminSettings"

        settings:controller="com.android.settings.applications.specialaccess.DeviceAdministratorsController" />



    <Preference

        android:key="system_alert_window"
@@ -48,7 +50,8 @@ 
    <Preference

        android:key="zen_access"

        android:title="@string/manage_zen_access_title"

        android:fragment="com.android.settings.notification.ZenAccessSettings" />

        android:fragment="com.android.settings.notification.ZenAccessSettings"

        settings:controller="com.android.settings.applications.specialaccess.ZenAccessController" />



    <Preference

        android:key="write_settings_apps"
@@ -63,23 +66,27 @@ 
    <Preference

        android:key="notification_access"

        android:title="@string/manage_notification_access_title"

        android:fragment="com.android.settings.notification.NotificationAccessSettings" />

        android:fragment="com.android.settings.notification.NotificationAccessSettings"

        settings:controller="com.android.settings.applications.specialaccess.NotificationAccessController" />



    <Preference

        android:key="picture_in_picture"

        android:title="@string/picture_in_picture_title"

        android:fragment="com.android.settings.applications.appinfo.PictureInPictureSettings"

        settings:keywords="@string/picture_in_picture_keywords" />

        settings:keywords="@string/picture_in_picture_keywords"

        settings:controller="com.android.settings.applications.specialaccess.PictureInPictureController" />



    <Preference

        android:key="premium_sms"

        android:title="@string/premium_sms_access"

        android:fragment="com.android.settings.applications.PremiumSmsAccess" />

        android:fragment="com.android.settings.applications.PremiumSmsAccess"

        settings:controller="com.android.settings.applications.specialaccess.PremiumSmsController" />



    <Preference

        android:key="data_saver"

        android:title="@string/unrestricted_data_saver"

        android:fragment="com.android.settings.datausage.UnrestrictedDataAccess" />

        android:fragment="com.android.settings.datausage.UnrestrictedDataAccess"

        settings:controller="com.android.settings.applications.specialaccess.DataSaverController" />



    <Preference

        android:key="manage_external_sources"
@@ -105,7 +112,8 @@ 
        android:key="enabled_vr_listeners"

        android:title="@string/vr_listeners_title"

        android:fragment="com.android.settings.applications.VrListenerSettings"

        settings:keywords="@string/keywords_vr_listener">

        settings:keywords="@string/keywords_vr_listener"

        settings:controller="com.android.settings.applications.specialaccess.EnabledVrListenersController">

        <extra

            android:name="classname"

            android:value="com.android.settings.Settings$VrListenersSettingsActivity" />

src/com/android/settings/applications/DataSaverController.java→src/com/android/settings/applications/specialaccess/DataSaverController.java

+4 −7
Original line number Diff line number Diff line
@@ -15,20 +15,17 @@ 
 */





package com.android.settings.applications;

package com.android.settings.applications.specialaccess;



import android.content.Context;

import androidx.annotation.VisibleForTesting;



import com.android.settings.core.BasePreferenceController;

import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;



public class DataSaverController extends BasePreferenceController {



    @VisibleForTesting static final String KEY_DATA_SAVER = "data_saver";



    public DataSaverController(Context context) {

        super(context, KEY_DATA_SAVER);

    public DataSaverController(Context context, String key) {

        super(context, key);

    }



    @AvailabilityStatus

src/com/android/settings/applications/DeviceAdministratorsController.java→src/com/android/settings/applications/specialaccess/DeviceAdministratorsController.java

+4 −7
Original line number Diff line number Diff line
@@ -14,20 +14,17 @@ 
 * limitations under the License.

 */



package com.android.settings.applications;

package com.android.settings.applications.specialaccess;



import android.content.Context;

import androidx.annotation.VisibleForTesting;



import com.android.settings.core.BasePreferenceController;

import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;



public class DeviceAdministratorsController extends BasePreferenceController {



    @VisibleForTesting static final String KEY_DEVICE_ADMIN = "device_administrators";



    public DeviceAdministratorsController(Context context) {

        super(context, KEY_DEVICE_ADMIN);

    public DeviceAdministratorsController(Context context, String key) {

        super(context, key);

    }



    @AvailabilityStatus

src/com/android/settings/applications/EnabledVrListenersController.java→src/com/android/settings/applications/specialaccess/EnabledVrListenersController.java

+6 −7
Original line number Diff line number Diff line
@@ -14,25 +14,24 @@ 
 * limitations under the License.

 */



package com.android.settings.applications;

package com.android.settings.applications.specialaccess;



import android.app.ActivityManager;

import android.content.Context;

import androidx.annotation.VisibleForTesting;



import com.android.settings.core.BasePreferenceController;

import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;



public class EnabledVrListenersController extends BasePreferenceController {



    @VisibleForTesting static final String KEY_ENABLED_VR_LISTENERS = "enabled_vr_listeners";



    public EnabledVrListenersController(Context context) {

        super(context, KEY_ENABLED_VR_LISTENERS);

    public EnabledVrListenersController(Context context, String key) {

        super(context, key);

    }



    @AvailabilityStatus

    public int getAvailabilityStatus() {

        return mContext.getResources().getBoolean(R.bool.config_show_enabled_vr_listeners)

                && !ActivityManager.isLowRamDeviceStatic()

                ? AVAILABLE

                : UNSUPPORTED_ON_DEVICE;

    }