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

Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev

Browse Source 
am: 43083b4332

Change-Id: I0df3898794b7bc7d5f31a33dbe4363e7502edb5c
This commit is contained in:
Suprabh Shukla
2017-05-05 20:56:10 +00:00
committed by android-build-merger
parent 83e2511d45 43083b4332
commit 3cadb80e8d
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,6 +65,8 @@ 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;
@@ -350,6 +352,8 @@ 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) {