diff options
| author | Amith Yamasani <yamasani@google.com> | 2015-02-03 21:31:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-03 21:31:56 +0000 |
| commit | 29c99f1534ed5b3638a047b0651fa0d10f2c3c35 (patch) | |
| tree | c28571c1fc829ac801e53256d152363c09580244 /src | |
| parent | 907990dbc575f2eb2a4ab68edf11843cbac66017 (diff) | |
| parent | 47ba346e1ea491f925ad47a4fa04b217bfcb4019 (diff) | |
| download | packages_apps_Settings-29c99f1534ed5b3638a047b0651fa0d10f2c3c35.zip packages_apps_Settings-29c99f1534ed5b3638a047b0651fa0d10f2c3c35.tar.gz packages_apps_Settings-29c99f1534ed5b3638a047b0651fa0d10f2c3c35.tar.bz2 | |
Merge "set tapjacking protection for deviceadmin permission dialog" automerge: 6317e06
automerge: 47ba346
* commit '47ba346e1ea491f925ad47a4fa04b217bfcb4019':
set tapjacking protection for deviceadmin permission dialog
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/DeviceAdminAdd.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java index ed95500..c9f876b 100644 --- a/src/com/android/settings/DeviceAdminAdd.java +++ b/src/com/android/settings/DeviceAdminAdd.java @@ -259,6 +259,7 @@ public class DeviceAdminAdd extends Activity { mAdminWarning = (TextView) findViewById(R.id.admin_warning); mAdminPolicies = (ViewGroup) findViewById(R.id.admin_policies); mCancelButton = (Button) findViewById(R.id.cancel_button); + mCancelButton.setFilterTouchesWhenObscured(true); mCancelButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { EventLog.writeEvent(EventLogTags.EXP_DET_DEVICE_ADMIN_DECLINED_BY_USER, @@ -267,6 +268,7 @@ public class DeviceAdminAdd extends Activity { } }); mActionButton = (Button) findViewById(R.id.action_button); + mActionButton.setFilterTouchesWhenObscured(true); mActionButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { if (mAdding) { |