Backout part 1 of bug 1162930 for wrong resource. r=bustage
authorChenxia Liu <liuche@mozilla.com>
Tue, 11 Aug 2015 17:19:46 -0700
changeset 289953 f7a42f684d2da9da9804ed3f458c4c0b7e288bf4
parent 289952 87cace3f3eac614c9f3d3a2b1ee8d2c9f17b8fb8
child 289954 e0c68e7e82af4203ed7df249a4899d8112419419
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1162930
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout part 1 of bug 1162930 for wrong resource. r=bustage
mobile/android/base/resources/drawable-hdpi/firstrun_background_coffee.png
mobile/android/base/resources/drawable-large-hdpi-v11/firstrun_background_coffee.png
mobile/android/base/resources/drawable-large-xhdpi-v11/firstrun_background_coffee.png
mobile/android/base/resources/drawable-large-xxhdpi-v11/firstrun_background_coffee.png
mobile/android/base/resources/drawable-xhdpi/firstrun_background_coffee.png
mobile/android/base/resources/drawable-xxhdpi/firstrun_background_coffee.png
mobile/android/base/resources/layout-mdpi/firstrun_welcome_fragment.xml
mobile/android/base/resources/layout/firstrun_welcome_fragment.xml
mobile/android/base/resources/values-large-v11/dimens.xml
mobile/android/base/resources/values/dimens.xml
deleted file mode 100644
index 6e4f718c7f98c5e9e57e6d3df0f331d49efec9f9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 593e4d56c56efbb5e93818d4f28655cd177e79ca..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 97211617cd7322f3830b48a72cebe30d2d895994..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 2067432c0bb5fa858de0fec49df2ec0e6da3b8a6..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 97534e000414604b4286f1a260e46915855bc921..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index dcae6ae7272d1ec93d29e269a6080ec458b4ae6e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
--- /dev/null
+++ b/mobile/android/base/resources/layout-mdpi/firstrun_welcome_fragment.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:fillViewport="true">
+
+    <LinearLayout android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:minHeight="@dimen/firstrun_min_height"
+                  android:orientation="vertical">
+
+       <LinearLayout android:layout_width="match_parent"
+                     android:layout_height="0dp"
+                     android:layout_weight="21"
+                     android:orientation="vertical"
+                     android:gravity="center"
+                     android:padding="10dp">
+
+           <ImageView android:layout_width="100dp"
+                      android:layout_height="100dp"
+                      android:layout_gravity="center"
+                      android:src="@drawable/large_icon"/>
+
+        </LinearLayout>
+        <LinearLayout android:layout_width="match_parent"
+                      android:layout_height="0dp"
+                      android:layout_weight="29"
+                      android:orientation="vertical"
+                      android:gravity="center_horizontal"
+                      android:background="@color/android:white">
+
+            <TextView android:layout_width="@dimen/firstrun_content_width"
+                      android:layout_height="wrap_content"
+                      android:gravity="center_horizontal"
+                      android:paddingTop="30dp"
+                      android:textAppearance="@style/TextAppearance.FirstrunLight.Main"
+                      android:text="@string/firstrun_welcome_message"/>
+
+            <TextView android:layout_width="@dimen/firstrun_content_width"
+                      android:layout_height="wrap_content"
+                      android:paddingTop="20dp"
+                      android:paddingBottom="30dp"
+                      android:gravity="center"
+                      android:textAppearance="@style/TextAppearance.FirstrunRegular.Body"
+                      android:text="@string/firstrun_welcome_subtext"/>
+
+            <Button android:id="@+id/welcome_account"
+                    style="@style/Widget.Firstrun.Button"
+                    android:background="@drawable/button_background_action_orange_round"
+                    android:layout_gravity="center"
+                    android:text="@string/firstrun_welcome_button_account"/>
+
+            <TextView android:id="@+id/welcome_browse"
+                      android:layout_width="@dimen/firstrun_content_width"
+                      android:layout_height="wrap_content"
+                      android:minHeight="92dp"
+                      android:padding="20dp"
+                      android:gravity="center"
+                      android:textAppearance="@style/TextAppearance.FirstrunRegular.Link"
+                      android:text="@string/firstrun_welcome_button_browser"/>
+        </LinearLayout>
+    </LinearLayout>
+</ScrollView>
--- a/mobile/android/base/resources/layout/firstrun_welcome_fragment.xml
+++ b/mobile/android/base/resources/layout/firstrun_welcome_fragment.xml
@@ -8,58 +8,61 @@
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:orientation="vertical"
             android:fillViewport="true">
 
     <LinearLayout android:layout_width="match_parent"
                   android:layout_height="match_parent"
                   android:minHeight="@dimen/firstrun_min_height"
-                  android:background="@color/android:white"
-                  android:gravity="center_horizontal"
                   android:orientation="vertical">
 
-        <FrameLayout android:layout_width="match_parent"
-                     android:layout_height="wrap_content"
-                     android:background="@color/link_blue">
+       <LinearLayout android:layout_width="match_parent"
+                     android:layout_height="0dp"
+                     android:layout_weight="21"
+                     android:orientation="vertical"
+                     android:gravity="center"
+                     android:padding="10dp">
 
-            <ImageView android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:layout_gravity="center"
-                       android:adjustViewBounds="true"
-                       android:src="@drawable/firstrun_background_coffee"/>
+           <ImageView android:layout_width="100dp"
+                      android:layout_height="100dp"
+                      android:layout_gravity="center"
+                      android:src="@drawable/large_icon"/>
 
