Calendar : Add lollipop ux

Change-Id: Ibc7bc2267b464c4f8c3d07c2406ed2cf87e7febb

33 files changed, 170 insertions, 59 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 523da445..3e31e412 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -39,7 +39,7 @@
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.mail" />
-    <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="18"></uses-sdk>
+    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="21"></uses-sdk>
 
     <application android:name="CalendarApplication"
             android:label="@string/app_label" android:icon="@mipmap/ic_launcher_calendar"
@@ -132,14 +132,14 @@
 
         <activity android:name=".selectcalendars.SelectVisibleCalendarsActivity"
             android:label="@string/select_visible_calendars_title"
-            android:theme="@android:style/Theme.Holo.Light"/>
+            android:theme="@android:style/Theme.Material.Light.DarkActionBar"/>
 
         <activity android:name=".selectcalendars.SelectSyncedCalendarsMultiAccountActivity"
             android:label="@string/select_synced_calendars_title"
-            android:theme="@android:style/Theme.Holo.Light"/>
+            android:theme="@android:style/Theme.Material.Light.DarkActionBar"/>
 
         <activity android:name="CalendarSettingsActivity" android:label="@string/preferences_title"
-            android:theme="@android:style/Theme.Holo.Light"/>
+            android:theme="@android:style/Theme.Material.Light.DarkActionBar"/>
 
         <!-- Declarations for search -->
         <!-- Make all activities a searchable context -->
@@ -170,14 +170,14 @@
 
         <!-- Declarations for alerts/reminders -->
         <activity android:name=".alerts.AlertActivity" android:launchMode="singleInstance"
-             android:theme="@android:style/Theme.Holo.Dialog" android:excludeFromRecents="true" />
+             android:theme="@android:style/Theme.Material.Dialog" android:excludeFromRecents="true" />
 
         <activity android:name=".alerts.QuickResponseActivity" android:launchMode="singleInstance"
-             android:theme="@android:style/Theme.Holo.Dialog" android:excludeFromRecents="true"
+             android:theme="@android:style/Theme.Material.Dialog" android:excludeFromRecents="true"
              android:label="@string/quick_response_dialog_title" />
 
         <activity android:name=".alerts.SnoozeDelayActivity" android:launchMode="singleInstance"
-             android:theme="@android:style/Theme.Holo.Dialog" android:excludeFromRecents="true" />
+             android:theme="@android:style/Theme.Material.Dialog" android:excludeFromRecents="true" />
 
         <receiver android:name=".alerts.AlertReceiver">
             <intent-filter>
