Merge remote-tracking branch 'origin/master'

app/src/main/res/layout/activity_main_player.xml

@@ -107,7 +107,7 @@
                     android:layout_height="35dp"
                     android:layout_marginLeft="2dp"
                     android:layout_marginRight="2dp"
-                    android:layout_toLeftOf="@+id/screenRotationButton"
+                    android:layout_toLeftOf="@+id/playbackSpeed"
                     android:gravity="center"
                     android:minWidth="50dp"
                     android:text="720p"
@@ -115,6 +115,20 @@
                     android:textStyle="bold"
                     tools:ignore="HardcodedText,RtlHardcoded"/>
 
+                <TextView
+                    android:id="@+id/playbackSpeed"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="2dp"
+                    android:layout_toLeftOf="@+id/screenRotationButton"
+                    android:gravity="center"
+                    android:minHeight="35dp"
+                    android:minWidth="40dp"
+                    android:textColor="@android:color/white"
+                    android:textStyle="bold"
+                    tools:ignore="RtlHardcoded,RtlSymmetry"
+                    tools:text="1x" />
+
                 <ImageButton
                     android:id="@+id/screenRotationButton"
                     android:layout_width="35dp"

app/src/main/res/layout/fragment_search.xml

@@ -3,9 +3,14 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:focusable="true"
-    android:focusableInTouchMode="true">
+    android:layout_height="match_parent">
+
+    <!-- Empty view to receive the focus when the edit text of the toolbar lose it  -->
+    <View
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:focusable="true"
+        android:focusableInTouchMode="true"/>
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/result_list_view"

app/src/main/res/layout/player_popup.xml

@@ -6,8 +6,8 @@
     android:layout_height="match_parent"
     android:background="@android:color/black"
     android:gravity="center"
-    tools:layout_width="@dimen/popup_default_width"
-    tools:layout_height="101.25dp">
+    tools:layout_height="84dp"
+    tools:layout_width="@dimen/popup_minimum_width">
 
 
     <com.google.android.exoplayer2.ui.AspectRatioFrameLayout
@@ -56,21 +56,34 @@
             android:layout_alignParentTop="true"
             android:background="@drawable/player_top_controls_bg"
             android:paddingBottom="20dp"
-            android:paddingLeft="6dp"
+            android:paddingLeft="2dp"
             android:paddingRight="6dp"
-            android:paddingTop="4dp">
+            android:paddingTop="4dp"
+            tools:ignore="RtlHardcoded">
 
             <TextView
                 android:id="@+id/qualityTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="30dp"
                 android:layout_alignParentLeft="true"
-                android:padding="5dp"
                 android:gravity="center"
-                android:text="720p"
+                android:padding="5dp"
                 android:textColor="@android:color/white"
                 android:textStyle="bold"
-                tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry"/>
+                tools:ignore="RtlHardcoded,RtlSymmetry"
+                tools:text="1080p60"/>
+
+            <TextView
+                android:id="@+id/playbackSpeed"
+                android:layout_width="wrap_content"
+                android:layout_height="30dp"
+                android:layout_toRightOf="@+id/qualityTextView"
+                android:gravity="center"
+                android:padding="6dp"
+                android:textColor="@android:color/white"
+                android:textStyle="bold"
+                tools:ignore="RelativeOverlap,RtlHardcoded,RtlSymmetry"
+                tools:text="1.75x"/>
 
             <ImageButton
                 android:id="@+id/fullScreenButton"
@@ -142,7 +155,7 @@
         android:layout_height="match_parent"
         android:gravity="center"
         android:orientation="horizontal"
-        android:weightSum="5">
+        android:weightSum="5.5">
         <!--tools:visibility="gone">-->
 
         <ImageView
@@ -207,5 +220,5 @@
         android:textStyle="bold"
         android:visibility="gone"
         tools:ignore="RtlHardcoded"
-        tools:visibility="visible"/>
+        tools:visibility="gone"/>
 </FrameLayout>

app/src/main/res/values-sw600dp/dimens.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="popup_default_width">230dp</dimen>
-    <dimen name="popup_minimum_width">140dp</dimen>
+    <dimen name="popup_minimum_width">160dp</dimen>
     <!-- Video Item Detail View Dimensions-->
     <!-- Text Size -->
     <dimen name="channel_item_detail_title_text_size">18sp</dimen>

app/src/main/res/values/dimens.xml

@@ -22,7 +22,7 @@
     <dimen name="video_item_detail_description_to_details_margin">4dp</dimen>
     <!-- Miscellaneous -->
     <dimen name="popup_default_width">180dp</dimen>
-    <dimen name="popup_minimum_width">120dp</dimen>
+    <dimen name="popup_minimum_width">150dp</dimen>
     <!-- Video Item Detail View Dimensions-->
     <!-- Text Size -->
     <dimen name="video_item_detail_title_text_size">16sp</dimen>