author | Martyn Haigh <mhaigh@mozilla.org> |
Wed, 17 Jun 2015 15:36:39 +0100 | |
changeset 249383 | 3ad027df2594fcbfed3e993bb0450a84c6f06524 |
parent 249186 | 012aa1862a20dd0c316a36a3c7e11ce5af3e1bb2 |
child 249384 | 002f738e36f0eb4aa3d20f3b7a0b1244395daff2 |
push id | 28924 |
push user | ryanvm@gmail.com |
push date | Wed, 17 Jun 2015 19:01:32 +0000 |
treeherder | mozilla-central@a3f280b6f8d5 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mcomella |
bugs | 1174845 |
milestone | 41.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
|
mobile/android/base/resources/drawable-hdpi/menu_pb.png | file | annotate | diff | comparison | revisions | |
mobile/android/base/resources/drawable-mdpi/menu_pb.png | file | annotate | diff | comparison | revisions | |
mobile/android/base/resources/drawable-xhdpi/menu_pb.png | file | annotate | diff | comparison | revisions | |
mobile/android/base/resources/drawable/menu_level.xml | file | annotate | diff | comparison | revisions | |
mobile/android/base/resources/layout/browser_toolbar.xml | file | annotate | diff | comparison | revisions | |
mobile/android/base/toolbar/BrowserToolbar.java | file | annotate | diff | comparison | revisions |
deleted file mode 100644 index af190aa7a01c32d430bcffbf82dd774027e9c2e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@<O00001
deleted file mode 100644 index aa79b84abfd94f69a3b30e82d181978cae140860..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@<O00001
deleted file mode 100644 index ce7edea6361a093f502fceee7acb14bf9d43b3d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@<O00001
deleted file mode 100644 --- a/mobile/android/base/resources/drawable/menu_level.xml +++ /dev/null @@ -1,22 +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/. --> - -<level-list xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:gecko="http://schemas.android.com/apk/res-auto"> - - <item android:maxLevel="1"> - - <selector> - - <item gecko:state_private="true" android:drawable="@drawable/menu_pb"/> - <item android:drawable="@drawable/menu"/> - - </selector> - - </item> - - <item android:maxLevel="2" android:drawable="@android:color/transparent"/> - -</level-list>
--- a/mobile/android/base/resources/layout/browser_toolbar.xml +++ b/mobile/android/base/resources/layout/browser_toolbar.xml @@ -43,17 +43,17 @@ android:background="@drawable/shaped_button" android:visibility="gone"/> <org.mozilla.gecko.widget.ThemedImageView android:id="@+id/menu_icon" style="@style/UrlBar.ImageButton" android:layout_alignLeft="@id/menu" android:layout_alignRight="@id/menu" android:gravity="center_vertical" - android:src="@drawable/menu_level" + android:src="@drawable/menu" android:visibility="gone"/> <org.mozilla.gecko.toolbar.PhoneTabsButton android:id="@+id/tabs" style="@style/UrlBar.ImageButton" android:layout_width="64dip" android:layout_toLeftOf="@id/menu" android:layout_alignWithParentIfMissing="true" android:background="@drawable/shaped_button"/>
--- a/mobile/android/base/toolbar/BrowserToolbar.java +++ b/mobile/android/base/toolbar/BrowserToolbar.java @@ -831,17 +831,16 @@ public abstract class BrowserToolbar ext } @Override public void setPrivateMode(boolean isPrivate) { super.setPrivateMode(isPrivate); tabsButton.setPrivateMode(isPrivate); menuButton.setPrivateMode(isPrivate); - menuIcon.setPrivateMode(isPrivate); urlEditLayout.setPrivateMode(isPrivate); } public void show() { setVisibility(View.VISIBLE); } public void hide() {