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

Merge "set tapjacking protection for deviceadmin permission dialog" automerge: 6317e06

Browse Source 
automerge: 47ba346

* commit '47ba346e1ea491f925ad47a4fa04b217bfcb4019':
  set tapjacking protection for deviceadmin permission dialog
This commit is contained in:
Amith Yamasani
2015-02-03 21:31:56 +00:00
committed by android-build-merger
parent 907990dbc5 47ba346e1e
commit 29c99f1534
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {