diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 0cae8c74d..065c5c56d 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -35,6 +35,7 @@
     <string name="play_next">下集</string>
     <string name="play_prev">上集</string>
     <string name="play_loop">循环</string>
+    <string name="play_timer">定时</string>
     <string name="play_danmu">弹幕</string>
     <string name="play_change">换源</string>
     <string name="play_forward">→</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 4cf6a4a0b..119939b81 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -35,6 +35,7 @@
     <string name="play_next">下集</string>
     <string name="play_prev">上集</string>
     <string name="play_loop">循環</string>
+    <string name="play_timer">定時</string>
     <string name="play_danmu">彈幕</string>
     <string name="play_change">換源</string>
     <string name="play_forward">→</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 145846f2e..0af65a4f1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -35,6 +35,7 @@
     <string name="play_next">Next</string>
     <string name="play_prev">Prev</string>
     <string name="play_loop">Loop</string>
+    <string name="play_timer">Timer</string>
     <string name="play_danmu">Danmu</string>
     <string name="play_change">Change</string>
     <string name="play_forward">→</string>
diff --git a/app/src/mobile/res/layout-sw600dp/activity_video.xml b/app/src/mobile/res/layout-sw600dp/activity_video.xml
index 6d486644b..73749dad9 100644
--- a/app/src/mobile/res/layout-sw600dp/activity_video.xml
+++ b/app/src/mobile/res/layout-sw600dp/activity_video.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:keepScreenOn="true"
     android:tag="land">
 
     <com.fongmi.android.tv.ui.custom.ProgressLayout
diff --git a/app/src/mobile/res/layout/activity_video.xml b/app/src/mobile/res/layout/activity_video.xml
index 0eb13403b..42d4ea850 100644
--- a/app/src/mobile/res/layout/activity_video.xml
+++ b/app/src/mobile/res/layout/activity_video.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:keepScreenOn="true"
     android:tag="port">
 
     <FrameLayout
diff --git a/app/src/mobile/res/layout/dialog_control.xml b/app/src/mobile/res/layout/dialog_control.xml
index a2808fdad..c09268ec0 100644
--- a/app/src/mobile/res/layout/dialog_control.xml
+++ b/app/src/mobile/res/layout/dialog_control.xml
@@ -72,8 +72,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
                 android:background="@drawable/shape_accent"
-                android:gravity="center"
-                android:singleLine="true"
                 android:tag="0"
                 android:textColor="@color/control"
                 android:textSize="14sp"
@@ -85,8 +83,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
                 android:background="@drawable/shape_accent"
-                android:gravity="center"
-                android:singleLine="true"
                 android:tag="1"
                 android:textColor="@color/control"
                 android:textSize="14sp"
@@ -98,8 +94,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
                 android:background="@drawable/shape_accent"
-                android:gravity="center"
-                android:singleLine="true"
                 android:tag="2"
                 android:textColor="@color/control"
                 android:textSize="14sp"
@@ -111,8 +105,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
                 android:background="@drawable/shape_accent"
-                android:gravity="center"
-                android:singleLine="true"
                 android:tag="3"
                 android:textColor="@color/control"
                 android:textSize="14sp"
@@ -123,8 +115,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@drawable/shape_accent"
-                android:gravity="center"
-                android:singleLine="true"
                 android:tag="4"
                 android:textColor="@color/control"
                 android:textSize="14sp"
@@ -159,8 +149,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
                 android:background="@drawable/shape_accent"
-                android:gravity="center"
-                android:singleLine="true"
                 android:textColor="@color/control"
                 android:textSize="14sp"
                 tools:text="EXO" />
@@ -171,8 +159,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
                 android:background="@drawable/shape_accent"
-                android:gravity="center"
-                android:singleLine="true"
                 android:textColor="@color/control"
                 android:textSize="14sp"
                 tools:text="硬解" />
@@ -183,8 +169,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
                 android:background="@drawable/shape_accent"
-                android:gravity="center"
-                android:singleLine="true"
                 android:text="@string/play_loop"
                 android:textColor="@color/control"
                 android:textSize="14sp" />
@@ -195,8 +179,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
                 android:background="@drawable/shape_accent"
-                android:gravity="center"
-                android:singleLine="true"
                 android:textColor="@color/control"
                 android:textSize="14sp"
                 tools:text="片頭" />
@@ -205,10 +187,8 @@
                 android:id="@+id/ending"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="0dp"
+                android:layout_marginEnd="8dp"
                 android:background="@drawable/shape_accent"
-                android:gravity="center"
-                android:singleLine="true"
                 android:textColor="@color/control"
                 android:textSize="14sp"
                 tools:text="片尾" />
@@ -239,7 +219,6 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
             android:background="@drawable/shape_accent"
-            android:gravity="center"
             android:tag="3"
             android:text="@string/play_track_text"
             android:textColor="@color/control"
@@ -253,7 +232,6 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
             android:background="@drawable/shape_accent"
-            android:gravity="center"
             android:tag="1"
             android:text="@string/play_track_audio"
             android:textColor="@color/control"
@@ -266,7 +244,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@drawable/shape_accent"
-            android:gravity="center"
             android:tag="2"
             android:text="@string/play_track_video"
             android:textColor="@color/control"