diff --git a/res/drawable/options_add_call_alt.xml b/res/drawable/options_add_call_alt.xml
new file mode 100644
index 000000000..41658a7cf
--- /dev/null
+++ b/res/drawable/options_add_call_alt.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" 
+        android:drawable="@drawable/options_add_over_alt" />
+    <item android:state_enabled="false"
+	android:drawable="@drawable/options_add_disabled_alt" />
+    <item
+         android:drawable="@drawable/options_add_default_alt" />
+</selector>
diff --git a/res/drawable/options_add_default.png b/res/drawable/options_add_default.png
index e8ca669f5..80a0834db 100644
Binary files a/res/drawable/options_add_default.png and b/res/drawable/options_add_default.png differ
diff --git a/res/drawable/options_add_default_alt.png b/res/drawable/options_add_default_alt.png
new file mode 100644
index 000000000..2e37ca8f3
Binary files /dev/null and b/res/drawable/options_add_default_alt.png differ
diff --git a/res/drawable/options_add_disabled.png b/res/drawable/options_add_disabled.png
index aa7b03b4f..11b0f84c6 100644
Binary files a/res/drawable/options_add_disabled.png and b/res/drawable/options_add_disabled.png differ
diff --git a/res/drawable/options_add_disabled_alt.png b/res/drawable/options_add_disabled_alt.png
new file mode 100644
index 000000000..270f27afa
Binary files /dev/null and b/res/drawable/options_add_disabled_alt.png differ
diff --git a/res/drawable/options_add_over.png b/res/drawable/options_add_over.png
index cea0c0d00..5ebea8ee3 100644
Binary files a/res/drawable/options_add_over.png and b/res/drawable/options_add_over.png differ
diff --git a/res/drawable/options_add_over_alt.png b/res/drawable/options_add_over_alt.png
new file mode 100644
index 000000000..62df2bb52
Binary files /dev/null and b/res/drawable/options_add_over_alt.png differ
diff --git a/res/drawable/options_alt.xml b/res/drawable/options_alt.xml
new file mode 100644
index 000000000..3b8abe67c
--- /dev/null
+++ b/res/drawable/options_alt.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" 
+        android:drawable="@drawable/options_over_alt" />
+    <item android:state_enabled="false"
+	android:drawable="@drawable/options_disabled_alt" />
+    <item android:state_selected="true"
+	android:drawable="@drawable/options_selected_alt" />
+    <item
+         android:drawable="@drawable/options_default_alt" />
+</selector>
diff --git a/res/drawable/options_default.png b/res/drawable/options_default.png
index 2a2c832e6..9fd8b64ee 100644
Binary files a/res/drawable/options_default.png and b/res/drawable/options_default.png differ
diff --git a/res/drawable/options_default_alt.png b/res/drawable/options_default_alt.png
new file mode 100644
index 000000000..a3a780871
Binary files /dev/null and b/res/drawable/options_default_alt.png differ
diff --git a/res/drawable/options_disabled.png b/res/drawable/options_disabled.png
index 3f5a32482..108141d43 100644
Binary files a/res/drawable/options_disabled.png and b/res/drawable/options_disabled.png differ
diff --git a/res/drawable/options_disabled_alt.png b/res/drawable/options_disabled_alt.png
new file mode 100644
index 000000000..dfe81d9c2
Binary files /dev/null and b/res/drawable/options_disabled_alt.png differ
diff --git a/res/drawable/options_over.png b/res/drawable/options_over.png
index 4c33e642b..02ec45664 100644
Binary files a/res/drawable/options_over.png and b/res/drawable/options_over.png differ
diff --git a/res/drawable/options_over_alt.png b/res/drawable/options_over_alt.png
new file mode 100644
index 000000000..f56ff7b5e
Binary files /dev/null and b/res/drawable/options_over_alt.png differ
diff --git a/res/drawable/options_selected.png b/res/drawable/options_selected.png
index dda796353..b2d517ada 100644
Binary files a/res/drawable/options_selected.png and b/res/drawable/options_selected.png differ
diff --git a/res/drawable/options_selected_alt.png b/res/drawable/options_selected_alt.png
new file mode 100644
index 000000000..92cc0b473
Binary files /dev/null and b/res/drawable/options_selected_alt.png differ
diff --git a/res/drawable/options_transfer_default.png b/res/drawable/options_transfer_default.png
index 0a4e18919..7f6393e9b 100644
Binary files a/res/drawable/options_transfer_default.png and b/res/drawable/options_transfer_default.png differ
diff --git a/res/drawable/options_transfer_disabled.png b/res/drawable/options_transfer_disabled.png
index 9da015b6a..d1c434465 100644
Binary files a/res/drawable/options_transfer_disabled.png and b/res/drawable/options_transfer_disabled.png differ
diff --git a/res/drawable/options_transfer_over.png b/res/drawable/options_transfer_over.png
index a97416089..34fe8747e 100644
Binary files a/res/drawable/options_transfer_over.png and b/res/drawable/options_transfer_over.png differ
diff --git a/res/drawable/statebar_background.png b/res/drawable/statebar_background.png
new file mode 100644
index 000000000..001991fb0
Binary files /dev/null and b/res/drawable/statebar_background.png differ
diff --git a/res/layout/incall.xml b/res/layout/incall.xml
index f259f5f09..8dc406e35 100644
--- a/res/layout/incall.xml
+++ b/res/layout/incall.xml
@@ -1,191 +1,191 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:layout_height="match_parent">
     
-    <fragment android:name="org.linphone.StatusFragment"
-		android:id="@+id/status"
+    <FrameLayout
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content" />
-    
-    <RelativeLayout
-	    android:layout_width="match_parent"
-	    android:layout_height="0dip"
-	    android:layout_weight="1">
-        
-	    <LinearLayout
+		android:layout_height="wrap_content">
+       
+		<LinearLayout
 		    android:id="@+id/fragmentContainer"
 		    android:layout_width="match_parent"
 		    android:layout_height="match_parent"
+		    android:paddingTop="20dp"
 		    android:orientation="horizontal" />
