合入

.idea/misc.xml

@@ -35,7 +35,7 @@
       </value>
       </value>
     </option>
     </option>
   </component>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   </component>
   <component name="ProjectType">
   <component name="ProjectType">

app/src/main/AndroidManifest.xml

@@ -41,11 +41,11 @@
             android:theme="@style/AppTheme.Launcher"
             android:theme="@style/AppTheme.Launcher"
             android:name="com.toscl.turingos.MainActivity"
             android:name="com.toscl.turingos.MainActivity"
             android:screenOrientation="portrait">
             android:screenOrientation="portrait">
-<!--            <intent-filter>
+            <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.MAIN" />
 
 
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>-->
+            </intent-filter>
         </activity>
         </activity>
 
 
         <meta-data
         <meta-data

global_dialog/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

-#Wed Aug 07 15:05:08 CST 2019
+#Mon Aug 19 14:08:27 CST 2019
 F\:\\Cuiliang.shi\\demand\\AI_TuringOS\\turingos\\global_dialog\\src\\main\\res\\drawable\\blue_button_background.xml=F\:\\Cuiliang.shi\\demand\\AI_TuringOS\\turingos\\global_dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\blue_button_background.xml
 F\:\\Cuiliang.shi\\demand\\AI_TuringOS\\turingos\\global_dialog\\src\\main\\res\\drawable\\blue_button_background.xml=F\:\\Cuiliang.shi\\demand\\AI_TuringOS\\turingos\\global_dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\blue_button_background.xml
 F\:\\Cuiliang.shi\\demand\\AI_TuringOS\\turingos\\global_dialog\\src\\main\\res\\mipmap\\ic_voice.png=F\:\\Cuiliang.shi\\demand\\AI_TuringOS\\turingos\\global_dialog\\build\\intermediates\\packaged_res\\debug\\mipmap\\ic_voice.png
 F\:\\Cuiliang.shi\\demand\\AI_TuringOS\\turingos\\global_dialog\\src\\main\\res\\mipmap\\ic_voice.png=F\:\\Cuiliang.shi\\demand\\AI_TuringOS\\turingos\\global_dialog\\build\\intermediates\\packaged_res\\debug\\mipmap\\ic_voice.png
 F\:\\Cuiliang.shi\\demand\\AI_TuringOS\\turingos\\global_dialog\\src\\main\\res\\layout\\alert_dialog.xml=F\:\\Cuiliang.shi\\demand\\AI_TuringOS\\turingos\\global_dialog\\build\\intermediates\\packaged_res\\debug\\layout\\alert_dialog.xml
 F\:\\Cuiliang.shi\\demand\\AI_TuringOS\\turingos\\global_dialog\\src\\main\\res\\layout\\alert_dialog.xml=F\:\\Cuiliang.shi\\demand\\AI_TuringOS\\turingos\\global_dialog\\build\\intermediates\\packaged_res\\debug\\layout\\alert_dialog.xml

global_dialog/build/intermediates/packaged_res/debug/layout/alert_dialog.xml

@@ -127,9 +127,13 @@
         android:singleLine="true"
         android:singleLine="true"
         android:text="@string/dialog_default_title" />
         android:text="@string/dialog_default_title" />
 
 
+    <ScrollView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
         <TextView
         <TextView
             android:id="@+id/content_text"
             android:id="@+id/content_text"
             android:layout_marginTop="10dp"
             android:layout_marginTop="10dp"
+            android:paddingBottom="4dp"
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="19sp"
             android:textSize="19sp"
@@ -137,6 +141,7 @@
             android:gravity="center"
             android:gravity="center"
             android:textColor="#797979"
             android:textColor="#797979"
             android:visibility="gone" />
             android:visibility="gone" />
+    </ScrollView>
 
 
     <LinearLayout
     <LinearLayout
         android:layout_marginTop="10dp"
         android:layout_marginTop="10dp"