diff options
Diffstat (limited to 'src/com/android')
3 files changed, 13 insertions, 15 deletions
diff --git a/src/com/android/timezonepicker/TimeZoneFilterTypeAdapter.java b/src/com/android/timezonepicker/TimeZoneFilterTypeAdapter.java index 361a060..b5557cb 100644 --- a/src/com/android/timezonepicker/TimeZoneFilterTypeAdapter.java +++ b/src/com/android/timezonepicker/TimeZoneFilterTypeAdapter.java @@ -93,11 +93,15 @@ public class TimeZoneFilterTypeAdapter extends BaseAdapter implements Filterable public TimeZoneFilterTypeAdapter(Context context, TimeZoneData tzd, OnSetFilterListener l) { mTimeZoneData = tzd; mListener = l; - mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); } @Override + public boolean isEnabled(int position) { + return !mLiveResults.get(position).showLabel; + } + + @Override public int getCount() { return mLiveResultsCount; } diff --git a/src/com/android/timezonepicker/TimeZonePickerDialog.java b/src/com/android/timezonepicker/TimeZonePickerDialog.java index e1d70a7..fca2bbc 100644 --- a/src/com/android/timezonepicker/TimeZonePickerDialog.java +++ b/src/com/android/timezonepicker/TimeZonePickerDialog.java @@ -49,9 +49,7 @@ public class TimeZonePickerDialog extends DialogFragment implements Bundle savedInstanceState) { long timeMillis = 0; String timeZone = null; - if (savedInstanceState != null) { - // TODO - } else { + if (savedInstanceState == null) { Bundle b = getArguments(); if (b != null) { timeMillis = b.getLong(BUNDLE_START_TIME_MILLIS); @@ -65,13 +63,7 @@ public class TimeZonePickerDialog extends DialogFragment implements public Dialog onCreateDialog(Bundle savedInstanceState) { Dialog dialog = super.onCreateDialog(savedInstanceState); dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); - - Window w = dialog.getWindow(); - WindowManager.LayoutParams a = w.getAttributes(); - a.softInputMode |= WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE; - a.softInputMode |= WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN; - w.setAttributes(a); - + dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); return dialog; } diff --git a/src/com/android/timezonepicker/TimeZoneResultAdapter.java b/src/com/android/timezonepicker/TimeZoneResultAdapter.java index c22dac0..5b718cc 100644 --- a/src/com/android/timezonepicker/TimeZoneResultAdapter.java +++ b/src/com/android/timezonepicker/TimeZoneResultAdapter.java @@ -156,11 +156,13 @@ public class TimeZoneResultAdapter extends BaseAdapter implements OnClickListene } break; case TimeZoneFilterTypeAdapter.FILTER_TYPE_TIME_ZONE: - for (TimeZoneInfo tzi : mTimeZoneData.mTimeZones) { - if (str.equalsIgnoreCase(tzi.mDisplayName)) { - mFilteredTimeZoneIndices[mFilteredTimeZoneLength++] = idx; + if (str != null) { + for (TimeZoneInfo tzi : mTimeZoneData.mTimeZones) { + if (str.equalsIgnoreCase(tzi.mDisplayName)) { + mFilteredTimeZoneIndices[mFilteredTimeZoneLength++] = idx; + } + idx++; } - idx++; } break; case TimeZoneFilterTypeAdapter.FILTER_TYPE_COUNTRY: |