-	    
-	    <ImageView
-	        android:id="@+id/switchCamera"
-            android:visibility="gone"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:layout_alignParentLeft="true"
-	        android:layout_alignParentTop="true"
-	        android:contentDescription="@string/content_description_switch_camera"
-	        android:src="@drawable/switch_camera" />
-	    
-	    <LinearLayout
-		    android:id="@+id/menu"
-		    android:layout_width="match_parent"
-		    android:layout_height="wrap_content"
-			android:layout_alignParentBottom="true"
-		    android:orientation="vertical">
-    
-	        <LinearLayout
-			    android:layout_width="match_parent"
-			    android:layout_height="match_parent"
-			    android:orientation="horizontal"
-	            android:layout_weight="0.5">
-			    
-	            <View
-	                android:layout_width="match_parent"
-	                android:layout_height="75dp"
-	                android:layout_weight="0.25"
-	                android:visibility="invisible"/>
-	            
-	           <View
-	                android:layout_width="match_parent"
-	                android:layout_height="75dp"
-	                android:layout_weight="0.25"
-	                android:visibility="invisible"/>
-	            
-	            <View
-	                android:layout_width="match_parent"
-	                android:layout_height="75dp"
-	                android:layout_weight="0.25"
-	                android:visibility="invisible"/>
-	                
-	            <ImageView 
-	                android:id="@+id/transfer"
-	                android:visibility="gone"
-				    android:layout_width="match_parent"
-				    android:layout_height="75dp"
-				    android:src="@drawable/options_transfer"
-	                android:scaleType="fitXY"
-				    android:layout_weight="0.25" />
-	            
-	    	</LinearLayout>
-	    	
-	        <LinearLayout
-			    android:layout_width="match_parent"
-			    android:layout_height="match_parent"
-			    android:orientation="horizontal"
-	            android:layout_weight="0.5">
-			    
-	            <View
-	                android:layout_width="match_parent"
-	                android:layout_height="75dp"
-	                android:layout_weight="0.25"
-	                android:visibility="invisible"/>
-	            
-	           <View
-	                android:layout_width="match_parent"
-	                android:layout_height="75dp"
-	                android:layout_weight="0.25"
-	                android:visibility="invisible"/>
-	            
-	            <View
-	                android:layout_width="match_parent"
-	                android:layout_height="75dp"
-	                android:layout_weight="0.25"
-	                android:visibility="invisible"/>
-	                
-	            <ImageView 
-	                android:id="@+id/addCall"
-	                android:visibility="gone"
-				    android:layout_width="match_parent"
-				    android:layout_height="75dp"
-				    android:src="@drawable/options_add_call"
-	                android:scaleType="fitXY"
-				    android:layout_weight="0.25" />
-	            
-	    	</LinearLayout>
-	    	
-	        <LinearLayout
-			    android:layout_width="match_parent"
-			    android:layout_height="match_parent"
-			    android:orientation="horizontal"
-	            android:layout_weight="0.5">
-			    
-	            <ImageView
-            		android:contentDescription="@string/content_description_switch_video"
-	                android:id="@+id/video"
-	                android:layout_width="match_parent"
-	                android:layout_height="75dp"
-	                android:layout_weight="0.25"
-	                android:scaleType="fitXY"
-	                android:src="@drawable/video_off" />
-	            
-	            <ImageView 
-            		android:contentDescription="@string/content_description_toggle_micro"
-	                android:id="@+id/micro"
-				    android:layout_width="match_parent"
-				    android:layout_height="75dp"
-				    android:src="@drawable/micro_on"
-	                android:scaleType="fitXY"
-				    android:layout_weight="0.25"/>
-	            
-	            <ImageView 
-            		android:contentDescription="@string/content_description_toggle_speaker"
-	                android:id="@+id/speaker"
-				    android:layout_width="match_parent"
-				    android:layout_height="75dp"
-				    android:src="@drawable/speaker_off"
-	                android:scaleType="fitXY"
-				    android:layout_weight="0.25"/>
-	                
-	            <ImageView 
-	                android:id="@+id/options"
-				    android:layout_width="match_parent"
-				    android:layout_height="75dp"
-				    android:src="@drawable/options"
-	                android:scaleType="fitXY"
-				    android:layout_weight="0.25" />
-	            
-	    	</LinearLayout>
-	    	
-	        <LinearLayout
-			    android:layout_width="match_parent"
-			    android:layout_height="75dp"
-			    android:orientation="horizontal"
-	            android:layout_weight="0.5">
-			    
-	            <ImageView 
-            		android:contentDescription="@string/content_description_pause"
-	                android:id="@+id/pause"
-				    android:layout_width="match_parent"
-				    android:layout_height="match_parent"
-				    android:src="@drawable/pause_off"
-	                android:scaleType="fitXY"
-				    android:layout_weight="0.3"/>
-	            
-	            <ImageView 
-           			android:contentDescription="@string/content_description_hang_up"
-	                android:id="@+id/hangUp"
-				    android:layout_width="match_parent"
-				    android:layout_height="match_parent"
-				    android:src="@drawable/hangup"
-	                android:scaleType="fitXY"
-				    android:layout_weight="0.3"/>
-	            
-	            <ImageView 
-            		android:contentDescription="@string/content_description_numpad"
-	                android:id="@+id/dialer"
-				    android:layout_width="match_parent"
-				    android:layout_height="match_parent"
-				    android:src="@drawable/dialer_alt"
-	                android:scaleType="fitXY"
-				    android:layout_weight="0.3"/>
-	    	</LinearLayout>
-	    
-	    </LinearLayout>
-    
-    </RelativeLayout>
+	  	
+	   	<fragment android:name="org.linphone.StatusFragment"
+			android:id="@+id/status"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content" />
+	
+	</FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+   <ImageView
+       android:id="@+id/switchCamera"
+       android:visibility="gone"
+       android:layout_width="wrap_content"
+       android:layout_height="wrap_content"
+       android:layout_alignParentLeft="true"
+       android:layout_alignParentTop="true"
+       android:contentDescription="@string/content_description_switch_camera"
+       android:src="@drawable/switch_camera" />
+   
+   <LinearLayout
+	    android:id="@+id/menu"
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+		android:layout_alignParentBottom="true"
+	    android:orientation="vertical">
+  
+       <LinearLayout
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
+		    android:orientation="horizontal"
+	        android:layout_weight="0.5">
+	    
+           	<View
+               	android:layout_width="match_parent"
+               	android:layout_height="75dp"
+               	android:layout_weight="0.25"
+               	android:visibility="invisible"/>
+           
+          	<View
+               	android:layout_width="match_parent"
+               	android:layout_height="75dp"
+               	android:layout_weight="0.25"
+               	android:visibility="invisible"/>
+           
+           	<View
+            	android:layout_width="match_parent"
+               	android:layout_height="75dp"
+               	android:layout_weight="0.25"
+               	android:visibility="invisible"/>
+               
+           	<ImageView 
+               	android:id="@+id/transfer"
+               	android:visibility="gone"
+		    	android:layout_width="match_parent"
+		    	android:layout_height="75dp"
+		    	android:src="@drawable/options_transfer"
+               	android:scaleType="fitXY"
+		    	android:layout_weight="0.25" />
+           
+   	</LinearLayout>
+   	
+   	<LinearLayout
+		android:layout_width="match_parent"
+	    android:layout_height="match_parent"
+	    android:orientation="horizontal"
+        android:layout_weight="0.5">
+	    
+        <View
+        	android:layout_width="match_parent"
+            android:layout_height="75dp"
+            android:layout_weight="0.25"
+            android:visibility="invisible"/>
+        
+       	<View
+            android:layout_width="match_parent"
+            android:layout_height="75dp"
+            android:layout_weight="0.25"
+            android:visibility="invisible"/>
+        
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="75dp"
+            android:layout_weight="0.25"
+            android:visibility="invisible"/>
+            
+        <ImageView 
+            android:id="@+id/addCall"
+            android:visibility="gone"
+   			android:layout_width="match_parent"
+   			android:layout_height="75dp"
+   			android:src="@drawable/options_add_call_alt"
+            android:scaleType="fitXY"
+   			android:layout_weight="0.25" />
+           
+ 	</LinearLayout>
+  	
+   	<LinearLayout
+		android:layout_width="match_parent"
+	    android:layout_height="match_parent"
+	    android:orientation="horizontal"
+        android:layout_weight="0.5">
+	    
+        <ImageView
+			android:contentDescription="@string/content_description_switch_video"
+            android:id="@+id/video"
+            android:layout_width="match_parent"
+            android:layout_height="75dp"
+            android:layout_weight="0.25"
+            android:scaleType="fitXY"
+            android:src="@drawable/video_off" />
+           
+ 		<ImageView 
+          	android:contentDescription="@string/content_description_toggle_micro"
+            android:id="@+id/micro"
+		    android:layout_width="match_parent"
+		    android:layout_height="75dp"
+		    android:src="@drawable/micro_on"
+            android:scaleType="fitXY"
+		    android:layout_weight="0.25"/>
+           
+		<ImageView 
+          	android:contentDescription="@string/content_description_toggle_speaker"
+            android:id="@+id/speaker"
+		    android:layout_width="match_parent"
+		    android:layout_height="75dp"
+		    android:src="@drawable/speaker_off"
+            android:scaleType="fitXY"
+		    android:layout_weight="0.25"/>
+               
+		<ImageView 
+            android:id="@+id/options"
+		    android:layout_width="match_parent"
+		    android:layout_height="75dp"
+		    android:src="@drawable/options"
+            android:scaleType="fitXY"
+		    android:layout_weight="0.25" />
+           
+	</LinearLayout>
+   	
+	<LinearLayout
+		   android:layout_width="match_parent"
+		   android:layout_height="75dp"
+		   android:orientation="horizontal"
+	       android:layout_weight="0.5">
+	    
+           <ImageView 
+          		android:contentDescription="@string/content_description_pause"
+            	android:id="@+id/pause"
+		    	android:layout_width="match_parent"
+		    	android:layout_height="match_parent"
+		    	android:src="@drawable/pause_off"
+            	android:scaleType="fitXY"
+		    	android:layout_weight="0.3"/>
+           
+           <ImageView 
+         		android:contentDescription="@string/content_description_hang_up"
+               	android:id="@+id/hangUp"
+		    	android:layout_width="match_parent"
+		    	android:layout_height="match_parent"
+		    	android:src="@drawable/hangup"
+               	android:scaleType="fitXY"
+		    	android:layout_weight="0.3"/>
+           
+           <ImageView 
+          		android:contentDescription="@string/content_description_numpad"
+               	android:id="@+id/dialer"
+		    	android:layout_width="match_parent"
+		    	android:layout_height="match_parent"
+		    	android:src="@drawable/dialer_alt"
+              	android:scaleType="fitXY"
+		    	android:layout_weight="0.3"/>
+           
+   		</LinearLayout>
+   
+	</LinearLayout>
+  
+  </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 14bf5a990..07941dd78 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,127 +1,115 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-    
-    <!-- <ImageView 
-	    android:layout_width="match_parent"
-	    android:layout_height="match_parent"
-	    android:id="@+id/tutorial"/> -->
-    
-	<LinearLayout
-	    android:layout_width="match_parent"
-	    android:layout_height="match_parent" 
-	    android:weightSum="6"
-	    android:orientation="vertical">
-		
-	    <fragment android:name="org.linphone.StatusFragment"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+    <FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_alignParentTop="true">
+	       
+		<LinearLayout
+		    android:id="@+id/fragmentContainer"
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
+		    android:paddingTop="20dp"
+		    android:paddingBottom="75dp"
+		    android:orientation="horizontal" />
+   	
+	   	<fragment android:name="org.linphone.StatusFragment"
 			android:id="@+id/status"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content" />
-		    
+	
+	</FrameLayout>
+    
+	<LinearLayout
+	    android:id="@+id/menu"
+	    android:layout_width="match_parent"
+	    android:layout_height="90dp"
+	    android:layout_alignParentBottom="true"
+	    android:orientation="horizontal">
 	    
 	    <RelativeLayout
 		    android:layout_width="match_parent"
-		    android:layout_height="match_parent">
+		    android:layout_height="wrap_content"
+	        android:layout_weight="0.2">
 	        
