Dying again

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

@@ -8,12 +8,12 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="12dp"
-        android:background="@drawable/floating_console_bg_bottom"
         android:orientation="vertical">
 
         <android.support.design.widget.AppBarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@drawable/floating_console_bg_top"
             android:theme="@style/AppTheme.AppBarOverlay">
 
             <android.support.v7.widget.Toolbar
@@ -22,13 +22,25 @@
                 android:layout_height="40dp"
                 android:background="?attr/colorPrimary"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
-                app:title="@string/_app_name">
+                app:title="@string/text_console">
 
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_gravity="right">
 
+                    <ImageView
+                        android:id="@+id/minimize"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:background="?selectableItemBackgroundBorderless"
+                        android:paddingBottom="10dp"
+                        android:paddingLeft="8dp"
+                        android:paddingRight="10dp"
+                        android:paddingTop="26dp"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/ic_remove_white_24dp"/>
+
                     <ImageView
                         android:id="@+id/move_or_resize"
                         android:layout_width="40dp"
@@ -52,11 +64,11 @@
 
         </android.support.design.widget.AppBarLayout>
 
-        <view
+        <com.stardust.scriptdroid.external.floating_window.console.FloatingConsoleView
             android:id="@+id/console"
-            class="com.stardust.scriptdroid.ui.console.ConsoleActivity$ConsoleView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:background="@drawable/floating_console_bg_bottom"
             android:minHeight="200dp"/>
     </LinearLayout>
 

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

@@ -36,10 +36,18 @@
                 android:textSize="16sp"/>
         </LinearLayout>
 
-        <com.stardust.scriptdroid.ui.main.task.TaskListRecyclerView
-            android:id="@+id/task_list"
+        <android.support.v4.widget.SwipeRefreshLayout
+            android:id="@+id/swipe_refresh_layout"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent">
+
+            <com.stardust.scriptdroid.ui.main.task.TaskListRecyclerView
+                android:id="@+id/task_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
+
+        </android.support.v4.widget.SwipeRefreshLayout>
+
     </LinearLayout>
 
     <TextView

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

@@ -214,6 +214,7 @@
     <string name="text_guard_mode">保护模式</string>
     <string name="summary_guard_mode">在本软件界面无法运行自动操作命令以免误触</string>
     <string name="key_guard_mode">key_guard_mode</string>
+    <string name="text_console_floating_window">控制台悬浮窗</string>
 
     <string-array name="record_control_keys">
         <item>无</item>