Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug where existing account not pre-checked" into jb-dev

Browse Source
This commit is contained in:
Alice Yang
2012-05-31 17:09:25 -07:00
committed by Android (Google) Code Review
parent 69a1f6e6a1 6cab5e823a
commit be50440152
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/accounts/ChooseTypeAndAccountActivity.java
View File

@@ -22,7 +22,6 @@ import android.os.Parcelable;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.Button; import android.widget.Button;
@@ -280,23 +279,16 @@ public class ChooseTypeAndAccountActivity extends Activity
if (selectedAddNewAccount) { if (selectedAddNewAccount) {
mSelectedItemIndex = mAccounts.size(); mSelectedItemIndex = mAccounts.size();
} }
if (Log.isLoggable(TAG, Log.VERBOSE)) { if (mSelectedItemIndex != SELECTED_ITEM_NONE) {
Log.v(TAG, "mSelectedItemIndex is " + mSelectedItemIndex); list.setItemChecked(mSelectedItemIndex, true);
} if (Log.isLoggable(TAG, Log.VERBOSE)) {
Log.v(TAG, "List item " + mSelectedItemIndex + " should be selected");
ViewGroup buttonBar = (ViewGroup) findViewById(R.id.button_bar);
if (buttonBar != null) {
mOkButton = (Button) buttonBar.findViewById(android.R.id.button2);
if (mSelectedItemIndex != SELECTED_ITEM_NONE) {
// If caller specified a selectedAccount, then display that as selected and enable
// the "OK" button by default.
list.setSelection(mSelectedItemIndex);
mOkButton.setEnabled(true);
} else {
// Otherwise "OK" button is disabled since nothing is pre-selected.
mOkButton.setEnabled(false);
} }
} }
// Only enable "OK" button if something has been selected.
mOkButton = (Button) findViewById(android.R.id.button2);
mOkButton.setEnabled(mSelectedItemIndex != SELECTED_ITEM_NONE);
} }
@Override @Override