diff --git a/res/drawable-hdpi/ic_action_share_dark.png b/res/drawable-hdpi/ic_action_share_dark.png
new file mode 100644
index 00000000..9963c6a0
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_share_dark.png
diff --git a/res/drawable-hdpi/ic_compose_white.png b/res/drawable-hdpi/ic_compose_white.png
new file mode 100644
index 00000000..ecf6215c
--- /dev/null
+++ b/res/drawable-hdpi/ic_compose_white.png
diff --git a/res/drawable-hdpi/ic_menu_today_holo_light.png b/res/drawable-hdpi/ic_menu_today_holo_light.png
deleted file mode 100644
index 6b023649..00000000
--- a/res/drawable-hdpi/ic_menu_today_holo_light.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_action_share_dark.png b/res/drawable-mdpi/ic_action_share_dark.png
new file mode 100644
index 00000000..dd536bca
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_share_dark.png
diff --git a/res/drawable-mdpi/ic_compose_white.png b/res/drawable-mdpi/ic_compose_white.png
new file mode 100644
index 00000000..f72ce0a3
--- /dev/null
+++ b/res/drawable-mdpi/ic_compose_white.png
diff --git a/res/drawable-mdpi/ic_menu_today_holo_light.png b/res/drawable-mdpi/ic_menu_today_holo_light.png
deleted file mode 100644
index a932c7bc..00000000
--- a/res/drawable-mdpi/ic_menu_today_holo_light.png
+++ /dev/null
diff --git a/res/drawable-sw600dp/ic_menu_today_holo_light.png b/res/drawable-sw600dp/ic_menu_today_holo_light.png
deleted file mode 100644
index 6b023649..00000000
--- a/res/drawable-sw600dp/ic_menu_today_holo_light.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_action_share_dark.png b/res/drawable-xhdpi/ic_action_share_dark.png
new file mode 100644
index 00000000..bb521c14
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_share_dark.png
diff --git a/res/drawable-xhdpi/ic_compose_white.png b/res/drawable-xhdpi/ic_compose_white.png
new file mode 100644
index 00000000..b7d6c0fb
--- /dev/null
+++ b/res/drawable-xhdpi/ic_compose_white.png
diff --git a/res/drawable-xhdpi/ic_menu_today_holo_light.png b/res/drawable-xhdpi/ic_menu_today_holo_light.png
deleted file mode 100644
index 2b58f4d2..00000000
--- a/res/drawable-xhdpi/ic_menu_today_holo_light.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_action_share_dark.png b/res/drawable-xxhdpi/ic_action_share_dark.png
new file mode 100644
index 00000000..cf3072ec
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_share_dark.png
diff --git a/res/drawable-xxhdpi/ic_compose_white.png b/res/drawable-xxhdpi/ic_compose_white.png
new file mode 100644
index 00000000..1ca09dfa
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_compose_white.png
diff --git a/res/drawable-xxhdpi/ic_menu_today_holo_light.png b/res/drawable-xxhdpi/ic_menu_today_holo_light.png
deleted file mode 100644
index 51a4cfc2..00000000
--- a/res/drawable-xxhdpi/ic_menu_today_holo_light.png
+++ /dev/null
diff --git a/res/drawable/fab_blue.xml b/res/drawable/fab_blue.xml
new file mode 100644
index 00000000..ba876847
--- /dev/null
+++ b/res/drawable/fab_blue.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:shape="oval">
+    <solid android:color="@color/fab_theme_color"/>
+</shape>
diff --git a/res/drawable/floating_action_button.xml b/res/drawable/floating_action_button.xml
new file mode 100644
index 00000000..d63c623d
--- /dev/null
+++ b/res/drawable/floating_action_button.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 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.
+-->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/fab_theme_color_dark">
+    <item android:drawable="@drawable/fab_blue" />
+</ripple>
diff --git a/res/drawable/ic_menu_today_holo_light.xml b/res/drawable/ic_menu_today_holo_light.xml
new file mode 100644
index 00000000..276cb88c
--- /dev/null
+++ b/res/drawable/ic_menu_today_holo_light.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <group>
+        <path
+            android:pathData="M-83,85h48v48h-48V85Z" />
+        <path
+            android:fillColor="#000000"
+            android:pathData="M38,4h-2V0h-4v4H16V0h-4v4h-2C7.8,4,6,5.8,6,8v28c0,2.2,1.8,4,4,4h28c2.2,0,4-1.8,4-4V8C42,5.8,40.2,4,38,4Z
+M38,36H10V14 h28V36z" />
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/layout-land/all_in_one.xml b/res/layout-land/all_in_one.xml
index 14671d12..e7f6e941 100644
--- a/res/layout-land/all_in_one.xml
+++ b/res/layout-land/all_in_one.xml
@@ -68,4 +68,7 @@
         android:layout_width="0dip"
         android:layout_height="0dip"
         android:visibility="gone"/>
+
+    <include layout="@layout/floating_action_button" />
+
 </RelativeLayout>
diff --git a/res/layout-sw600dp-w960dp-h527dp-land/all_in_one.xml b/res/layout-sw600dp-w960dp-h527dp-land/all_in_one.xml
index 7f64a7b2..38deee9f 100644
--- a/res/layout-sw600dp-w960dp-h527dp-land/all_in_one.xml
+++ b/res/layout-sw600dp-w960dp-h527dp-land/all_in_one.xml
@@ -71,11 +71,17 @@
         android:layout_below="@id/date_group"
         android:layout_height="match_parent"
         android:layout_width="match_parent">
