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

Commit 81ec9e11 authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Move device admin viewer/adder to specialaccess package."

parents 9beaab01 ca6d86c5

AndroidManifest.xml

+4 −4
Original line number Diff line number Diff line
@@ -1382,7 +1382,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.DeviceAdminSettings" />

                android:value="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings" />

        </activity>



        <!-- Keep compatibility with old shortcuts. -->
@@ -1391,10 +1391,10 @@ 
                android:exported="true"

                android:targetActivity="Settings$DeviceAdminSettingsActivity">

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

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

                android:value="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings" />

        </activity-alias>



        <activity android:name="DeviceAdminAdd"

        <activity android:name=".applications.specialaccess.deviceadmin.DeviceAdminAdd"

                android:label="@string/device_admin_add_title"

                android:clearTaskOnLaunch="true">

            <intent-filter>
@@ -1405,7 +1405,7 @@ 


        <activity-alias android:name="SetProfileOwner"

                        android:label="@string/profile_owner_add_title"

                        android:targetActivity="DeviceAdminAdd">

                        android:targetActivity=".applications.specialaccess.deviceadmin.DeviceAdminAdd">

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

                <action android:name="android.app.action.SET_PROFILE_OWNER" />

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

res/xml/security_dashboard_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ 
            android:key="manage_device_admin"

            android:title="@string/manage_device_admin"

            android:summary="@string/summary_placeholder"

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

            android:fragment="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings" />



        <Preference

            android:key="enterprise_privacy"

res/xml/special_access.xml

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ 
    <Preference

        android:key="device_administrators"

        android:title="@string/manage_device_admin"

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

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

        android:fragment="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings"

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



    <Preference

        android:key="system_alert_window"

src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ import android.view.View; 
import android.webkit.IWebViewUpdateService;



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

import com.android.settings.DeviceAdminAdd;

import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAdd;

import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.Utils;

src/com/android/settings/DeviceAdminAdd.java→src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java

+3 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.settings;

package com.android.settings.applications.specialaccess.deviceadmin;



import android.app.Activity;

import android.app.ActivityManager;
@@ -59,6 +59,8 @@ import android.widget.ImageView; 
import android.widget.TextView;



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

import com.android.settings.EventLogTags;

import com.android.settings.R;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.users.UserDialogs;

import com.android.settingslib.RestrictedLockUtils;