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

Commit 62e6e37d authored by Shashank Mittal's avatar Shashank Mittal Committed by Linux Build Service Account
Browse files

AppOps: Enable App Ops under security setting. 

Add support for MODE_ASK mode and enable App Ops under security settings.
Conflicts:
	res/xml/security_settings_misc.xml

Change-Id: I4bed9425bea0d621a1f33121264d96587a4cb06e
parent 83e7ffb5

AndroidManifest.xml

+0 −2
Original line number Diff line number Diff line
@@ -834,7 +834,6 @@ 
                android:value="com.android.settings.notification.NotificationStation" />

        </activity>



        <!--

        <activity android:name="Settings$AppOpsSummaryActivity"

                android:label="@string/app_ops_settings"

                android:taskAffinity=""
@@ -851,7 +850,6 @@ 
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/application_settings" />

        </activity>

        -->



        <activity android:name="Settings$LocationSettingsActivity"

                android:label="@string/location_settings_title"

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -3074,6 +3074,8 @@ 
    <!-- App Ops Settings --> <skip />

    <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->

    <string name="app_ops_settings">App ops</string>

    <!-- [CHAR LIMIT=NONE] App ops settings summary, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->

    <string name="app_ops_settings_summary">View or change app permissions</string>

    <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->

    <string name="app_ops_running">Running</string>

    <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->

res/xml/security_settings_misc.xml

+6 −1
Original line number Diff line number Diff line
@@ -52,7 +52,12 @@ 
                android:persistent="false"

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



        <SwitchPreference android:key="toggle_install_applications"

        <Preference android:title="@string/app_ops_settings"

                android:summary="@string/app_ops_settings_summary"

                android:persistent="false"

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



        <CheckBoxPreference android:key="toggle_install_applications"

                android:title="@string/install_applications"

                android:summaryOff="@string/install_unknown_applications"

                android:summaryOn="@string/install_unknown_applications"

src/com/android/settings/applications/AppOpsState.java

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ public class AppOpsState { 
                    false,

                    false,

                    false,

                    false,

                    false }

            );