Skip to content

Commit

Permalink
Remove attendees list in edit event (chips only)
Browse files Browse the repository at this point in the history 
Also fixes b/5118490 which was the cancel button being gone.

Change-Id: Idab96876601627e48dddaa3ef4756f11ac9c5dfb
  • Loading branch information
@RoboErikG
RoboErikG committed Aug 5, 2011
1 parent e5d35d2 commit 6a7003d
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 197 deletions.
1 change: 1 addition & 0 deletions CleanSpec.mk
View file
Expand Up @@ -43,6 +43,7 @@
#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
$(call add-clean-step, rm -rf $(OUT_DIR)/out/target/common/obj/APPS/Calendar_intermediates)

# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
Expand Down
49 changes: 9 additions & 40 deletions res/layout-xlarge/edit_event_2.xml
View file
Expand Up @@ -76,47 +76,16 @@
android:id="@+id/add_attendees_row">
<TextView
android:id="@+id/add_attendees_label"
android:text="@string/add_guests_label"
style="@style/TextAppearance.EditEvent_Label" />
<LinearLayout
android:id="@+id/add_attendees_group"
android:orientation="horizontal">
<!-- ATTENDEES INPUT -->
<com.android.ex.chips.RecipientEditTextView
android:id="@+id/attendees"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:inputType="textEmailAddress|textMultiLine"
android:hint="@string/hint_attendees"
android:imeOptions="actionNext"
style="@style/TextAppearance.EditEvent_Value" />

<!-- ATTENDEES ADD BUTTON -->
<ImageButton
android:id="@+id/add_attendee_button"
style="@style/PlusButton"
android:layout_gravity="center_vertical|right"
android:enabled="false"
android:contentDescription="@string/accessibility_add_attendee"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
</TableRow>

<!-- ATTENDEES -->
<TableRow
android:id="@+id/attendees_row"
android:focusable="true">
<TextView
android:text="@string/attendees_label"
style="@style/TextAppearance.EditEvent_Label" />

<!-- GUEST LIST -->
<com.android.calendar.event.AttendeesView
android:id="@+id/attendee_list"
android:orientation="vertical"
android:animateLayoutChanges="true">
</com.android.calendar.event.AttendeesView>
<com.android.ex.chips.RecipientEditTextView
android:id="@+id/attendees"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:inputType="textEmailAddress|textMultiLine"
android:hint="@string/hint_attendees"
android:imeOptions="actionNext"
style="@style/TextAppearance.EditEvent_Value" />
</TableRow>
</TableLayout>
34 changes: 0 additions & 34 deletions res/layout/edit_event_2.xml
View file
Expand Up @@ -97,12 +97,6 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/add_attendees_group"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="horizontal">
<!-- ATTENDEES INPUT -->
<com.android.ex.chips.RecipientEditTextView
android:id="@+id/attendees"
android:layout_width="0dip"
Expand All @@ -112,34 +106,6 @@
android:hint="@string/hint_attendees"
android:imeOptions="actionNext"
style="@style/TextAppearance.EditEvent_Value" />

<!-- ATTENDEES ADD BUTTON -->
<ImageButton
android:id="@+id/add_attendee_button"
style="@style/PlusButton"
android:layout_gravity="center_vertical|right"
android:enabled="false"
android:contentDescription="@string/accessibility_add_attendee"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>

<!-- ATTENDEES -->
<LinearLayout
android:id="@+id/attendees_row"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="true">
<!-- GUEST LIST -->
<com.android.calendar.event.AttendeesView
android:id="@+id/attendee_list"
android:orientation="vertical"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:animateLayoutChanges="true">
</com.android.calendar.event.AttendeesView>
</LinearLayout>

<View
Expand Down
2 changes: 2 additions & 0 deletions src/com/android/calendar/event/EditEventFragment.java
View file
Expand Up @@ -347,6 +347,7 @@ private void updateActionBar() {
}
return;
} else {
cancelItem.setVisible(true);
editItem.setVisible(false);
}
boolean canRespond = EditEventHelper.canRespond(mModel);
Expand Down Expand Up @@ -643,6 +644,7 @@ public void run() {
if ((mCode & Utils.DONE_SAVE) != 0 && mModel != null
&& (EditEventHelper.canRespond(mModel)
|| EditEventHelper.canModifyEvent(mModel))
&& mView.prepareForSave()
&& !isEmptyNewEvent()
&& mModel.normalizeReminders()
&& mHelper.saveEvent(mModel, mOriginalModel, mModification)) {
Expand Down

0 comments on commit 6a7003d

Please sign in to comment.