Bug 1366669 - Part 1: Rename images and move to Australis folder. r=walkingice

In Photon few images(most of them are related to site identity) are renamed to be more formalized.

These images in Australis need to be renamed as well to make resources easy to maintain.
The mapping between old/new name is below:

OLD                   NEW
----                  ----
reader                ic_readermode
reader_active         ic_readermode_on
close_edit_mode_dark  ic_cancel_nm
close_edit_mode_light ic_cancel_pm
ab_menu               ic_overflow
ab_mic                ic_mic
ab_qrcode             ic_qrcode
lock_secure           ic_lock
warning_minor         ic_warning_minor
warning_major         ic_warning_major
lock_disabled         ic_lock_disabled
lock_inactive         ic_lock_inactive
shield_enabled        ic_shield_enabled
shield_disabled       ic_shield_disabled
search_icon_inactive  ic_search_icon

MozReview-Commit-ID: FivDIHiqe1w

--HG--
rename : mobile/android/app/src/main/res/drawable-hdpi/close_edit_mode_dark.png => mobile/android/app/src/main/res/drawable-hdpi/ic_cancel_nm.png
rename : mobile/android/app/src/main/res/drawable-hdpi/close_edit_mode_light.png => mobile/android/app/src/main/res/drawable-hdpi/ic_cancel_pm.png
rename : mobile/android/app/src/main/res/drawable-hdpi/lock_secure.png => mobile/android/app/src/main/res/drawable-hdpi/ic_lock.png
rename : mobile/android/app/src/main/res/drawable-hdpi/lock_disabled.png => mobile/android/app/src/main/res/drawable-hdpi/ic_lock_disabled.png
rename : mobile/android/app/src/main/res/drawable-hdpi/lock_inactive.png => mobile/android/app/src/main/res/drawable-hdpi/ic_lock_inactive.png
rename : mobile/android/app/src/main/res/drawable-hdpi/ab_mic.png => mobile/android/app/src/main/res/drawable-hdpi/ic_mic.png
rename : mobile/android/app/src/main/res/drawable-hdpi/ab_menu.png => mobile/android/app/src/main/res/drawable-hdpi/ic_overflow.png
rename : mobile/android/app/src/main/res/drawable-hdpi/ab_qrcode.png => mobile/android/app/src/main/res/drawable-hdpi/ic_qrcode.png
rename : mobile/android/app/src/main/res/drawable-hdpi/search_icon_inactive.png => mobile/android/app/src/main/res/drawable-hdpi/ic_search_icon.png
rename : mobile/android/app/src/main/res/drawable-hdpi/shield_disabled.png => mobile/android/app/src/main/res/drawable-hdpi/ic_shield_disabled.png
rename : mobile/android/app/src/main/res/drawable-hdpi/shield_enabled.png => mobile/android/app/src/main/res/drawable-hdpi/ic_shield_enabled.png
rename : mobile/android/app/src/main/res/drawable-hdpi/warning_major.png => mobile/android/app/src/main/res/drawable-hdpi/ic_warning_major.png
rename : mobile/android/app/src/main/res/drawable-hdpi/warning_minor.png => mobile/android/app/src/main/res/drawable-hdpi/ic_warning_minor.png
rename : mobile/android/app/src/main/res/drawable-xhdpi/close_edit_mode_dark.png => mobile/android/app/src/main/res/drawable-xhdpi/ic_cancel_nm.png
rename : mobile/android/app/src/main/res/drawable-xhdpi/close_edit_mode_light.png => mobile/android/app/src/main/res/drawable-xhdpi/ic_cancel_pm.png
rename : mobile/android/app/src/main/res/drawable-xhdpi/lock_secure.png => mobile/android/app/src/main/res/drawable-xhdpi/ic_lock.png
rename : mobile/android/app/src/main/res/drawable-xhdpi/lock_disabled.png => mobile/android/app/src/main/res/drawable-xhdpi/ic_lock_disabled.png
rename : mobile/android/app/src/main/res/drawable-xhdpi/lock_inactive.png => mobile/android/app/src/main/res/drawable-xhdpi/ic_lock_inactive.png
rename : mobile/android/app/src/main/res/drawable-xhdpi/ab_mic.png => mobile/android/app/src/main/res/drawable-xhdpi/ic_mic.png
rename : mobile/android/app/src/main/res/drawable-xhdpi/ab_menu.png => mobile/android/app/src/main/res/drawable-xhdpi/ic_overflow.png
rename : mobile/android/app/src/main/res/drawable-xhdpi/ab_qrcode.png => mobile/android/app/src/main/res/drawable-xhdpi/ic_qrcode.png
rename : mobile/android/app/src/main/res/drawable-xhdpi/search_icon_inactive.png => mobile/android/app/src/main/res/drawable-xhdpi/ic_search_icon.png
rename : mobile/android/app/src/main/res/drawable-xhdpi/shield_disabled.png => mobile/android/app/src/main/res/drawable-xhdpi/ic_shield_disabled.png
rename : mobile/android/app/src/main/res/drawable-xhdpi/shield_enabled.png => mobile/android/app/src/main/res/drawable-xhdpi/ic_shield_enabled.png
rename : mobile/android/app/src/main/res/drawable-xhdpi/warning_major.png => mobile/android/app/src/main/res/drawable-xhdpi/ic_warning_major.png
rename : mobile/android/app/src/main/res/drawable-xhdpi/warning_minor.png => mobile/android/app/src/main/res/drawable-xhdpi/ic_warning_minor.png
rename : mobile/android/app/src/main/res/drawable-xxhdpi/close_edit_mode_dark.png => mobile/android/app/src/main/res/drawable-xxhdpi/ic_cancel_nm.png
rename : mobile/android/app/src/main/res/drawable-xxhdpi/close_edit_mode_light.png => mobile/android/app/src/main/res/drawable-xxhdpi/ic_cancel_pm.png
rename : mobile/android/app/src/main/res/drawable-xxhdpi/lock_secure.png => mobile/android/app/src/main/res/drawable-xxhdpi/ic_lock.png
rename : mobile/android/app/src/main/res/drawable-xxhdpi/lock_disabled.png => mobile/android/app/src/main/res/drawable-xxhdpi/ic_lock_disabled.png
rename : mobile/android/app/src/main/res/drawable-xxhdpi/lock_inactive.png => mobile/android/app/src/main/res/drawable-xxhdpi/ic_lock_inactive.png
rename : mobile/android/app/src/main/res/drawable-xxhdpi/ab_mic.png => mobile/android/app/src/main/res/drawable-xxhdpi/ic_mic.png
rename : mobile/android/app/src/main/res/drawable-xxhdpi/ab_qrcode.png => mobile/android/app/src/main/res/drawable-xxhdpi/ic_qrcode.png
rename : mobile/android/app/src/main/res/drawable-xxhdpi/search_icon_inactive.png => mobile/android/app/src/main/res/drawable-xxhdpi/ic_search_icon.png
rename : mobile/android/app/src/main/res/drawable-xxhdpi/shield_disabled.png => mobile/android/app/src/main/res/drawable-xxhdpi/ic_shield_disabled.png
rename : mobile/android/app/src/main/res/drawable-xxhdpi/shield_enabled.png => mobile/android/app/src/main/res/drawable-xxhdpi/ic_shield_enabled.png
rename : mobile/android/app/src/main/res/drawable-xxhdpi/warning_major.png => mobile/android/app/src/main/res/drawable-xxhdpi/ic_warning_major.png
rename : mobile/android/app/src/main/res/drawable-xxhdpi/warning_minor.png => mobile/android/app/src/main/res/drawable-xxhdpi/ic_warning_minor.png
extra : rebase_source : e7319d4b092d3330b43e9aa21d0984e8f532ec51

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"/>
 
     <org.mozilla.gecko.toolbar.ToolbarEditText
