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

Commit 7f550afc authored by Suprabh Shukla's avatar Suprabh Shukla Committed by android-build-merger
Browse files

Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev 

am: 136a3da4

Change-Id: I82ce91a75cc84ef02ae6beead23195bfdec0234f
parents e8e23081 136a3da4

res/values/strings.xml

+0 −5
Original line number Diff line number Diff line
@@ -4307,11 +4307,6 @@ 
         can't verify user consent. [CHAR LIMIT=NONE] -->

    <string name="touch_filtered_warning">Because an app is obscuring a permission request, Settings

        can’t verify your response.</string>

    <!-- Warning shown when user input has been blocked due to another app overlaying screen

         content. Since we don't know what the app is showing on top of the input target, we

         can't verify user consent. [CHAR LIMIT=NONE] -->

    <string name="window_obscured_warning">Because another app is displaying on top of these options,

        Settings can\u2019t respond to your action.</string>

    <!-- Warning that the device data will not be encrypted with password or PIN if

        enabling an accessibility service and there is a secure lock setup. [CHAR LIMIT=NONE] -->

    <string name="enable_service_encryption_warning">If you turn on <xliff:g id="service"

src/com/android/settings/DeviceAdminAdd.java

+0 −4
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ import com.android.settings.R; 
import com.android.settings.users.UserDialogs;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;

import com.android.settingslib.SecureTouchListener;



import org.xmlpull.v1.XmlPullParserException;



import java.io.IOException;
@@ -352,8 +350,6 @@ public class DeviceAdminAdd extends Activity { 


        final View restrictedAction = findViewById(R.id.restricted_action);

        restrictedAction.setFilterTouchesWhenObscured(true);

        restrictedAction.setOnTouchListener(

                new SecureTouchListener(getString(R.string.window_obscured_warning)));

        restrictedAction.setOnClickListener(new View.OnClickListener() {

            public void onClick(View v) {

                if (mAdding) {