Backed out 2 changesets (bug 1058852) for Android 2.3 reftest orange

Backed out changeset 512b16337fa9 (bug 1058852)
Backed out changeset 30684d07599d (bug 1058852)

mobile/android/base/resources/layout/fxaccount_status.xml

@@ -0,0 +1,118 @@
+<?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_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true" >
+
+    <LinearLayout
+        android:id="@+id/existing_user"
+        style="@style/FxAccountMiddle" >
+
+        <TextView
+            style="@style/FxAccountHeaderItem"
+            android:text="@string/fxaccount_status_header" >
+        </TextView>
+
+        <TextView
+            android:id="@+id/email"
+            style="@style/FxAccountTextItem" >
+        </TextView>
+
+        <TextView
+            android:id="@+id/sync_status_text"
+            style="@style/FxAccountHeaderItem"
+            android:text="@string/fxaccount_status_sync" >
+        </TextView>
+
+        <ViewFlipper
+            android:id="@+id/connection_status_view"
+            style="@style/FxAccountTextItem"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
+
+            <TextView
+                android:id="@+id/needs_upgrade_view"
+                style="@style/FxAccountTextItem"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:background="#fad4d2"
+                android:drawablePadding="10dp"
+                android:drawableStart="@drawable/fxaccount_sync_error"
+                android:gravity="center_vertical"
+                android:padding="10dp"
+                android:text="@string/fxaccount_status_needs_upgrade" >
+            </TextView>
+
+            <TextView
+                android:id="@+id/sign_in_view"
+                style="@style/FxAccountTextItem"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:background="#fad4d2"
+                android:drawablePadding="10dp"
+                android:drawableStart="@drawable/fxaccount_sync_error"
+                android:gravity="center_vertical"
+                android:padding="10dp"
+                android:text="@string/fxaccount_status_needs_credentials" >
+            </TextView>
+
+            <TextView
+                android:id="@+id/unverified_view"
+                style="@style/FxAccountTextItem"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:background="#fad4d2"
+                android:drawablePadding="10dp"
+                android:drawableStart="@drawable/fxaccount_sync_error"
+                android:gravity="center_vertical"
+                android:padding="10dp"
+                android:text="@string/fxaccount_status_needs_verification" >
+            </TextView>
+        </ViewFlipper>
+
+        <CheckBox
+            android:id="@+id/bookmarks_checkbox"
+            style="@style/FxAccountCheckBox"
+            android:text="@string/fxaccount_status_bookmarks" />
+
+        <CheckBox
+            android:id="@+id/history_checkbox"
+            style="@style/FxAccountCheckBox"
+            android:text="@string/fxaccount_status_history" />
+
+        <CheckBox
+            android:id="@+id/tabs_checkbox"
+            style="@style/FxAccountCheckBox"
+            android:text="@string/fxaccount_status_tabs" />
+
+        <CheckBox
+            android:id="@+id/passwords_checkbox"
+            style="@style/FxAccountCheckBox"
+            android:text="@string/fxaccount_status_passwords" />
+
+        <TextView
+            style="@style/FxAccountHeaderItem"
+            android:text="@string/fxaccount_status_legal" >
+        </TextView>
+
+        <TextView
+            android:id="@+id/fxaccount_status_linktos"
+            style="@style/FxAccountLinkifiedItem"
+            android:text="@string/fxaccount_policy_linktos" />
+
+        <TextView
+            android:id="@+id/fxaccount_status_linkprivacy"
+            style="@style/FxAccountLinkifiedItem"
+            android:text="@string/fxaccount_policy_linkprivacy" />
+    </LinearLayout>
+
+</ScrollView>

mobile/android/base/resources/layout/home_panel_picker.xml

@@ -0,0 +1,19 @@
+<?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/. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:layout_marginLeft="15dp"
+              android:layout_marginRight="6dp"
+              android:layout_marginTop="6dp"
+              android:layout_marginBottom="6dp">
+
+    <ListView android:id="@+id/list"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent" />
+
+</LinearLayout>

mobile/android/base/resources/layout/home_panel_picker_empty.xml

@@ -0,0 +1,11 @@
+<?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/. -->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"
+          android:padding="15dp"
+          android:textAppearance="?android:attr/textAppearanceSmall"
+          android:text="@string/home_add_panel_empty" />

mobile/android/base/resources/layout/home_panel_picker_row.xml

@@ -0,0 +1,18 @@
+<?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/. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:minHeight="?android:attr/listPreferredItemHeight"
+              android:orientation="horizontal">
+
+    <TextView android:id="@+id/title"
+              android:textAppearance="?android:attr/textAppearanceMedium"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:gravity="center_vertical" />
+
+</LinearLayout>

mobile/android/base/resources/layout/launch_app_list.xml

@@ -0,0 +1,10 @@
+<?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/. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:padding="3dip"
+              android:windowIsFloating="true"/>

mobile/android/base/resources/layout/launch_app_listitem.xml

@@ -0,0 +1,30 @@
+<?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/. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="?android:attr/listPreferredItemHeight"
+              android:paddingLeft="16dip"
+              android:paddingRight="16dip"
+              android:orientation="horizontal"
+              android:gravity="left">
+  
+   <ImageView android:id="@+id/favicon"
+              android:layout_width="48dip"
+              android:layout_height="48dip"
+              android:layout_marginRight="12dip"
+              android:layout_gravity="center_vertical"
+              android:adjustViewBounds="true"
+              android:scaleType="fitCenter"/>
+
+   <TextView android:id="@+id/title"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:gravity="center_vertical"
+             android:textAppearance="?android:attr/textAppearanceLargeInverse"
+             android:ellipsize="marquee"
+             android:fadingEdge="horizontal"/>
+
+ </LinearLayout>

mobile/android/base/resources/layout/videoplayer.xml

@@ -0,0 +1,16 @@
+<?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/. -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+  <VideoView
+      android:layout_height="match_parent"
+      android:layout_width="match_parent"
+      android:layout_gravity="center"
+      android:id="@+id/VideoView" />
+</LinearLayout>