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

Merge "The time and data pickers did not support IME editor action correctly."

Browse Source
This commit is contained in:
Svetoslav Ganov
2011-09-09 11:24:24 -07:00
committed by Android (Google) Code Review
parent 5b60d38a8a a53efe9923
commit 99e109915e
4 changed files with 64 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
core/java/android/widget/DatePicker.java
View File

@@ -31,6 +31,7 @@ import android.util.SparseArray;
import android.view.LayoutInflater;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityManager;
import android.view.inputmethod.EditorInfo;
import android.widget.NumberPicker.OnValueChangeListener;
import com.android.internal.R;
@@ -81,10 +82,10 @@ public class DatePicker extends FrameLayout {
private static final boolean DEFAULT_ENABLED_STATE = true;
private final NumberPicker mDaySpinner;
private final LinearLayout mSpinners;
private final NumberPicker mDaySpinner;
private final NumberPicker mMonthSpinner;
private final NumberPicker mYearSpinner;
@@ -481,16 +482,20 @@ public class DatePicker extends FrameLayout {
private void reorderSpinners() {
mSpinners.removeAllViews();
char[] order = DateFormat.getDateFormatOrder(getContext());
for (int i = 0; i < order.length; i++) {
final int spinnerCount = order.length;
for (int i = 0; i < spinnerCount; i++) {
switch (order[i]) {
case DateFormat.DATE:
mSpinners.addView(mDaySpinner);
setImeOptions(mDaySpinner, spinnerCount, i);
break;
case DateFormat.MONTH:
mSpinners.addView(mMonthSpinner);
setImeOptions(mMonthSpinner, spinnerCount, i);
break;
case DateFormat.YEAR:
mSpinners.addView(mYearSpinner);
setImeOptions(mYearSpinner, spinnerCount, i);
break;
default:
throw new IllegalArgumentException();
@@ -668,6 +673,42 @@ public class DatePicker extends FrameLayout {
}
}
/**
* Sets the IME options for a spinner based on its ordering.
*
* @param spinner The spinner.
* @param spinnerCount The total spinner count.
* @param spinnerIndex The index of the given spinner.
*/
private void setImeOptions(NumberPicker spinner, int spinnerCount, int spinnerIndex) {
final int imeOptions;
if (spinnerIndex < spinnerCount - 1) {
imeOptions = EditorInfo.IME_ACTION_NEXT;
} else {
imeOptions = EditorInfo.IME_ACTION_DONE;
}
TextView input = (TextView) spinner.findViewById(R.id.numberpicker_input);
input.setImeOptions(imeOptions);
}
private void setContentDescriptions() {
// Day
String text = mContext.getString(R.string.date_picker_increment_day_button);
mDaySpinner.findViewById(R.id.increment).setContentDescription(text);
text = mContext.getString(R.string.date_picker_decrement_day_button);
mDaySpinner.findViewById(R.id.decrement).setContentDescription(text);
// Month
text = mContext.getString(R.string.date_picker_increment_month_button);
mMonthSpinner.findViewById(R.id.increment).setContentDescription(text);
text = mContext.getString(R.string.date_picker_decrement_month_button);
mMonthSpinner.findViewById(R.id.decrement).setContentDescription(text);
// Year
text = mContext.getString(R.string.date_picker_increment_year_button);
mYearSpinner.findViewById(R.id.increment).setContentDescription(text);
text = mContext.getString(R.string.date_picker_decrement_year_button);
mYearSpinner.findViewById(R.id.decrement).setContentDescription(text);
}
/**
* Class for managing state storing/restoring.
*/
@@ -720,22 +761,4 @@ public class DatePicker extends FrameLayout {
}
};
}
private void setContentDescriptions() {
// Day
String text = mContext.getString(R.string.date_picker_increment_day_button);
mDaySpinner.findViewById(R.id.increment).setContentDescription(text);
text = mContext.getString(R.string.date_picker_decrement_day_button);
mDaySpinner.findViewById(R.id.decrement).setContentDescription(text);
// Month
text = mContext.getString(R.string.date_picker_increment_month_button);
mMonthSpinner.findViewById(R.id.increment).setContentDescription(text);
text = mContext.getString(R.string.date_picker_decrement_month_button);
mMonthSpinner.findViewById(R.id.decrement).setContentDescription(text);
// Year
text = mContext.getString(R.string.date_picker_increment_year_button);
mYearSpinner.findViewById(R.id.increment).setContentDescription(text);
text = mContext.getString(R.string.date_picker_decrement_year_button);
mYearSpinner.findViewById(R.id.decrement).setContentDescription(text);
}
}

7
core/java/android/widget/NumberPicker.java
View File

@@ -33,7 +33,6 @@ import android.graphics.Paint;
import android.graphics.Rect;
import android.graphics.Paint.Align;
import android.graphics.drawable.Drawable;
import android.os.SystemClock;
import android.text.InputFilter;
import android.text.InputType;
import android.text.Spanned;
@@ -517,7 +516,10 @@ public class NumberPicker extends LinearLayout {
mInputText = (EditText) findViewById(R.id.numberpicker_input);
mInputText.setOnFocusChangeListener(new OnFocusChangeListener() {
public void onFocusChange(View v, boolean hasFocus) {
if (!hasFocus) {
if (hasFocus) {
mInputText.selectAll();
} else {
mInputText.setSelection(0, 0);
validateInputTextView(v);
}
}
@@ -687,7 +689,6 @@ public class NumberPicker extends LinearLayout {
InputMethodManager imm = (InputMethodManager) getContext().getSystemService(
Context.INPUT_METHOD_SERVICE);
imm.showSoftInput(mInputText, 0);
mInputText.setSelection(0, mInputText.getText().length());
return true;
}
VelocityTracker velocityTracker = mVelocityTracker;

13
core/java/android/widget/TextView.java
View File

@@ -3726,19 +3726,19 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
// instead turning this into the normal enter key codes that an
// app may be expecting.
if (actionCode == EditorInfo.IME_ACTION_NEXT) {
View v = focusSearch(FOCUS_DOWN);
View v = focusSearch(FOCUS_FORWARD);
if (v != null) {
if (!v.requestFocus(FOCUS_DOWN)) {
if (!v.requestFocus(FOCUS_FORWARD)) {
throw new IllegalStateException("focus search returned a view " +
"that wasn't able to take focus!");
}
}
return;
} else if (actionCode == EditorInfo.IME_ACTION_PREVIOUS) {
View v = focusSearch(FOCUS_UP);
View v = focusSearch(FOCUS_BACKWARD);
if (v != null) {
if (!v.requestFocus(FOCUS_UP)) {
if (!v.requestFocus(FOCUS_BACKWARD)) {
throw new IllegalStateException("focus search returned a view " +
"that wasn't able to take focus!");
}
@@ -3750,10 +3750,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
if (imm != null && imm.isActive(this)) {
imm.hideSoftInputFromWindow(getWindowToken(), 0);
}
clearFocus();
return;
}
}
Handler h = getHandler();
if (h != null) {
long eventTime = SystemClock.uptimeMillis();

11
core/java/android/widget/TimePicker.java
View File

@@ -16,8 +16,6 @@
package android.widget;
import com.android.internal.R;
import android.annotation.Widget;
import android.content.Context;
import android.content.res.Configuration;
@@ -30,8 +28,11 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityManager;
import android.view.inputmethod.EditorInfo;
import android.widget.NumberPicker.OnValueChangeListener;
import com.android.internal.R;
import java.text.DateFormatSymbols;
import java.util.Calendar;
import java.util.Locale;
@@ -149,6 +150,8 @@ public class TimePicker extends FrameLayout {
onTimeChanged();
}
});
EditText hourInput = (EditText) mHourSpinner.findViewById(R.id.numberpicker_input);
hourInput.setImeOptions(EditorInfo.IME_ACTION_NEXT);
// divider (only for the new widget style)
mDivider = (TextView) findViewById(R.id.divider);
@@ -184,6 +187,8 @@ public class TimePicker extends FrameLayout {
onTimeChanged();
}
});
EditText minuteInput = (EditText) mMinuteSpinner.findViewById(R.id.numberpicker_input);
minuteInput.setImeOptions(EditorInfo.IME_ACTION_NEXT);
/* Get the localized am/pm strings and use them in the spinner */
mAmPmStrings = new DateFormatSymbols().getAmPmStrings();
@@ -214,6 +219,8 @@ public class TimePicker extends FrameLayout {
}
});
}
EditText amPmInput = (EditText) mAmPmSpinner.findViewById(R.id.numberpicker_input);
amPmInput.setImeOptions(EditorInfo.IME_ACTION_DONE);
// update controls to initial state
updateHourControl();