--- a/mobile/android/base/AwesomeBar.java
+++ b/mobile/android/base/AwesomeBar.java
@@ -140,17 +140,17 @@ public class AwesomeBar extends GeckoAct
mText.setText(currentUrl);
mText.selectAll();
}
mTarget = intent.getStringExtra(TARGET_KEY);
if (mTarget.equals(Target.CURRENT_TAB.name())) {
Tab tab = Tabs.getInstance().getSelectedTab();
if (tab != null && tab.isPrivate()) {
- BrowserToolbarBackground mAddressBarBg = (BrowserToolbarBackground) findViewById(R.id.address_bar_bg);
+ BrowserToolbarBackground mAddressBarBg = (BrowserToolbarBackground) findViewById(R.id.url_bar_bg);
mAddressBarBg.setPrivateMode(true);
ShapedButton mTabs = (ShapedButton) findViewById(R.id.dummy_tab);
if (mTabs != null)
mTabs.setPrivateMode(true);
mText.setPrivateMode(true);
}
@@ -297,38 +297,38 @@ public class AwesomeBar extends GeckoAct
private void updateGoButton(String text) {
if (text.length() == 0) {
mGoButton.setVisibility(View.GONE);
return;
}
mGoButton.setVisibility(View.VISIBLE);
- int imageResource = R.drawable.ic_awesomebar_go;
+ int imageResource = R.drawable.ic_url_bar_go;
String contentDescription = getString(R.string.go);
int imeAction = EditorInfo.IME_ACTION_GO;
int actionBits = mText.getImeOptions() & EditorInfo.IME_MASK_ACTION;
if (StringUtils.isSearchQuery(text, actionBits == EditorInfo.IME_ACTION_SEARCH)) {
- imageResource = R.drawable.ic_awesomebar_search;
+ imageResource = R.drawable.ic_url_bar_search;
contentDescription = getString(R.string.search);
imeAction = EditorInfo.IME_ACTION_SEARCH;
}
InputMethodManager imm = InputMethods.getInputMethodManager(mText.getContext());
if (imm == null) {
return;
}
boolean restartInput = false;
if (actionBits != imeAction) {
int optionBits = mText.getImeOptions() & ~EditorInfo.IME_MASK_ACTION;
mText.setImeOptions(optionBits | imeAction);
mDelayRestartInput = (imeAction == EditorInfo.IME_ACTION_GO) &&
- (InputMethods.shouldDelayAwesomebarUpdate(mText.getContext()));
+ (InputMethods.shouldDelayUrlBarUpdate(mText.getContext()));
if (!mDelayRestartInput) {
restartInput = true;
}
} else if (mDelayRestartInput) {
// Only call delayed restartInput when actionBits == imeAction
// so if there are two restarts in a row, the first restarts will
// be discarded and the second restart will be properly delayed
mDelayRestartInput = false;
--- a/mobile/android/base/AwesomeBarTabs.java
+++ b/mobile/android/base/AwesomeBarTabs.java
@@ -370,13 +370,13 @@ public class AwesomeBarTabs extends TabH
@Override
public void onLightweightThemeReset() {
int[] padding = new int[] { getPaddingLeft(),
getPaddingTop(),
getPaddingRight(),
getPaddingBottom()
};
- setBackgroundResource(R.drawable.address_bar_bg);
+ setBackgroundResource(R.drawable.url_bar_bg);
setPadding(padding[0], padding[1], padding[2], padding[3]);
}
}
}
--- a/mobile/android/base/BackButton.java
+++ b/mobile/android/base/BackButton.java
@@ -68,17 +68,17 @@ public class BackButton extends ShapedBu
@Override
public void draw(Canvas canvas) {
mCanvasDelegate.draw(canvas, mPath, getWidth(), getHeight());
// Draw the border on top.
canvas.drawPath(mBorderPath, isPrivateMode() ? mBorderPrivatePaint : mBorderPaint);
}
- // The drawable is constructed as per @drawable/address_bar_nav_button.
+ // The drawable is constructed as per @drawable/url_bar_nav_button.
@Override
public void onLightweightThemeChanged() {
Drawable drawable = mActivity.getLightweightTheme().getDrawable(this);
if (drawable == null)
return;
Resources resources = getContext().getResources();
StateListDrawable stateList = new StateListDrawable();
@@ -90,11 +90,11 @@ public class BackButton extends ShapedBu
stateList.addState(new int[] { R.attr.state_private }, new ColorDrawable(resources.getColor(R.color.background_private)));
stateList.addState(new int[] {}, drawable);
setBackgroundDrawable(stateList);
}
@Override
public void onLightweightThemeReset() {
- setBackgroundResource(R.drawable.address_bar_nav_button);
+ setBackgroundResource(R.drawable.url_bar_nav_button);
}
}
--- a/mobile/android/base/BrowserToolbar.java
+++ b/mobile/android/base/BrowserToolbar.java
@@ -93,23 +93,22 @@ public class BrowserToolbar implements T
public void onDismiss();
}
public interface OnFilterListener {
public void onFilter(String searchText, AutocompleteHandler handler);
}
private GeckoRelativeLayout mLayout;
- private LayoutParams mAwesomeBarParams;
private View mUrlDisplayContainer;
private View mUrlEditContainer;
private CustomEditText mUrlEditText;
- private View mAwesomeBarEntry;
- private ImageView mAwesomeBarRightEdge;
- private BrowserToolbarBackground mAddressBarBg;
+ private View mUrlBarEntry;
+ private ImageView mUrlBarRightEdge;
+ private BrowserToolbarBackground mUrlBarBackground;
private GeckoTextView mTitle;
private int mTitlePadding;
private boolean mSiteSecurityVisible;
private boolean mSwitchingTabs;
private ShapedButton mTabs;
private ImageButton mBack;
private ImageButton mForward;
public ImageButton mFavicon;
@@ -147,17 +146,17 @@ public class BrowserToolbar implements T
private static List<View> sActionItems;
private boolean mAnimatingEntry;
private AlphaAnimation mLockFadeIn;
private TranslateAnimation mTitleSlideLeft;
private TranslateAnimation mTitleSlideRight;
- private int mAddressBarViewOffset;
+ private int mUrlBarViewOffset;
private int mDefaultForwardMargin;
private PropertyAnimator mForwardAnim = null;
private int mFaviconSize;
private PropertyAnimator mVisibilityAnimator;
private static final int TABS_CONTRACTED = 1;
@@ -268,36 +267,36 @@ public class BrowserToolbar implements T
}
});
mShowSiteSecurity = false;
mShowReader = false;
mAnimatingEntry = false;
- mAddressBarBg = (BrowserToolbarBackground) mLayout.findViewById(R.id.address_bar_bg);
- mAddressBarViewOffset = mActivity.getResources().getDimensionPixelSize(R.dimen.addressbar_offset_left);
+ mUrlBarBackground = (BrowserToolbarBackground) mLayout.findViewById(R.id.url_bar_bg);
+ mUrlBarViewOffset = mActivity.getResources().getDimensionPixelSize(R.dimen.url_bar_offset_left);
mDefaultForwardMargin = mActivity.getResources().getDimensionPixelSize(R.dimen.forward_default_offset);
- mUrlDisplayContainer = mLayout.findViewById(R.id.awesome_bar_display_container);
- mAwesomeBarEntry = mLayout.findViewById(R.id.awesome_bar_entry);
+ mUrlDisplayContainer = mLayout.findViewById(R.id.url_display_container);
+ mUrlBarEntry = mLayout.findViewById(R.id.url_bar_entry);
- mUrlEditContainer = mLayout.findViewById(R.id.awesome_bar_edit_container);
- mUrlEditText = (CustomEditText) mLayout.findViewById(R.id.awesome_bar_edit_text);
+ mUrlEditContainer = mLayout.findViewById(R.id.url_edit_container);
+ mUrlEditText = (CustomEditText) mLayout.findViewById(R.id.url_edit_text);
mUrlEditText.addTextChangedListener(this);
mUrlEditText.setOnKeyPreImeListener(new CustomEditText.OnKeyPreImeListener() {
@Override
public boolean onKeyPreIme(View v, int keyCode, KeyEvent event) {
// We only want to process one event per tap
if (event.getAction() != KeyEvent.ACTION_DOWN)
return false;
if (keyCode == KeyEvent.KEYCODE_ENTER) {
- // If the AwesomeBar has a composition string, don't submit the text yet.
+ // If the edit text has a composition string, don't submit the text yet.
// ENTER is needed to commit the composition string.
Editable content = mUrlEditText.getText();
if (!hasCompositionString(content)) {
if (mCommitListener != null) {
mCommitListener.onCommit(mEditingTarget);
}
return true;
}
@@ -368,22 +367,22 @@ public class BrowserToolbar implements T
public void onSelectionChanged(int selStart, int selEnd) {
if (Build.VERSION.SDK_INT >= 11 && selStart == selEnd) {
// mActivity.getActionBar().hide();
}
}
});
// This will clip the right edge's image at half of its width
- mAwesomeBarRightEdge = (ImageView) mLayout.findViewById(R.id.awesome_bar_right_edge);
- if (mAwesomeBarRightEdge != null) {
- mAwesomeBarRightEdge.getDrawable().setLevel(5000);
+ mUrlBarRightEdge = (ImageView) mLayout.findViewById(R.id.url_bar_right_edge);
+ if (mUrlBarRightEdge != null) {
+ mUrlBarRightEdge.getDrawable().setLevel(5000);
}
- mTitle = (GeckoTextView) mLayout.findViewById(R.id.awesome_bar_title);
+ mTitle = (GeckoTextView) mLayout.findViewById(R.id.url_bar_title);
mTitlePadding = mTitle.getPaddingRight();
if (Build.VERSION.SDK_INT >= 16)
mTitle.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
mTabs = (ShapedButton) mLayout.findViewById(R.id.tabs);
mTabs.setOnClickListener(new Button.OnClickListener() {
@Override
public void onClick(View v) {
@@ -617,17 +616,17 @@ public class BrowserToolbar implements T
(InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
imm.showSoftInput(mUrlEditText, InputMethodManager.SHOW_IMPLICIT);
return true;
} else if (isEditing()) {
final int prevSelStart = mUrlEditText.getSelectionStart();
final int prevSelEnd = mUrlEditText.getSelectionEnd();
- // Manually dispatch the key event to the AwesomeBar. If selection changed as
+ // Manually dispatch the key event to the edit text. If selection changed as
// a result of the key event, then give focus back to mUrlEditText
mUrlEditText.dispatchKeyEvent(event);
final int curSelStart = mUrlEditText.getSelectionStart();
final int curSelEnd = mUrlEditText.getSelectionEnd();
if (prevSelStart != curSelStart || prevSelEnd != curSelEnd) {
mUrlEditText.requestFocusFromTouch();
@@ -760,17 +759,17 @@ public class BrowserToolbar implements T
}
mAutoCompletePrefix = text;
if (reuseAutocomplete) {
onAutocomplete(mAutoCompleteResult);
}
}
- // If the AwesomeBar has a composition string, don't call updateGoButton().
+ // If the edit text has a composition string, don't call updateGoButton().
// That method resets IME and composition state will be broken.
if (!hasCompositionString(s)) {
updateGoButton(text);
}
if (Build.VERSION.SDK_INT >= 11) {
// mActivity.getActionBar().hide();
}
@@ -827,21 +826,21 @@ public class BrowserToolbar implements T
@Override
public void onAnimationEnd(Animation animation) {
if (animation.equals(mTitleSlideRight)) {
mSiteSecurity.startAnimation(mLockFadeIn);
}
}
- private int getAwesomeBarEntryTranslation() {
- return mLayout.getWidth() - mAwesomeBarEntry.getRight();
+ private int getUrlBarEntryTranslation() {
+ return mLayout.getWidth() - mUrlBarEntry.getRight();
}
- private int getAwesomeBarCurveTranslation() {
+ private int getUrlBarCurveTranslation() {
return mLayout.getWidth() - mTabs.getLeft();
}
private static boolean hasCompositionString(Editable content) {
Object[] spans = content.getSpans(0, content.length(), Object.class);
if (spans != null) {
for (Object span : spans) {
if ((content.getSpanFlags(span) & Spanned.SPAN_COMPOSING) != 0) {
@@ -1190,30 +1189,30 @@ public class BrowserToolbar implements T
}
if (mAnimatingEntry)
return;
final PropertyAnimator contentAnimator = new PropertyAnimator(250);
contentAnimator.setUseHardwareLayer(false);
- final int entryTranslation = getAwesomeBarEntryTranslation();
- final int curveTranslation = getAwesomeBarCurveTranslation();
+ final int entryTranslation = getUrlBarEntryTranslation();
+ final int curveTranslation = getUrlBarCurveTranslation();
// Keep the entry highlighted during the animation
mLayout.setSelected(true);
// Hide stop/reader buttons immediately
ViewHelper.setAlpha(mReader, 0);
ViewHelper.setAlpha(mStop, 0);
// Slide the right side elements of the toolbar
- if (mAwesomeBarRightEdge != null) {
- contentAnimator.attach(mAwesomeBarRightEdge,
+ if (mUrlBarRightEdge != null) {
+ contentAnimator.attach(mUrlBarRightEdge,
PropertyAnimator.Property.TRANSLATION_X,
entryTranslation);
}
contentAnimator.attach(mTabs,
PropertyAnimator.Property.TRANSLATION_X,
curveTranslation);
contentAnimator.attach(mTabsCounter,
@@ -1278,20 +1277,20 @@ public class BrowserToolbar implements T
mLayout.setSelected(false);
updateTabCountAndAnimate(Tabs.getInstance().getDisplayCount());
return url;
}
final PropertyAnimator contentAnimator = new PropertyAnimator(250);
contentAnimator.setUseHardwareLayer(false);
- // Shrink the awesome entry back to its original size
+ // Shrink the urlbar entry back to its original size
- if (mAwesomeBarRightEdge != null) {
- contentAnimator.attach(mAwesomeBarRightEdge,
+ if (mUrlBarRightEdge != null) {
+ contentAnimator.attach(mUrlBarRightEdge,
PropertyAnimator.Property.TRANSLATION_X,
0);
}
contentAnimator.attach(mTabs,
PropertyAnimator.Property.TRANSLATION_X,
0);
contentAnimator.attach(mTabsCounter,
@@ -1347,38 +1346,38 @@ public class BrowserToolbar implements T
private void updateGoButton(String text) {
if (text.length() == 0) {
mGo.setVisibility(View.GONE);
return;
}
mGo.setVisibility(View.VISIBLE);
- int imageResource = R.drawable.ic_awesomebar_go;
+ int imageResource = R.drawable.ic_url_bar_go;
String contentDescription = mActivity.getString(R.string.go);
int imeAction = EditorInfo.IME_ACTION_GO;
int actionBits = mUrlEditText.getImeOptions() & EditorInfo.IME_MASK_ACTION;
if (StringUtils.isSearchQuery(text, actionBits == EditorInfo.IME_ACTION_SEARCH)) {
- imageResource = R.drawable.ic_awesomebar_search;
+ imageResource = R.drawable.ic_url_bar_search;
contentDescription = mActivity.getString(R.string.search);
imeAction = EditorInfo.IME_ACTION_SEARCH;
}
InputMethodManager imm = InputMethods.getInputMethodManager(mUrlEditText.getContext());
if (imm == null) {
return;
}
boolean restartInput = false;
if (actionBits != imeAction) {
int optionBits = mUrlEditText.getImeOptions() & ~EditorInfo.IME_MASK_ACTION;
mUrlEditText.setImeOptions(optionBits | imeAction);
mDelayRestartInput = (imeAction == EditorInfo.IME_ACTION_GO) &&
- (InputMethods.shouldDelayAwesomebarUpdate(mUrlEditText.getContext()));
+ (InputMethods.shouldDelayUrlBarUpdate(mUrlEditText.getContext()));
if (!mDelayRestartInput) {
restartInput = true;
}
} else if (mDelayRestartInput) {
// Only call delayed restartInput when actionBits == imeAction
// so if there are two restarts in a row, the first restarts will
// be discarded and the second restart will be properly delayed
mDelayRestartInput = false;
@@ -1446,17 +1445,17 @@ public class BrowserToolbar implements T
}
}
@Override
public void onPropertyAnimationEnd() {
if (enabled) {
ViewGroup.MarginLayoutParams layoutParams =
(ViewGroup.MarginLayoutParams)mUrlDisplayContainer.getLayoutParams();
- layoutParams.leftMargin = mAddressBarViewOffset;
+ layoutParams.leftMargin = mUrlBarViewOffset;
ViewHelper.setTranslationX(mTitle, 0);
ViewHelper.setTranslationX(mFavicon, 0);
ViewHelper.setTranslationX(mSiteSecurity, 0);
}
ViewGroup.MarginLayoutParams layoutParams =
(ViewGroup.MarginLayoutParams)mForward.getLayoutParams();
@@ -1488,35 +1487,35 @@ public class BrowserToolbar implements T
0);
anim.attach(mSiteSecurity,
PropertyAnimator.Property.TRANSLATION_X,
0);
// We're hiding the forward button. We're going to reset the margin before
// the animation starts, so we shift these items to the right so that they don't
// appear to move initially.
- ViewHelper.setTranslationX(mTitle, mAddressBarViewOffset);
- ViewHelper.setTranslationX(mFavicon, mAddressBarViewOffset);
- ViewHelper.setTranslationX(mSiteSecurity, mAddressBarViewOffset);
+ ViewHelper.setTranslationX(mTitle, mUrlBarViewOffset);
+ ViewHelper.setTranslationX(mFavicon, mUrlBarViewOffset);
+ ViewHelper.setTranslationX(mSiteSecurity, mUrlBarViewOffset);
} else {
anim.attach(mForward,
PropertyAnimator.Property.TRANSLATION_X,
width);
anim.attach(mForward,
PropertyAnimator.Property.ALPHA,
1);
anim.attach(mTitle,
PropertyAnimator.Property.TRANSLATION_X,
- mAddressBarViewOffset);
+ mUrlBarViewOffset);
anim.attach(mFavicon,
PropertyAnimator.Property.TRANSLATION_X,
- mAddressBarViewOffset);
+ mUrlBarViewOffset);
anim.attach(mSiteSecurity,
PropertyAnimator.Property.TRANSLATION_X,
- mAddressBarViewOffset);
+ mUrlBarViewOffset);
}
}
@Override
public void addActionItem(View actionItem) {
mActionItemBar.addView(actionItem);
if (!sActionItems.contains(actionItem))
@@ -1550,17 +1549,17 @@ public class BrowserToolbar implements T
setProgressVisibility(tab.getState() == Tab.STATE_LOADING);
setSecurityMode(tab.getSecurityMode());
setReaderMode(tab.getReaderEnabled());
setShadowVisibility(true);
updateBackButton(tab.canDoBack());
updateForwardButton(tab.canDoForward());
final boolean isPrivate = tab.isPrivate();
- mAddressBarBg.setPrivateMode(isPrivate);
+ mUrlBarBackground.setPrivateMode(isPrivate);
mLayout.setPrivateMode(isPrivate);
mTabs.setPrivateMode(isPrivate);
mTitle.setPrivateMode(isPrivate);
mMenu.setPrivateMode(isPrivate);
mMenuIcon.setPrivateMode(isPrivate);
mUrlEditText.setPrivateMode(isPrivate);
if (mBack instanceof BackButton)
--- a/mobile/android/base/BrowserToolbarBackground.java
+++ b/mobile/android/base/BrowserToolbarBackground.java
@@ -32,11 +32,11 @@ public class BrowserToolbarBackground ex
stateList.addState(new int[] { R.attr.state_private }, new ColorDrawable(mActivity.getResources().getColor(R.color.background_private)));
stateList.addState(new int[] {}, drawable);
setBackgroundDrawable(stateList);
}
@Override
public void onLightweightThemeReset() {
- setBackgroundResource(R.drawable.address_bar_bg);
+ setBackgroundResource(R.drawable.url_bar_bg);
}
}
--- a/mobile/android/base/Favicons.java
+++ b/mobile/android/base/Favicons.java
@@ -230,20 +230,20 @@ public class Favicons {
color = BitmapUtils.getDominantColor(image);
mColorCache.put(key, color);
return color;
}
public void attachToContext(Context context) {
mContext = context;
if (sFaviconSmallSize < 0) {
- sFaviconSmallSize = Math.round(mContext.getResources().getDimension(R.dimen.awesomebar_row_favicon_size_small));
+ sFaviconSmallSize = Math.round(mContext.getResources().getDimension(R.dimen.favicon_size_small));
}
if (sFaviconLargeSize < 0) {
- sFaviconLargeSize = Math.round(mContext.getResources().getDimension(R.dimen.awesomebar_row_favicon_size_large));
+ sFaviconLargeSize = Math.round(mContext.getResources().getDimension(R.dimen.favicon_size_large));
}
}
private class LoadFaviconTask extends UiAsyncTask<Void, Void, Bitmap> {
private long mId;
private String mPageUrl;
private String mFaviconUrl;
private OnFaviconLoadedListener mListener;
--- a/mobile/android/base/ForwardButton.java
+++ b/mobile/android/base/ForwardButton.java
@@ -61,17 +61,17 @@ public class ForwardButton extends Shape
@Override
public void draw(Canvas canvas) {
super.draw(canvas);
// Draw the border on top.
canvas.drawPath(mBorderPath, isPrivateMode() ? mBorderPrivatePaint : mBorderPaint);
}
- // The drawable is constructed as per @drawable/address_bar_nav_button.
+ // The drawable is constructed as per @drawable/url_bar_nav_button.
@Override
public void onLightweightThemeChanged() {
Drawable drawable = mActivity.getLightweightTheme().getDrawable(this);
if (drawable == null)
return;
Resources resources = getContext().getResources();
StateListDrawable stateList = new StateListDrawable();
@@ -83,11 +83,11 @@ public class ForwardButton extends Shape
stateList.addState(new int[] { R.attr.state_private }, new ColorDrawable(resources.getColor(R.color.background_private)));
stateList.addState(new int[] {}, drawable);
setBackgroundDrawable(stateList);
}
@Override
public void onLightweightThemeReset() {
- setBackgroundResource(R.drawable.address_bar_nav_button);
+ setBackgroundResource(R.drawable.url_bar_nav_button);
}
}
--- a/mobile/android/base/InputMethods.java
+++ b/mobile/android/base/InputMethods.java
@@ -56,17 +56,17 @@ final class InputMethods {
return Build.VERSION.SDK_INT >= 17 && (METHOD_ANDROID_LATINIME.equals(inputMethod) ||
METHOD_GOOGLE_LATINIME.equals(inputMethod));
}
public static boolean shouldCommitCharAsKey(String inputMethod) {
return METHOD_HTC_TOUCH_INPUT.equals(inputMethod);
}
- public static boolean shouldDelayAwesomebarUpdate(Context context) {
+ public static boolean shouldDelayUrlBarUpdate(Context context) {
String inputMethod = getCurrentInputMethod(context);
return METHOD_SAMSUNG.equals(inputMethod) ||
METHOD_SWIFTKEY.equals(inputMethod);
}
public static boolean isGestureKeyboard(Context context) {
// SwiftKey is a gesture keyboard, but it doesn't seem to need any special-casing
// to do AwesomeBar auto-spacing.
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -566,43 +566,42 @@ RES_DRAWABLE_MDPI = \
res/drawable-mdpi/abouthome_logo_light.png \
res/drawable-mdpi/abouthome_promo_box_bg.9.png \
res/drawable-mdpi/abouthome_promo_box_pressed_bg.9.png \
res/drawable-mdpi/abouthome_promo_logo_apps.png \
res/drawable-mdpi/abouthome_promo_logo_sync.png \
res/drawable-mdpi/abouthome_thumbnail.png \
res/drawable-mdpi/abouthome_thumbnail_bg.png \
res/drawable-mdpi/abouthome_thumbnail_add.png \
- res/drawable-mdpi/address_bar_bg_shadow.png \
res/drawable-mdpi/alert_addon.png \
res/drawable-mdpi/alert_app.png \
res/drawable-mdpi/alert_download.png \
res/drawable-mdpi/autocomplete_list_bg.9.png \
res/drawable-mdpi/awesomebar_tab_center.9.png \
res/drawable-mdpi/awesomebar_tab_left.9.png \
res/drawable-mdpi/awesomebar_tab_right.9.png \
res/drawable-mdpi/awesomebar_sep_left.9.png \
res/drawable-mdpi/awesomebar_sep_right.9.png \
res/drawable-mdpi/desktop_notification.png \
res/drawable-mdpi/ic_addons_empty.png \
- res/drawable-mdpi/ic_awesomebar_go.png \
- res/drawable-mdpi/ic_awesomebar_reader.png \
- res/drawable-mdpi/ic_awesomebar_search.png \
- res/drawable-mdpi/ic_awesomebar_star.png \
- res/drawable-mdpi/ic_awesomebar_tab.png \
res/drawable-mdpi/ic_menu_addons_filler.png \
res/drawable-mdpi/ic_menu_bookmark_add.png \
res/drawable-mdpi/ic_menu_bookmark_remove.png \
res/drawable-mdpi/ic_menu_character_encoding.png \
res/drawable-mdpi/ic_menu_close_all_tabs.png \
res/drawable-mdpi/ic_menu_forward.png \
res/drawable-mdpi/ic_menu_new_private_tab.png \
res/drawable-mdpi/ic_menu_new_tab.png \
res/drawable-mdpi/ic_menu_reload.png \
res/drawable-mdpi/ic_status_logo.png \
+ res/drawable-mdpi/ic_url_bar_go.png \
+ res/drawable-mdpi/ic_url_bar_reader.png \
+ res/drawable-mdpi/ic_url_bar_search.png \
+ res/drawable-mdpi/ic_url_bar_star.png \
+ res/drawable-mdpi/ic_url_bar_tab.png \
res/drawable-mdpi/progress_spinner_1.png \
res/drawable-mdpi/progress_spinner_2.png \
res/drawable-mdpi/progress_spinner_3.png \
res/drawable-mdpi/progress_spinner_4.png \
res/drawable-mdpi/progress_spinner_5.png \
res/drawable-mdpi/progress_spinner_6.png \
res/drawable-mdpi/progress_spinner_7.png \
res/drawable-mdpi/progress_spinner_8.png \
@@ -618,20 +617,21 @@ RES_DRAWABLE_MDPI = \
res/drawable-mdpi/spinner_pressed.9.png \
res/drawable-mdpi/tab_new.png \
res/drawable-mdpi/tab_new_pb.png \
res/drawable-mdpi/tab_close.png \
res/drawable-mdpi/tab_thumbnail_default.png \
res/drawable-mdpi/tab_thumbnail_shadow.png \
res/drawable-mdpi/tabs_count.png \
res/drawable-mdpi/tabs_count_foreground.png \
- res/drawable-mdpi/address_bar_url_default.9.png \
- res/drawable-mdpi/address_bar_url_default_pb.9.png \
- res/drawable-mdpi/address_bar_url_pressed.9.png \
- res/drawable-mdpi/address_bar_url_pressed_pb.9.png \
+ res/drawable-mdpi/url_bar_bg_shadow.png \
+ res/drawable-mdpi/url_bar_entry_default.9.png \
+ res/drawable-mdpi/url_bar_entry_default_pb.9.png \
+ res/drawable-mdpi/url_bar_entry_pressed.9.png \
+ res/drawable-mdpi/url_bar_entry_pressed_pb.9.png \
res/drawable-mdpi/doorhanger_popup_bg.9.png \
res/drawable-mdpi/find_close.png \
res/drawable-mdpi/find_next.png \
res/drawable-mdpi/find_prev.png \
res/drawable-mdpi/larry_blue.png \
res/drawable-mdpi/larry_green.png \
res/drawable-mdpi/menu.png \
res/drawable-mdpi/menu_pb.png \
@@ -681,58 +681,58 @@ RES_DRAWABLE_HDPI = \
res/drawable-hdpi/abouthome_logo_light.png \
res/drawable-hdpi/abouthome_promo_box_bg.9.png \
res/drawable-hdpi/abouthome_promo_box_pressed_bg.9.png \
res/drawable-hdpi/abouthome_promo_logo_apps.png \
res/drawable-hdpi/abouthome_promo_logo_sync.png \
res/drawable-hdpi/abouthome_thumbnail.png \
res/drawable-hdpi/abouthome_thumbnail_bg.png \
res/drawable-hdpi/abouthome_thumbnail_add.png \
- res/drawable-hdpi/address_bar_bg_shadow.png \
res/drawable-hdpi/alert_addon.png \
res/drawable-hdpi/alert_app.png \
res/drawable-hdpi/alert_download.png \
res/drawable-hdpi/awesomebar_tab_center.9.png \
res/drawable-hdpi/awesomebar_tab_left.9.png \
res/drawable-hdpi/awesomebar_tab_right.9.png \
res/drawable-hdpi/awesomebar_sep_left.9.png \
res/drawable-hdpi/awesomebar_sep_right.9.png \
res/drawable-hdpi/ic_addons_empty.png \
- res/drawable-hdpi/ic_awesomebar_go.png \
- res/drawable-hdpi/ic_awesomebar_reader.png \
- res/drawable-hdpi/ic_awesomebar_search.png \
- res/drawable-hdpi/ic_awesomebar_star.png \
- res/drawable-hdpi/ic_awesomebar_tab.png \
res/drawable-hdpi/ic_menu_addons_filler.png \
res/drawable-hdpi/ic_menu_bookmark_add.png \
res/drawable-hdpi/ic_menu_bookmark_remove.png \
res/drawable-hdpi/ic_menu_character_encoding.png \
res/drawable-hdpi/ic_menu_close_all_tabs.png \
res/drawable-hdpi/ic_menu_forward.png \
res/drawable-hdpi/ic_menu_new_private_tab.png \
res/drawable-hdpi/ic_menu_new_tab.png \
res/drawable-hdpi/ic_menu_reload.png \
res/drawable-hdpi/ic_status_logo.png \
+ res/drawable-hdpi/ic_url_bar_go.png \
+ res/drawable-hdpi/ic_url_bar_reader.png \
+ res/drawable-hdpi/ic_url_bar_search.png \
+ res/drawable-hdpi/ic_url_bar_star.png \
+ res/drawable-hdpi/ic_url_bar_tab.png \
res/drawable-hdpi/tab_indicator_divider.9.png \
res/drawable-hdpi/tab_indicator_selected.9.png \
res/drawable-hdpi/tab_indicator_selected_focused.9.png \
res/drawable-hdpi/spinner_default.9.png \
res/drawable-hdpi/spinner_focused.9.png \
res/drawable-hdpi/spinner_pressed.9.png \
res/drawable-hdpi/tab_new.png \
res/drawable-hdpi/tab_new_pb.png \
res/drawable-hdpi/tab_close.png \
res/drawable-hdpi/tab_thumbnail_default.png \
res/drawable-hdpi/tab_thumbnail_shadow.png \
res/drawable-hdpi/tabs_count.png \
res/drawable-hdpi/tabs_count_foreground.png \
- res/drawable-hdpi/address_bar_url_default.9.png \
- res/drawable-hdpi/address_bar_url_default_pb.9.png \
- res/drawable-hdpi/address_bar_url_pressed.9.png \
- res/drawable-hdpi/address_bar_url_pressed_pb.9.png \
+ res/drawable-hdpi/url_bar_bg_shadow.png \
+ res/drawable-hdpi/url_bar_entry_default.9.png \
+ res/drawable-hdpi/url_bar_entry_default_pb.9.png \
+ res/drawable-hdpi/url_bar_entry_pressed.9.png \
+ res/drawable-hdpi/url_bar_entry_pressed_pb.9.png \
res/drawable-hdpi/doorhanger_popup_bg.9.png \
res/drawable-hdpi/find_close.png \
res/drawable-hdpi/find_next.png \
res/drawable-hdpi/find_prev.png \
res/drawable-hdpi/larry_blue.png \
res/drawable-hdpi/larry_green.png \
res/drawable-hdpi/menu.png \
res/drawable-hdpi/menu_pb.png \
@@ -770,45 +770,45 @@ RES_DRAWABLE_XHDPI = \
res/drawable-xhdpi/abouthome_logo_light.png \
res/drawable-xhdpi/abouthome_promo_box_bg.9.png \
res/drawable-xhdpi/abouthome_promo_box_pressed_bg.9.png \
res/drawable-xhdpi/abouthome_promo_logo_apps.png \
res/drawable-xhdpi/abouthome_promo_logo_sync.png \
res/drawable-xhdpi/abouthome_thumbnail.png \
res/drawable-xhdpi/abouthome_thumbnail_bg.png \
res/drawable-xhdpi/abouthome_thumbnail_add.png \
- res/drawable-xhdpi/address_bar_bg_shadow.png \
- res/drawable-xhdpi/address_bar_url_default.9.png \
- res/drawable-xhdpi/address_bar_url_default_pb.9.png \
- res/drawable-xhdpi/address_bar_url_pressed.9.png \
- res/drawable-xhdpi/address_bar_url_pressed_pb.9.png \
+ res/drawable-xhdpi/url_bar_bg_shadow.png \
+ res/drawable-xhdpi/url_bar_entry_default.9.png \
+ res/drawable-xhdpi/url_bar_entry_default_pb.9.png \
+ res/drawable-xhdpi/url_bar_entry_pressed.9.png \
+ res/drawable-xhdpi/url_bar_entry_pressed_pb.9.png \
res/drawable-xhdpi/alert_addon.png \
res/drawable-xhdpi/alert_app.png \
res/drawable-xhdpi/alert_download.png \
res/drawable-xhdpi/awesomebar_tab_center.9.png \
res/drawable-xhdpi/awesomebar_tab_left.9.png \
res/drawable-xhdpi/awesomebar_tab_right.9.png \
res/drawable-xhdpi/awesomebar_sep_left.9.png \
res/drawable-xhdpi/awesomebar_sep_right.9.png \
res/drawable-xhdpi/ic_addons_empty.png \
- res/drawable-xhdpi/ic_awesomebar_go.png \
- res/drawable-xhdpi/ic_awesomebar_reader.png \
- res/drawable-xhdpi/ic_awesomebar_search.png \
- res/drawable-xhdpi/ic_awesomebar_star.png \
- res/drawable-xhdpi/ic_awesomebar_tab.png \
res/drawable-xhdpi/ic_menu_addons_filler.png \
res/drawable-xhdpi/ic_menu_bookmark_add.png \
res/drawable-xhdpi/ic_menu_bookmark_remove.png \
res/drawable-xhdpi/ic_menu_close_all_tabs.png \
res/drawable-xhdpi/ic_menu_character_encoding.png \
res/drawable-xhdpi/ic_menu_forward.png \
res/drawable-xhdpi/ic_menu_new_private_tab.png \
res/drawable-xhdpi/ic_menu_new_tab.png \
res/drawable-xhdpi/ic_menu_reload.png \
res/drawable-xhdpi/ic_status_logo.png \
+ res/drawable-xhdpi/ic_url_bar_go.png \
+ res/drawable-xhdpi/ic_url_bar_reader.png \
+ res/drawable-xhdpi/ic_url_bar_search.png \
+ res/drawable-xhdpi/ic_url_bar_star.png \
+ res/drawable-xhdpi/ic_url_bar_tab.png \
res/drawable-xhdpi/spinner_default.9.png \
res/drawable-xhdpi/spinner_focused.9.png \
res/drawable-xhdpi/spinner_pressed.9.png \
res/drawable-xhdpi/tab_new.png \
res/drawable-xhdpi/tab_new_pb.png \
res/drawable-xhdpi/tab_close.png \
res/drawable-xhdpi/tab_thumbnail_default.png \
res/drawable-xhdpi/tab_thumbnail_shadow.png \
@@ -977,26 +977,26 @@ RES_DRAWABLE_XLARGE_XHDPI_V11 = \
res/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_add.png \
res/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_remove.png \
$(NULL)
RES_COLOR = \
res/color/abouthome_section_more_text.xml \
res/color/abouthome_section_subtitle.xml \
res/color/abouthome_section_title.xml \
- res/color/awesome_bar_title.xml \
- res/color/awesome_bar_title_hint.xml \
res/color/menu_item_title.xml \
res/color/primary_text.xml \
res/color/primary_text_inverse.xml \
res/color/secondary_text.xml \
res/color/secondary_text_inverse.xml \
res/color/select_item_multichoice.xml \
res/color/tertiary_text.xml \
res/color/tertiary_text_inverse.xml \
+ res/color/url_bar_title.xml \
+ res/color/url_bar_title_hint.xml \
$(NULL)
RES_MENU = \
res/menu/abouthome_topsites_contextmenu.xml \
res/menu/awesomebar_contextmenu.xml \
res/menu/browser_app_menu.xml \
res/menu/gecko_app_menu.xml \
res/menu/titlebar_contextmenu.xml \
@@ -1014,21 +1014,21 @@ RES_LAYOUT += res/layout/crash_reporter.
endif
MOZ_ANDROID_DRAWABLES += \
$(SYNC_RES_DRAWABLE) \
mobile/android/base/resources/drawable/abouthome_logo.xml \
mobile/android/base/resources/drawable/abouthome_promo_box.xml \
mobile/android/base/resources/drawable/action_bar_button.xml \
mobile/android/base/resources/drawable/action_bar_button_inverse.xml \
- mobile/android/base/resources/drawable/address_bar_bg.xml \
- mobile/android/base/resources/drawable/address_bar_bg_shadow_repeat.xml \
- mobile/android/base/resources/drawable/address_bar_nav_button.xml \
- mobile/android/base/resources/drawable/address_bar_right_edge.xml \
- mobile/android/base/resources/drawable/address_bar_url.xml \
+ mobile/android/base/resources/drawable/url_bar_bg.xml \
+ mobile/android/base/resources/drawable/url_bar_bg_shadow_repeat.xml \
+ mobile/android/base/resources/drawable/url_bar_entry.xml \
+ mobile/android/base/resources/drawable/url_bar_nav_button.xml \
+ mobile/android/base/resources/drawable/url_bar_right_edge.xml \
mobile/android/base/resources/drawable/awesomebar_listview_divider.xml \
mobile/android/base/resources/drawable/awesomebar_header_row.xml \
mobile/android/base/resources/drawable/awesomebar_tab_indicator.xml \
mobile/android/base/resources/drawable/awesomebar_tab_selected.xml \
mobile/android/base/resources/drawable/awesomebar_tab_unselected.xml \
mobile/android/base/resources/drawable/favicon_bg.xml \
mobile/android/base/resources/drawable/handle_end_level.xml \
mobile/android/base/resources/drawable/handle_start_level.xml \
--- a/mobile/android/base/awesomebar/AllPagesTab.java
+++ b/mobile/android/base/awesomebar/AllPagesTab.java
@@ -104,17 +104,17 @@ public class AllPagesTab extends Awesome
@Override
public boolean onBackPressed() {
return false;
}
@Override
public int getTitleStringId() {
- return R.string.awesomebar_all_pages_title;
+ return R.string.all_pages_title;
}
@Override
public String getTag() {
return TAG;
}
private ListView getListView() {
@@ -801,19 +801,19 @@ public class AllPagesTab extends Awesome
int display = cursor.getInt(displayIndex);
// The bookmark id will be 0 (null in database) when the url
// is not a bookmark.
int visibility = (id == 0 ? View.GONE : View.VISIBLE);
bookmarkIconView.setVisibility(visibility);
if (display == Combined.DISPLAY_READER) {
- bookmarkIconView.setImageResource(R.drawable.ic_awesomebar_reader);
+ bookmarkIconView.setImageResource(R.drawable.ic_url_bar_reader);
} else {
- bookmarkIconView.setImageResource(R.drawable.ic_awesomebar_star);
+ bookmarkIconView.setImageResource(R.drawable.ic_url_bar_star);
}
}
@Override
public ContextMenuSubject getSubject(ContextMenu menu, View view, ContextMenuInfo menuInfo) {
ContextMenuSubject subject = null;
if (!(menuInfo instanceof AdapterView.AdapterContextMenuInfo)) {
--- a/mobile/android/base/awesomebar/AwesomeBarTab.java
+++ b/mobile/android/base/awesomebar/AwesomeBarTab.java
@@ -172,18 +172,18 @@ abstract public class AwesomeBarTab {
String url = cursor.getString(urlIndex);
updateUrl(holder, url);
}
protected void updateUrl(AwesomeEntryViewHolder holder, String url) {
Integer tabId = getOpenTabs().get(url);
holder.url = url;
if (tabId != null) {
- holder.urlView.setText(R.string.awesomebar_switch_to_tab);
- holder.urlView.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_awesomebar_tab, 0, 0, 0);
+ holder.urlView.setText(R.string.switch_to_tab);
+ holder.urlView.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_url_bar_tab, 0, 0, 0);
} else {
holder.urlView.setText(url);
holder.urlView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
}
}
protected boolean hideSoftInput(View view) {
InputMethodManager imm =
--- a/mobile/android/base/awesomebar/BookmarksTab.java
+++ b/mobile/android/base/awesomebar/BookmarksTab.java
@@ -41,17 +41,17 @@ public class BookmarksTab extends Awesom
private int mFolderId;
private String mFolderTitle;
private BookmarksListAdapter mCursorAdapter = null;
private BookmarksQueryTask mQueryTask = null;
private boolean mShowReadingList = false;
@Override
public int getTitleStringId() {
- return R.string.awesomebar_bookmarks_title;
+ return R.string.bookmarks_title;
}
@Override
public String getTag() {
return TAG;
}
public BookmarksTab(Context context) {
--- a/mobile/android/base/awesomebar/HistoryTab.java
+++ b/mobile/android/base/awesomebar/HistoryTab.java
@@ -54,17 +54,17 @@ public class HistoryTab extends AwesomeB
public HistoryTab(Context context) {
super(context);
mContentObserver = null;
}
@Override
public int getTitleStringId() {
- return R.string.awesomebar_history_title;
+ return R.string.history_title;
}
@Override
public String getTag() {
return TAG;
}
@Override
@@ -204,17 +204,17 @@ public class HistoryTab extends AwesomeB
// The bookmark id will be 0 (null in database) when the url
// is not a bookmark. Reading list items are irrelevant in history
// tab. We should never show any sign or them.
int visibility = (bookmarkId != 0 && display != Combined.DISPLAY_READER ?
View.VISIBLE : View.GONE);
viewHolder.bookmarkIconView.setVisibility(visibility);
- viewHolder.bookmarkIconView.setImageResource(R.drawable.ic_awesomebar_star);
+ viewHolder.bookmarkIconView.setImageResource(R.drawable.ic_url_bar_star);
return convertView;
}
}
private static class GroupList extends LinkedList<Map<String,String>> {
private static final long serialVersionUID = 0L;
}
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -4,20 +4,20 @@
<!ENTITY splash_settingup "Setting up your &brandShortName;">
<!ENTITY splash_bookmarks_history "We are updating your bookmarks and history, which may take a minute or so.">
<!ENTITY no_space_to_start_error "There is not enough space available for &brandShortName; to start.">
<!ENTITY error_loading_file "An error occurred when trying to load files required to run &brandShortName;">
-<!ENTITY awesomebar_all_pages_title "Top Sites">
-<!ENTITY awesomebar_bookmarks_title "Bookmarks">
-<!ENTITY awesomebar_history_title "History">
-<!ENTITY awesomebar_switch_to_tab "Switch to tab">
+<!ENTITY all_pages_title "Top Sites">
+<!ENTITY bookmarks_title "Bookmarks">
+<!ENTITY history_title "History">
+<!ENTITY switch_to_tab "Switch to tab">
<!ENTITY crash_reporter_title "&brandShortName; Crash Reporter">
<!ENTITY crash_message2 "&brandShortName; had a problem and crashed. Your tabs should be listed on the &brandShortName; Start page when you restart.">
<!ENTITY crash_send_report_message2 "Tell Mozilla about this crash so they can fix it">
<!ENTITY crash_include_url2 "Include the address of the page I was on">
<!ENTITY crash_sorry "We\'re sorry">
<!ENTITY crash_comment "Add a comment (comments are publicly visible)">
<!ENTITY crash_allow_contact "Allow Mozilla to contact me about this report">
@@ -28,17 +28,17 @@
<!ENTITY crash_restart_label "Restart &brandShortName;">
<!ENTITY exit_label "Exit">
<!ENTITY launcher_shortcuts_title "&brandShortName; Web Apps">
<!ENTITY launcher_shortcuts_empty "No web apps were found">
<!ENTITY choose_file "Choose File">
-<!ENTITY awesomebar_default_text "Enter Search or Address">
+<!ENTITY url_bar_default_text "Enter Search or Address">
<!ENTITY remote_tabs "Synced Tabs">
<!ENTITY remote_tabs_show_all "Show all tabs">
<!ENTITY bookmark "Bookmark">
<!ENTITY bookmark_added "Bookmark added">
<!ENTITY bookmark_removed "Bookmark removed">
<!ENTITY bookmark_updated "Bookmark updated">
rename from mobile/android/base/resources/color/awesome_bar_title.xml
rename to mobile/android/base/resources/color/url_bar_title.xml
rename from mobile/android/base/resources/color/awesome_bar_title_hint.xml
rename to mobile/android/base/resources/color/url_bar_title_hint.xml
rename from mobile/android/base/resources/drawable-hdpi/ic_awesomebar_go.png
rename to mobile/android/base/resources/drawable-hdpi/ic_url_bar_go.png
rename from mobile/android/base/resources/drawable-hdpi/ic_awesomebar_reader.png
rename to mobile/android/base/resources/drawable-hdpi/ic_url_bar_reader.png
rename from mobile/android/base/resources/drawable-hdpi/ic_awesomebar_search.png
rename to mobile/android/base/resources/drawable-hdpi/ic_url_bar_search.png
rename from mobile/android/base/resources/drawable-hdpi/ic_awesomebar_star.png
rename to mobile/android/base/resources/drawable-hdpi/ic_url_bar_star.png
rename from mobile/android/base/resources/drawable-hdpi/ic_awesomebar_tab.png
rename to mobile/android/base/resources/drawable-hdpi/ic_url_bar_tab.png
rename from mobile/android/base/resources/drawable-hdpi/address_bar_bg_shadow.png
rename to mobile/android/base/resources/drawable-hdpi/url_bar_bg_shadow.png
rename from mobile/android/base/resources/drawable-hdpi/address_bar_url_default.9.png
rename to mobile/android/base/resources/drawable-hdpi/url_bar_entry_default.9.png
rename from mobile/android/base/resources/drawable-hdpi/address_bar_url_default_pb.9.png
rename to mobile/android/base/resources/drawable-hdpi/url_bar_entry_default_pb.9.png
rename from mobile/android/base/resources/drawable-hdpi/address_bar_url_pressed.9.png
rename to mobile/android/base/resources/drawable-hdpi/url_bar_entry_pressed.9.png
rename from mobile/android/base/resources/drawable-hdpi/address_bar_url_pressed_pb.9.png
rename to mobile/android/base/resources/drawable-hdpi/url_bar_entry_pressed_pb.9.png
rename from mobile/android/base/resources/drawable-mdpi/ic_awesomebar_go.png
rename to mobile/android/base/resources/drawable-mdpi/ic_url_bar_go.png
rename from mobile/android/base/resources/drawable-mdpi/ic_awesomebar_reader.png
rename to mobile/android/base/resources/drawable-mdpi/ic_url_bar_reader.png
rename from mobile/android/base/resources/drawable-mdpi/ic_awesomebar_search.png
rename to mobile/android/base/resources/drawable-mdpi/ic_url_bar_search.png
rename from mobile/android/base/resources/drawable-mdpi/ic_awesomebar_star.png
rename to mobile/android/base/resources/drawable-mdpi/ic_url_bar_star.png
rename from mobile/android/base/resources/drawable-mdpi/ic_awesomebar_tab.png
rename to mobile/android/base/resources/drawable-mdpi/ic_url_bar_tab.png
rename from mobile/android/base/resources/drawable-mdpi/address_bar_bg_shadow.png
rename to mobile/android/base/resources/drawable-mdpi/url_bar_bg_shadow.png
rename from mobile/android/base/resources/drawable-mdpi/address_bar_url_default.9.png
rename to mobile/android/base/resources/drawable-mdpi/url_bar_entry_default.9.png
rename from mobile/android/base/resources/drawable-mdpi/address_bar_url_default_pb.9.png
rename to mobile/android/base/resources/drawable-mdpi/url_bar_entry_default_pb.9.png
rename from mobile/android/base/resources/drawable-mdpi/address_bar_url_pressed.9.png
rename to mobile/android/base/resources/drawable-mdpi/url_bar_entry_pressed.9.png
rename from mobile/android/base/resources/drawable-mdpi/address_bar_url_pressed_pb.9.png
rename to mobile/android/base/resources/drawable-mdpi/url_bar_entry_pressed_pb.9.png
rename from mobile/android/base/resources/drawable-xhdpi/ic_awesomebar_go.png
rename to mobile/android/base/resources/drawable-xhdpi/ic_url_bar_go.png
rename from mobile/android/base/resources/drawable-xhdpi/ic_awesomebar_reader.png
rename to mobile/android/base/resources/drawable-xhdpi/ic_url_bar_reader.png
rename from mobile/android/base/resources/drawable-xhdpi/ic_awesomebar_search.png
rename to mobile/android/base/resources/drawable-xhdpi/ic_url_bar_search.png
rename from mobile/android/base/resources/drawable-xhdpi/ic_awesomebar_star.png
rename to mobile/android/base/resources/drawable-xhdpi/ic_url_bar_star.png
rename from mobile/android/base/resources/drawable-xhdpi/ic_awesomebar_tab.png
rename to mobile/android/base/resources/drawable-xhdpi/ic_url_bar_tab.png
rename from mobile/android/base/resources/drawable-xhdpi/address_bar_bg_shadow.png
rename to mobile/android/base/resources/drawable-xhdpi/url_bar_bg_shadow.png
rename from mobile/android/base/resources/drawable-xhdpi/address_bar_url_default.9.png
rename to mobile/android/base/resources/drawable-xhdpi/url_bar_entry_default.9.png
rename from mobile/android/base/resources/drawable-xhdpi/address_bar_url_default_pb.9.png
rename to mobile/android/base/resources/drawable-xhdpi/url_bar_entry_default_pb.9.png
rename from mobile/android/base/resources/drawable-xhdpi/address_bar_url_pressed.9.png
rename to mobile/android/base/resources/drawable-xhdpi/url_bar_entry_pressed.9.png
rename from mobile/android/base/resources/drawable-xhdpi/address_bar_url_pressed_pb.9.png
rename to mobile/android/base/resources/drawable-xhdpi/url_bar_entry_pressed_pb.9.png
rename from mobile/android/base/resources/drawable/address_bar_bg.xml
rename to mobile/android/base/resources/drawable/url_bar_bg.xml
rename from mobile/android/base/resources/drawable/address_bar_bg_shadow_repeat.xml
rename to mobile/android/base/resources/drawable/url_bar_bg_shadow_repeat.xml
--- a/mobile/android/base/resources/drawable/address_bar_bg_shadow_repeat.xml
+++ b/mobile/android/base/resources/drawable/url_bar_bg_shadow_repeat.xml
@@ -1,9 +1,9 @@
<?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/. -->
<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/address_bar_bg_shadow"
+ android:src="@drawable/url_bar_bg_shadow"
android:tileMode="repeat"
android:dither="false"/>
rename from mobile/android/base/resources/drawable/address_bar_url.xml
rename to mobile/android/base/resources/drawable/url_bar_entry.xml
--- a/mobile/android/base/resources/drawable/address_bar_url.xml
+++ b/mobile/android/base/resources/drawable/url_bar_entry.xml
@@ -4,34 +4,34 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:gecko="http://schemas.android.com/apk/res-auto">
<!-- private browsing mode -->
<item gecko:state_private="true"
android:state_focused="true"
- android:drawable="@drawable/address_bar_url_pressed_pb"/>
+ android:drawable="@drawable/url_bar_entry_pressed_pb"/>
<item gecko:state_private="true"
android:state_pressed="true"
- android:drawable="@drawable/address_bar_url_pressed_pb"/>
+ android:drawable="@drawable/url_bar_entry_pressed_pb"/>
<item gecko:state_private="true"
android:state_selected="true"
- android:drawable="@drawable/address_bar_url_pressed_pb"/>
+ android:drawable="@drawable/url_bar_entry_pressed_pb"/>
<item gecko:state_private="true"
- android:drawable="@drawable/address_bar_url_default_pb"/>
+ android:drawable="@drawable/url_bar_entry_default_pb"/>
<!-- normal modes -->
<item android:state_focused="true"
- android:drawable="@drawable/address_bar_url_pressed"/>
+ android:drawable="@drawable/url_bar_entry_pressed"/>
<item android:state_pressed="true"
- android:drawable="@drawable/address_bar_url_pressed"/>
+ android:drawable="@drawable/url_bar_entry_pressed"/>
<item android:state_selected="true"
- android:drawable="@drawable/address_bar_url_pressed"/>
+ android:drawable="@drawable/url_bar_entry_pressed"/>
- <item android:drawable="@drawable/address_bar_url_default"/>
+ <item android:drawable="@drawable/url_bar_entry_default"/>
</selector>
rename from mobile/android/base/resources/drawable/address_bar_nav_button.xml
rename to mobile/android/base/resources/drawable/url_bar_nav_button.xml
rename from mobile/android/base/resources/drawable/address_bar_right_edge.xml
rename to mobile/android/base/resources/drawable/url_bar_right_edge.xml
--- a/mobile/android/base/resources/drawable/address_bar_right_edge.xml
+++ b/mobile/android/base/resources/drawable/url_bar_right_edge.xml
@@ -1,9 +1,9 @@
<?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/. -->
<clip xmlns:android="http://schemas.android.com/apk/res/android"
- android:drawable="@drawable/address_bar_url"
+ android:drawable="@drawable/url_bar_entry"
android:clipOrientation="horizontal"
android:gravity="right"/>
\ No newline at end of file
--- a/mobile/android/base/resources/layout-large-v11/awesomebar_search.xml
+++ b/mobile/android/base/resources/layout-large-v11/awesomebar_search.xml
@@ -2,39 +2,39 @@
<!-- 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/. -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:gecko="http://schemas.android.com/apk/res-auto"
style="@style/AwesomeBar">
- <org.mozilla.gecko.BrowserToolbarBackground android:id="@+id/address_bar_bg"
+ <org.mozilla.gecko.BrowserToolbarBackground android:id="@+id/url_bar_bg"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
gecko:curveTowards="none"
- android:background="@drawable/address_bar_bg"/>
+ android:background="@drawable/url_bar_bg"/>
<view class="org.mozilla.gecko.CustomEditText"
android:id="@+id/awesomebar_text"
- style="@style/AddressBar.Button"
- android:background="@drawable/address_bar_url"
+ style="@style/UrlBar.Button"
+ android:background="@drawable/url_bar_entry"
android:layout_marginLeft="6dip"
android:layout_marginRight="6dip"
android:layout_marginTop="7dip"
android:layout_marginBottom="7dip"
android:layout_alignParentBottom="true"
android:layout_centerVertical="true"
android:paddingLeft="15dip"
android:paddingRight="40dip"
- android:hint="@string/awesomebar_default_text"
- android:textColor="@color/awesome_bar_title"
- android:textColorHint="@color/awesome_bar_title_hint"
+ android:hint="@string/url_bar_default_text"
+ android:textColor="@color/url_bar_title"
+ android:textColorHint="@color/url_bar_title_hint"
android:textColorHighlight="@color/url_bar_text_highlight"
android:textCursorDrawable="@null"
android:inputType="textUri|textNoSuggestions"
android:imeOptions="actionSearch|flagNoExtractUi|flagNoFullscreen"
android:selectAllOnFocus="true"
android:singleLine="true"
android:gravity="center_vertical|left"
gecko:autoUpdateTheme="false">
@@ -42,16 +42,16 @@
</view>
<LinearLayout android:layout_width="4dp"
android:layout_height="fill_parent"
android:orientation="vertical"
android:layout_alignParentRight="true"/>
<ImageButton android:id="@+id/awesomebar_button"
- style="@style/AddressBar.ImageButton.Icon"
+ style="@style/UrlBar.ImageButton.Icon"
android:padding="14dip"
android:layout_centerVertical="true"
android:layout_alignRight="@id/awesomebar_text"
android:visibility="gone"
- android:src="@drawable/ic_awesomebar_go"/>
+ android:src="@drawable/ic_url_bar_go"/>
</RelativeLayout>
--- a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
@@ -5,190 +5,190 @@
<org.mozilla.gecko.BrowserToolbarLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:gecko="http://schemas.android.com/apk/res-auto"
android:id="@+id/browser_toolbar"
style="@style/BrowserToolbar"
android:clickable="true"
android:focusable="true">
- <org.mozilla.gecko.BrowserToolbarBackground android:id="@+id/address_bar_bg"
+ <org.mozilla.gecko.BrowserToolbarBackground android:id="@+id/url_bar_bg"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:background="@drawable/address_bar_bg"/>
+ android:background="@drawable/url_bar_bg"/>
<Gecko.ShapedButton android:id="@+id/tabs"
- style="@style/AddressBar.ImageButton"
+ style="@style/UrlBar.ImageButton"
android:layout_width="84dip"
android:layout_alignParentLeft="true"
gecko:curveTowards="left"
android:background="@drawable/shaped_button"
android:gravity="center_vertical"
android:paddingLeft="6dip"
android:paddingRight="38dip"/>
<!-- The TextSwitcher should be shifted 28dp on the right, to avoid
the curve. On a 56dp space, centering 24dp image will leave
16dp on all sides. However this image has a perception of
2 layers. Hence to center this, an additional 4dp is added to the right.
The margins will be 12dp on left, 48dp on right, instead of ideal 16dp
and 44dp. -->
<org.mozilla.gecko.TabCounter android:id="@+id/tabs_counter"
- style="@style/AddressBar.ImageButton.TabCount"
+ style="@style/UrlBar.ImageButton.TabCount"
android:layout_width="24dip"
android:layout_height="24dip"
android:layout_marginLeft="12dip"
android:layout_marginRight="48dip"
android:layout_marginTop="16dp"
android:layout_alignLeft="@id/tabs"/>
- <ImageView android:id="@+id/awesome_bar_entry"
+ <ImageView android:id="@+id/url_bar_entry"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_toRightOf="@id/tabs"
android:layout_toLeftOf="@id/menu_items"
android:layout_marginLeft="-18dp"
android:layout_marginTop="7dp"
android:layout_marginBottom="7dp"
android:duplicateParentState="true"
android:clickable="false"
android:focusable="false"
- android:background="@drawable/address_bar_url"/>
+ android:background="@drawable/url_bar_entry"/>
- <org.mozilla.gecko.ForwardButton style="@style/AddressBar.ImageButton.Forward"
+ <org.mozilla.gecko.ForwardButton style="@style/UrlBar.ImageButton.Forward"
android:id="@+id/forward"
android:layout_toRightOf="@+id/tabs"/>
<org.mozilla.gecko.BackButton android:id="@+id/back"
- style="@style/AddressBar.ImageButton"
+ style="@style/UrlBar.ImageButton"
android:layout_width="50dip"
android:layout_height="50dip"
android:layout_toRightOf="@id/tabs"
android:layout_marginLeft="-28dp"
android:layout_centerVertical="true"
android:padding="13dp"
android:src="@drawable/ic_menu_back"
android:contentDescription="@string/back"
- android:background="@drawable/address_bar_nav_button"/>
+ android:background="@drawable/url_bar_nav_button"/>
- <LinearLayout android:id="@+id/awesome_bar_edit_container"
- style="@style/AddressBar.Button"
+ <LinearLayout android:id="@+id/url_edit_container"
+ style="@style/UrlBar.Button"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
android:paddingLeft="8dp"
android:visibility="gone"
android:orientation="horizontal"
android:layout_toRightOf="@id/back"
android:layout_toLeftOf="@id/menu_items">
<view class="org.mozilla.gecko.CustomEditText"
- android:id="@+id/awesome_bar_edit_text"
- style="@style/AddressBar.Button"
+ android:id="@+id/url_edit_text"
+ style="@style/UrlBar.Button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1.0"
- android:hint="@string/awesomebar_default_text"
- android:textColor="@color/awesome_bar_title"
- android:textColorHint="@color/awesome_bar_title_hint"
+ android:hint="@string/url_bar_default_text"
+ android:textColor="@color/url_bar_title"
+ android:textColorHint="@color/url_bar_title_hint"
android:textColorHighlight="@color/url_bar_text_highlight"
android:textSelectHandle="@drawable/handle_middle"
android:textSelectHandleLeft="@drawable/handle_start"
android:textSelectHandleRight="@drawable/handle_end"
android:textCursorDrawable="@null"
android:inputType="textUri|textNoSuggestions"
android:imeOptions="actionSearch|flagNoExtractUi|flagNoFullscreen"
android:selectAllOnFocus="true"
android:singleLine="true"
android:gravity="center_vertical|left"
gecko:autoUpdateTheme="false"/>
<ImageButton android:id="@+id/go"
- style="@style/AddressBar.ImageButton.Icon"
- android:src="@drawable/ic_awesomebar_go"
+ style="@style/UrlBar.ImageButton.Icon"
+ android:src="@drawable/ic_url_bar_go"
android:contentDescription="@string/go"
android:visibility="gone"/>
</LinearLayout>
- <LinearLayout android:id="@+id/awesome_bar_display_container"
- style="@style/AddressBar.Button.Container"
+ <LinearLayout android:id="@+id/url_display_container"
+ style="@style/UrlBar.Button.Container"
android:layout_toRightOf="@id/back"
android:layout_toLeftOf="@id/menu_items">
<ImageButton android:id="@+id/favicon"
- style="@style/AddressBar.ImageButton"
+ style="@style/UrlBar.ImageButton"
android:layout_width="@dimen/browser_toolbar_favicon_size"
android:layout_height="fill_parent"
android:scaleType="fitCenter"
android:paddingLeft="8dip"
android:layout_marginRight="4dip"
android:layout_gravity="center_vertical"
android:src="@drawable/favicon"/>
<ImageButton android:id="@+id/site_security"
- style="@style/AddressBar.ImageButton"
+ style="@style/UrlBar.ImageButton"
android:layout_width="@dimen/browser_toolbar_lock_width"
android:scaleType="fitCenter"
android:layout_marginLeft="-4dip"
android:src="@drawable/site_security_level"
android:contentDescription="@string/site_security"
android:visibility="gone"/>
- <Gecko.TextView android:id="@+id/awesome_bar_title"
- style="@style/AddressBar.Button"
+ <Gecko.TextView android:id="@+id/url_bar_title"
+ style="@style/UrlBar.Button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1.0"
android:singleLine="true"
android:paddingRight="8dp"
- android:textColor="@color/awesome_bar_title"
- android:textColorHint="@color/awesome_bar_title_hint"
+ android:textColor="@color/url_bar_title"
+ android:textColorHint="@color/url_bar_title_hint"
android:gravity="center_vertical|left"
- android:hint="@string/awesomebar_default_text"
+ android:hint="@string/url_bar_default_text"
android:layout_gravity="center_vertical"
gecko:autoUpdateTheme="false"/>
<ImageButton android:id="@+id/reader"
- style="@style/AddressBar.ImageButton.Icon"
+ style="@style/UrlBar.ImageButton.Icon"
android:src="@drawable/reader"
android:contentDescription="@string/reader"
android:visibility="gone"/>
<ImageButton android:id="@+id/stop"
- style="@style/AddressBar.ImageButton.Icon"
+ style="@style/UrlBar.ImageButton.Icon"
android:src="@drawable/urlbar_stop"
android:contentDescription="@string/stop"
android:visibility="gone"/>
</LinearLayout>
<LinearLayout android:id="@+id/menu_items"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_marginLeft="3dp"
android:orientation="horizontal"
android:layout_toLeftOf="@id/menu"
android:layout_alignWithParentIfMissing="true"/>
<Gecko.ImageButton android:id="@+id/menu"
- style="@style/AddressBar.ImageButton"
+ style="@style/UrlBar.ImageButton"
android:layout_width="56dip"
android:layout_alignParentRight="true"
android:contentDescription="@string/menu"
android:background="@drawable/action_bar_button"
android:visibility="gone"/>
<Gecko.ImageView android:id="@+id/menu_icon"
- style="@style/AddressBar.ImageButton"
+ style="@style/UrlBar.ImageButton"
android:layout_alignLeft="@id/menu"
android:layout_alignRight="@id/menu"
android:gravity="center_vertical"
android:src="@drawable/menu_level"
android:visibility="gone"/>
<ImageView android:id="@+id/shadow"
android:layout_width="fill_parent"
android:layout_height="2dp"
android:layout_alignParentBottom="true"
- android:background="@drawable/address_bar_bg_shadow_repeat"
+ android:background="@drawable/url_bar_bg_shadow_repeat"
android:visibility="gone"/>
</org.mozilla.gecko.BrowserToolbarLayout>
--- a/mobile/android/base/resources/layout-xlarge-v11/awesomebar_search.xml
+++ b/mobile/android/base/resources/layout-xlarge-v11/awesomebar_search.xml
@@ -2,64 +2,64 @@
<!-- 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/. -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:gecko="http://schemas.android.com/apk/res-auto"
style="@style/AwesomeBar">
- <org.mozilla.gecko.BrowserToolbarBackground android:id="@+id/address_bar_bg"
+ <org.mozilla.gecko.BrowserToolbarBackground android:id="@+id/url_bar_bg"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
gecko:curveTowards="none"
- android:background="@drawable/address_bar_bg"/>
+ android:background="@drawable/url_bar_bg"/>
<Gecko.ShapedButton android:id="@+id/dummy_tab"
- style="@style/AddressBar.ImageButton"
+ style="@style/UrlBar.ImageButton"
android:layout_width="84dip"
android:layout_alignParentLeft="true"
gecko:curveTowards="left"
android:background="@drawable/shaped_button"
android:gravity="center_vertical"/>
<view class="org.mozilla.gecko.CustomEditText"
android:id="@+id/awesomebar_text"
- style="@style/AddressBar.Button"
- android:background="@drawable/address_bar_url"
+ style="@style/UrlBar.Button"
+ android:background="@drawable/url_bar_entry"
android:layout_marginLeft="0dip"
android:layout_marginRight="56dip"
android:layout_marginTop="7dip"
android:layout_marginBottom="7dip"
android:layout_toRightOf="@id/dummy_tab"
android:layout_alignParentBottom="true"
android:layout_centerVertical="true"
android:paddingLeft="15dip"
android:paddingRight="40dip"
- android:hint="@string/awesomebar_default_text"
- android:textColor="@color/awesome_bar_title"
- android:textColorHint="@color/awesome_bar_title_hint"
+ android:hint="@string/url_bar_default_text"
+ android:textColor="@color/url_bar_title"
+ android:textColorHint="@color/url_bar_title_hint"
android:textColorHighlight="@color/url_bar_text_highlight"
android:textCursorDrawable="@null"
android:inputType="textUri|textNoSuggestions"
android:imeOptions="actionSearch|flagNoExtractUi|flagNoFullscreen"
android:selectAllOnFocus="true"
android:singleLine="true"
android:gravity="center_vertical|left">
<requestFocus/>
</view>
<LinearLayout android:layout_width="4dp"
android:layout_height="fill_parent"
android:orientation="vertical"
android:layout_alignParentRight="true"/>
<ImageButton android:id="@+id/awesomebar_button"
- style="@style/AddressBar.ImageButton.Icon"
+ style="@style/UrlBar.ImageButton.Icon"
android:padding="14dip"
android:layout_centerVertical="true"
android:layout_alignRight="@id/awesomebar_text"
android:visibility="gone"
- android:src="@drawable/ic_awesomebar_go"/>
+ android:src="@drawable/ic_url_bar_go"/>
</RelativeLayout>
--- a/mobile/android/base/resources/layout/awesomebar_actionbar.xml
+++ b/mobile/android/base/resources/layout/awesomebar_actionbar.xml
@@ -1,7 +1,7 @@
<?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"
- style="@style/AddressBar"/>
+ style="@style/UrlBar"/>
--- a/mobile/android/base/resources/layout/awesomebar_search.xml
+++ b/mobile/android/base/resources/layout/awesomebar_search.xml
@@ -2,39 +2,39 @@
<!-- 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/. -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:gecko="http://schemas.android.com/apk/res-auto"
style="@style/AwesomeBar">
- <org.mozilla.gecko.BrowserToolbarBackground android:id="@+id/address_bar_bg"
+ <org.mozilla.gecko.BrowserToolbarBackground android:id="@+id/url_bar_bg"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
gecko:curveTowards="none"
- android:background="@drawable/address_bar_bg"/>
+ android:background="@drawable/url_bar_bg"/>
<view class="org.mozilla.gecko.CustomEditText"
android:id="@+id/awesomebar_text"
- style="@style/AddressBar.Button"
- android:background="@drawable/address_bar_url"
+ style="@style/UrlBar.Button"
+ android:background="@drawable/url_bar_entry"
android:layout_marginLeft="4dip"
android:layout_marginRight="4dip"
android:layout_marginTop="5dip"
android:layout_marginBottom="5dip"
android:layout_alignParentBottom="true"
android:layout_centerVertical="true"
android:paddingLeft="15dip"
android:paddingRight="40dip"
- android:hint="@string/awesomebar_default_text"
- android:textColor="@color/awesome_bar_title"
- android:textColorHint="@color/awesome_bar_title_hint"
+ android:hint="@string/url_bar_default_text"
+ android:textColor="@color/url_bar_title"
+ android:textColorHint="@color/url_bar_title_hint"
android:textColorHighlight="@color/url_bar_text_highlight"
android:textSelectHandle="@drawable/handle_middle"
android:textSelectHandleLeft="@drawable/handle_start"
android:textSelectHandleRight="@drawable/handle_end"
android:textCursorDrawable="@null"
android:inputType="textUri|textNoSuggestions"
android:imeOptions="actionSearch|flagNoExtractUi|flagNoFullscreen"
android:selectAllOnFocus="true"
@@ -45,16 +45,16 @@
</view>
<LinearLayout android:layout_width="4dp"
android:layout_height="fill_parent"
android:orientation="vertical"
android:layout_alignParentRight="true"/>
<ImageButton android:id="@+id/awesomebar_button"
- style="@style/AddressBar.ImageButton.Icon"
+ style="@style/UrlBar.ImageButton.Icon"
android:padding="12dip"
android:layout_centerVertical="true"
android:layout_alignRight="@id/awesomebar_text"
android:visibility="gone"
- android:src="@drawable/ic_awesomebar_go"/>
+ android:src="@drawable/ic_url_bar_go"/>
</RelativeLayout>
--- a/mobile/android/base/resources/layout/awesomebar_suggestion_item.xml
+++ b/mobile/android/base/resources/layout/awesomebar_suggestion_item.xml
@@ -7,17 +7,17 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@drawable/suggestion_selector"
android:gravity="center_vertical"
android:padding="7dp">
<ImageView android:id="@+id/suggestion_magnifier"
- android:src="@drawable/ic_awesomebar_search"
+ android:src="@drawable/ic_url_bar_search"
android:layout_marginRight="3dip"
android:layout_width="16dip"
android:layout_height="16dip"/>
<TextView android:id="@+id/suggestion_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#222222"
--- a/mobile/android/base/resources/layout/awesomebar_suggestion_prompt.xml
+++ b/mobile/android/base/resources/layout/awesomebar_suggestion_prompt.xml
@@ -2,30 +2,30 @@
<!-- 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/. -->
<view xmlns:android="http://schemas.android.com/apk/res/android"
class="org.mozilla.gecko.AwesomeBarTabs$BackgroundLayout"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="@drawable/address_bar_bg">
+ android:background="@drawable/url_bar_bg">
<LinearLayout android:id="@+id/prompt_container"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:minHeight="@dimen/awesomebar_row_height"
android:gravity="center_vertical"
android:padding="10dip">
<Gecko.TextView android:id="@+id/suggestions_prompt_title"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:textColor="@color/awesome_bar_title"
+ android:textColor="@color/url_bar_title"
android:layout_marginLeft="6dip"
android:textSize="14sp"
android:layout_weight="1" />
<TextView android:id="@+id/suggestions_prompt_yes"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textSize="14sp"
--- a/mobile/android/base/resources/layout/awesomebar_tab_indicator.xml
+++ b/mobile/android/base/resources/layout/awesomebar_tab_indicator.xml
@@ -9,10 +9,10 @@
android:layout_height="fill_parent"
android:layout_weight="1.0"
android:gravity="center"
android:background="@drawable/awesomebar_tab_indicator"
android:padding="10dp"
android:singleLine="true"
android:ellipsize="marquee"
android:textSize="14sp"
- android:textColor="@color/awesome_bar_title"
+ android:textColor="@color/url_bar_title"
gecko:autoUpdateTheme="false"/>
--- a/mobile/android/base/resources/layout/awesomebar_tabs.xml
+++ b/mobile/android/base/resources/layout/awesomebar_tabs.xml
@@ -13,17 +13,17 @@
<LinearLayout android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<view class="org.mozilla.gecko.AwesomeBarTabs$BackgroundLayout"
android:id="@+id/tab_widget_container"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="@drawable/address_bar_bg"
+ android:background="@drawable/url_bar_bg"
android:focusable="false"
android:descendantFocusability="blocksDescendants">
<View android:id="@+id/tab_widget_left"
style="@style/AwesomeBarTabIndicatorCurve.Left"/>
<TabWidget android:id="@android:id/tabs"
style="@style/TabWidget"/>
--- a/mobile/android/base/resources/layout/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout/browser_toolbar.xml
@@ -9,189 +9,189 @@
style="@style/BrowserToolbar"
android:layout_centerVertical="true"
android:clipChildren="false"
android:clipToPadding="false"
android:clickable="true"
android:focusable="true">
<ImageButton android:id="@+id/back"
- style="@style/AddressBar.ImageButton.Back"/>
+ style="@style/UrlBar.ImageButton.Back"/>
<ImageButton android:id="@+id/forward"
- style="@style/AddressBar.ImageButton.Forward"/>
+ style="@style/UrlBar.ImageButton.Forward"/>
- <org.mozilla.gecko.BrowserToolbarBackground android:id="@+id/address_bar_bg"
+ <org.mozilla.gecko.BrowserToolbarBackground android:id="@+id/url_bar_bg"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:background="@drawable/address_bar_bg"/>
+ android:background="@drawable/url_bar_bg"/>
- <ImageView android:id="@+id/awesome_bar_entry"
- style="@style/AddressBar.Button"
+ <ImageView android:id="@+id/url_bar_entry"
+ style="@style/UrlBar.Button"
android:layout_marginLeft="4dp"
android:layout_marginRight="-19dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/tabs"
android:paddingRight="4dp"
android:duplicateParentState="true"
android:clickable="false"
android:focusable="false"
- android:src="@drawable/address_bar_url"
+ android:src="@drawable/url_bar_entry"
android:scaleType="fitXY"/>
- <ImageView android:id="@+id/awesome_bar_right_edge"
- style="@style/AddressBar.Button"
- android:layout_alignLeft="@id/awesome_bar_entry"
- android:layout_alignRight="@id/awesome_bar_entry"
- android:layout_alignTop="@id/awesome_bar_entry"
- android:layout_alignBottom="@id/awesome_bar_entry"
+ <ImageView android:id="@+id/url_bar_right_edge"
+ style="@style/UrlBar.Button"
+ android:layout_alignLeft="@id/url_bar_entry"
+ android:layout_alignRight="@id/url_bar_entry"
+ android:layout_alignTop="@id/url_bar_entry"
+ android:layout_alignBottom="@id/url_bar_entry"
android:paddingRight="4dp"
android:duplicateParentState="true"
android:clickable="false"
android:focusable="false"
- android:src="@drawable/address_bar_right_edge"
+ android:src="@drawable/url_bar_right_edge"
android:scaleType="fitXY"/>
<LinearLayout android:id="@+id/menu_items"
- style="@style/AddressBar.ImageButton.Unused"/>
+ style="@style/UrlBar.ImageButton.Unused"/>
<Gecko.ShapedButton android:id="@+id/menu"
- style="@style/AddressBar.ImageButton"
+ style="@style/UrlBar.ImageButton"
android:layout_width="48dip"
android:layout_alignParentRight="true"
android:contentDescription="@string/menu"
android:background="@drawable/shaped_button"
android:visibility="gone"/>
<Gecko.ImageView android:id="@+id/menu_icon"
- style="@style/AddressBar.ImageButton"
+ style="@style/UrlBar.ImageButton"
android:layout_alignLeft="@id/menu"
android:layout_alignRight="@id/menu"
android:gravity="center_vertical"
android:src="@drawable/menu_level"
android:visibility="gone"/>
<Gecko.ShapedButton android:id="@+id/tabs"
- style="@style/AddressBar.ImageButton"
+ style="@style/UrlBar.ImageButton"
android:layout_width="72dip"
android:layout_toLeftOf="@id/menu"
android:layout_alignWithParentIfMissing="true"
gecko:curveTowards="right"
android:background="@drawable/shaped_button"
android:gravity="center_vertical"
android:paddingLeft="37dip"
android:paddingRight="11dip"/>
<!-- The TextSwitcher should be shifted 24dp on the left, to avoid
the curve. On a 48dp space, centering 24dp image will leave
12dp on all sides. However this image has a perception of
2 layers. Hence to center this, an additional 4dp is added to the left.
The margins will be 40dp on left, 8dp on right, instead of ideal 30dp
and 12dp. -->
<org.mozilla.gecko.TabCounter android:id="@+id/tabs_counter"
- style="@style/AddressBar.ImageButton.TabCount"
+ style="@style/UrlBar.ImageButton.TabCount"
android:layout_width="24dip"
android:layout_height="24dip"
android:layout_marginLeft="40dip"
android:layout_marginRight="8dip"
android:layout_marginTop="12dip"
android:layout_alignRight="@id/tabs"/>
- <LinearLayout android:id="@+id/awesome_bar_edit_container"
- style="@style/AddressBar.Button"
+ <LinearLayout android:id="@+id/url_edit_container"
+ style="@style/UrlBar.Button"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
android:paddingLeft="8dp"
android:visibility="gone"
android:orientation="horizontal">
<view class="org.mozilla.gecko.CustomEditText"
- android:id="@+id/awesome_bar_edit_text"
- style="@style/AddressBar.Button"
+ android:id="@+id/url_edit_text"
+ style="@style/UrlBar.Button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1.0"
- android:hint="@string/awesomebar_default_text"
- android:textColor="@color/awesome_bar_title"
- android:textColorHint="@color/awesome_bar_title_hint"
+ android:hint="@string/url_bar_default_text"
+ android:textColor="@color/url_bar_title"
+ android:textColorHint="@color/url_bar_title_hint"
android:textColorHighlight="@color/url_bar_text_highlight"
android:textSelectHandle="@drawable/handle_middle"
android:textSelectHandleLeft="@drawable/handle_start"
android:textSelectHandleRight="@drawable/handle_end"
android:textCursorDrawable="@null"
android:inputType="textUri|textNoSuggestions"
android:imeOptions="actionSearch|flagNoExtractUi|flagNoFullscreen"
android:selectAllOnFocus="true"
android:singleLine="true"
android:gravity="center_vertical|left"
gecko:autoUpdateTheme="false"/>
<ImageButton android:id="@+id/go"
- style="@style/AddressBar.ImageButton.Icon"
- android:src="@drawable/ic_awesomebar_go"
+ style="@style/UrlBar.ImageButton.Icon"
+ android:src="@drawable/ic_url_bar_go"
android:contentDescription="@string/go"
android:visibility="gone"/>
</LinearLayout>
- <LinearLayout android:id="@+id/awesome_bar_display_container"
- style="@style/AddressBar.Button"
+ <LinearLayout android:id="@+id/url_display_container"
+ style="@style/UrlBar.Button"
android:layout_toLeftOf="@id/tabs"
android:layout_marginRight="-24dp"
android:orientation="horizontal">
<ImageButton android:id="@+id/favicon"
- style="@style/AddressBar.ImageButton"
+ style="@style/UrlBar.ImageButton"
android:layout_width="@dimen/browser_toolbar_favicon_size"
android:layout_height="fill_parent"
android:scaleType="fitCenter"
android:paddingLeft="12dip"
android:layout_marginRight="4dip"
android:layout_gravity="center_vertical"
android:src="@drawable/favicon"/>
<ImageButton android:id="@+id/site_security"
- style="@style/AddressBar.ImageButton"
+ style="@style/UrlBar.ImageButton"
android:layout_width="@dimen/browser_toolbar_lock_width"
android:scaleType="fitCenter"
android:layout_marginLeft="-4dip"
android:src="@drawable/site_security_level"
android:contentDescription="@string/site_security"
android:visibility="gone"/>
- <Gecko.TextView android:id="@+id/awesome_bar_title"
- style="@style/AddressBar.Button"
+ <Gecko.TextView android:id="@+id/url_bar_title"
+ style="@style/UrlBar.Button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1.0"
android:singleLine="true"
android:paddingRight="8dp"
- android:textColor="@color/awesome_bar_title"
- android:textColorHint="@color/awesome_bar_title_hint"
+ android:textColor="@color/url_bar_title"
+ android:textColorHint="@color/url_bar_title_hint"
android:gravity="center_vertical|left"
- android:hint="@string/awesomebar_default_text"
+ android:hint="@string/url_bar_default_text"
android:layout_gravity="center_vertical"
gecko:autoUpdateTheme="false"/>
<ImageButton android:id="@+id/reader"
- style="@style/AddressBar.ImageButton.Icon"
+ style="@style/UrlBar.ImageButton.Icon"
android:src="@drawable/reader"
android:contentDescription="@string/reader"
android:visibility="gone"/>
<ImageButton android:id="@+id/stop"
- style="@style/AddressBar.ImageButton.Icon"
+ style="@style/UrlBar.ImageButton.Icon"
android:src="@drawable/urlbar_stop"
android:contentDescription="@string/stop"
android:visibility="gone"/>
</LinearLayout>
<ImageView android:id="@+id/shadow"
android:layout_width="fill_parent"
android:layout_height="2dp"
android:layout_alignParentBottom="true"
- android:background="@drawable/address_bar_bg_shadow_repeat"
+ android:background="@drawable/url_bar_bg_shadow_repeat"
android:visibility="gone"/>
</org.mozilla.gecko.BrowserToolbarLayout>
--- a/mobile/android/base/resources/layout/find_in_page_content.xml
+++ b/mobile/android/base/resources/layout/find_in_page_content.xml
@@ -4,17 +4,17 @@
<view class="org.mozilla.gecko.CustomEditText"
android:id="@+id/find_text"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1.0"
android:layout_marginLeft="5dip"
android:layout_marginRight="5dip"
android:contentDescription="@string/find_text"
- android:background="@drawable/address_bar_url"
+ android:background="@drawable/url_bar_entry"
android:singleLine="true"
android:textColor="#000000"
android:textCursorDrawable="@null"
android:inputType="text"
android:paddingLeft="15dip"
android:paddingRight="15dip"
android:textColorHighlight="@color/url_bar_text_highlight"
android:imeOptions="actionSearch"
--- a/mobile/android/base/resources/layout/tabs_panel_header.xml
+++ b/mobile/android/base/resources/layout/tabs_panel_header.xml
@@ -11,17 +11,17 @@
android:tabStripEnabled="false"
android:divider="@drawable/tab_indicator_divider"/>
<View android:layout_width="0dip"
android:layout_height="fill_parent"
android:layout_weight="1.0"/>
<ImageButton android:id="@+id/add_tab"
- style="@style/AddressBar.ImageButton"
+ style="@style/UrlBar.ImageButton"
android:layout_width="@dimen/browser_toolbar_height"
android:layout_height="@dimen/browser_toolbar_height"
android:padding="@dimen/browser_toolbar_button_padding"
android:src="@drawable/tab_new_level"
android:contentDescription="@string/new_tab"
android:background="@drawable/action_bar_button_inverse"/>
</merge>
--- a/mobile/android/base/resources/values-large-v11/styles.xml
+++ b/mobile/android/base/resources/values-large-v11/styles.xml
@@ -26,33 +26,33 @@
<item name="android:listSelector">@drawable/action_bar_button</item>
<item name="android:paddingTop">0dip</item>
<item name="android:paddingBottom">0dip</item>
<!-- Increase the padding on left and right on large screen sizes -->
<item name="android:paddingLeft">60dip</item>
<item name="android:paddingRight">60dip</item>
</style>
- <style name="AddressBar.ImageButton.Forward">
+ <style name="UrlBar.ImageButton.Forward">
<item name="android:contentDescription">@string/forward</item>
<item name="android:layout_width">45dip</item>
<item name="android:layout_height">38dip</item>
<item name="android:paddingLeft">10dp</item>
<item name="android:paddingTop">7dp</item>
<item name="android:paddingBottom">7dp</item>
<item name="android:layout_gravity">center_vertical</item>
<item name="android:layout_centerVertical">true</item>
<item name="android:src">@drawable/ic_menu_forward</item>
- <item name="android:background">@drawable/address_bar_nav_button</item>
+ <item name="android:background">@drawable/url_bar_nav_button</item>
<!-- Start with the button hidden -->
<item name="android:alpha">0</item>
<item name="android:layout_marginLeft">@dimen/forward_default_offset</item>
</style>
- <style name="AddressBar.Button.Container">
+ <style name="UrlBar.Button.Container">
<item name="android:layout_marginTop">6dp</item>
<item name="android:layout_marginBottom">6dp</item>
<!-- Start with forward hidden -->
<item name="android:orientation">horizontal</item>
</style>
<style name="TabsList" parent="TabsListBase">
<item name="android:orientation">horizontal</item>
--- a/mobile/android/base/resources/values-xlarge-v11/dimens.xml
+++ b/mobile/android/base/resources/values-xlarge-v11/dimens.xml
@@ -16,11 +16,11 @@
<dimen name="awesomebar_row_height">66dp</dimen>
<dimen name="awesomebar_tab_transparency_height">46dp</dimen>
<dimen name="browser_toolbar_height">56dp</dimen>
<dimen name="remote_tab_child_row_height">56dp</dimen>
<dimen name="remote_tab_group_row_height">34dp</dimen>
<dimen name="tabs_counter_size">26sp</dimen>
<dimen name="tabs_panel_indicator_width">60dp</dimen>
<dimen name="tabs_panel_list_padding">8dip</dimen>
- <dimen name="addressbar_offset_left">84dip</dimen>
+ <dimen name="url_bar_offset_left">84dip</dimen>
</resources>
--- a/mobile/android/base/resources/values/arrays.xml
+++ b/mobile/android/base/resources/values/arrays.xml
@@ -53,18 +53,18 @@
<item>@string/pref_donottrack_no_pref</item>
</string-array>
<string-array name="pref_donottrack_values">
<item>1</item>
<item>2</item>
<item>0</item>
</string-array>
<string-array name="pref_import_android_entries">
- <item>@string/awesomebar_bookmarks_title</item>
- <item>@string/awesomebar_history_title</item>
+ <item>@string/bookmarks_title</item>
+ <item>@string/history_title</item>
</string-array>
<string-array name="pref_import_android_values">
<item>true</item>
<item>true</item>
</string-array>
<string-array name="pref_import_android_keys">
<item>android_import.data.bookmarks</item>
<item>android_import.data.history</item>
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -18,24 +18,26 @@
<dimen name="autocomplete_min_width">200dp</dimen>
<dimen name="autocomplete_row_height">32dp</dimen>
<!-- Padding on either side of the lists in AwesomeBar -->
<dimen name="awesomebar_list_padding">0dp</dimen>
<dimen name="awesomebar_header_row_height">20dp</dimen>
<dimen name="awesomebar_row_height">48dp</dimen>
- <dimen name="awesomebar_row_favicon_size_small">16dp</dimen>
- <dimen name="awesomebar_row_favicon_size_large">32dp</dimen>
<dimen name="awesomebar_tab_transparency_height">38dp</dimen>
<dimen name="browser_toolbar_height">48dp</dimen>
<dimen name="browser_toolbar_button_padding">12dp</dimen>
<dimen name="browser_toolbar_icon_width">48dp</dimen>
<dimen name="browser_toolbar_lock_width">20dp</dimen>
<dimen name="browser_toolbar_favicon_size">29.33dip</dimen>
+
+ <!-- Dimensions used by Favicons and FaviconView -->
+ <dimen name="favicon_size_small">16dp</dimen>
+ <dimen name="favicon_size_large">32dp</dimen>
<dimen name="favicon_bg">32dp</dimen>
<dimen name="favicon_bg_radius">1dp</dimen>
<!-- Max width of the doorhanger on tablets -->
<dimen name="doorhanger_width">400dp</dimen>
<dimen name="flow_layout_spacing">6dp</dimen>
<dimen name="menu_item_icon">21dp</dimen>
@@ -65,10 +67,10 @@
<dimen name="tabs_sidebar_width">200dp</dimen>
<dimen name="tabs_tray_horizontal_height">156dp</dimen>
<dimen name="text_selection_handle_width">47dp</dimen>
<dimen name="text_selection_handle_height">58dp</dimen>
<dimen name="text_selection_handle_shadow">11dp</dimen>
<dimen name="validation_message_height">50dp</dimen>
<dimen name="validation_message_margin_top">6dp</dimen>
<dimen name="forward_default_offset">-13dip</dimen>
- <dimen name="addressbar_offset_left">32dp</dimen>
+ <dimen name="url_bar_offset_left">32dp</dimen>
</resources>
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -163,61 +163,61 @@
<!-- BrowserToolbar -->
<style name="BrowserToolbar">
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">@dimen/browser_toolbar_height</item>
<item name="android:orientation">horizontal</item>
</style>
- <style name="AddressBar.ImageButton.TabCount">
+ <style name="UrlBar.ImageButton.TabCount">
<item name="android:background">@drawable/tabs_count</item>
<item name="android:gravity">center_horizontal</item>
<item name="android:clipChildren">false</item>
<item name="android:clipToPadding">false</item>
</style>
- <!-- Address bar -->
- <style name="AddressBar">
+ <!-- URL bar -->
+ <style name="UrlBar">
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">fill_parent</item>
<item name="android:orientation">horizontal</item>
</style>
- <!-- Address bar - Button -->
- <style name="AddressBar.Button">
+ <!-- URL bar - Button -->
+ <style name="UrlBar.Button">
<item name="android:layout_height">fill_parent</item>
<item name="android:textSize">16sp</item>
<item name="android:background">@android:color/transparent</item>
</style>
- <!-- Address bar - Image Button -->
- <style name="AddressBar.ImageButton" parent="AddressBar.Button">
+ <!-- URL bar - Image Button -->
+ <style name="UrlBar.ImageButton" parent="UrlBar.Button">
<item name="android:scaleType">center</item>
<item name="android:layout_gravity">center_vertical</item>
<item name="android:background">@android:color/transparent</item>
</style>
- <!-- Address bar - Image Button - Unused -->
- <style name="AddressBar.ImageButton.Unused">
+ <!-- URL bar - Image Button - Unused -->
+ <style name="UrlBar.ImageButton.Unused">
<item name="android:layout_width">0dip</item>
<item name="android:layout_height">0dip</item>
<item name="android:visibility">gone</item>
</style>
- <style name="AddressBar.ImageButton.Back" parent="AddressBar.ImageButton.Unused">
+ <style name="UrlBar.ImageButton.Back" parent="UrlBar.ImageButton.Unused">
<item name="android:contentDescription">@string/back</item>
</style>
- <style name="AddressBar.ImageButton.Forward" parent="AddressBar.ImageButton.Unused">
+ <style name="UrlBar.ImageButton.Forward" parent="UrlBar.ImageButton.Unused">
<item name="android:contentDescription">@string/forward</item>
</style>
- <!-- Address bar - Image Button - Icon -->
- <style name="AddressBar.ImageButton.Icon">
+ <!-- URL bar - Image Button - Icon -->
+ <style name="UrlBar.ImageButton.Icon">
<item name="android:layout_width">@dimen/browser_toolbar_icon_width</item>
<item name="android:layout_height">@dimen/browser_toolbar_height</item>
<item name="android:layout_weight">0.0</item>
</style>
<!-- AwesomeBar -->
<style name="AwesomeBar">
<item name="android:layout_width">fill_parent</item>
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -18,20 +18,20 @@
<resources>
<string name="moz_app_displayname">@MOZ_APP_DISPLAYNAME@</string>
#include ../services/strings.xml.in
<string name="splash_settingup">&splash_settingup;</string>
<string name="splash_bookmarks_history">&splash_bookmarks_history;</string>
<string name="no_space_to_start_error">&no_space_to_start_error;</string>
<string name="error_loading_file">&error_loading_file;</string>
- <string name="awesomebar_all_pages_title">&awesomebar_all_pages_title;</string>
- <string name="awesomebar_bookmarks_title">&awesomebar_bookmarks_title;</string>
- <string name="awesomebar_history_title">&awesomebar_history_title;</string>
- <string name="awesomebar_switch_to_tab">&awesomebar_switch_to_tab;</string>
+ <string name="all_pages_title">&all_pages_title;</string>
+ <string name="bookmarks_title">&bookmarks_title;</string>
+ <string name="history_title">&history_title;</string>
+ <string name="switch_to_tab">&switch_to_tab;</string>
<string name="crash_reporter_title">&crash_reporter_title;</string>
<string name="crash_message2">&crash_message2;</string>
<string name="crash_send_report_message2">&crash_send_report_message2;</string>
<string name="crash_include_url2">&crash_include_url2;</string>
<string name="crash_sorry">&crash_sorry;</string>
<string name="crash_comment">&crash_comment;</string>
<string name="crash_allow_contact">&crash_allow_contact;</string>
@@ -42,17 +42,17 @@
<string name="crash_restart_label">&crash_restart_label;</string>
<string name="exit_label">&exit_label;</string>
<string name="launcher_shortcuts_title">&launcher_shortcuts_title;</string>
<string name="launcher_shortcuts_empty">&launcher_shortcuts_empty;</string>
<string name="choose_file">&choose_file;</string>
- <string name="awesomebar_default_text">&awesomebar_default_text;</string>
+ <string name="url_bar_default_text">&url_bar_default_text;</string>
<string name="remote_tabs">&remote_tabs;</string>
<string name="remote_tabs_show_all">&remote_tabs_show_all;</string>
<string name="quit">&quit;</string>
<string name="bookmark">&bookmark;</string>
<string name="bookmark_added">&bookmark_added;</string>
<string name="bookmark_removed">&bookmark_removed;</string>
