From 3fb03ee4f9936a8ad646a47e3c2fb83a77bc0135 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Thu, 30 May 2013 22:11:26 -0400 Subject: [PATCH] Backed out 5 changesets (bug 872388) for Android 2.2 bustage on a CLOSED TREE. Backed out changeset f2fbb5c6cfc7 (bug 872388) Backed out changeset 416f9cdde0f7 (bug 872388) Backed out changeset 684ba082942b (bug 872388) Backed out changeset 7acb6c63fdf4 (bug 872388) Backed out changeset 2076903c21fa (bug 872388) --- mobile/android/base/AwesomeBar.java | 113 ++++++++- mobile/android/base/BrowserApp.java | 57 +---- mobile/android/base/EditBookmarkDialog.java | 237 ------------------ mobile/android/base/Makefile.in | 8 - mobile/android/base/db/BrowserDB.java | 6 - mobile/android/base/db/LocalBrowserDB.java | 19 -- .../base/locales/en-US/android_strings.dtd | 1 - .../base/resources/drawable-mdpi/toast.9.png | Bin 839 -> 0 bytes .../drawable-mdpi/toast_button_focused.9.png | Bin 311 -> 0 bytes .../drawable-mdpi/toast_button_pressed.9.png | Bin 311 -> 0 bytes .../drawable-mdpi/toast_divider.9.png | Bin 963 -> 0 bytes .../base/resources/drawable/toast_button.xml | 20 -- .../base/resources/layout/gecko_app.xml | 11 - .../android/base/resources/values/styles.xml | 48 ---- mobile/android/base/strings.xml.in | 1 - mobile/android/base/widget/ButtonToast.java | 150 ----------- 16 files changed, 114 insertions(+), 557 deletions(-) delete mode 100644 mobile/android/base/EditBookmarkDialog.java delete mode 100644 mobile/android/base/resources/drawable-mdpi/toast.9.png delete mode 100644 mobile/android/base/resources/drawable-mdpi/toast_button_focused.9.png delete mode 100644 mobile/android/base/resources/drawable-mdpi/toast_button_pressed.9.png delete mode 100644 mobile/android/base/resources/drawable-mdpi/toast_divider.9.png delete mode 100644 mobile/android/base/resources/drawable/toast_button.xml delete mode 100644 mobile/android/base/widget/ButtonToast.java diff --git a/mobile/android/base/AwesomeBar.java b/mobile/android/base/AwesomeBar.java index 2e1c1f3ce81..4da8bece5e1 100644 --- a/mobile/android/base/AwesomeBar.java +++ b/mobile/android/base/AwesomeBar.java @@ -15,7 +15,9 @@ import org.mozilla.gecko.util.ThreadUtils; import org.mozilla.gecko.util.UiAsyncTask; import android.app.Activity; +import android.app.AlertDialog; import android.content.Context; +import android.content.DialogInterface; import android.content.Intent; import android.content.res.Configuration; import android.graphics.Bitmap; @@ -553,6 +555,62 @@ public class AwesomeBar extends GeckoActivity mContextMenuSubject = tab.getSubject(menu, view, menuInfo); } + private abstract class EditBookmarkTextWatcher implements TextWatcher { + protected AlertDialog mDialog; + protected EditBookmarkTextWatcher mPairedTextWatcher; + protected boolean mEnabled = true; + + public EditBookmarkTextWatcher(AlertDialog aDialog) { + mDialog = aDialog; + } + + public void setPairedTextWatcher(EditBookmarkTextWatcher aTextWatcher) { + mPairedTextWatcher = aTextWatcher; + } + + public boolean isEnabled() { + return mEnabled; + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + // Disable if the we're disabled or paired partner is disabled + boolean enabled = mEnabled && (mPairedTextWatcher == null || mPairedTextWatcher.isEnabled()); + mDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(enabled); + } + + @Override + public void afterTextChanged(Editable s) {} + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) {} + } + + private class LocationTextWatcher extends EditBookmarkTextWatcher implements TextWatcher { + public LocationTextWatcher(AlertDialog aDialog) { + super(aDialog); + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + // Disable if the location is empty + mEnabled = (s.toString().trim().length() > 0); + super.onTextChanged(s, start, before, count); + } + } + + private class KeywordTextWatcher extends EditBookmarkTextWatcher implements TextWatcher { + public KeywordTextWatcher(AlertDialog aDialog) { + super(aDialog); + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + // Disable if the keyword contains spaces + mEnabled = (s.toString().trim().indexOf(' ') == -1); + super.onTextChanged(s, start, before, count); + } + } + @Override public boolean onContextItemSelected(MenuItem item) { if (mContextMenuSubject == null) @@ -595,7 +653,60 @@ public class AwesomeBar extends GeckoActivity break; } case R.id.edit_bookmark: { - new EditBookmarkDialog(this).show(id, title, url, keyword); + AlertDialog.Builder editPrompt = new AlertDialog.Builder(this); + final View editView = getLayoutInflater().inflate(R.layout.bookmark_edit, null); + editPrompt.setTitle(R.string.bookmark_edit_title); + editPrompt.setView(editView); + + final EditText nameText = ((EditText) editView.findViewById(R.id.edit_bookmark_name)); + final EditText locationText = ((EditText) editView.findViewById(R.id.edit_bookmark_location)); + final EditText keywordText = ((EditText) editView.findViewById(R.id.edit_bookmark_keyword)); + nameText.setText(title); + locationText.setText(url); + keywordText.setText(keyword); + + editPrompt.setPositiveButton(R.string.button_ok, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int whichButton) { + (new UiAsyncTask(ThreadUtils.getBackgroundHandler()) { + @Override + public Void doInBackground(Void... params) { + String newUrl = locationText.getText().toString().trim(); + String newKeyword = keywordText.getText().toString().trim(); + BrowserDB.updateBookmark(getContentResolver(), id, newUrl, nameText.getText().toString(), newKeyword); + return null; + } + + @Override + public void onPostExecute(Void result) { + Toast.makeText(AwesomeBar.this, R.string.bookmark_updated, Toast.LENGTH_SHORT).show(); + } + }).execute(); + } + }); + + editPrompt.setNegativeButton(R.string.button_cancel, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int whichButton) { + // do nothing + } + }); + + final AlertDialog dialog = editPrompt.create(); + + // Create our TextWatchers + LocationTextWatcher locationTextWatcher = new LocationTextWatcher(dialog); + KeywordTextWatcher keywordTextWatcher = new KeywordTextWatcher(dialog); + + // Cross reference the TextWatchers + locationTextWatcher.setPairedTextWatcher(keywordTextWatcher); + keywordTextWatcher.setPairedTextWatcher(locationTextWatcher); + + // Add the TextWatcher Listeners + locationText.addTextChangedListener(locationTextWatcher); + keywordText.addTextChangedListener(keywordTextWatcher); + + dialog.show(); break; } case R.id.remove_bookmark: { diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java index b233c79ce98..a1af84c7280 100644 --- a/mobile/android/base/BrowserApp.java +++ b/mobile/android/base/BrowserApp.java @@ -21,7 +21,6 @@ import org.mozilla.gecko.util.HardwareUtils; import org.mozilla.gecko.util.ThreadUtils; import org.mozilla.gecko.util.UiAsyncTask; import org.mozilla.gecko.widget.AboutHome; -import org.mozilla.gecko.widget.ButtonToast; import org.json.JSONArray; import org.json.JSONException; @@ -33,7 +32,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.content.res.Configuration; -import android.content.res.Resources; import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.PointF; @@ -88,8 +86,6 @@ abstract public class BrowserApp extends GeckoApp private static final int READER_ADD_FAILED = 1; private static final int READER_ADD_DUPLICATE = 2; - private static final String ADD_SHORTCUT_TOAST = "add_shortcut_toast"; - private static final String STATE_DYNAMIC_TOOLBAR_ENABLED = "dynamic_toolbar"; public static BrowserToolbar mBrowserToolbar; @@ -109,7 +105,7 @@ abstract public class BrowserApp extends GeckoApp } private Vector mAddonMenuItemsCache; - private ButtonToast mToast; + private PropertyAnimator mMainLayoutAnimator; private static final Interpolator sTabsInterpolator = new Interpolator() { @@ -366,15 +362,6 @@ abstract public class BrowserApp extends GeckoApp RelativeLayout actionBar = (RelativeLayout) findViewById(R.id.browser_toolbar); - mToast = new ButtonToast(findViewById(R.id.toast), new ButtonToast.ToastListener() { - @Override - public void onButtonClicked(CharSequence token) { - if (ADD_SHORTCUT_TOAST.equals(token)) { - showBookmarkDialog(); - } - } - }); - ((GeckoApp.MainLayout) mMainLayout).setTouchEventInterceptor(new HideTabsTouchListener()); ((GeckoApp.MainLayout) mMainLayout).setMotionEventInterceptor(new MotionEventInterceptor() { @Override @@ -481,42 +468,6 @@ abstract public class BrowserApp extends GeckoApp }); } - private void showBookmarkDialog() { - final Tab tab = Tabs.getInstance().getSelectedTab(); - final Prompt ps = new Prompt(this, new Prompt.PromptCallback() { - @Override - public void onPromptFinished(String result) { - int itemId = -1; - try { - itemId = new JSONObject(result).getInt("button"); - } catch(Exception ex) { - Log.e(LOGTAG, "Exception reading bookmark prompt result", ex); - } - - if (tab == null) - return; - - if (itemId == 0) { - new EditBookmarkDialog(BrowserApp.this).show(tab.getURL()); - } else if (itemId == 1) { - String url = tab.getURL(); - String title = tab.getDisplayTitle(); - Bitmap favicon = tab.getFavicon(); - if (url != null && title != null) { - GeckoAppShell.createShortcut(title, url, url, favicon == null ? null : favicon, ""); - } - } - } - }); - - final Prompt.PromptListItem[] items = new Prompt.PromptListItem[2]; - Resources res = getResources(); - items[0] = new Prompt.PromptListItem(res.getString(R.string.contextmenu_edit_bookmark)); - items[1] = new Prompt.PromptListItem(res.getString(R.string.contextmenu_add_to_launcher)); - - ps.show("", "", items, false); - } - private void setDynamicToolbarEnabled(boolean enabled) { if (enabled) { if (mLayerView != null) { @@ -1600,11 +1551,7 @@ abstract public class BrowserApp extends GeckoApp item.setIcon(R.drawable.ic_menu_bookmark_add); } else { tab.addBookmark(); - mToast.show(false, - getResources().getString(R.string.bookmark_added), - getResources().getString(R.string.bookmark_options), - 0, - ADD_SHORTCUT_TOAST); + Toast.makeText(this, R.string.bookmark_added, Toast.LENGTH_SHORT).show(); item.setIcon(R.drawable.ic_menu_bookmark_remove); } } diff --git a/mobile/android/base/EditBookmarkDialog.java b/mobile/android/base/EditBookmarkDialog.java deleted file mode 100644 index 867717ecf55..00000000000 --- a/mobile/android/base/EditBookmarkDialog.java +++ /dev/null @@ -1,237 +0,0 @@ -/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*- - * 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/. */ - -package org.mozilla.gecko; - -import org.mozilla.gecko.db.BrowserContract.Bookmarks; -import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.util.UiAsyncTask; - -import android.content.Context; -import android.app.AlertDialog; -import android.content.DialogInterface; -import android.database.Cursor; -import android.text.Editable; -import android.text.TextWatcher; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.EditText; -import android.widget.Toast; - -/** - * A dialog that allows editing a bookmarks url, title, or keywords - *

- * Invoked by calling one of the {@link org.mozilla.gecko.EditBookmarkDialog.show} - * methods. - */ -public class EditBookmarkDialog { - private static final String LOGTAG = "GeckoEditBookmarkDialog"; - private Context mContext; - - public EditBookmarkDialog(Context context) { - mContext = context; - } - - /** - * A private struct to make it easier to pass bookmark data across threads - */ - private class Bookmark { - int id; - String title; - String url; - String keyword; - - public Bookmark(int aId, String aTitle, String aUrl, String aKeyword) { - id = aId; - title = aTitle; - url = aUrl; - keyword = aKeyword; - } - } - - /** - * This text watcher to enable or disable the OK button if the dialog contains - * valid information. This class is overridden to do data checking diffferent fields. - * By itself, it always enables the button. - * - * Callers can also assing a paired partner to the TextWatcher, and callers will check - * that both are enabled before enabling the ok button. - */ - private class EditBookmarkTextWatcher implements TextWatcher { - // A stored reference to the dialog containing the text field being watched - protected AlertDialog mDialog; - - // A stored text watcher to do the real verification of a field - protected EditBookmarkTextWatcher mPairedTextWatcher; - - // Whether or not the ok button should be enabled. - protected boolean mEnabled = true; - - public EditBookmarkTextWatcher(AlertDialog aDialog) { - mDialog = aDialog; - } - - public void setPairedTextWatcher(EditBookmarkTextWatcher aTextWatcher) { - mPairedTextWatcher = aTextWatcher; - } - - public boolean isEnabled() { - return mEnabled; - } - - // Textwatcher interface - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - // Disable if the we're disabled or the paired partner is disabled - boolean enabled = mEnabled && (mPairedTextWatcher == null || mPairedTextWatcher.isEnabled()); - mDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(enabled); - } - - @Override - public void afterTextChanged(Editable s) {} - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) {} - } - - /** - * A version of the EditBookmarkTextWatcher for the url field of the dialog. - * Only checks if the field is empty or not. - */ - private class LocationTextWatcher extends EditBookmarkTextWatcher { - public LocationTextWatcher(AlertDialog aDialog) { - super(aDialog); - } - - // Disables the ok button if the location field is empty. - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - mEnabled = (s.toString().trim().length() > 0); - super.onTextChanged(s, start, before, count); - } - } - - /** - * A version of the EditBookmarkTextWatcher for the keyword field of the dialog. - * Checks if the field has any (non leading or trailing) spaces. - */ - private class KeywordTextWatcher extends EditBookmarkTextWatcher { - public KeywordTextWatcher(AlertDialog aDialog) { - super(aDialog); - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - // Disable if the keyword contains spaces - mEnabled = (s.toString().trim().indexOf(' ') == -1); - super.onTextChanged(s, start, before, count); - } - } - - /** - * Show the Edit bookmark dialog for a particular url. If the url is bookmarked multiple times - * this will just edit the first instance it finds. - * - * @param url The url of the bookmark to edit. The dialog will look up other information like the id, - * current title, or keywords associated with this url. If the url isn't bookmarked, the - * dialog will fail silently. If the url is bookmarked multiple times, this will only show - * information about the first it finds. - */ - public void show(final String url) { - (new UiAsyncTask(ThreadUtils.getBackgroundHandler()) { - @Override - public Bookmark doInBackground(Void... params) { - Cursor cursor = BrowserDB.getBookmarkForUrl(mContext.getContentResolver(), url); - if (cursor == null) { - return null; - } - - cursor.moveToFirst(); - Bookmark bookmark = new Bookmark(cursor.getInt(cursor.getColumnIndexOrThrow(Bookmarks._ID)), - cursor.getString(cursor.getColumnIndexOrThrow(Bookmarks.TITLE)), - cursor.getString(cursor.getColumnIndexOrThrow(Bookmarks.URL)), - cursor.getString(cursor.getColumnIndexOrThrow(Bookmarks.KEYWORD))); - cursor.close(); - return bookmark; - } - - @Override - public void onPostExecute(Bookmark bookmark) { - if (bookmark == null) - return; - - show(bookmark.id, bookmark.title, bookmark.url, bookmark.keyword); - } - }).execute(); - } - - /** - * Show the Edit bookmark dialog for a set of data. This will show the dialog whether - * a bookmark with this url exists or not, but the results will NOT be saved if the id - * is not a valid bookmark id. - * - * @param id The id of the bookmark to change. If there is no bookmark with this ID, the dialog - * will fail silently. - * @param title The initial title to show in the dialog - * @param url The initial url to show in the dialog - * @param keyword The initial keyword to show in the dialog - */ - public void show(final int id, final String title, final String url, final String keyword) { - AlertDialog.Builder editPrompt = new AlertDialog.Builder(mContext); - final View editView = LayoutInflater.from(mContext).inflate(R.layout.bookmark_edit, null); - editPrompt.setTitle(R.string.bookmark_edit_title); - editPrompt.setView(editView); - - final EditText nameText = ((EditText) editView.findViewById(R.id.edit_bookmark_name)); - final EditText locationText = ((EditText) editView.findViewById(R.id.edit_bookmark_location)); - final EditText keywordText = ((EditText) editView.findViewById(R.id.edit_bookmark_keyword)); - nameText.setText(title); - locationText.setText(url); - keywordText.setText(keyword); - - editPrompt.setPositiveButton(R.string.button_ok, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int whichButton) { - (new UiAsyncTask(ThreadUtils.getBackgroundHandler()) { - @Override - public Void doInBackground(Void... params) { - String newUrl = locationText.getText().toString().trim(); - String newKeyword = keywordText.getText().toString().trim(); - BrowserDB.updateBookmark(mContext.getContentResolver(), id, newUrl, nameText.getText().toString(), newKeyword); - return null; - } - - @Override - public void onPostExecute(Void result) { - Toast.makeText(mContext, R.string.bookmark_updated, Toast.LENGTH_SHORT).show(); - } - }).execute(); - } - }); - - editPrompt.setNegativeButton(R.string.button_cancel, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int whichButton) { - // do nothing - } - }); - - final AlertDialog dialog = editPrompt.create(); - - // Create our TextWatchers - LocationTextWatcher locationTextWatcher = new LocationTextWatcher(dialog); - KeywordTextWatcher keywordTextWatcher = new KeywordTextWatcher(dialog); - - // Cross reference the TextWatchers - locationTextWatcher.setPairedTextWatcher(keywordTextWatcher); - keywordTextWatcher.setPairedTextWatcher(locationTextWatcher); - - // Add the TextWatcher Listeners - locationText.addTextChangedListener(locationTextWatcher); - keywordText.addTextChangedListener(keywordTextWatcher); - - dialog.show(); - } -} diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in index af6e7e04082..bc1be95c530 100644 --- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -82,7 +82,6 @@ FENNEC_JAVA_FILES = \ Distribution.java \ DoorHanger.java \ DoorHangerPopup.java \ - EditBookmarkDialog.java \ Favicons.java \ FilePickerResultHandler.java \ FilePickerResultHandlerSync.java \ @@ -229,7 +228,6 @@ FENNEC_JAVA_FILES = \ widget/AboutHomeView.java \ widget/AboutHomeSection.java \ widget/AddonsSection.java \ - widget/ButtonToast.java \ widget/DateTimePicker.java \ widget/Divider.java \ widget/FaviconView.java \ @@ -636,11 +634,6 @@ RES_DRAWABLE_MDPI = \ res/drawable-mdpi/tab_thumbnail_shadow.png \ res/drawable-mdpi/tabs_count.png \ res/drawable-mdpi/tabs_count_foreground.png \ - res/drawable-mdpi/toast.9.png \ - res/drawable-mdpi/toast_button_focused.9.png \ - res/drawable-mdpi/toast_button_focused.9.png \ - res/drawable-mdpi/toast_button_pressed.9.png \ - res/drawable-mdpi/toast_divider.9.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 \ @@ -1067,7 +1060,6 @@ MOZ_ANDROID_DRAWABLES += \ mobile/android/base/resources/drawable/tab_thumbnail.xml \ mobile/android/base/resources/drawable/tabs_panel_indicator.xml \ mobile/android/base/resources/drawable/textbox_bg.xml \ - mobile/android/base/resources/drawable/toast_button.xml \ mobile/android/base/resources/drawable/webapp_titlebar_bg.xml \ $(NULL) diff --git a/mobile/android/base/db/BrowserDB.java b/mobile/android/base/db/BrowserDB.java index fdf6d5a4fa2..b51014a317b 100644 --- a/mobile/android/base/db/BrowserDB.java +++ b/mobile/android/base/db/BrowserDB.java @@ -112,8 +112,6 @@ public class BrowserDB { public void unpinAllSites(ContentResolver cr); public Cursor getPinnedSites(ContentResolver cr, int limit); - - public Cursor getBookmarkForUrl(ContentResolver cr, String url); } static { @@ -291,10 +289,6 @@ public class BrowserDB { return sDb.getPinnedSites(cr, limit); } - public static Cursor getBookmarkForUrl(ContentResolver cr, String url) { - return sDb.getBookmarkForUrl(cr, url); - } - public static class PinnedSite { public String title = ""; public String url = ""; diff --git a/mobile/android/base/db/LocalBrowserDB.java b/mobile/android/base/db/LocalBrowserDB.java index d093662c4a7..484decc438b 100644 --- a/mobile/android/base/db/LocalBrowserDB.java +++ b/mobile/android/base/db/LocalBrowserDB.java @@ -1222,23 +1222,4 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface { return (count > 0); } - - public Cursor getBookmarkForUrl(ContentResolver cr, String url) { - Cursor c = cr.query(bookmarksUriWithLimit(1), - new String[] { Bookmarks._ID, - Bookmarks.URL, - Bookmarks.TITLE, - Bookmarks.KEYWORD }, - Bookmarks.URL + " = ?", - new String[] { url }, - null); - if (c == null) { - return c; - } else if (c.getCount() == 0) { - c.close(); - c = null; - } - - return c; - } } diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd index 55535906e7c..1d326027fdb 100644 --- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -42,7 +42,6 @@ - diff --git a/mobile/android/base/resources/drawable-mdpi/toast.9.png b/mobile/android/base/resources/drawable-mdpi/toast.9.png deleted file mode 100644 index b9105deeefb805737627a38fc0818ac00be90e11..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 839 zcmV-N1GxN&P)j~O(aS~>jI*GARALPZW)ym*FPHDWq8I1(U46`4*`nM`D4nMO0(kX7~VWc8B1QAYMk#;(>=Ms+~!;%PV0Gr)z_q{C3C+FM>Baw?0{`#|j2Eey%`+L9N z|3EB+?_LjvCh`apVq4es)8TL!ErNlfs;X}Qej@gm6_n6K>hRD+9{hWJ42J2f4U2rolzf7QueV$hL*? zeq6Ps{oDTy*)c+Hc^mT++1otgPB0_q>{MgURD}oI*F)o7SLQ|BNQ`hyc?#qmEaNF@jv&1X-2A|B{*aCP2@CCrvu6{(w zNRVf+OW!EuQRD=m0q_Fg89)u-Pgg%9cu0fTL!$F&Ei5(YjZL1?AU%UM(r`{cJaB@_p?Zmwe8|2zaHPyRMb2tUt<#|N9Q^takF=<1YkybI$aT RjbH!(002ovPDHLkV1hAGdGG)L diff --git a/mobile/android/base/resources/drawable-mdpi/toast_button_focused.9.png b/mobile/android/base/resources/drawable-mdpi/toast_button_focused.9.png deleted file mode 100644 index e2a7942f5f45653f3b82f67549bf4ba1ee848e02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 311 zcmeAS@N?(olHy`uVBq!ia0vp^`arD3!3HFiUopu8DYhhUcNd2LAh=-f^2tCE&H|6f zVg?58P7r1^KY4mBP>{XE)7O>#E-OE)fUuRrYGI(z5lBejUrQ@uNc11I906-{vJryH4I1k;)yr`BVqzzw4}<9ttw`C$gGpyb%y^;!ymq z(36&(E0&v`)T7@eGH=e42S@Aw)t;7nemco~{<@$~q6{xK)@e_UE=&Umj6lCtN3g`)&I#XbN|Xy&sFq4xSmt0F`Kfy#xZ1j zrNwefGlm;qrk?LjwYVA$wDxE9nz|dW#LvHb!j*entGxf-swY7IFnGH9xvX{XE)7O>#E-ODPKQFK7jCVkxBc3jfArXh)&fLq(WXRJR?<1C= z6w%mbt1+{ot*=RRMIJ+z+Jf{>Z3iZy_=E9dO*JFXUHK(^zL-`q}q z)j13SU#Fh$efl*d-;qP{$@`7JHeA)e_HGGdV5n|RpI})V&_4{Gu6{1-oD!M+EB?tsY|jY1TafHS=s>_ww>AzQaBmo zL2v#9vx!Ij0ebMfXK(%q6HjY2!6^%@2eD~8GjE>fc|Ye(v+-ze=k^Z6FnjeQtwq;s z^xNIOPXD#DJ2&Z)CbceU<35>~0b&kq+(V%5ngi5AragUjj!F!ZJa9T)(lw413%i^d zW4OrmDVt$R<;XX!5h9?629Bq)-#>q0fn%%eiD+aEzlw&=(JVmiS)*gkMwV=|<%ggY zDOA8k!~~Ih>V-?qf60f(3+(RQ58cuF(Wl93UWaxr~*C5J(aS^P(id2SCU| zfzQ%c%D}uLN{Ubb%ZH`j0=uuYG=1rdo>X>7h_CScWHR96<@|9|UOoD?B#;2<)HiwwtaEN_SZA;*;VOowC z8}2O_hN0BGkeHr@>YB<@4bE|FMJ(hCIa#mOpj3pg24%gNE9#YE0cLffs#jKA4O?Ru zd1S@4ueka~ZafUGPd#fWaGoPu53masNh{9gSgITKmRx&tEZRmcPlMs(*8bJ%m5I(z zyj>42J*-C`d34?bI@s@@T>PMyLab|to#b?Z@hRt2U05e>hacDI-Q>9;Jd_e p;;r!e{&tG_U>_K% - - - - - \ No newline at end of file diff --git a/mobile/android/base/resources/layout/gecko_app.xml b/mobile/android/base/resources/layout/gecko_app.xml index 7bffa430d21..a181be6375e 100644 --- a/mobile/android/base/resources/layout/gecko_app.xml +++ b/mobile/android/base/resources/layout/gecko_app.xml @@ -40,15 +40,4 @@ android:layout_height="@dimen/browser_toolbar_height"/> - - - - -