| Index: adblockplussbrowser/src/org/adblockplus/sbrowser/contentblocker/UrlInputOpenerPreference.java |
| =================================================================== |
| --- a/adblockplussbrowser/src/org/adblockplus/sbrowser/contentblocker/UrlInputOpenerPreference.java |
| +++ b/adblockplussbrowser/src/org/adblockplus/sbrowser/contentblocker/UrlInputOpenerPreference.java |
| @@ -14,22 +14,18 @@ |
| * You should have received a copy of the GNU General Public License |
| * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| */ |
| package org.adblockplus.sbrowser.contentblocker; |
| import android.app.AlertDialog; |
| import android.content.Context; |
| -import android.graphics.drawable.Drawable; |
| -import android.os.Build; |
| import android.os.Bundle; |
| import android.preference.EditTextPreference; |
| -import android.support.annotation.DrawableRes; |
| -import android.support.v4.content.ContextCompat; |
| import android.text.Editable; |
| import android.text.InputType; |
| import android.text.TextWatcher; |
| import android.util.AttributeSet; |
| import android.util.Patterns; |
| import android.view.KeyEvent; |
| import android.view.inputmethod.EditorInfo; |
| import android.widget.EditText; |
| @@ -117,30 +113,16 @@ public class UrlInputOpenerPreference ex |
| { |
| Toast.makeText(getContext(), R.string.whitelist_website_invalid_url_error, Toast.LENGTH_SHORT).show(); |
| } |
| return true; |
| } |
| return false; |
| } |
| - public void setIcon(@DrawableRes int iconResId) |
| - { |
| - final Drawable drawable = ContextCompat.getDrawable(getContext(), iconResId); |
| - setIcon(drawable); |
| - } |
| - |
| - public void setIcon(Drawable icon) |
| - { |
| - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) |
| - { |
| - super.setIcon(icon); |
| - } |
| - } |
| - |
| public void setOnUrlReadyListener(OnUrlReadyListener listener) |
| { |
| this.onUrlReadyListener = listener; |
| } |
| private boolean isValidUrl() |
| { |
| return Patterns.WEB_URL.matcher(getUrl()).matches(); |