-            <ImageView android:layout_width="@dimen/firstrun_brand_size"
-                       android:layout_height="@dimen/firstrun_brand_size"
-                       android:src="@drawable/large-icon"
-                       android:layout_gravity="center"/>
-        </FrameLayout>
+        </LinearLayout>
+        <LinearLayout android:layout_width="match_parent"
+                      android:layout_height="0dp"
+                      android:layout_weight="29"
+                      android:orientation="vertical"
+                      android:gravity="center_horizontal"
+                      android:background="@color/android:white">
 
-        <TextView android:layout_width="@dimen/firstrun_content_width"
-                  android:layout_height="wrap_content"
-                  android:gravity="center"
-                  android:paddingTop="30dp"
-                  android:textAppearance="@style/TextAppearance.FirstrunLight.Main"
-                  android:text="@string/firstrun_welcome_message"/>
+            <TextView android:layout_width="@dimen/firstrun_content_width"
+                      android:layout_height="wrap_content"
+                      android:gravity="center_horizontal"
+                      android:paddingTop="30dp"
+                      android:textAppearance="@style/TextAppearance.FirstrunLight.Main"
+                      android:text="@string/firstrun_welcome_message"/>
+
+            <TextView android:layout_width="@dimen/firstrun_content_width"
+                      android:layout_height="wrap_content"
+                      android:paddingTop="20dp"
+                      android:paddingBottom="30dp"
+                      android:gravity="center"
+                      android:textAppearance="@style/TextAppearance.FirstrunRegular.Body"
+                      android:text="@string/firstrun_welcome_subtext"/>
 
-        <TextView android:layout_width="@dimen/firstrun_content_width"
-                  android:layout_height="wrap_content"
-                  android:paddingTop="20dp"
-                  android:paddingBottom="30dp"
-                  android:gravity="center"
-                  android:textAppearance="@style/TextAppearance.FirstrunRegular.Body"
-                  android:text="@string/firstrun_welcome_subtext"/>
+            <Button android:id="@+id/welcome_account"
+                    style="@style/Widget.Firstrun.Button"
+                    android:background="@drawable/button_background_action_orange_round"
+                    android:layout_gravity="center"
+                    android:text="@string/firstrun_welcome_button_account"/>
 
-        <Button android:id="@+id/welcome_account"
-                style="@style/Widget.Firstrun.Button"
-                android:background="@drawable/button_background_action_orange_round"
-                android:layout_gravity="center"
-                android:text="@string/firstrun_welcome_button_account"/>
-
-        <TextView android:id="@+id/welcome_browse"
-                  android:layout_width="@dimen/firstrun_content_width"
-                  android:layout_height="wrap_content"
-                  android:padding="20dp"
-                  android:gravity="center"
-                  android:textAppearance="@style/TextAppearance.FirstrunRegular.Link"
-                  android:text="@string/firstrun_welcome_button_browser"/>
+            <TextView android:id="@+id/welcome_browse"
+                      android:layout_width="@dimen/firstrun_content_width"
+                      android:layout_height="wrap_content"
+                      android:padding="20dp"
+                      android:gravity="center"
+                      android:textAppearance="@style/TextAppearance.FirstrunRegular.Link"
+                      android:text="@string/firstrun_welcome_button_browser"/>
+        </LinearLayout>
     </LinearLayout>
 </ScrollView>
--- a/mobile/android/base/resources/values-large-v11/dimens.xml
+++ b/mobile/android/base/resources/values-large-v11/dimens.xml
@@ -19,18 +19,16 @@
 
     <dimen name="browser_toolbar_site_security_height">60dp</dimen>
     <dimen name="browser_toolbar_site_security_width">34dp</dimen>
     <dimen name="browser_toolbar_site_security_margin_right">1dp</dimen>
     <!-- We primarily use padding (instead of margins) to increase the hit area. -->
     <dimen name="browser_toolbar_site_security_padding_vertical">21dp</dimen>
     <dimen name="browser_toolbar_site_security_padding_horizontal">8dp</dimen>
 
-    <dimen name="firstrun_brand_size">72dp</dimen>
-
     <dimen name="tabs_panel_indicator_width">72dp</dimen>
     <dimen name="tabs_panel_button_width">60dp</dimen>
     <dimen name="panel_grid_view_column_width">200dp</dimen>
 
     <dimen name="reading_list_row_height">96dp</dimen>
     <dimen name="reading_list_row_padding_right">15dp</dimen>
 
     <dimen name="overlay_prompt_container_width">360dp</dimen>
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -55,17 +55,16 @@
          redesign sometime after this is written) you should increase this value to the largest
          commonly-used size of favicon and, performance permitting, fetch the remainder from the
          database. The largest available size is always stored in the database, regardless of this
          value.-->
     <dimen name="favicon_largest_interesting_size">32dp</dimen>
 
     <dimen name="firstrun_content_width">300dp</dimen>
     <dimen name="firstrun_min_height">180dp</dimen>
-    <dimen name="firstrun_brand_size">48dp</dimen>
 
     <dimen name="overlay_prompt_content_width">260dp</dimen>
     <dimen name="overlay_prompt_button_width">148dp</dimen>
     <dimen name="overlay_prompt_container_width">@dimen/match_parent</dimen>
 
     <!-- Site security icon -->
     <dimen name="browser_toolbar_site_security_height">@dimen/match_parent</dimen>
     <dimen name="browser_toolbar_site_security_width">12dp</dimen>