Backed out changeset 5350f45b9724 (bug 1366671) on request from flod. r=backout a=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Fri, 21 Jul 2017 12:58:05 +0200
changeset 418734 874cdf9f9c9e668a587963b6fd219b272050a190
parent 418733 1acc7a08d914694e4f9eb244cb193c8ca6d27865
child 418735 417eea89f792059e88be5e217e6f1a5cecf2d3d0
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout, backout
bugs1366671
milestone56.0a1
backs out5350f45b972428ecb57323a78e9d42a31800ebd7
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
Backed out changeset 5350f45b9724 (bug 1366671) on request from flod. r=backout a=backout MozReview-Commit-ID: 7PXCgF8Vcer
mobile/android/app/src/australis/res/drawable-hdpi/tip_addsearch.png
mobile/android/app/src/australis/res/drawable-xhdpi/tip_addsearch.png
mobile/android/app/src/australis/res/layout/preference_search_tip.xml
mobile/android/app/src/australis/res/layout/private_tabs_panel.xml
mobile/android/app/src/main/res/drawable-hdpi/tip_addsearch.png
mobile/android/app/src/main/res/drawable-xhdpi/tip_addsearch.png
mobile/android/app/src/main/res/layout/preference_search_tip.xml
mobile/android/app/src/main/res/layout/private_tabs_panel.xml
mobile/android/app/src/photon/res/drawable-hdpi/tip_addsearch.png
mobile/android/app/src/photon/res/drawable-mdpi/tip_addsearch.png
mobile/android/app/src/photon/res/drawable-xhdpi/tip_addsearch.png
mobile/android/app/src/photon/res/drawable-xxhdpi/tip_addsearch.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/tip_addsearch.png
mobile/android/app/src/photon/res/layout/preference_search_tip.xml
mobile/android/app/src/photon/res/layout/private_tabs_panel.xml
rename from mobile/android/app/src/australis/res/drawable-hdpi/tip_addsearch.png
rename to mobile/android/app/src/main/res/drawable-hdpi/tip_addsearch.png
rename from mobile/android/app/src/australis/res/drawable-xhdpi/tip_addsearch.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/tip_addsearch.png
rename from mobile/android/app/src/australis/res/layout/preference_search_tip.xml
rename to mobile/android/app/src/main/res/layout/preference_search_tip.xml
rename from mobile/android/app/src/australis/res/layout/private_tabs_panel.xml
rename to mobile/android/app/src/main/res/layout/private_tabs_panel.xml
deleted file mode 100644
index e415636a3df781525cd913db0fd67b1f11dc77f2..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 62558ce3dc8d1739710956b7f3e33d6d49118961..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 11da076aa7d85d6361d6847125c3fc48f1e01159..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index de8721e606c28f9145f376e3ad7b83fe6f4d0101..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a7e688ea200160b5b1bd816cd39fe214153afb7e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/mobile/android/app/src/photon/res/layout/preference_search_tip.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/. -->
-
-<!-- Ignore UseCompoundDrawables because they caused a regression in bug 1208790. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              tools:ignore="UseCompoundDrawables"
-              android:orientation="horizontal"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:paddingRight="?android:attr/scrollbarSize">
-
-    <TextView android:id="@+id/label_search_hint"
-              android:layout_height="wrap_content"
-              android:layout_width="0dp"
-              android:text="@string/pref_search_hint"
-              android:layout_marginTop="5dip"
-              android:layout_marginBottom="6dip"
-              android:layout_marginLeft="15dip"
-              android:layout_marginRight="6dip"
-              android:paddingTop="8dp"
-              android:paddingBottom="8dp"
-              android:paddingRight="6dip"
-              android:layout_weight="1"/>
-
-    <ImageView android:layout_height="wrap_content"
-               android:layout_width="wrap_content"
-               android:paddingRight="8dp"
-               android:paddingTop="12dip"
-               android:src="@drawable/tip_addsearch"/>
-
-</LinearLayout>
deleted file mode 100644
--- a/mobile/android/app/src/photon/res/layout/private_tabs_panel.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/. -->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:gecko="http://schemas.android.com/apk/res-auto">
-
-    <ImageView android:id="@+id/private_tabs_empty"
-               android:layout_height="wrap_content"
-               android:layout_width="wrap_content"
-               android:src="@drawable/private_masq"
-               android:layout_gravity="center"/>
-
-    <!-- Note: for an unknown reason, scrolling in the TabsLayout
-         does not work unless it is laid out after the empty view. -->
-    <view class="org.mozilla.gecko.tabs.TabsPanel$TabsLayout"
-          android:id="@+id/private_tabs_layout"
-          style="@style/TabsLayout"
-          android:layout_width="match_parent"
-          android:layout_height="match_parent"
-          gecko:tabs="tabs_private"/>
-
-</merge>