-        <FrameLayout
+        <RelativeLayout
             android:id="@+id/main_pane"
             android:layout_weight="6"
             android:layout_height="match_parent"
-            android:layout_width="0dip" />
+            android:layout_width="0dip" >
+
+            <include
+                android:layout_gravity="bottom|right"
+                layout="@layout/floating_action_button" />
+
+        </RelativeLayout>
         <FrameLayout
             android:id="@+id/secondary_pane"
             android:layout_weight="4"
diff --git a/res/layout-sw600dp/all_in_one.xml b/res/layout-sw600dp/all_in_one.xml
index c71d187e..def67703 100644
--- a/res/layout-sw600dp/all_in_one.xml
+++ b/res/layout-sw600dp/all_in_one.xml
@@ -61,12 +61,17 @@
         android:layout_weight="1"
         android:layout_width="match_parent"
         android:layout_height="0dip">
-        <FrameLayout
+        <RelativeLayout
             android:id="@+id/main_pane"
             android:layout_weight="2"
             android:layout_height="0dip"
-            android:layout_width="match_parent" />
+            android:layout_width="match_parent" >
+
+            <include
+                android:layout_gravity="bottom|right"
+                layout="@layout/floating_action_button" />
 
+        </RelativeLayout>
         <FrameLayout
             android:id="@+id/secondary_pane"
             android:visibility="gone"
diff --git a/res/layout/all_in_one.xml b/res/layout/all_in_one.xml
index 63011b61..40e1b944 100644
--- a/res/layout/all_in_one.xml
+++ b/res/layout/all_in_one.xml
@@ -65,4 +65,7 @@
         android:layout_width="0dip"
         android:layout_height="0dip"
         android:visibility="gone"/>
+
+    <include layout="@layout/floating_action_button" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/floating_action_button.xml b/res/layout/floating_action_button.xml
new file mode 100644
index 00000000..7636cb14
--- /dev/null
+++ b/res/layout/floating_action_button.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<!-- This expects to be included inside a RelativeLayout -->
+<ImageButton
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="@dimen/floating_action_button_width"
+        android:layout_height="@dimen/floating_action_button_height"
+        android:layout_marginEnd="@dimen/floating_action_button_margin_right"
+        android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:onClick="createEvent"
+        android:id="@+id/floating_action_button"
+        android:background="@drawable/floating_action_button"
+        android:tint="@color/floating_action_button_icon_color"
+        android:contentDescription="@string/event_create"
+        android:elevation="@dimen/floating_action_button_translation_z"
+        android:src="@drawable/ic_compose_white"/>
diff --git a/res/menu-land/all_in_one_title_bar.xml b/res/menu-land/all_in_one_title_bar.xml
index 3e9d19e8..24681881 100644
--- a/res/menu-land/all_in_one_title_bar.xml
+++ b/res/menu-land/all_in_one_title_bar.xml
@@ -23,12 +23,6 @@
         android:icon="@drawable/today_icon"
         android:showAsAction="withText|ifRoom" />
     <item
-        android:id="@+id/action_create_event"
-        android:alphabeticShortcut="n"
-        android:title="@string/event_create"
-        android:icon="@drawable/ic_menu_add_event_holo_light"
-        android:showAsAction="ifRoom" />
-    <item
         android:id="@+id/action_refresh"
         android:alphabeticShortcut="r"
         android:showAsAction="never"
diff --git a/res/menu-sw600dp-land/all_in_one_title_bar.xml b/res/menu-sw600dp-land/all_in_one_title_bar.xml
index 57ad494c..fe82f96c 100644
--- a/res/menu-sw600dp-land/all_in_one_title_bar.xml
+++ b/res/menu-sw600dp-land/all_in_one_title_bar.xml
@@ -23,12 +23,6 @@
         android:icon="@drawable/today_icon"
         android:showAsAction="always|withText" />
     <item
