PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 136a3da4a3

Change-Id: I82ce91a75cc84ef02ae6beead23195bfdec0234f
This commit is contained in:
Suprabh Shukla
2017-05-26 01:18:05 +00:00
committed by android-build-merger
parent e8e23081fa 136a3da4a3
commit 7f550afc37
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/strings.xml
View File

@@ -4307,11 +4307,6 @@
can't verify user consent. [CHAR LIMIT=NONE] --> can't verify user consent. [CHAR LIMIT=NONE] -->
<string name="touch_filtered_warning">Because an app is obscuring a permission request, Settings <string name="touch_filtered_warning">Because an app is obscuring a permission request, Settings
can’t verify your response.</string> 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 <!-- 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] --> 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" <string name="enable_service_encryption_warning">If you turn on <xliff:g id="service"

4
src/com/android/settings/DeviceAdminAdd.java
View File

@@ -65,8 +65,6 @@ import com.android.settings.R;
import com.android.settings.users.UserDialogs; import com.android.settings.users.UserDialogs;
import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.SecureTouchListener;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException; import java.io.IOException;
@@ -352,8 +350,6 @@ public class DeviceAdminAdd extends Activity {
final View restrictedAction = findViewById(R.id.restricted_action); final View restrictedAction = findViewById(R.id.restricted_action);
restrictedAction.setFilterTouchesWhenObscured(true); restrictedAction.setFilterTouchesWhenObscured(true);
restrictedAction.setOnTouchListener(
new SecureTouchListener(getString(R.string.window_obscured_warning)));
restrictedAction.setOnClickListener(new View.OnClickListener() { restrictedAction.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
if (mAdding) { if (mAdding) {