diff --git a/mobile/android/app/src/australis/res/layout/toolbar_edit_layout.xml b/mobile/android/app/src/australis/res/layout/toolbar_edit_layout.xml index de1d58288ded..89234b72830f 100644 --- a/mobile/android/app/src/australis/res/layout/toolbar_edit_layout.xml +++ b/mobile/android/app/src/australis/res/layout/toolbar_edit_layout.xml @@ -21,7 +21,7 @@ android:paddingEnd="@dimen/browser_toolbar_site_security_padding_horizontal" android:paddingTop="@dimen/browser_toolbar_site_security_padding_vertical" android:scaleType="fitCenter" - android:src="@drawable/search_icon_inactive" + android:src="@drawable/ic_search_icon" android:visibility="gone"/> diff --git a/mobile/android/app/src/main/res/drawable-hdpi/close_edit_mode_dark.png b/mobile/android/app/src/main/res/drawable-hdpi/ic_cancel_nm.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-hdpi/close_edit_mode_dark.png rename to mobile/android/app/src/main/res/drawable-hdpi/ic_cancel_nm.png diff --git a/mobile/android/app/src/main/res/drawable-hdpi/close_edit_mode_light.png b/mobile/android/app/src/main/res/drawable-hdpi/ic_cancel_pm.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-hdpi/close_edit_mode_light.png rename to mobile/android/app/src/main/res/drawable-hdpi/ic_cancel_pm.png diff --git a/mobile/android/app/src/main/res/drawable-hdpi/lock_secure.png b/mobile/android/app/src/main/res/drawable-hdpi/ic_lock.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-hdpi/lock_secure.png rename to mobile/android/app/src/main/res/drawable-hdpi/ic_lock.png diff --git a/mobile/android/app/src/main/res/drawable-hdpi/lock_disabled.png b/mobile/android/app/src/main/res/drawable-hdpi/ic_lock_disabled.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-hdpi/lock_disabled.png rename to mobile/android/app/src/main/res/drawable-hdpi/ic_lock_disabled.png diff --git a/mobile/android/app/src/main/res/drawable-hdpi/lock_inactive.png b/mobile/android/app/src/main/res/drawable-hdpi/ic_lock_inactive.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-hdpi/lock_inactive.png rename to mobile/android/app/src/main/res/drawable-hdpi/ic_lock_inactive.png diff --git a/mobile/android/app/src/main/res/drawable-hdpi/ab_mic.png b/mobile/android/app/src/main/res/drawable-hdpi/ic_mic.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-hdpi/ab_mic.png rename to mobile/android/app/src/main/res/drawable-hdpi/ic_mic.png diff --git a/mobile/android/app/src/main/res/drawable-hdpi/ab_menu.png b/mobile/android/app/src/main/res/drawable-hdpi/ic_overflow.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-hdpi/ab_menu.png rename to mobile/android/app/src/main/res/drawable-hdpi/ic_overflow.png diff --git a/mobile/android/app/src/main/res/drawable-hdpi/ab_qrcode.png b/mobile/android/app/src/main/res/drawable-hdpi/ic_qrcode.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-hdpi/ab_qrcode.png rename to mobile/android/app/src/main/res/drawable-hdpi/ic_qrcode.png diff --git a/mobile/android/app/src/main/res/drawable-hdpi/search_icon_inactive.png b/mobile/android/app/src/main/res/drawable-hdpi/ic_search_icon.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-hdpi/search_icon_inactive.png rename to mobile/android/app/src/main/res/drawable-hdpi/ic_search_icon.png diff --git a/mobile/android/app/src/main/res/drawable-hdpi/shield_disabled.png b/mobile/android/app/src/main/res/drawable-hdpi/ic_shield_disabled.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-hdpi/shield_disabled.png rename to mobile/android/app/src/main/res/drawable-hdpi/ic_shield_disabled.png diff --git a/mobile/android/app/src/main/res/drawable-hdpi/shield_enabled.png b/mobile/android/app/src/main/res/drawable-hdpi/ic_shield_enabled.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-hdpi/shield_enabled.png rename to mobile/android/app/src/main/res/drawable-hdpi/ic_shield_enabled.png diff --git a/mobile/android/app/src/main/res/drawable-hdpi/warning_major.png b/mobile/android/app/src/main/res/drawable-hdpi/ic_warning_major.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-hdpi/warning_major.png rename to mobile/android/app/src/main/res/drawable-hdpi/ic_warning_major.png diff --git a/mobile/android/app/src/main/res/drawable-hdpi/warning_minor.png b/mobile/android/app/src/main/res/drawable-hdpi/ic_warning_minor.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-hdpi/warning_minor.png rename to mobile/android/app/src/main/res/drawable-hdpi/ic_warning_minor.png diff --git a/mobile/android/app/src/main/res/drawable-xhdpi/close_edit_mode_dark.png b/mobile/android/app/src/main/res/drawable-xhdpi/ic_cancel_nm.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xhdpi/close_edit_mode_dark.png rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_cancel_nm.png diff --git a/mobile/android/app/src/main/res/drawable-xhdpi/close_edit_mode_light.png b/mobile/android/app/src/main/res/drawable-xhdpi/ic_cancel_pm.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xhdpi/close_edit_mode_light.png rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_cancel_pm.png diff --git a/mobile/android/app/src/main/res/drawable-xhdpi/lock_secure.png b/mobile/android/app/src/main/res/drawable-xhdpi/ic_lock.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xhdpi/lock_secure.png rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_lock.png diff --git a/mobile/android/app/src/main/res/drawable-xhdpi/lock_disabled.png b/mobile/android/app/src/main/res/drawable-xhdpi/ic_lock_disabled.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xhdpi/lock_disabled.png rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_lock_disabled.png diff --git a/mobile/android/app/src/main/res/drawable-xhdpi/lock_inactive.png b/mobile/android/app/src/main/res/drawable-xhdpi/ic_lock_inactive.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xhdpi/lock_inactive.png rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_lock_inactive.png diff --git a/mobile/android/app/src/main/res/drawable-xhdpi/ab_mic.png b/mobile/android/app/src/main/res/drawable-xhdpi/ic_mic.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xhdpi/ab_mic.png rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_mic.png diff --git a/mobile/android/app/src/main/res/drawable-xhdpi/ab_menu.png b/mobile/android/app/src/main/res/drawable-xhdpi/ic_overflow.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xhdpi/ab_menu.png rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_overflow.png diff --git a/mobile/android/app/src/main/res/drawable-xhdpi/ab_qrcode.png b/mobile/android/app/src/main/res/drawable-xhdpi/ic_qrcode.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xhdpi/ab_qrcode.png rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_qrcode.png diff --git a/mobile/android/app/src/main/res/drawable-xhdpi/search_icon_inactive.png b/mobile/android/app/src/main/res/drawable-xhdpi/ic_search_icon.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xhdpi/search_icon_inactive.png rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_search_icon.png diff --git a/mobile/android/app/src/main/res/drawable-xhdpi/shield_disabled.png b/mobile/android/app/src/main/res/drawable-xhdpi/ic_shield_disabled.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xhdpi/shield_disabled.png rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_shield_disabled.png diff --git a/mobile/android/app/src/main/res/drawable-xhdpi/shield_enabled.png b/mobile/android/app/src/main/res/drawable-xhdpi/ic_shield_enabled.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xhdpi/shield_enabled.png rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_shield_enabled.png diff --git a/mobile/android/app/src/main/res/drawable-xhdpi/warning_major.png b/mobile/android/app/src/main/res/drawable-xhdpi/ic_warning_major.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xhdpi/warning_major.png rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_warning_major.png diff --git a/mobile/android/app/src/main/res/drawable-xhdpi/warning_minor.png b/mobile/android/app/src/main/res/drawable-xhdpi/ic_warning_minor.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xhdpi/warning_minor.png rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_warning_minor.png diff --git a/mobile/android/app/src/main/res/drawable-xxhdpi/close_edit_mode_dark.png b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_cancel_nm.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xxhdpi/close_edit_mode_dark.png rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_cancel_nm.png diff --git a/mobile/android/app/src/main/res/drawable-xxhdpi/close_edit_mode_light.png b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_cancel_pm.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xxhdpi/close_edit_mode_light.png rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_cancel_pm.png diff --git a/mobile/android/app/src/main/res/drawable-xxhdpi/lock_secure.png b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_lock.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xxhdpi/lock_secure.png rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_lock.png diff --git a/mobile/android/app/src/main/res/drawable-xxhdpi/lock_disabled.png b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_lock_disabled.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xxhdpi/lock_disabled.png rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_lock_disabled.png diff --git a/mobile/android/app/src/main/res/drawable-xxhdpi/lock_inactive.png b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_lock_inactive.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xxhdpi/lock_inactive.png rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_lock_inactive.png diff --git a/mobile/android/app/src/main/res/drawable-xxhdpi/ab_mic.png b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_mic.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xxhdpi/ab_mic.png rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_mic.png diff --git a/mobile/android/app/src/main/res/drawable-xxhdpi/ab_qrcode.png b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_qrcode.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xxhdpi/ab_qrcode.png rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_qrcode.png diff --git a/mobile/android/app/src/main/res/drawable-xxhdpi/search_icon_inactive.png b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_search_icon.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xxhdpi/search_icon_inactive.png rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_search_icon.png diff --git a/mobile/android/app/src/main/res/drawable-xxhdpi/shield_disabled.png b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_shield_disabled.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xxhdpi/shield_disabled.png rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_shield_disabled.png diff --git a/mobile/android/app/src/main/res/drawable-xxhdpi/shield_enabled.png b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_shield_enabled.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xxhdpi/shield_enabled.png rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_shield_enabled.png diff --git a/mobile/android/app/src/main/res/drawable-xxhdpi/warning_major.png b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_warning_major.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xxhdpi/warning_major.png rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_warning_major.png diff --git a/mobile/android/app/src/main/res/drawable-xxhdpi/warning_minor.png b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_warning_minor.png similarity index 100% rename from mobile/android/app/src/main/res/drawable-xxhdpi/warning_minor.png rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_warning_minor.png diff --git a/mobile/android/app/src/main/res/drawable/close_edit_mode_selector.xml b/mobile/android/app/src/main/res/drawable/close_edit_mode_selector.xml index aab2a469c162..b4d208798d2f 100644 --- a/mobile/android/app/src/main/res/drawable/close_edit_mode_selector.xml +++ b/mobile/android/app/src/main/res/drawable/close_edit_mode_selector.xml @@ -7,11 +7,11 @@ xmlns:gecko="http://schemas.android.com/apk/res-auto"> + android:drawable="@drawable/ic_cancel_nm"/> + android:drawable="@drawable/ic_cancel_pm"/> - + diff --git a/mobile/android/app/src/main/res/drawable/site_security_icon.xml b/mobile/android/app/src/main/res/drawable/site_security_icon.xml index 0a6934e40d85..ac8624f861ad 100644 --- a/mobile/android/app/src/main/res/drawable/site_security_icon.xml +++ b/mobile/android/app/src/main/res/drawable/site_security_icon.xml @@ -11,22 +11,22 @@ android:drawable="@drawable/site_security_unknown" android:maxLevel="0" /> diff --git a/mobile/android/app/src/main/res/layout/search_bar.xml b/mobile/android/app/src/main/res/layout/search_bar.xml index fdbd5d37e6e9..8feac949a570 100644 --- a/mobile/android/app/src/main/res/layout/search_bar.xml +++ b/mobile/android/app/src/main/res/layout/search_bar.xml @@ -11,8 +11,8 @@ android:layout_gravity="center_vertical" android:imeOptions="actionSearch" android:inputType="textNoSuggestions" - android:drawableLeft="@drawable/search_icon_inactive" - android:drawableStart="@drawable/search_icon_inactive" + android:drawableLeft="@drawable/ic_search_icon" + android:drawableStart="@drawable/ic_search_icon" android:paddingRight="30dp" android:paddingEnd="30dp" android:drawablePadding="5dp" diff --git a/mobile/android/app/src/photon/res/layout/toolbar_edit_layout.xml b/mobile/android/app/src/photon/res/layout/toolbar_edit_layout.xml index 9747119b5f23..62d97537f0ae 100644 --- a/mobile/android/app/src/photon/res/layout/toolbar_edit_layout.xml +++ b/mobile/android/app/src/photon/res/layout/toolbar_edit_layout.xml @@ -31,7 +31,7 @@ android:paddingStart="@dimen/browser_toolbar_site_security_padding_horizontal" android:paddingTop="@dimen/browser_toolbar_site_security_padding_vertical" android:scaleType="fitCenter" - android:src="@drawable/search_icon_inactive" + android:src="@drawable/ic_search_icon" android:visibility="gone" tools:visibility="visible" /> diff --git a/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java b/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java index cc0dbdd82ba4..60aaa9f597d4 100644 --- a/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java +++ b/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java @@ -225,7 +225,7 @@ public class CustomTabsActivity extends AppCompatActivity popupMenu = createCustomPopupMenu(); @SuppressWarnings("deprecation") - Drawable icon = getResources().getDrawable(R.drawable.ab_menu); + Drawable icon = getResources().getDrawable(R.drawable.ic_overflow); actionBarPresenter.addActionButton(menu, icon, true) .setOnClickListener(new View.OnClickListener() { @Override diff --git a/mobile/android/base/java/org/mozilla/gecko/home/SearchEngine.java b/mobile/android/base/java/org/mozilla/gecko/home/SearchEngine.java index 8cc9590113ec..e002b1e98791 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/SearchEngine.java +++ b/mobile/android/base/java/org/mozilla/gecko/home/SearchEngine.java @@ -49,7 +49,7 @@ public class SearchEngine { } private Bitmap getDefaultFavicon(final Context context) { - return BitmapFactory.decodeResource(context.getResources(), R.drawable.search_icon_inactive); + return BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_search_icon); } /** diff --git a/mobile/android/base/java/org/mozilla/gecko/toolbar/SiteIdentityPopup.java b/mobile/android/base/java/org/mozilla/gecko/toolbar/SiteIdentityPopup.java index 97f61aa76412..30d141fa34b2 100644 --- a/mobile/android/base/java/org/mozilla/gecko/toolbar/SiteIdentityPopup.java +++ b/mobile/android/base/java/org/mozilla/gecko/toolbar/SiteIdentityPopup.java @@ -322,7 +322,7 @@ public class SiteIdentityPopup extends AnchoredPopup implements BundleEventListe } else if (!siteIdentity.isSecure()) { if (siteIdentity.getMixedModeActive() == MixedMode.LOADED) { // Active Mixed Content loaded because user has disabled blocking. - mIcon.setImageResource(R.drawable.lock_disabled); + mIcon.setImageResource(R.drawable.ic_lock_disabled); clearSecurityStateIcon(); mMixedContentActivity.setVisibility(View.VISIBLE); mMixedContentActivity.setText(R.string.mixed_content_protection_disabled); @@ -330,8 +330,8 @@ public class SiteIdentityPopup extends AnchoredPopup implements BundleEventListe mLink.setVisibility(View.VISIBLE); } else if (siteIdentity.getMixedModeDisplay() == MixedMode.LOADED) { // Passive Mixed Content loaded. - mIcon.setImageResource(R.drawable.lock_inactive); - setSecurityStateIcon(R.drawable.warning_major, 1); + mIcon.setImageResource(R.drawable.ic_lock_inactive); + setSecurityStateIcon(R.drawable.ic_warning_major, 1); mMixedContentActivity.setVisibility(View.VISIBLE); if (siteIdentity.getMixedModeActive() == MixedMode.BLOCKED) { mMixedContentActivity.setText(R.string.mixed_content_blocked_some); @@ -354,14 +354,14 @@ public class SiteIdentityPopup extends AnchoredPopup implements BundleEventListe } else if (siteIdentity.isSecurityException()) { - mIcon.setImageResource(R.drawable.lock_inactive); - setSecurityStateIcon(R.drawable.warning_major, 1); + mIcon.setImageResource(R.drawable.ic_lock_inactive); + setSecurityStateIcon(R.drawable.ic_warning_major, 1); mSecurityState.setText(R.string.identity_connection_insecure); mSecurityState.setTextColor(ContextCompat.getColor(mContext, R.color.placeholder_active_grey)); } else { // Connection is secure. - mIcon.setImageResource(R.drawable.lock_secure); + mIcon.setImageResource(R.drawable.ic_lock); setSecurityStateIcon(R.drawable.img_check, 2); mSecurityState.setTextColor(ContextCompat.getColor(mContext, R.color.affirmative_green)); @@ -420,7 +420,7 @@ public class SiteIdentityPopup extends AnchoredPopup implements BundleEventListe final DoorhangerConfig config = new DoorhangerConfig(DoorHanger.Type.TRACKING, mContentButtonClickListener); - final int icon = blocked ? R.drawable.shield_enabled : R.drawable.shield_disabled; + final int icon = blocked ? R.drawable.ic_shield_enabled : R.drawable.ic_shield_disabled; final GeckoBundle options = new GeckoBundle(); final GeckoBundle tracking = new GeckoBundle(); diff --git a/mobile/android/search/java/org/mozilla/search/autocomplete/SearchBar.java b/mobile/android/search/java/org/mozilla/search/autocomplete/SearchBar.java index 39386d93a551..bb76be19632c 100644 --- a/mobile/android/search/java/org/mozilla/search/autocomplete/SearchBar.java +++ b/mobile/android/search/java/org/mozilla/search/autocomplete/SearchBar.java @@ -164,7 +164,7 @@ public class SearchBar extends FrameLayout { editText.setFocusable(active); editText.setFocusableInTouchMode(active); - final int startDrawable = active ? R.drawable.search_icon_active : R.drawable.search_icon_inactive; + final int startDrawable = active ? R.drawable.search_icon_active : R.drawable.ic_search_icon; TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(editText, startDrawable, 0, 0, 0); // We can't use a selector drawable because we apply a color filter to the focused diff --git a/mobile/android/themes/core/aboutLogins.css b/mobile/android/themes/core/aboutLogins.css index 2d962784e42c..858dcf79960f 100644 --- a/mobile/android/themes/core/aboutLogins.css +++ b/mobile/android/themes/core/aboutLogins.css @@ -79,7 +79,7 @@ body { } #filter-clear { - background-image: url("resource://android/res/drawable-mdpi-v4/close_edit_mode_light.png"); + background-image: url("resource://android/res/drawable-mdpi-v4/ic_cancel_pm.png"); background-position: center; background-size: 12px 12px; background-repeat: no-repeat; @@ -175,7 +175,7 @@ body { } #filter-clear { - background-image: url("resource://android/res/drawable-hdpi-v4/close_edit_mode_light.png"); + background-image: url("resource://android/res/drawable-hdpi-v4/ic_cancel_pm.png"); } .icon { @@ -189,7 +189,7 @@ body { } #filter-clear { - background-image: url("resource://android/res/drawable-hdpi-v4/close_edit_mode_light.png"); + background-image: url("resource://android/res/drawable-hdpi-v4/ic_cancel_pm.png"); } .icon {