-        android:id="@+id/action_create_event"
-        android:alphabeticShortcut="n"
-        android:title="@string/event_create"
-        android:showAsAction="ifRoom"
-        android:icon="@drawable/ic_menu_add_event_holo_light" />
-    <item
         android:id="@+id/action_refresh"
         android:alphabeticShortcut="r"
         android:title="@string/calendar_refresh"
diff --git a/res/menu-sw600dp/all_in_one_title_bar.xml b/res/menu-sw600dp/all_in_one_title_bar.xml
index d463f137..fe82f96c 100644
--- a/res/menu-sw600dp/all_in_one_title_bar.xml
+++ b/res/menu-sw600dp/all_in_one_title_bar.xml
@@ -23,12 +23,6 @@
         android:icon="@drawable/today_icon"
         android:showAsAction="always|withText" />
     <item
-        android:id="@+id/action_create_event"
-        android:alphabeticShortcut="n"
-        android:showAsAction="ifRoom"
-        android:title="@string/event_create"
-        android:icon="@drawable/ic_menu_add_event_holo_light" />
-    <item
         android:id="@+id/action_refresh"
         android:alphabeticShortcut="r"
         android:title="@string/calendar_refresh"
diff --git a/res/menu/all_in_one_title_bar.xml b/res/menu/all_in_one_title_bar.xml
index 6349fe74..118eb5d1 100644
--- a/res/menu/all_in_one_title_bar.xml
+++ b/res/menu/all_in_one_title_bar.xml
@@ -24,13 +24,6 @@
         android:showAsAction="ifRoom"
         android:orderInCategory="1" />
     <item
-        android:id="@+id/action_create_event"
-        android:alphabeticShortcut="n"
-        android:title="@string/event_create"
-        android:icon="@drawable/ic_menu_add_event_holo_light"
-        android:showAsAction="never"
-        android:orderInCategory="2" />
-    <item
         android:id="@+id/action_refresh"
         android:alphabeticShortcut="r"
         android:title="@string/calendar_refresh"
diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml
new file mode 100644
index 00000000..ba56f0fa
--- /dev/null
+++ b/res/values/cm_colors.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2012-2013 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <color name="fab_theme_color">#da4336</color>
+    <color name="fab_theme_color_dark">#ffc33c33</color>
+    <color name="fab_theme_color_accent">#0288d1</color>
+    <color name="floating_action_button_icon_color">#ffffff</color>
+</resources>
diff --git a/res/values/cm_dimens.xml b/res/values/cm_dimens.xml
new file mode 100644
index 00000000..c914dfb8
--- /dev/null
+++ b/res/values/cm_dimens.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2012-2013 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Floating action button -->
+    <dimen name="floating_action_button_height">56dp</dimen>
+    <dimen name="floating_action_button_width">56dp</dimen>
+    <dimen name="floating_action_button_radius">28dp</dimen>
+    <dimen name="floating_action_button_translation_z">2dp</dimen>
+    <dimen name="floating_action_button_margin_right">16dp</dimen>
+    <dimen name="floating_action_button_margin_bottom">16dp</dimen>
+</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 9dbab809..81f77950 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -112,7 +112,7 @@
     <!-- Color of the event location's text in an agenda item  -->
     <color name="agenda_item_where_declined_text_color">#66666666</color>
     <!-- Color of text in the calendar view selection menu -->
-    <color name="calendar_view_switch_menu_text_color">#FF666666</color>
+    <color name="calendar_view_switch_menu_text_color">#FF000000</color>
     <!-- Light color of text in the calendar view selection menu -->
     <color name="calendar_view_switch_menu_text_color_light">#FF888888</color>
     <!-- Color of the separator between items in the agenda list -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b24c3c3a..be60876f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -163,20 +163,15 @@
         <item name="android:textColor">@color/calendar_date_range_color</item>
     </style>
 
-    <style name="CalendarTheme" parent="android:Theme.Holo.Light">
-        <item name="android:windowContentOverlay">@null</item>
-    </style>
-
-    <style name="CalendarTheme.WithActionBar" parent="android:Theme.Holo.Light">
+    <style name="CalendarTheme.WithActionBar" parent="android:Theme.Material.Light">
         <item name="android:windowNoTitle">false</item>
         <item name="android:windowActionBar">true</item>
