Calendar: Revamp deleting calendar events UI.

  - Use contextual action bar instead of weird spinner/action bar combo
  - Actually influence behavior and let the user know they're deleting something

Change-Id: Idec775f84b873211d6c6a46be120ea82b8a0b9e5

2 files changed, 2 insertions, 59 deletions

diff --git a/res/layout/action_mode.xml b/res/layout/action_mode.xml
deleted file mode 100644
index f44ee5f4..00000000
--- a/res/layout/action_mode.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2014, The Linux Foundation. All rights reserved.
-     Not a Contribution.
-
-     Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/navigation_bar"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <FrameLayout
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_alignParentLeft="true" >
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="right"
-            android:src="@drawable/dropdown_ic_arrow" />
-
-        <Button
-            android:id="@+id/selection_menu"
-            style="?android:attr/actionButtonStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:divider="?android:attr/listDividerAlertDialog"
-            android:gravity="left|center_vertical"
-            android:onClick="onSelectionButtonClicked"
-            android:paddingRight="25dip"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
-            android:textColor="?android:attr/actionMenuTextColor" />
-    </FrameLayout>
-
-    <View
-        android:layout_width="1dp"
-        android:layout_height="match_parent"
-        android:layout_alignParentRight="true"
-        android:layout_marginBottom="9dp"
-        android:layout_marginTop="9dp"
-        android:background="#F0B0B0B0" />
-
-</RelativeLayout>
diff --git a/res/menu/delete_events_title_bar.xml b/res/menu/delete_events_title_bar.xml
index 87966453..4ab869fb 100644
--- a/res/menu/delete_events_title_bar.xml
+++ b/res/menu/delete_events_title_bar.xml
@@ -32,7 +32,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
     <item
         android:id="@+id/action_delete"
-        android:showAsAction="always|withText"
+        android:showAsAction="always"
+        android:icon="@drawable/ic_menu_trash_holo_light"
         android:title="@string/action_delete"
         android:visible="true">
     </item>