@@ -41,13 +41,13 @@
     <org.mozilla.gecko.widget.themed.ThemedImageButton android:id="@+id/qrcode"
                  android:layout_width="@dimen/page_action_button_width"
                  android:layout_height="match_parent"
-                 android:src="@drawable/ab_qrcode"
+                 android:src="@drawable/ic_qrcode"
                  android:background="@android:color/transparent"/>
 
     <org.mozilla.gecko.widget.themed.ThemedImageButton android:id="@+id/mic"
                  android:layout_width="@dimen/page_action_button_width"
                  android:layout_height="match_parent"
-                 android:src="@drawable/ab_mic"
+                 android:src="@drawable/ic_mic"
                  android:background="@android:color/transparent"/>
 
 </merge>

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">
 
     <item gecko:state_dark="true"
-          android:drawable="@drawable/close_edit_mode_dark"/>
+          android:drawable="@drawable/ic_cancel_nm"/>
 
     <item gecko:state_private="true"
-          android:drawable="@drawable/close_edit_mode_light"/>
+          android:drawable="@drawable/ic_cancel_pm"/>
 
-    <item android:drawable="@drawable/close_edit_mode_light"/>
+    <item android:drawable="@drawable/ic_cancel_pm"/>
 
 </selector>

mobile/android/app/src/main/res/drawable/site_security_icon.xml

@@ -11,22 +11,22 @@
         android:drawable="@drawable/site_security_unknown"
         android:maxLevel="0" />
     <item
-        android:drawable="@drawable/lock_secure"
+        android:drawable="@drawable/ic_lock"
         android:maxLevel="1" />
     <item
-        android:drawable="@drawable/warning_minor"
+        android:drawable="@drawable/ic_warning_minor"
         android:maxLevel="2" />
     <item
-        android:drawable="@drawable/lock_disabled"
+        android:drawable="@drawable/ic_lock_disabled"
         android:maxLevel="3" />
     <item
-        android:drawable="@drawable/shield_enabled"
+        android:drawable="@drawable/ic_shield_enabled"
         android:maxLevel="4" />
     <item
-        android:drawable="@drawable/shield_disabled"
+        android:drawable="@drawable/ic_shield_disabled"
         android:maxLevel="5" />
     <item
-        android:drawable="@drawable/search_icon_inactive"
+        android:drawable="@drawable/ic_search_icon"
         android:maxLevel="6" />
 
 </level-list>

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"

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" />
 

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

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);
     }
 
     /**

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();

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

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 {