Merge change Ia7c57145 into eclair

* changes:
  SecuritySettings: remove trailing spaces.
This commit is contained in:
Android (Google) Code Review
2009-10-01 12:49:08 -04:00

View File

@@ -351,7 +351,7 @@ public class SecuritySettings extends PreferenceActivity {
private static final int UNLOCK_DIALOG = 1; private static final int UNLOCK_DIALOG = 1;
private static final int PASSWORD_DIALOG = 2; private static final int PASSWORD_DIALOG = 2;
private static final int RESET_DIALOG = 3; private static final int RESET_DIALOG = 3;
private KeyStore mKeyStore = KeyStore.getInstance(); private KeyStore mKeyStore = KeyStore.getInstance();
private int mState; private int mState;
private int mDialogId; private int mDialogId;
@@ -430,7 +430,7 @@ public class SecuritySettings extends PreferenceActivity {
} }
return false; return false;
} }
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {
if (preference == mInstallButton) { if (preference == mInstallButton) {
Credentials.getInstance().installFromSdCard(SecuritySettings.this); Credentials.getInstance().installFromSdCard(SecuritySettings.this);
@@ -534,7 +534,7 @@ public class SecuritySettings extends PreferenceActivity {
view.setVisibility(View.VISIBLE); view.setVisibility(View.VISIBLE);
} }
} }
private void createPreferences(PreferenceCategory category) { private void createPreferences(PreferenceCategory category) {
mAccessCheckBox = new CheckBoxPreference(SecuritySettings.this); mAccessCheckBox = new CheckBoxPreference(SecuritySettings.this);
mAccessCheckBox.setTitle(R.string.credentials_access); mAccessCheckBox.setTitle(R.string.credentials_access);