Bug 1196254 - Contextual hint shown the first time tracking protection is triggered is cut off in landscape. r=sebastian, a=sledru
authorMartyn Haigh <mhaigh@mozilla.org>
Fri, 21 Aug 2015 15:55:34 +0100
changeset 289314 7703f7784afd4a7dfc7d67907abd0840d7a1fb2e
parent 289313 39fcc0e11d27adc301394a094a5db2f3c9fd41b8
child 289315 0e2521392927dee4af38b2dcb3b653ed24eebfc0
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssebastian, sledru
bugs1196254
milestone42.0a2
Bug 1196254 - Contextual hint shown the first time tracking protection is triggered is cut off in landscape. r=sebastian, a=sledru
mobile/android/base/resources/layout/tracking_protection_prompt.xml
--- a/mobile/android/base/resources/layout/tracking_protection_prompt.xml
+++ b/mobile/android/base/resources/layout/tracking_protection_prompt.xml
@@ -14,78 +14,93 @@
         android:clipToPadding="false">
 
     <LinearLayout
             android:id="@+id/tracking_protection_inner_container"
             android:layout_width="@dimen/overlay_prompt_container_width"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|center"
             android:background="@android:color/white"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingBottom="40dp">
 
-        <ImageView android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:src="@drawable/tracking_protection_toolbar_illustration"
-                   android:layout_gravity="center"
-                   android:layout_marginTop="40dp"
-                   android:layout_marginBottom="20dp" />
+        <ScrollView android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:fillViewport="true"
+                    android:fadeScrollbars="false">
+
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
 
-        <TextView
-                android:id="@+id/title"
-                android:layout_width="@dimen/overlay_prompt_content_width"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:fontFamily="sans-serif-light"
-                android:gravity="center_horizontal"
-                android:text="@string/tracking_protection_prompt_title"
-                android:textColor="@color/text_and_tabs_tray_grey"
-                android:textSize="20sp"
+                <ImageView android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:src="@drawable/tracking_protection_toolbar_illustration"
+                           android:layout_gravity="center"
+                           android:layout_marginTop="40dp"
+                           android:layout_marginBottom="20dp"/>
 
-                tools:text="Now with Tracking Protection"/>
+                <TextView
+                        android:id="@+id/title"
+                        android:layout_width="@dimen/overlay_prompt_content_width"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:fontFamily="sans-serif-light"
+                        android:gravity="center_horizontal"
+                        android:text="@string/tracking_protection_prompt_title"
+                        android:textColor="@color/text_and_tabs_tray_grey"
+                        android:textSize="20sp"
 
-        <TextView
-                android:id="@+id/text"
-                android:layout_width="@dimen/overlay_prompt_content_width"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:lineSpacingMultiplier="1.25"
-                android:paddingTop="20dp"
-                android:text="@string/tracking_protection_prompt_text"
-                android:textColor="@color/placeholder_grey"
-                android:textSize="16sp"
+                        tools:text="Now with Tracking Protection"/>
 
-                tools:text="Actively block tracking elements so you don't have to worry."/>
+                <TextView
+                        android:id="@+id/text"
+                        android:layout_width="@dimen/overlay_prompt_content_width"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:lineSpacingMultiplier="1.25"
+                        android:paddingTop="20dp"
+                        android:text="@string/tracking_protection_prompt_text"
+                        android:textColor="@color/placeholder_grey"
+                        android:textSize="16sp"
+
+                        tools:text="Actively block tracking elements so you don't have to worry."/>
 
-        <TextView
-                android:id="@+id/link_text"
-                android:layout_width="@dimen/overlay_prompt_content_width"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:paddingBottom="30dp"
-                android:paddingTop="20dp"
-                android:text="@string/tracking_protection_prompt_tip_text"
-                android:textColor="@color/link_blue"
-                android:textSize="14sp"
+                <TextView
+                        android:id="@+id/link_text"
+                        android:layout_width="@dimen/overlay_prompt_content_width"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:paddingBottom="30dp"
+                        android:paddingTop="20dp"
+                        android:text="@string/tracking_protection_prompt_tip_text"
+                        android:textColor="@color/link_blue"
+                        android:textSize="14sp"
 
-                tools:text="Visit Privacy settings to learn more"/>
+                        tools:text="Visit Privacy settings to learn more"/>
 
+            </LinearLayout>
+
+        </ScrollView>
 
         <Button
                 android:id="@+id/ok_button"
                 style="@style/Widget.BaseButton"
                 android:layout_width="match_parent"
 
                 android:layout_height="52dp"
                 android:layout_gravity="center"
-                android:layout_marginBottom="40dp"
                 android:background="@drawable/button_background_action_orange_round"
                 android:text="@string/tracking_protection_prompt_action_button"
                 android:textColor="@android:color/white"
                 android:textSize="16sp"
 
                 android:layout_marginLeft="32dp"
                 android:layout_marginRight="32dp"
                 tools:text="Got it"/>
 
     </LinearLayout>
+
 </merge>