зеркало из https://github.com/mozilla/gecko-dev.git
Bug 869494 - Rename mAwesomeBarContent to mUrlDisplayContainer in BrowserToolbar (r=mfinkle)
This commit is contained in:
Родитель
6b7f0d2a12
Коммит
3d52ca97fb
|
@ -66,7 +66,7 @@ public class BrowserToolbar implements Tabs.OnTabsChangedListener,
|
|||
public static final String PREF_TITLEBAR_MODE = "browser.chrome.titlebarMode";
|
||||
private GeckoRelativeLayout mLayout;
|
||||
private LayoutParams mAwesomeBarParams;
|
||||
private View mAwesomeBarContent;
|
||||
private View mUrlDisplayContainer;
|
||||
private View mAwesomeBarEntry;
|
||||
private ImageView mAwesomeBarRightEdge;
|
||||
private BrowserToolbarBackground mAddressBarBg;
|
||||
|
@ -228,7 +228,7 @@ public class BrowserToolbar implements Tabs.OnTabsChangedListener,
|
|||
mAddressBarBg = (BrowserToolbarBackground) mLayout.findViewById(R.id.address_bar_bg);
|
||||
mAddressBarViewOffset = mActivity.getResources().getDimensionPixelSize(R.dimen.addressbar_offset_left);
|
||||
mDefaultForwardMargin = mActivity.getResources().getDimensionPixelSize(R.dimen.forward_default_offset);
|
||||
mAwesomeBarContent = mLayout.findViewById(R.id.awesome_bar_content);
|
||||
mUrlDisplayContainer = mLayout.findViewById(R.id.awesome_bar_display_container);
|
||||
mAwesomeBarEntry = mLayout.findViewById(R.id.awesome_bar_entry);
|
||||
|
||||
// This will clip the right edge's image at half of its width
|
||||
|
@ -1035,9 +1035,9 @@ public class BrowserToolbar implements Tabs.OnTabsChangedListener,
|
|||
// Set the margin before the transition when hiding the forward button. We
|
||||
// have to do this so that the favicon isn't clipped during the transition
|
||||
ViewGroup.MarginLayoutParams layoutParams =
|
||||
(ViewGroup.MarginLayoutParams)mAwesomeBarContent.getLayoutParams();
|
||||
(ViewGroup.MarginLayoutParams)mUrlDisplayContainer.getLayoutParams();
|
||||
layoutParams.leftMargin = 0;
|
||||
mAwesomeBarContent.requestLayout();
|
||||
mUrlDisplayContainer.requestLayout();
|
||||
// Note, we already translated the favicon, site security, and text field
|
||||
// in prepareForwardAnimation, so they should appear to have not moved at
|
||||
// all at this point.
|
||||
|
@ -1048,7 +1048,7 @@ public class BrowserToolbar implements Tabs.OnTabsChangedListener,
|
|||
public void onPropertyAnimationEnd() {
|
||||
if (enabled) {
|
||||
ViewGroup.MarginLayoutParams layoutParams =
|
||||
(ViewGroup.MarginLayoutParams)mAwesomeBarContent.getLayoutParams();
|
||||
(ViewGroup.MarginLayoutParams)mUrlDisplayContainer.getLayoutParams();
|
||||
layoutParams.leftMargin = mAddressBarViewOffset;
|
||||
|
||||
ViewHelper.setTranslationX(mTitle, 0);
|
||||
|
@ -1061,7 +1061,7 @@ public class BrowserToolbar implements Tabs.OnTabsChangedListener,
|
|||
layoutParams.leftMargin = mDefaultForwardMargin + (mForward.isEnabled() ? mForward.getWidth() / 2 : 0);
|
||||
ViewHelper.setTranslationX(mForward, 0);
|
||||
|
||||
mAwesomeBarContent.requestLayout();
|
||||
mUrlDisplayContainer.requestLayout();
|
||||
mForwardAnim = null;
|
||||
}
|
||||
});
|
||||
|
|
|
@ -69,7 +69,7 @@
|
|||
android:contentDescription="@string/back"
|
||||
android:background="@drawable/address_bar_nav_button"/>
|
||||
|
||||
<LinearLayout android:id="@+id/awesome_bar_content"
|
||||
<LinearLayout android:id="@+id/awesome_bar_display_container"
|
||||
style="@style/AddressBar.Button.Container"
|
||||
android:layout_toRightOf="@id/back"
|
||||
android:layout_toLeftOf="@id/menu_items">
|
||||
|
|
|
@ -97,7 +97,7 @@
|
|||
android:layout_marginTop="12dip"
|
||||
android:layout_alignRight="@id/tabs"/>
|
||||
|
||||
<LinearLayout android:id="@+id/awesome_bar_content"
|
||||
<LinearLayout android:id="@+id/awesome_bar_display_container"
|
||||
style="@style/AddressBar.Button"
|
||||
android:layout_toLeftOf="@id/tabs"
|
||||
android:layout_marginRight="-24dp"
|
||||
|
|
Загрузка…
Ссылка в новой задаче