-			<LinearLayout
-			    android:id="@+id/fragmentContainer"
+		    <ImageView
+          			android:contentDescription="@string/content_description_history"
+		        android:id="@+id/history"
+		        android:layout_width="match_parent"
+		        android:layout_height="wrap_content"
+		        android:scaleType="fitXY"
+		        android:src="@drawable/history" />
+		    
+		    <TextView 
+		        android:id="@+id/missedCalls"
+		        android:layout_width="25dp"
+		        android:layout_height="25dp"
+		        android:gravity="center"
+		        android:textSize="20dp"
+		        android:visibility="gone"
+		        android:layout_alignParentTop="true"
+		        android:layout_alignParentRight="true"
+		        android:background="@drawable/missed_calls_bg" />
+	    
+	    </RelativeLayout>
+	    
+	    <ImageView
+          		android:contentDescription="@string/content_description_contacts"
+	        android:id="@+id/contacts"
+	        android:layout_width="match_parent"
+	        android:layout_height="match_parent"
+	        android:layout_weight="0.2"
+	        android:scaleType="fitXY"
+	        android:src="@drawable/contacts" />
+
+	    <ImageView
+          		android:contentDescription="@string/content_description_dialer"
+	        android:id="@+id/dialer"
+	        android:layout_width="match_parent"
+	        android:layout_height="match_parent"
+	        android:layout_weight="0.2"
+	        android:scaleType="fitXY"
+	        android:src="@drawable/dialer" />
+
+	    <ImageView
+          		android:contentDescription="@string/content_description_settings"
+	        android:id="@+id/settings"
+	        android:layout_width="match_parent"
+	        android:layout_height="match_parent"
+	        android:layout_weight="0.2"
+	        android:scaleType="fitXY"
+	        android:src="@drawable/settings" />
+
+	    <RelativeLayout
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content"
+	        android:layout_weight="0.2">
+	        
+			<ImageView
+           		android:contentDescription="@string/content_description_chat"
+			    android:id="@+id/chat"
 			    android:layout_width="match_parent"
 			    android:layout_height="match_parent"
-			    android:paddingBottom="75dp"
-			    android:orientation="horizontal" />
+			    android:layout_weight="0.2"
+			    android:scaleType="fitXY"
+			    android:src="@drawable/chat" />
 		    
-			<LinearLayout
-			    android:id="@+id/menu"
-			    android:layout_width="match_parent"
-			    android:layout_height="90dp"
-			    android:layout_alignParentBottom="true"
-			    android:orientation="horizontal">
-			    
-			    <RelativeLayout
-				    android:layout_width="match_parent"
-				    android:layout_height="wrap_content"
-			        android:layout_weight="0.2">
-			        
-				    <ImageView
-            			android:contentDescription="@string/content_description_history"
-				        android:id="@+id/history"
-				        android:layout_width="match_parent"
-				        android:layout_height="wrap_content"
-				        android:scaleType="fitXY"
-				        android:src="@drawable/history" />
-				    
-				    <TextView 
-				        android:id="@+id/missedCalls"
-				        android:layout_width="25dp"
-				        android:layout_height="25dp"
-				        android:gravity="center"
-				        android:textSize="20dp"
-				        android:visibility="gone"
-				        android:layout_alignParentTop="true"
-				        android:layout_alignParentRight="true"
-				        android:background="@drawable/missed_calls_bg" />
-			    
-			    </RelativeLayout>
-			    
-			    <ImageView
-            		android:contentDescription="@string/content_description_contacts"
-			        android:id="@+id/contacts"
-			        android:layout_width="match_parent"
-			        android:layout_height="match_parent"
-			        android:layout_weight="0.2"
-			        android:scaleType="fitXY"
-			        android:src="@drawable/contacts" />
-		
-			    <ImageView
-            		android:contentDescription="@string/content_description_dialer"
-			        android:id="@+id/dialer"
-			        android:layout_width="match_parent"
-			        android:layout_height="match_parent"
-			        android:layout_weight="0.2"
-			        android:scaleType="fitXY"
-			        android:src="@drawable/dialer" />
-		
-			    <ImageView
-            		android:contentDescription="@string/content_description_settings"
-			        android:id="@+id/settings"
-			        android:layout_width="match_parent"
-			        android:layout_height="match_parent"
-			        android:layout_weight="0.2"
-			        android:scaleType="fitXY"
-			        android:src="@drawable/settings" />
-		
-			    <RelativeLayout
-				    android:layout_width="match_parent"
-				    android:layout_height="wrap_content"
-			        android:layout_weight="0.2">
-			        
-					<ImageView
-	            		android:contentDescription="@string/content_description_chat"
-					    android:id="@+id/chat"
-					    android:layout_width="match_parent"
-					    android:layout_height="match_parent"
-					    android:layout_weight="0.2"
-					    android:scaleType="fitXY"
-					    android:src="@drawable/chat" />
-				    
-				    <TextView 
-				        android:id="@+id/missedChats"
-				        android:layout_width="25dp"
-				        android:layout_height="25dp"
-				        android:gravity="center"
-				        android:textSize="20dp"
-				        android:visibility="gone"
-				        android:layout_alignParentTop="true"
-				        android:layout_alignParentRight="true"
-				        android:background="@drawable/missed_calls_bg" />
-			    
-			    </RelativeLayout>
-			    
-			</LinearLayout>
-		
-		</RelativeLayout>
-			    
+		    <TextView 
+		        android:id="@+id/missedChats"
+		        android:layout_width="25dp"
+		        android:layout_height="25dp"
+		        android:gravity="center"
+		        android:textSize="20dp"
+		        android:visibility="gone"
+		        android:layout_alignParentTop="true"
+		        android:layout_alignParentRight="true"
+		        android:background="@drawable/missed_calls_bg" />
+	    
+	    </RelativeLayout>
+	    
 	</LinearLayout>
 
-</FrameLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/status.xml b/res/layout/status.xml
index 0369d38de..ef71bf6a7 100644
--- a/res/layout/status.xml
+++ b/res/layout/status.xml
@@ -1,40 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+	xmlns:linphone="http://schemas.android.com/apk/res-auto" 
+	xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal" >
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+		    
+    <org.linphone.ui.SlidingDrawer
+		android:id="@+id/statusBar"
+		linphone:direction="topToBottom"
+		android:layout_width="fill_parent"
+		android:layout_height="80dp"
+		linphone:handle="@+id/handle"
+		linphone:content="@+id/content">
+	
+        <RelativeLayout
+			android:id="@id/content"
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
+		    android:background="@android:color/black">
+            
+	        <Button 
+			    android:layout_width="match_parent"
+			    android:layout_height="match_parent"
+			    android:text="@string/menu_exit" />
+            
+        </RelativeLayout>
+        
+		<RelativeLayout
+			android:id="@id/handle"
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content">
     
-    <TextView 
-        android:id="@+id/statusText" 
-        android:text="@string/status_not_connected"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+		    <ImageView 
+		        android:layout_width="match_parent"
+		        android:layout_height="20dp"
+		        android:scaleType="fitXY"
+		        android:src="@drawable/statebar_background"/>
     
-    <ImageView 
-        android:contentDescription="@string/content_description_led"
-        android:id="@+id/statusLed"
-        android:paddingLeft="5dp"
-        android:src="@drawable/led_disconnected"
-        android:layout_toRightOf="@id/statusText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-    
-    <ImageView
-        android:contentDescription="@string/content_description_call_quality"
-        android:id="@+id/callQuality"
-        android:layout_width="wrap_content"
-        android:layout_height="17dp"
-        android:src="@drawable/call_quality_indicator_0" 
-        android:layout_centerHorizontal="true"
-        android:visibility="gone" />
-    
-    <ImageView
-        android:contentDescription="@string/content_description_encryption"
-        android:id="@+id/encryption"
-        android:layout_width="wrap_content"
-        android:layout_height="17dp"
-        android:src="@drawable/security_pending" 
-        android:visibility="gone"
-        android:layout_alignParentRight="true" />
-
+		    <TextView 
+		        android:id="@+id/statusText" 
+		        android:text="@string/status_not_connected"
+		        android:layout_width="wrap_content"
+		        android:layout_height="wrap_content" />
+		    
+		    <ImageView 
+		        android:contentDescription="@string/content_description_led"
+		        android:id="@+id/statusLed"
+		        android:paddingLeft="5dp"
+		        android:src="@drawable/led_disconnected"
+		        android:layout_toRightOf="@id/statusText"
+		        android:layout_width="wrap_content"
+		        android:layout_height="wrap_content" />
+		    
+		    <ImageView
+		        android:contentDescription="@string/content_description_call_quality"
+		        android:id="@+id/callQuality"
+		        android:layout_width="wrap_content"
+		        android:layout_height="20dp"
+		        android:src="@drawable/call_quality_indicator_0" 
+		        android:layout_centerHorizontal="true"
+		        android:visibility="gone" />
+		    
+		    <ImageView
+		        android:contentDescription="@string/content_description_encryption"
+		        android:id="@+id/encryption"
+		        android:layout_width="wrap_content"
+		        android:layout_height="20dp"
+		        android:src="@drawable/security_pending" 
+		        android:visibility="gone"
+		        android:layout_alignParentRight="true" />
+		
+		</RelativeLayout>
+		
+	</org.linphone.ui.SlidingDrawer>
+	
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
new file mode 100644
index 000000000..e32fda763
--- /dev/null
+++ b/res/values/attrs.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <attr name="direction">
+        <enum name="rightToLeft" value="0" />
+        <enum name="bottomToTop" value="1" />
+        <enum name="leftToRight" value="2" />
+        <enum name="topToBottom" value="3" />
+    </attr>
+    
+    <declare-styleable name="SlidingDrawer">
+        <attr name="handle" format="reference" />
+        <attr name="content" format="reference" />
+        <attr name="direction" />
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index ccdf87f45..d18553c8f 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -11,6 +11,7 @@
     <bool name="hide_accounts">false</bool>
 	<bool name="useFirstLoginActivity">false</bool>
 	<bool name="disable_animations">false</bool>
