Fixed issue #40: text resizing on phone with normal screen size.

dronekit · Feb 9, 2015 · 51430d9 · 51430d9
1 parent ebf15ec
commit 51430d9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/ClientLib/mobile/libs/AidlLib.jar b/ClientLib/mobile/libs/AidlLib.jar
diff --git a/ServiceApp/build.gradle b/ServiceApp/build.gradle
@@ -27,7 +27,7 @@ android {
         applicationId 'org.droidplanner.services.android'
         minSdkVersion 14
         targetSdkVersion 21
-        versionCode 10203
+        versionCode 10204
         versionName getGitVersion()
     }
 

diff --git a/ServiceApp/res/layout/item_recommended_app_info.xml b/ServiceApp/res/layout/item_recommended_app_info.xml
@@ -43,34 +43,29 @@
             android:padding="2dp"
             />
 
-        <ScrollView
-            android:id="@+id/app_description_container"
+        <TextView
             android:layout_alignStart="@+id/app_name"
             android:layout_alignLeft="@+id/app_name"
             android:layout_below="@+id/app_name"
             android:layout_width="match_parent"
             android:layout_marginTop="5dp"
             android:layout_marginBottom="5dp"
-            android:layout_height="80dp">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/app_description"
-                android:gravity="center_vertical"
-                android:padding="2dp"
-                android:textAppearance="?android:textAppearanceSmall"
-                android:textColor="@android:color/black"
-                tools:text="Tower is 3DR’s powerful and intuitive new flight control program. "/>
-        </ScrollView>
+            android:minHeight="64dp"
+            android:layout_height="wrap_content"
+            android:id="@+id/app_description"
+            android:gravity="center_vertical"
+            android:padding="2dp"
+            android:textAppearance="?android:textAppearanceSmall"
+            android:textColor="@android:color/black"
+            tools:text="Tower is 3DR’s powerful and intuitive new flight control program. "/>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:id="@+id/action_button_container"
-            android:visibility="gone"
-            android:layout_below="@+id/app_description_container">
+            android:visibility="visible"
+            android:layout_below="@+id/app_description">
 
             <View
                 android:layout_width="match_parent"