Merge d820908 into b53f6a4

Author: tagboola

firebase-appdistribution/src/main/res/drawable/btn_disabled_stroked.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="#0D000000" />
+    <corners android:radius="8dp"/>
+    <stroke android:width="1dp" android:color="#0F000000" />
+</shape>

firebase-appdistribution/src/main/res/drawable/btn_stroked.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="#00000000"/>
+    <corners android:radius="8dp"/>
+    <stroke android:width="1dp" android:color="#1A000000" />
+</shape>

firebase-appdistribution/src/main/res/drawable/btn_stroked_background.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Drawable state list for background of basic button -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- disabled button background -->
+    <item android:state_enabled="false" android:drawable="@drawable/btn_disabled_stroked" />
+    <!-- default button background -->
+    <item android:drawable="@drawable/btn_stroked" />
+</selector>

firebase-appdistribution/src/main/res/drawable/card_background.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="20dp"/>
+    <corners android:radius="8dp"/>
     <padding android:left="10dp" android:right="10dp" android:top="10dp" android:bottom="10dp"/>
     <stroke android:width="1dp" android:color="#CCCCCC"/>
 </shape>

firebase-appdistribution/src/main/res/layout/activity_feedback.xml

@@ -100,25 +100,34 @@
                 android:background="@drawable/card_background"
                 android:orientation="vertical">
 
-                <CheckBox
-                    android:id="@+id/screenshotCheckBox"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/screenshot" />
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <CheckBox
+                        android:id="@+id/screenshotCheckBox"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_alignParentStart="true"
+                        android:layout_alignParentLeft="true"
+                        android:text="@string/screenshot" />
+                    <Button
+                        style="@style/FeedbackTheme.Button.Stroked"
+                        android:id="@+id/chooseScreenshotButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:layout_alignParentRight="true"
+                        android:text="Gallery"/>
+                </RelativeLayout>
 
                 <ImageView
                     android:id="@+id/screenshotImageView"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:scaleType="centerInside"
+                    android:layout_marginTop="12dp"
                     android:adjustViewBounds="true"
-                    android:contentDescription="@string/screenshot_image_description" />
-
-                <Button
-                    android:id="@+id/chooseScreenshotButton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Gallery" />
+                    android:contentDescription="@string/screenshot_image_description"/>
             </LinearLayout>
         </LinearLayout>
     </ScrollView>

firebase-appdistribution/src/main/res/values/themes.xml

@@ -2,4 +2,8 @@
     <style name="FeedbackTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorAccent">#000000</item>
     </style>
+    <style name="FeedbackTheme.Button.Stroked" parent="Widget.AppCompat.Button.Colored">
+        <item name="android:background">@drawable/btn_stroked_background</item>
+        <item name="android:textColor">#1a73e8</item>
+    </style>
 </resources>