Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 13:55:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge fx-team to m-c. a=merge

Browse Source
This commit is contained in:
Ryan VanderMeulen 2015-06-29 13:41:12 -04:00
commit 794982e82a
5 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
browser/themes/windows/devedition.css
View File

@ -200,3 +200,10 @@
.tab-close-button[visuallyselected=true]:not(:hover) {
-moz-image-region: rect(0, 64px, 16px, 48px);
}
@media (min-resolution: 1.1dppx) {
.tab-close-button[visuallyselected=true]:not(:hover) {
-moz-image-region: rect(0px, 128px, 32px, 96px);
}
}

1
mobile/android/base/BrowserApp.java
View File

@ -1471,7 +1471,6 @@ public class BrowserApp extends GeckoApp
TransitionsTracker.track(alphaAnimator);
alphaAnimator.start();
}
@Override

10
mobile/android/base/menu/MenuPopup.java
View File

@ -13,14 +13,14 @@ import android.graphics.drawable.ColorDrawable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.FrameLayout;
import android.widget.PopupWindow;
/**
* A popup to show the inflated MenuPanel.
*/
public class MenuPopup extends PopupWindow {
private final LinearLayout mPanel;
private final FrameLayout mPanel;
private final int mYOffset;
private final int mPopupWidth;
@ -41,7 +41,7 @@ public class MenuPopup extends PopupWindow {
ViewGroup.LayoutParams.WRAP_CONTENT);
LayoutInflater inflater = LayoutInflater.from(context);
mPanel = (LinearLayout) inflater.inflate(R.layout.menu_popup, null);
mPanel = (FrameLayout) inflater.inflate(R.layout.menu_popup, null);
setContentView(mPanel);
setAnimationStyle(R.style.PopupAnimation);
@ -53,8 +53,8 @@ public class MenuPopup extends PopupWindow {
* @param view The panel view with the menu to be shown.
*/
public void setPanelView(View view) {
view.setLayoutParams(new LinearLayout.LayoutParams(mPopupWidth,
LinearLayout.LayoutParams.WRAP_CONTENT));
view.setLayoutParams(new FrameLayout.LayoutParams(mPopupWidth,
FrameLayout.LayoutParams.WRAP_CONTENT));
mPanel.removeAllViews();
mPanel.addView(view);

15
mobile/android/base/resources/layout/gecko_app.xml
View File

@ -57,14 +57,13 @@
</FrameLayout>
<LinearLayout android:id="@+id/doorhanger_overlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/dark_transparent_overlay"
android:visibility="gone"
android:alpha="0"
android:layerType="hardware"
android:orientation="horizontal" />
<View android:id="@+id/doorhanger_overlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/dark_transparent_overlay"
android:visibility="gone"
android:alpha="0"
android:layerType="hardware"/>
</RelativeLayout>

7
mobile/android/base/resources/layout/menu_popup.xml
View File

@ -3,15 +3,14 @@
- 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"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/menu_panel"
android:layout_width="@dimen/menu_popup_width"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:minWidth="@dimen/menu_popup_width"
android:background="@drawable/menu_popup_bg"
android:orientation="horizontal">
android:background="@drawable/menu_popup_bg">
<!-- MenuPanel will be added here dynamically -->
</LinearLayout>
</FrameLayout>