+	<bool name="lock_statusbar">false</bool>
 	<bool name="only_display_username_if_unknown">true</bool>
 	<bool name="show_full_remote_address_on_incoming_call">true</bool>
 	<bool name="display_messages_time">true</bool> <!-- Used to show the time of each message arrival -->
diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java
index 4a1f622a5..a88b632cf 100644
--- a/src/org/linphone/InCallActivity.java
+++ b/src/org/linphone/InCallActivity.java
@@ -436,30 +436,13 @@ public class InCallActivity extends FragmentActivity implements
 	
 	private void hideOrDisplayCallOptions() {
 		if (addCall.getVisibility() == View.VISIBLE) {
+			options.setImageResource(R.drawable.options);
 			if (getResources().getBoolean(R.bool.disable_animations)) {
 				transfer.setVisibility(View.GONE);
 				addCall.setVisibility(View.GONE);
 			} else {
-				final Animation animAddCall = AnimationUtils.loadAnimation(this, R.anim.slide_out_top_to_bottom);
-				animAddCall.setAnimationListener(new AnimationListener() {
-					@Override
-					public void onAnimationStart(Animation animation) {
-						
-					}
-					
-					@Override
-					public void onAnimationRepeat(Animation animation) {
-						
-					}
-					
-					@Override
-					public void onAnimationEnd(Animation animation) {
-						addCall.setVisibility(View.GONE);
-					}
-				});
-				
-				Animation animTransfer = AnimationUtils.loadAnimation(this, R.anim.slide_out_top_to_bottom);
-				animTransfer.setAnimationListener(new AnimationListener() {
+				Animation anim = AnimationUtils.loadAnimation(this, R.anim.slide_out_left_to_right);
+				anim.setAnimationListener(new AnimationListener() {
 					@Override
 					public void onAnimationStart(Animation animation) {
 						
@@ -473,21 +456,23 @@ public class InCallActivity extends FragmentActivity implements
 					@Override
 					public void onAnimationEnd(Animation animation) {
 						transfer.setVisibility(View.GONE);
-						addCall.startAnimation(animAddCall);
+						addCall.setVisibility(View.GONE);
 					}
 				});
-				transfer.startAnimation(animTransfer);
+				transfer.startAnimation(anim);
+				addCall.startAnimation(anim);
 			}
 		} else {		
 			if (getResources().getBoolean(R.bool.disable_animations)) {
 				transfer.setVisibility(View.VISIBLE);
 				addCall.setVisibility(View.VISIBLE);
+				options.setImageResource(R.drawable.options_alt);
 			} else {
-				final Animation animTransfer = AnimationUtils.loadAnimation(this, R.anim.slide_in_bottom_to_top);
-				animTransfer.setAnimationListener(new AnimationListener() {
+				Animation anim = AnimationUtils.loadAnimation(this, R.anim.slide_in_right_to_left);
+				anim.setAnimationListener(new AnimationListener() {
 					@Override
 					public void onAnimationStart(Animation animation) {
-						transfer.setVisibility(View.VISIBLE);
+						
 					}
 					
 					@Override
@@ -497,27 +482,13 @@ public class InCallActivity extends FragmentActivity implements
 					
 					@Override
 					public void onAnimationEnd(Animation animation) {
-					}
-				});
-				
-				Animation animAddCall = AnimationUtils.loadAnimation(this, R.anim.slide_in_bottom_to_top);
-				animAddCall.setAnimationListener(new AnimationListener() {
-					@Override
-					public void onAnimationStart(Animation animation) {
+						options.setImageResource(R.drawable.options_alt);
+						transfer.setVisibility(View.VISIBLE);
 						addCall.setVisibility(View.VISIBLE);
 					}
-					
-					@Override
-					public void onAnimationRepeat(Animation animation) {
-						
-					}
-					
-					@Override
-					public void onAnimationEnd(Animation animation) {
-						transfer.startAnimation(animTransfer);
-					}
 				});
-				addCall.startAnimation(animAddCall);
+				transfer.startAnimation(anim);
+				addCall.startAnimation(anim);
 			}
 		}
 	}
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 550860b46..4a0bafcb0 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -206,24 +206,20 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
 	private void changeFragment(Fragment newFragment, FragmentsAvailable newFragmentType, boolean withoutAnimation) {
 		FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 
-		if (currentFragment.shouldAddToBackStack()) {
-			if (!withoutAnimation && !getResources().getBoolean(R.bool.disable_animations) && currentFragment.shouldAnimate()) {
-				if (newFragmentType.isRightOf(currentFragment)) {
-					transaction.setCustomAnimations(R.anim.slide_in_right_to_left, R.anim.slide_out_right_to_left, R.anim.slide_in_left_to_right, R.anim.slide_out_left_to_right);
-				} else {
-					transaction.setCustomAnimations(R.anim.slide_in_left_to_right, R.anim.slide_out_left_to_right, R.anim.slide_in_right_to_left, R.anim.slide_out_right_to_left);
-				}
+		if (!withoutAnimation && !getResources().getBoolean(R.bool.disable_animations) && currentFragment.shouldAnimate()) {
+			if (newFragmentType.isRightOf(currentFragment)) {
+				transaction.setCustomAnimations(R.anim.slide_in_right_to_left, R.anim.slide_out_right_to_left, R.anim.slide_in_left_to_right, R.anim.slide_out_left_to_right);
+			} else {
+				transaction.setCustomAnimations(R.anim.slide_in_left_to_right, R.anim.slide_out_left_to_right, R.anim.slide_in_right_to_left, R.anim.slide_out_right_to_left);
 			}
+		}
+		try {
 			getSupportFragmentManager().popBackStack(newFragmentType.toString(), FragmentManager.POP_BACK_STACK_INCLUSIVE);
-			transaction.addToBackStack(newFragmentType.toString());
-		}
-		else {
-			try {
-				getSupportFragmentManager().popBackStack("Add to back stack", FragmentManager.POP_BACK_STACK_INCLUSIVE);
-			} catch (java.lang.IllegalStateException e) {
-				
-			}
+		} catch (java.lang.IllegalStateException e) {
+			
 		}
+		
+		transaction.addToBackStack(newFragmentType.toString());
 		transaction.replace(R.id.fragmentContainer, newFragment);
 
 		transaction.commitAllowingStateLoss();
@@ -658,6 +654,9 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
 				return true;
 			}
 		}
+		if (keyCode == KeyEvent.KEYCODE_MENU && statusFragment != null) {
+			statusFragment.openOrCloseStatusBar();
+		}
 		return super.onKeyDown(keyCode, event);
 	}
 }
diff --git a/src/org/linphone/StatusFragment.java b/src/org/linphone/StatusFragment.java
index f2269b886..64a015c83 100644
--- a/src/org/linphone/StatusFragment.java
+++ b/src/org/linphone/StatusFragment.java
@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.LinphoneCore.MediaEncryption;
 import org.linphone.core.LinphoneCore.RegistrationState;
+import org.linphone.ui.SlidingDrawer;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -40,6 +41,7 @@ public class StatusFragment extends Fragment {
 	private Handler refreshHandler = new Handler();
 	private TextView statusText;
 	private ImageView statusLed, callQuality, encryption;
+	private SlidingDrawer drawer;
 	private Runnable mCallQualityUpdater;
 	private boolean isInCall, isAttached = false;
 	
@@ -54,6 +56,8 @@ public class StatusFragment extends Fragment {
 		callQuality = (ImageView) view.findViewById(R.id.callQuality);
 		encryption = (ImageView) view.findViewById(R.id.encryption);
 		
+		drawer = (SlidingDrawer) view.findViewById(R.id.statusBar);
+		
         return view;
     }
 
@@ -84,6 +88,18 @@ public class StatusFragment extends Fragment {
 		isAttached = false;
 	}
 	
+	public void openOrCloseStatusBar() {
+		if (getResources().getBoolean(R.bool.lock_statusbar)) {
+			return;
+		}
+		
+		if (getResources().getBoolean(R.bool.disable_animations)) {
+			drawer.toggle();
+		} else {
+			drawer.animateToggle();
+		}
+	}
+	
 	public void registrationStateChanged(final RegistrationState state) {
 		if (!isAttached)
 			return;
@@ -173,6 +189,14 @@ public class StatusFragment extends Fragment {
 			// We are obviously connected
 			statusLed.setImageResource(R.drawable.led_connected);
 			statusText.setText(getString(R.string.status_connected));
+			
+			if (drawer != null) {
+				drawer.lock();
+			}
+		} else {
+			if (drawer != null && !getResources().getBoolean(R.bool.lock_statusbar)) {
+				drawer.unlock();
+			}
 		}
 	}
 	
diff --git a/src/org/linphone/ui/SlidingDrawer.java b/src/org/linphone/ui/SlidingDrawer.java
new file mode 100644
index 000000000..b0a15b0b1
--- /dev/null
+++ b/src/org/linphone/ui/SlidingDrawer.java
@@ -0,0 +1,1153 @@
+package org.linphone.ui;
+
+/*
+ * Copyright (C) 2008 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.
+ * 
+ * Modifications by: Sylvain Berfini
+ */
+
+import org.linphone.R;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.os.Handler;
+import android.os.Message;
+import android.os.SystemClock;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.SoundEffectConstants;
+import android.view.VelocityTracker;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityEvent;
+
+public class SlidingDrawer extends ViewGroup {
+
+	public static final int ORIENTATION_RTL = 0;
+	public static final int ORIENTATION_BTT = 1;
+	public static final int ORIENTATION_LTR = 2;
+	public static final int ORIENTATION_TTB = 3;
+
+	private static final int TAP_THRESHOLD = 6;
+	private static final float MAXIMUM_TAP_VELOCITY = 100.0f;
+	private static final float MAXIMUM_MINOR_VELOCITY = 150.0f;
+	private static final float MAXIMUM_MAJOR_VELOCITY = 200.0f;
+	private static final float MAXIMUM_ACCELERATION = 2000.0f;
+	private static final int VELOCITY_UNITS = 1000;
+	private static final int MSG_ANIMATE = 1000;
+	private static final int ANIMATION_FRAME_DURATION = 1000 / 60;
+
+	private static final int EXPANDED_FULL_OPEN = -10001;
+	private static final int COLLAPSED_FULL_CLOSED = -10002;
+
+	private final int mHandleId;
+	private final int mContentId;
+
+	private View mHandle;
+	private View mContent;
+
+	private final Rect mFrame = new Rect();
+	private final Rect mInvalidate = new Rect();
+	private boolean mTracking;
+	private boolean mLocked;
+
+	private VelocityTracker mVelocityTracker;
+
+	private boolean mInvert;
+	private boolean mVertical;
+	private boolean mExpanded;
+	private int mBottomOffset;
+	private int mTopOffset;
+	private int mHandleHeight;
+	private int mHandleWidth;
+
+	private OnDrawerOpenListener mOnDrawerOpenListener;
+	private OnDrawerCloseListener mOnDrawerCloseListener;
+	private OnDrawerScrollListener mOnDrawerScrollListener;
+
+	private final Handler mHandler = new SlidingHandler();
+	private float mAnimatedAcceleration;
+	private float mAnimatedVelocity;
+	private float mAnimationPosition;
+	private long mAnimationLastTime;
+	private long mCurrentAnimationTime;
+	private int mTouchDelta;
+	private boolean mAnimating;
+	private boolean mAllowSingleTap;
+	private boolean mAnimateOnClick;
+
+	private final int mTapThreshold;
+	private final int mMaximumTapVelocity;
+	private int mMaximumMinorVelocity;
+	private int mMaximumMajorVelocity;
+	private int mMaximumAcceleration;
+	private final int mVelocityUnits;
+
+	/**
+	 * Callback invoked when the drawer is opened.
+	 */
+	public static interface OnDrawerOpenListener {
+
+		/**
+		 * Invoked when the drawer becomes fully open.
+		 */
+		public void onDrawerOpened();
+	}
+
+	/**
+	 * Callback invoked when the drawer is closed.
+	 */
+	public static interface OnDrawerCloseListener {
+
+		/**
+		 * Invoked when the drawer becomes fully closed.
+		 */
+		public void onDrawerClosed();
+	}
+
+	/**
+	 * Callback invoked when the drawer is scrolled.
+	 */
+	public static interface OnDrawerScrollListener {
+
+		/**
+		 * Invoked when the user starts dragging/flinging the drawer's handle.
+		 */
+		public void onScrollStarted();
+
+		/**
+		 * Invoked when the user stops dragging/flinging the drawer's handle.
+		 */
+		public void onScrollEnded();
+	}
+
+	/**
+	 * Creates a new SlidingDrawer from a specified set of attributes defined in
+	 * XML.
+	 * 
+	 * @param context
+	 *            The application's environment.
+	 * @param attrs
+	 *            The attributes defined in XML.
+	 */
+	public SlidingDrawer(Context context, AttributeSet attrs) {
+		this(context, attrs, 0);
+	}
+
+	/**
+	 * Creates a new SlidingDrawer from a specified set of attributes defined in
+	 * XML.
+	 * 
+	 * @param context
+	 *            The application's environment.
+	 * @param attrs
+	 *            The attributes defined in XML.
+	 * @param defStyle
+	 *            The style to apply to this widget.
+	 */
+	public SlidingDrawer(Context context, AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+		TypedArray a = context.obtainStyledAttributes(attrs,
+				R.styleable.SlidingDrawer, defStyle, 0);
+
+		mBottomOffset = 0;
+		mTopOffset = 0;
+		mAllowSingleTap = true;
+		mAnimateOnClick = true;
+		
+		int orientation = a.getInt(R.styleable.SlidingDrawer_direction,
+				ORIENTATION_BTT);
+		mVertical = (orientation == ORIENTATION_BTT || orientation == ORIENTATION_TTB);
+		mInvert = (orientation == ORIENTATION_TTB || orientation == ORIENTATION_LTR);
+
+		int handleId = a.getResourceId(R.styleable.SlidingDrawer_handle, 0);
+		if (handleId == 0) {
+			throw new IllegalArgumentException(
+					"The handle attribute is required and must refer "
+							+ "to a valid child.");
+		}
+
+		int contentId = a.getResourceId(R.styleable.SlidingDrawer_content, 0);
+		if (contentId == 0) {
+			throw new IllegalArgumentException(
+					"The content attribute is required and must refer "
+							+ "to a valid child.");
+		}
+
+		if (handleId == contentId) {
+			throw new IllegalArgumentException(
+					"The content and handle attributes must refer "
+							+ "to different children.");
+		}
+		mHandleId = handleId;
+		mContentId = contentId;
+
+		final float density = getResources().getDisplayMetrics().density;
+		mTapThreshold = (int) (TAP_THRESHOLD * density + 0.5f);
+		mMaximumTapVelocity = (int) (MAXIMUM_TAP_VELOCITY * density + 0.5f);
+		mMaximumMinorVelocity = (int) (MAXIMUM_MINOR_VELOCITY * density + 0.5f);
+		mMaximumMajorVelocity = (int) (MAXIMUM_MAJOR_VELOCITY * density + 0.5f);
+		mMaximumAcceleration = (int) (MAXIMUM_ACCELERATION * density + 0.5f);
+		mVelocityUnits = (int) (VELOCITY_UNITS * density + 0.5f);
+
+		if (mInvert) {
+			mMaximumAcceleration = -mMaximumAcceleration;
+			mMaximumMajorVelocity = -mMaximumMajorVelocity;
+			mMaximumMinorVelocity = -mMaximumMinorVelocity;
+		}
+
+		a.recycle();
+		setAlwaysDrawnWithCacheEnabled(false);
+	}
+
+	@Override
+	protected void onFinishInflate() {
+		mHandle = findViewById(mHandleId);
+		if (mHandle == null) {
+			throw new IllegalArgumentException(
+					"The handle attribute is must refer to an"
+							+ " existing child.");
+		}
+		mHandle.setOnClickListener(new DrawerToggler());
+
+		mContent = findViewById(mContentId);
+		if (mContent == null) {
+			throw new IllegalArgumentException(
+					"The content attribute is must refer to an"
+							+ " existing child.");
+		}
+		mContent.setVisibility(View.GONE);
+	}
+
+	@Override
+	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+		int widthSpecMode = MeasureSpec.getMode(widthMeasureSpec);
+		int widthSpecSize = MeasureSpec.getSize(widthMeasureSpec);
+
+		int heightSpecMode = MeasureSpec.getMode(heightMeasureSpec);
+		int heightSpecSize = MeasureSpec.getSize(heightMeasureSpec);
+
+		if (widthSpecMode == MeasureSpec.UNSPECIFIED
+				|| heightSpecMode == MeasureSpec.UNSPECIFIED) {
+			throw new RuntimeException(
+					"SlidingDrawer cannot have UNSPECIFIED dimensions");
+		}
+
+		final View handle = mHandle;
+		measureChild(handle, widthMeasureSpec, heightMeasureSpec);
+
+		if (mVertical) {
+			int height = heightSpecSize - handle.getMeasuredHeight()
+					- mTopOffset;
+			mContent.measure(MeasureSpec.makeMeasureSpec(widthSpecSize,
+					MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(height,
+					MeasureSpec.EXACTLY));
+		} else {
+			int width = widthSpecSize - handle.getMeasuredWidth() - mTopOffset;
+			mContent.measure(MeasureSpec.makeMeasureSpec(width,
+					MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(
+					heightSpecSize, MeasureSpec.EXACTLY));
+		}
+
+		setMeasuredDimension(widthSpecSize, heightSpecSize);
+	}
+
+	@Override
+	protected void dispatchDraw(Canvas canvas) {
+		final long drawingTime = getDrawingTime();
+		final View handle = mHandle;
+		final boolean isVertical = mVertical;
+
+		drawChild(canvas, handle, drawingTime);
+
+		if (mTracking || mAnimating) {
+			final Bitmap cache = mContent.getDrawingCache();
+			if (cache != null) {
+				if (isVertical) {
+					if (mInvert) {
+						canvas.drawBitmap(cache, 0, handle.getTop()
+								- (getBottom() - getTop()) + mHandleHeight,
+								null);
+					} else {
+						canvas.drawBitmap(cache, 0, handle.getBottom(), null);
+					}
+				} else {
+					canvas.drawBitmap(cache,
+							mInvert ? handle.getLeft() - cache.getWidth()
+									: handle.getRight(), 0, null);
+				}
+			} else {
+				canvas.save();
+				if (mInvert) {
+					canvas.translate(isVertical ? 0 : handle.getLeft()
+							- mTopOffset - mContent.getMeasuredWidth(),
+							isVertical ? handle.getTop() - mTopOffset
+									- mContent.getMeasuredHeight() : 0);
+				} else {
+					canvas.translate(isVertical ? 0 : handle.getLeft()
+							- mTopOffset, isVertical ? handle.getTop()
+							- mTopOffset : 0);
+				}
+				drawChild(canvas, mContent, drawingTime);
+				canvas.restore();
+			}
+			invalidate();
+		} else if (mExpanded) {
+			drawChild(canvas, mContent, drawingTime);
+		}
+	}
+
+	public static final String LOG_TAG = "Sliding";
+
+	@Override
+	protected void onLayout(boolean changed, int l, int t, int r, int b) {
+		if (mTracking) {
+			return;
+		}
+
+		final int width = r - l;
+		final int height = b - t;
+
+		final View handle = mHandle;
+
+		int handleWidth = handle.getMeasuredWidth();
+		int handleHeight = handle.getMeasuredHeight();
+
+		Log.d(LOG_TAG, "handleHeight: " + handleHeight);
+
+		int handleLeft;
+		int handleTop;
+
+		final View content = mContent;
+
+		if (mVertical) {
+			handleLeft = (width - handleWidth) / 2;
+			if (mInvert) {
+				Log.d(LOG_TAG, "content.layout(1)");
+				handleTop = mExpanded ? height - mBottomOffset - handleHeight
+						: mTopOffset;
+				content.layout(0, mTopOffset, content.getMeasuredWidth(),
+						mTopOffset + content.getMeasuredHeight());
+			} else {
+				handleTop = mExpanded ? mTopOffset : height - handleHeight
+						+ mBottomOffset;
+				content.layout(0, mTopOffset + handleHeight,
+						content.getMeasuredWidth(), mTopOffset + handleHeight
+								+ content.getMeasuredHeight());
+			}
+		} else {
+			handleTop = (height - handleHeight) / 2;
+			if (mInvert) {
+				handleLeft = mExpanded ? width - mBottomOffset - handleWidth
+						: mTopOffset;
+				content.layout(mTopOffset, 0,
+						mTopOffset + content.getMeasuredWidth(),
+						content.getMeasuredHeight());
+			} else {
+				handleLeft = mExpanded ? mTopOffset : width - handleWidth
+						+ mBottomOffset;
+				content.layout(mTopOffset + handleWidth, 0, mTopOffset
+						+ handleWidth + content.getMeasuredWidth(),
+						content.getMeasuredHeight());
+			}
+		}
+
+		handle.layout(handleLeft, handleTop, handleLeft + handleWidth,
+				handleTop + handleHeight);
+		mHandleHeight = handle.getHeight();
+		mHandleWidth = handle.getWidth();
+	}
+
+	@Override
+	public boolean onInterceptTouchEvent(MotionEvent event) {
+		if (mLocked) {
+			return false;
+		}
+
+		final int action = event.getAction();
+
+		float x = event.getX();
+		float y = event.getY();
+
+		final Rect frame = mFrame;
+		final View handle = mHandle;
+
+		handle.getHitRect(frame);
+		if (!mTracking && !frame.contains((int) x, (int) y)) {
+			return false;
+		}
+
+		if (action == MotionEvent.ACTION_DOWN) {
+			mTracking = true;
+
+			handle.setPressed(true);
+			// Must be called before prepareTracking()
+			prepareContent();
+
+			// Must be called after prepareContent()
+			if (mOnDrawerScrollListener != null) {
+				mOnDrawerScrollListener.onScrollStarted();
+			}
+
+			if (mVertical) {
+				final int top = mHandle.getTop();
+				mTouchDelta = (int) y - top;
+				prepareTracking(top);
+			} else {
+				final int left = mHandle.getLeft();
+				mTouchDelta = (int) x - left;
+				prepareTracking(left);
+			}
+			mVelocityTracker.addMovement(event);
+		}
+
+		return true;
+	}
+
+	@Override
+	public boolean onTouchEvent(MotionEvent event) {
+		if (mLocked) {
+			return true;
+		}
+
+		if (mTracking) {
+			mVelocityTracker.addMovement(event);
+			final int action = event.getAction();
+			switch (action) {
+			case MotionEvent.ACTION_MOVE:
+				moveHandle((int) (mVertical ? event.getY() : event.getX())
+						- mTouchDelta);
+				break;
+			case MotionEvent.ACTION_UP:
+			case MotionEvent.ACTION_CANCEL: {
+				final VelocityTracker velocityTracker = mVelocityTracker;
+				velocityTracker.computeCurrentVelocity(mVelocityUnits);
+
+				float yVelocity = velocityTracker.getYVelocity();
+				float xVelocity = velocityTracker.getXVelocity();
+				boolean negative;
+
+				final boolean vertical = mVertical;
+				if (vertical) {
+					negative = yVelocity < 0;
+					if (xVelocity < 0) {
+						xVelocity = -xVelocity;
+					}
+					// fix by Maciej Ciemięga.
+					if ((!mInvert && xVelocity > mMaximumMinorVelocity)
+							|| (mInvert && xVelocity < mMaximumMinorVelocity)) {
+						xVelocity = mMaximumMinorVelocity;
+					}
+				} else {
+					negative = xVelocity < 0;
+					if (yVelocity < 0) {
+						yVelocity = -yVelocity;
+					}
+					// fix by Maciej Ciemięga.
+					if ((!mInvert && yVelocity > mMaximumMinorVelocity)
+							|| (mInvert && yVelocity < mMaximumMinorVelocity)) {
+						yVelocity = mMaximumMinorVelocity;
+					}
+				}
+
+				float velocity = (float) Math.hypot(xVelocity, yVelocity);
+				if (negative) {
+					velocity = -velocity;
+				}
+
+				final int handleTop = mHandle.getTop();
+				final int handleLeft = mHandle.getLeft();
+				final int handleBottom = mHandle.getBottom();
+				final int handleRight = mHandle.getRight();
+
+				if (Math.abs(velocity) < mMaximumTapVelocity) {
+					boolean c1;
+					boolean c2;
+					boolean c3;
+					boolean c4;
+
+					if (mInvert) {
+						c1 = (mExpanded && (getBottom() - handleBottom) < mTapThreshold
+								+ mBottomOffset);
+						c2 = (!mExpanded && handleTop < mTopOffset
+								+ mHandleHeight - mTapThreshold);
+						c3 = (mExpanded && (getRight() - handleRight) < mTapThreshold
+								+ mBottomOffset);
+						c4 = (!mExpanded && handleLeft > mTopOffset
+								+ mHandleWidth + mTapThreshold);
+					} else {
+						c1 = (mExpanded && handleTop < mTapThreshold
+								+ mTopOffset);
+						c2 = (!mExpanded && handleTop > mBottomOffset
+								+ getBottom() - getTop() - mHandleHeight
+								- mTapThreshold);
+						c3 = (mExpanded && handleLeft < mTapThreshold
+								+ mTopOffset);
+						c4 = (!mExpanded && handleLeft > mBottomOffset
+								+ getRight() - getLeft() - mHandleWidth
+								- mTapThreshold);
+					}
+
+					Log.d(LOG_TAG, "ACTION_UP: " + "c1: " + c1 + ", c2: " + c2
+							+ ", c3: " + c3 + ", c4: " + c4);
+
+					if (vertical ? c1 || c2 : c3 || c4) {
+
+						if (mAllowSingleTap) {
+							playSoundEffect(SoundEffectConstants.CLICK);
+
+							if (mExpanded) {
+								animateClose(vertical ? handleTop : handleLeft);
+							} else {
+								animateOpen(vertical ? handleTop : handleLeft);
+							}
+						} else {
+							performFling(vertical ? handleTop : handleLeft,
+									velocity, false);
+						}
+					} else {
+						performFling(vertical ? handleTop : handleLeft,
+								velocity, false);
+					}
+				} else {
+					performFling(vertical ? handleTop : handleLeft, velocity,
+							false);
+				}
+			}
+				break;
+			}
+		}
+
+		return mTracking || mAnimating || super.onTouchEvent(event);
+	}
+
+	private void animateClose(int position) {
+		prepareTracking(position);
+		performFling(position, mMaximumAcceleration, true);
+	}
+
+	private void animateOpen(int position) {
+		prepareTracking(position);
+		performFling(position, -mMaximumAcceleration, true);
+	}
+
+	private void performFling(int position, float velocity, boolean always) {
+		mAnimationPosition = position;
+		mAnimatedVelocity = velocity;
+
+		boolean c1;
+		boolean c2;
+		boolean c3;
+
+		if (mExpanded) {
+			int bottom = mVertical ? getBottom() : getRight();
+			int handleHeight = mVertical ? mHandleHeight : mHandleWidth;
+
+			Log.d(LOG_TAG, "position: " + position + ", velocity: " + velocity
+					+ ", mMaximumMajorVelocity: " + mMaximumMajorVelocity);
+			c1 = mInvert ? velocity < mMaximumMajorVelocity
+					: velocity > mMaximumMajorVelocity;
+			c2 = mInvert ? (bottom - (position + handleHeight)) + mBottomOffset > handleHeight
+					: position > mTopOffset
+							+ (mVertical ? mHandleHeight : mHandleWidth);
+			c3 = mInvert ? velocity < -mMaximumMajorVelocity
+					: velocity > -mMaximumMajorVelocity;
+			Log.d(LOG_TAG, "EXPANDED. c1: " + c1 + ", c2: " + c2 + ", c3: "
+					+ c3);
+			if (always || (c1 || (c2 && c3))) {
+				// We are expanded, So animate to CLOSE!
+				mAnimatedAcceleration = mMaximumAcceleration;
+				if (mInvert) {
+					if (velocity > 0) {
+						mAnimatedVelocity = 0;
+					}
+				} else {
+					if (velocity < 0) {
+						mAnimatedVelocity = 0;
+					}
+				}
+			} else {
+				// We are expanded, but they didn't move sufficiently to cause
+				// us to retract. Animate back to the expanded position. so
+				// animate BACK to expanded!
+				mAnimatedAcceleration = -mMaximumAcceleration;
+
+				if (mInvert) {
+					if (velocity < 0) {
+						mAnimatedVelocity = 0;
+					}
+				} else {
+					if (velocity > 0) {
+						mAnimatedVelocity = 0;
+					}
+				}
+			}
+		} else {
+
+			// WE'RE COLLAPSED
+
+			c1 = mInvert ? velocity < mMaximumMajorVelocity
+					: velocity > mMaximumMajorVelocity;
+			c2 = mInvert ? (position < (mVertical ? getHeight() : getWidth()) / 2)
+					: (position > (mVertical ? getHeight() : getWidth()) / 2);
+			c3 = mInvert ? velocity < -mMaximumMajorVelocity
+					: velocity > -mMaximumMajorVelocity;
+
+			Log.d(LOG_TAG, "COLLAPSED. position: " + position + ", velocity: "
+					+ velocity + ", mMaximumMajorVelocity: "
+					+ mMaximumMajorVelocity);
+			Log.d(LOG_TAG, "COLLAPSED. always: " + always + ", c1: " + c1
+					+ ", c2: " + c2 + ", c3: " + c3);
+
+			if (!always && (c1 || (c2 && c3))) {
+				mAnimatedAcceleration = mMaximumAcceleration;
+
+				if (mInvert) {
+					if (velocity > 0) {
+						mAnimatedVelocity = 0;
+					}
+				} else {
+					if (velocity < 0) {
+						mAnimatedVelocity = 0;
+					}
+				}
+			} else {
+				mAnimatedAcceleration = -mMaximumAcceleration;
+
+				if (mInvert) {
+					if (velocity < 0) {
+						mAnimatedVelocity = 0;
+					}
+				} else {
+					if (velocity > 0) {
+						mAnimatedVelocity = 0;
+					}
+				}
+			}
+		}
+
+		long now = SystemClock.uptimeMillis();
+		mAnimationLastTime = now;
+		mCurrentAnimationTime = now + ANIMATION_FRAME_DURATION;
+		mAnimating = true;
+		mHandler.removeMessages(MSG_ANIMATE);
+		mHandler.sendMessageAtTime(mHandler.obtainMessage(MSG_ANIMATE),
+				mCurrentAnimationTime);
+		stopTracking();
+	}
+
+	private void prepareTracking(int position) {
+		mTracking = true;
+		mVelocityTracker = VelocityTracker.obtain();
+		boolean opening = !mExpanded;
+
+		if (opening) {
+			mAnimatedAcceleration = mMaximumAcceleration;
+			mAnimatedVelocity = mMaximumMajorVelocity;
+			if (mInvert)
+				mAnimationPosition = mTopOffset;
+			else
+				mAnimationPosition = mBottomOffset
+						+ (mVertical ? getHeight() - mHandleHeight : getWidth()
+								- mHandleWidth);
+			moveHandle((int) mAnimationPosition);
+			mAnimating = true;
+			mHandler.removeMessages(MSG_ANIMATE);
+			long now = SystemClock.uptimeMillis();
+			mAnimationLastTime = now;
+			mCurrentAnimationTime = now + ANIMATION_FRAME_DURATION;
+			mAnimating = true;
+		} else {
+			if (mAnimating) {
+				mAnimating = false;
+				mHandler.removeMessages(MSG_ANIMATE);
+			}
+			moveHandle(position);
+		}
+	}
+
+	private void moveHandle(int position) {
+		final View handle = mHandle;
+
+		if (mVertical) {
+			if (position == EXPANDED_FULL_OPEN) {
+				if (mInvert)
+					handle.offsetTopAndBottom(mBottomOffset + getBottom()
+							- getTop() - mHandleHeight);
+				else
+					handle.offsetTopAndBottom(mTopOffset - handle.getTop());
+				invalidate();
+			} else if (position == COLLAPSED_FULL_CLOSED) {
+				if (mInvert) {
+					handle.offsetTopAndBottom(mTopOffset - handle.getTop());
+				} else {
+					handle.offsetTopAndBottom(mBottomOffset + getBottom()
+							- getTop() - mHandleHeight - handle.getTop());
+				}
+				invalidate();
+			} else {
+				final int top = handle.getTop();
+				int deltaY = position - top;
+				if (position < mTopOffset) {
+					deltaY = mTopOffset - top;
+				} else if (deltaY > mBottomOffset + getBottom() - getTop()
+						- mHandleHeight - top) {
+					deltaY = mBottomOffset + getBottom() - getTop()
+							- mHandleHeight - top;
+				}
+
+				handle.offsetTopAndBottom(deltaY);
+
+				final Rect frame = mFrame;
+				final Rect region = mInvalidate;
+
+				handle.getHitRect(frame);
+				region.set(frame);
+
+				region.union(frame.left, frame.top - deltaY, frame.right,
+						frame.bottom - deltaY);
+				region.union(0, frame.bottom - deltaY, getWidth(), frame.bottom
+						- deltaY + mContent.getHeight());
+
+				invalidate(region);
+			}
+		} else {
+			if (position == EXPANDED_FULL_OPEN) {
+				if (mInvert)
+					handle.offsetLeftAndRight(mBottomOffset + getRight()
+							- getLeft() - mHandleWidth);
+				else
+					handle.offsetLeftAndRight(mTopOffset - handle.getLeft());
+				invalidate();
+			} else if (position == COLLAPSED_FULL_CLOSED) {
+				if (mInvert)
+					handle.offsetLeftAndRight(mTopOffset - handle.getLeft());
+				else
+					handle.offsetLeftAndRight(mBottomOffset + getRight()
+							- getLeft() - mHandleWidth - handle.getLeft());
+				invalidate();
+			} else {
+				final int left = handle.getLeft();
+				int deltaX = position - left;
+				if (position < mTopOffset) {
+					deltaX = mTopOffset - left;
+				} else if (deltaX > mBottomOffset + getRight() - getLeft()
+						- mHandleWidth - left) {
+					deltaX = mBottomOffset + getRight() - getLeft()
+							- mHandleWidth - left;
+				}
+				handle.offsetLeftAndRight(deltaX);
+
+				final Rect frame = mFrame;
+				final Rect region = mInvalidate;
+
+				handle.getHitRect(frame);
+				region.set(frame);
+
+				region.union(frame.left - deltaX, frame.top, frame.right
+						- deltaX, frame.bottom);
+				region.union(frame.right - deltaX, 0, frame.right - deltaX
+						+ mContent.getWidth(), getHeight());
+
+				invalidate(region);
+			}
+		}
+	}
+
+	private void prepareContent() {
+		if (mAnimating) {
+			return;
+		}
+
+		// Something changed in the content, we need to honor the layout request
+		// before creating the cached bitmap
+		final View content = mContent;
+		if (content.isLayoutRequested()) {
+
+			if (mVertical) {
+				final int handleHeight = mHandleHeight;
+				int height = getBottom() - getTop() - handleHeight - mTopOffset;
+				content.measure(MeasureSpec.makeMeasureSpec(getRight()
+						- getLeft(), MeasureSpec.EXACTLY), MeasureSpec
+						.makeMeasureSpec(height, MeasureSpec.EXACTLY));
+
+				Log.d(LOG_TAG, "content.layout(2)");
+
+				if (mInvert)
+					content.layout(0, mTopOffset, content.getMeasuredWidth(),
+							mTopOffset + content.getMeasuredHeight());
+				else
+					content.layout(
+							0,
+							mTopOffset + handleHeight,
+							content.getMeasuredWidth(),
+							mTopOffset + handleHeight
+									+ content.getMeasuredHeight());
+
+			} else {
+
+				final int handleWidth = mHandle.getWidth();
+				int width = getRight() - getLeft() - handleWidth - mTopOffset;
+				content.measure(MeasureSpec.makeMeasureSpec(width,
+						MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(
+						getBottom() - getTop(), MeasureSpec.EXACTLY));
+
+				if (mInvert)
+					content.layout(mTopOffset, 0,
+							mTopOffset + content.getMeasuredWidth(),
+							content.getMeasuredHeight());
+				else
+					content.layout(handleWidth + mTopOffset, 0, mTopOffset
+							+ handleWidth + content.getMeasuredWidth(),
+							content.getMeasuredHeight());
+			}
+		}
+		// Try only once... we should really loop but it's not a big deal
+		// if the draw was cancelled, it will only be temporary anyway
+		content.getViewTreeObserver().dispatchOnPreDraw();
+		content.buildDrawingCache();
+
+		content.setVisibility(View.GONE);
+	}
+
+	private void stopTracking() {
+		mHandle.setPressed(false);
+		mTracking = false;
+
+		if (mOnDrawerScrollListener != null) {
+			mOnDrawerScrollListener.onScrollEnded();
+		}
+
+		if (mVelocityTracker != null) {
+			mVelocityTracker.recycle();
+			mVelocityTracker = null;
+		}
+	}
+
+	private void doAnimation() {
+		if (mAnimating) {
+			incrementAnimation();
+
+			if (mInvert) {
+				if (mAnimationPosition < mTopOffset) {
+					mAnimating = false;
+					closeDrawer();
+				} else if (mAnimationPosition >= mTopOffset
+						+ (mVertical ? getHeight() : getWidth()) - 1) {
+					mAnimating = false;
+					openDrawer();
+				} else {
+					moveHandle((int) mAnimationPosition);
+					mCurrentAnimationTime += ANIMATION_FRAME_DURATION;
+					mHandler.sendMessageAtTime(
+							mHandler.obtainMessage(MSG_ANIMATE),
+							mCurrentAnimationTime);
+				}
+			} else {
+				if (mAnimationPosition >= mBottomOffset
+						+ (mVertical ? getHeight() : getWidth()) - 1) {
+					mAnimating = false;
+					closeDrawer();
+				} else if (mAnimationPosition < mTopOffset) {
+					mAnimating = false;
+					openDrawer();
+				} else {
+					moveHandle((int) mAnimationPosition);
+					mCurrentAnimationTime += ANIMATION_FRAME_DURATION;
+					mHandler.sendMessageAtTime(
+							mHandler.obtainMessage(MSG_ANIMATE),
+							mCurrentAnimationTime);
+				}
+			}
+		}
+	}
+
+	private void incrementAnimation() {
+		long now = SystemClock.uptimeMillis();
+		float t = (now - mAnimationLastTime) / 1000.0f; // ms -> s
+		final float position = mAnimationPosition;
+		final float v = mAnimatedVelocity; // px/s
+		final float a = mInvert ? mAnimatedAcceleration : mAnimatedAcceleration; // px/s/s
+		mAnimationPosition = position + (v * t) + (0.5f * a * t * t); // px
+		mAnimatedVelocity = v + (a * t); // px/s
+		mAnimationLastTime = now; // ms
+	}
+
+	/**
+	 * Toggles the drawer open and close. Takes effect immediately.
+	 * 
+	 * @see #open()
+	 * @see #close()
+	 * @see #animateClose()
+	 * @see #animateOpen()
+	 * @see #animateToggle()
+	 */
+	public void toggle() {
+		if (!mExpanded) {
+			openDrawer();
+		} else {
+			closeDrawer();
+		}
+		invalidate();
+		requestLayout();
+	}
+
+	/**
+	 * Toggles the drawer open and close with an animation.
+	 * 
+	 * @see #open()
+	 * @see #close()
+	 * @see #animateClose()
+	 * @see #animateOpen()
+	 * @see #toggle()
+	 */
+	public void animateToggle() {
+		if (!mExpanded) {
+			animateOpen();
+		} else {
+			animateClose();
+		}
+	}
+
+	/**
+	 * Opens the drawer immediately.
+	 * 
+	 * @see #toggle()
+	 * @see #close()
+	 * @see #animateOpen()
+	 */
+	public void open() {
+		openDrawer();
+		invalidate();
+		requestLayout();
+
+		sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
+	}
+
+	/**
+	 * Closes the drawer immediately.
+	 * 
+	 * @see #toggle()
+	 * @see #open()
+	 * @see #animateClose()
+	 */
+	public void close() {
+		closeDrawer();
+		invalidate();
+		requestLayout();
+	}
+
+	/**
+	 * Closes the drawer with an animation.
+	 * 
+	 * @see #close()
+	 * @see #open()
+	 * @see #animateOpen()
+	 * @see #animateToggle()
+	 * @see #toggle()
+	 */
+	public void animateClose() {
+		prepareContent();
+		final OnDrawerScrollListener scrollListener = mOnDrawerScrollListener;
+		if (scrollListener != null) {
+			scrollListener.onScrollStarted();
+		}
+		animateClose(mVertical ? mHandle.getTop() : mHandle.getLeft());
+
+		if (scrollListener != null) {
+			scrollListener.onScrollEnded();
+		}
+	}
+
+	/**
+	 * Opens the drawer with an animation.
+	 * 
+	 * @see #close()
+	 * @see #open()
+	 * @see #animateClose()
+	 * @see #animateToggle()
+	 * @see #toggle()
+	 */
+	public void animateOpen() {
+		prepareContent();
+		final OnDrawerScrollListener scrollListener = mOnDrawerScrollListener;
+		if (scrollListener != null) {
+			scrollListener.onScrollStarted();
+		}
+		animateOpen(mVertical ? mHandle.getTop() : mHandle.getLeft());
+
+		sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
+
+		if (scrollListener != null) {
+			scrollListener.onScrollEnded();
+		}
+	}
+
+	private void closeDrawer() {
+		moveHandle(COLLAPSED_FULL_CLOSED);
+		mContent.setVisibility(View.GONE);
+		mContent.destroyDrawingCache();
+
+		if (!mExpanded) {
+			return;
+		}
+
+		mExpanded = false;
+		if (mOnDrawerCloseListener != null) {
+			mOnDrawerCloseListener.onDrawerClosed();
+		}
+	}
+
+	private void openDrawer() {
+		moveHandle(EXPANDED_FULL_OPEN);
+		mContent.setVisibility(View.VISIBLE);
+
+		if (mExpanded) {
+			return;
+		}
+
+		mExpanded = true;
+
+		if (mOnDrawerOpenListener != null) {
+			mOnDrawerOpenListener.onDrawerOpened();
+		}
+	}
+
+	/**
+	 * Sets the listener that receives a notification when the drawer becomes
+	 * open.
+	 * 
+	 * @param onDrawerOpenListener
+	 *            The listener to be notified when the drawer is opened.
+	 */
+	public void setOnDrawerOpenListener(
+			OnDrawerOpenListener onDrawerOpenListener) {
+		mOnDrawerOpenListener = onDrawerOpenListener;
+	}
+
+	/**
+	 * Sets the listener that receives a notification when the drawer becomes
+	 * close.
+	 * 
+	 * @param onDrawerCloseListener
+	 *            The listener to be notified when the drawer is closed.
+	 */
+	public void setOnDrawerCloseListener(
+			OnDrawerCloseListener onDrawerCloseListener) {
+		mOnDrawerCloseListener = onDrawerCloseListener;
+	}
+
+	/**
+	 * Sets the listener that receives a notification when the drawer starts or
+	 * ends a scroll. A fling is considered as a scroll. A fling will also
+	 * trigger a drawer opened or drawer closed event.
+	 * 
+	 * @param onDrawerScrollListener
+	 *            The listener to be notified when scrolling starts or stops.
+	 */
+	public void setOnDrawerScrollListener(
+			OnDrawerScrollListener onDrawerScrollListener) {
+		mOnDrawerScrollListener = onDrawerScrollListener;
+	}
+
+	/**
+	 * Returns the handle of the drawer.
+	 * 
+	 * @return The View reprenseting the handle of the drawer, identified by the
+	 *         "handle" id in XML.
+	 */
+	public View getHandle() {
+		return mHandle;
+	}
+
+	/**
+	 * Returns the content of the drawer.
+	 * 
+	 * @return The View reprenseting the content of the drawer, identified by
+	 *         the "content" id in XML.
+	 */
+	public View getContent() {
+		return mContent;
+	}
+
+	/**
+	 * Unlocks the SlidingDrawer so that touch events are processed.
+	 * 
+	 * @see #lock()
+	 */
+	public void unlock() {
+		mLocked = false;
+	}
+
+	/**
+	 * Locks the SlidingDrawer so that touch events are ignores.
+	 * 
+	 * @see #unlock()
+	 */
+	public void lock() {
+		mLocked = true;
+	}
+
+	/**
+	 * Indicates whether the drawer is currently fully opened.
+	 * 
+	 * @return True if the drawer is opened, false otherwise.
+	 */
+	public boolean isOpened() {
+		return mExpanded;
+	}
+
+	/**
+	 * Indicates whether the drawer is scrolling or flinging.
+	 * 
+	 * @return True if the drawer is scroller or flinging, false otherwise.
+	 */
+	public boolean isMoving() {
+		return mTracking || mAnimating;
+	}
+
+	private class DrawerToggler implements OnClickListener {
+
+		public void onClick(View v) {
+			if (mLocked) {
+				return;
+			}
+			// mAllowSingleTap isn't relevant here; you're *always*
+			// allowed to open/close the drawer by clicking with the
+			// trackball.
+
+			if (mAnimateOnClick) {
+				animateToggle();
+			} else {
+				toggle();
+			}
+		}
+	}
+
+	private class SlidingHandler extends Handler {
+
+		public void handleMessage(Message m) {
+			switch (m.what) {
+			case MSG_ANIMATE:
+				doAnimation();
+				break;
+			}
+		}
+	}
+}
\ No newline at end of file