-        <item name="android:windowBackground">@color/background_color</item>
         <item name="android:actionBarStyle">@style/CalendarActionBarStyle</item>
         <item name="android:endYear">2036</item>
         <item name="android:startYear">1970</item>
     </style>
 
-    <style name="CalendarActionBarStyle" parent="android:style/Widget.Holo.Light.ActionBar.Solid">
+    <style name="CalendarActionBarStyle" parent="android:style/Widget.Material.Light.ActionBar">
         <item name="android:displayOptions">showCustom</item>
     </style>
 
diff --git a/src/com/android/calendar/AllInOneActivity.java b/src/com/android/calendar/AllInOneActivity.java
index 3c869574..d9e1a9ca 100644
--- a/src/com/android/calendar/AllInOneActivity.java
+++ b/src/com/android/calendar/AllInOneActivity.java
@@ -823,6 +823,19 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH
         return true;
     }
 
+    public void createEvent(View v) {
+        Time t = new Time();
+        t.set(mController.getTime());
+        if (t.minute > 30) {
+            t.hour++;
+            t.minute = 0;
+        } else if (t.minute > 0 && t.minute < 30) {
+            t.minute = 30;
+        }
+        mController.sendEventRelatedEvent(
+                this, EventType.CREATE_EVENT, -1, t.toMillis(true), 0, 0, 0, -1);
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         Time t = null;
@@ -837,18 +850,6 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH
             t = new Time(mTimeZone);
             t.setToNow();
             extras |= CalendarController.EXTRA_GOTO_TODAY;
-        } else if (itemId == R.id.action_create_event) {
-            t = new Time();
-            t.set(mController.getTime());
-            if (t.minute > 30) {
-                t.hour++;
-                t.minute = 0;
-            } else if (t.minute > 0 && t.minute < 30) {
-                t.minute = 30;
-            }
-            mController.sendEventRelatedEvent(
-                    this, EventType.CREATE_EVENT, -1, t.toMillis(true), 0, 0, 0, -1);
-            return true;
         } else if (itemId == R.id.action_select_visible_calendars) {
             mController.sendEvent(this, EventType.LAUNCH_SELECT_VISIBLE_CALENDARS, null, null,
                     0, 0);
diff --git a/src/com/android/calendar/DayOfMonthDrawable.java b/src/com/android/calendar/DayOfMonthDrawable.java
index 461ab317..0c17f952 100644
--- a/src/com/android/calendar/DayOfMonthDrawable.java
+++ b/src/com/android/calendar/DayOfMonthDrawable.java
@@ -34,16 +34,17 @@ public class DayOfMonthDrawable extends Drawable {
     private String mDayOfMonth = "1";
     private final Paint mPaint;
     private final Rect mTextBounds = new Rect();
-    private static float mTextSize = 14;
+    private static float mTextSize = 12;
 
     public DayOfMonthDrawable(Context c) {
         mTextSize = c.getResources().getDimension(R.dimen.today_icon_text_size);
         mPaint = new Paint();
         mPaint.setAlpha(255);
-        mPaint.setColor(0xFF777777);
+        mPaint.setColor(0xFF000000);
         mPaint.setTypeface(Typeface.DEFAULT_BOLD);
         mPaint.setTextSize(mTextSize);
         mPaint.setTextAlign(Paint.Align.CENTER);
+        mPaint.setAntiAlias(true);
     }
 
     @Override
diff --git a/src/com/android/calendar/EventInfoActivity.java b/src/com/android/calendar/EventInfoActivity.java
index 9b136bd0..b5279fb4 100644
--- a/src/com/android/calendar/EventInfoActivity.java
+++ b/src/com/android/calendar/EventInfoActivity.java
@@ -145,7 +145,7 @@ public class EventInfoActivity extends Activity {
         // Remove the application title
         ActionBar bar = getActionBar();
         if (bar != null) {
-            bar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_SHOW_HOME);
+            bar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP);
         }
 
         // Create a new fragment if none exists