diff options
author | Dianne Hackborn <hackbod@google.com> | 2010-03-03 17:18:13 -0800 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2010-03-03 17:18:13 -0800 |
commit | 97de6bccfe81655a16feb988da1d208f95a8d6e3 (patch) | |
tree | 5b0d660f0d7abe3df67c6b6b4939617a6262ee82 /src/com/android/settings/DeviceAdminAdd.java | |
parent | 65daa5f593a2ed59805a629cba4767ae89771bc8 (diff) | |
download | packages_apps_Settings-97de6bccfe81655a16feb988da1d208f95a8d6e3.zip packages_apps_Settings-97de6bccfe81655a16feb988da1d208f95a8d6e3.tar.gz packages_apps_Settings-97de6bccfe81655a16feb988da1d208f95a8d6e3.tar.bz2 |
Fix issue #2477264: "Force Stop" in "Manage Applications" is not working
Also add cancel button when adding a device admin.
Diffstat (limited to 'src/com/android/settings/DeviceAdminAdd.java')
-rw-r--r-- | src/com/android/settings/DeviceAdminAdd.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java index d953409..2653e81 100644 --- a/src/com/android/settings/DeviceAdminAdd.java +++ b/src/com/android/settings/DeviceAdminAdd.java @@ -64,6 +64,7 @@ public class DeviceAdminAdd extends Activity { TextView mAdminWarning; ViewGroup mAdminPolicies; Button mActionButton; + Button mCancelButton; View mSelectLayout; @@ -133,6 +134,12 @@ public class DeviceAdminAdd extends Activity { mAddMsg = (TextView)findViewById(R.id.add_msg); mAdminWarning = (TextView)findViewById(R.id.admin_warning); mAdminPolicies = (ViewGroup)findViewById(R.id.admin_policies); + mCancelButton = (Button)findViewById(R.id.cancel_button); + mCancelButton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + finish(); + } + }); mActionButton = (Button)findViewById(R.id.action_button); mActionButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { |