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

Merge "Stop showing software keyboard when appropriate"

Browse Source
This commit is contained in:
Daisuke Miyakawa
2010-11-12 18:28:23 -08:00
committed by Android (Google) Code Review
parent 00f3bd885f fdb9343ef6
commit a79a7ac47a
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/android/settings/wifi/WifiConfigUiForSetupWizardXL.java
View File

@@ -70,17 +70,26 @@ public class WifiConfigUiForSetupWizardXL implements WifiConfigUiBase, OnFocusCh
mView = mInflater.inflate(R.layout.wifi_config_ui_for_setup_wizard, parent, true); mView = mInflater.inflate(R.layout.wifi_config_ui_for_setup_wizard, parent, true);
mController = new WifiConfigController(this, mView, mAccessPoint, edit); mController = new WifiConfigController(this, mView, mAccessPoint, edit);
// Set Focus to password View. // Assumes R.id.password is inside security_fields.
final View viewToBeFocused = mView.findViewById(R.id.password); // TODO: confirm it is ok to assume R.id.password is the only EditText to be focused, and
if (viewToBeFocused != null && viewToBeFocused.getVisibility() == View.VISIBLE && // R.id.security_fields is the only parent for possible EditTexts. Possibly we need to
viewToBeFocused instanceof EditText) { // check parentand detect visibility manually.
// After acquiring the focus, we show software keyboard. if (mView.findViewById(R.id.security_fields).getVisibility() == View.VISIBLE) {
viewToBeFocused.setOnFocusChangeListener(this); // Set Focus to password View.
final boolean requestFocusResult = viewToBeFocused.requestFocus(); final View viewToBeFocused = mView.findViewById(R.id.password);
Log.i(TAG, String.format("Focus request %s.", if (viewToBeFocused == null) {
(requestFocusResult ? "successful" : "failed"))); Log.w(TAG, "password field to be focused not found.");
if (!requestFocusResult) { } else if (!(viewToBeFocused instanceof EditText)) {
viewToBeFocused.setOnFocusChangeListener(null); Log.w(TAG, "password field is not EditText");
} else {
// After acquiring the focus, we show software keyboard.
viewToBeFocused.setOnFocusChangeListener(this);
final boolean requestFocusResult = viewToBeFocused.requestFocus();
Log.i(TAG, String.format("Focus request %s.",
(requestFocusResult ? "successful" : "failed")));
if (!requestFocusResult) {
viewToBeFocused.setOnFocusChangeListener(null);
}
} }
} }
} }

2
src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
View File

@@ -163,6 +163,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
@Override @Override
public void onClick(View view) { public void onClick(View view) {
hideSoftwareKeyboard();
if (view == mAddNetworkButton) { if (view == mAddNetworkButton) {
onAddNetworkButtonPressed(); onAddNetworkButtonPressed();
} else if (view == mRefreshButton) { } else if (view == mRefreshButton) {
@@ -184,7 +185,6 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
} else if (view == mDetailButton) { } else if (view == mDetailButton) {
mWifiSettings.showDialogForSelectedPreference(); mWifiSettings.showDialogForSelectedPreference();
} }
hideSoftwareKeyboard();
} }
private void hideSoftwareKeyboard() { private void hideSoftwareKeyboard() {