summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Kung <kingkung@google.com>2013-05-13 13:07:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-13 13:07:51 -0700
commitaed8480fed1827681106a202ff0f4d96ee0eb554 (patch)
tree26cc5aca94fe45c96b987410d45ff3bc193e6438
parent904ea70e67d584800da3e88a2c8670396d657d92 (diff)
parent3f0521e93a94ac7fb927926ef3eab410bd6c83e3 (diff)
downloadandroid_packages_apps_Calendar-aed8480fed1827681106a202ff0f4d96ee0eb554.tar.gz
android_packages_apps_Calendar-aed8480fed1827681106a202ff0f4d96ee0eb554.tar.bz2
android_packages_apps_Calendar-aed8480fed1827681106a202ff0f4d96ee0eb554.zip
am 3f0521e9: Merge "Fix for interval strings beginning with the count" into ics-ub-calendar-denim
* commit '3f0521e93a94ac7fb927926ef3eab410bd6c83e3': Fix for interval strings beginning with the count
-rw-r--r--src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java b/src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java
index a11591f6..acf48431 100644
--- a/src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java
+++ b/src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java
@@ -1007,14 +1007,10 @@ public class RecurrencePickerDialog extends DialogFragment implements OnItemSele
int markerStart = intervalString.indexOf(INTERVAL_COUNT_MARKER);
if (markerStart != -1) {
- if (markerStart == 0) {
- mIntervalPreText.setText("");
- } else {
- int postTextStart = markerStart + INTERVAL_COUNT_MARKER.length();
- mIntervalPostText.setText(intervalString.substring(postTextStart,
- intervalString.length()).trim());
- mIntervalPreText.setText(intervalString.substring(0, markerStart).trim());
- }
+ int postTextStart = markerStart + INTERVAL_COUNT_MARKER.length();
+ mIntervalPostText.setText(intervalString.substring(postTextStart,
+ intervalString.length()).trim());
+ mIntervalPreText.setText(intervalString.substring(0, markerStart).trim());
}
}