Fix issue #2477264: "Force Stop" in "Manage Applications" is not working

Also add cancel button when adding a device admin.
This commit is contained in:
Dianne Hackborn
2010-03-03 17:18:13 -08:00
parent 65daa5f593
commit 97de6bccfe
3 changed files with 17 additions and 7 deletions

View File

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