Bug 1053258 - Change Search icon to Browser icon r=benfrancis

mozilla-b2g · Aug 18, 2014 · 3cae1cc · 3cae1cc
1 parent d0d773c
commit 3cae1cc
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 10 deletions.
diff --git a/apps/search/index.html b/apps/search/index.html
@@ -55,6 +55,12 @@
     <script defer src="js/providers/suggestions.js"></script>
     <script defer src="js/providers/webresults.js"></script>
 
+    <!-- Include the app icon in the application.zip -->
+    <link rel="resource" type="image/png" href="shared/resources/branding/browser_84.png"/>
+    <link rel="resource" type="image/png" href="shared/resources/branding/browser_126.png"/>
+    <link rel="resource" type="image/png" href="shared/resources/branding/browser_142.png"/>
+    <link rel="resource" type="image/png" href="shared/resources/branding/browser_189.png"/>
+    <link rel="resource" type="image/png" href="shared/resources/branding/browser_284.png"/>
   </head>
   <body>
 

diff --git a/apps/search/manifest.webapp b/apps/search/manifest.webapp
@@ -1,17 +1,17 @@
 {
-  "name": "Search",
+  "name": "Browser2",
+  "description": "Gaia System Web Browser",
   "type": "certified",
   "role": "search",
-  "description": "Search",
   "launch_path": "/newtab.html",
   "developer": {
     "name": "The Gaia Team",
     "url": "https://github.com/mozilla-b2g/gaia"
   },
   "locales": {
     "en-US": {
-      "name": "Search",
-      "description": "Search"
+      "name": "Browser2",
+      "description": "Gaia System Web Browser"
     }
   },
   "default_locale": "en-US",
@@ -27,7 +27,7 @@
   "connections": {
     "search": {
       "handler_path": "index.html",
-      "description": "Proxies search to copied search app. Should be moved to the search app manifest if we split the app up.",
+      "description": "Notifies the search app on query change.",
       "rules": {}
     }
   },
@@ -42,11 +42,11 @@
     }
   },
   "icons": {
-    "84": "/style/icons/search_84.png",
-    "126": "/style/icons/search_126.png",
-    "142": "/style/icons/search_142.png",
-    "189": "/style/icons/search_189.png",
-    "284": "/style/icons/search_284.png"
+    "84": "/shared/resources/branding/browser_84.png",
+    "126": "/shared/resources/branding/browser_126.png",
+    "142": "/shared/resources/branding/browser_142.png",
+    "189": "/shared/resources/branding/browser_189.png",
+    "284": "/shared/resources/branding/browser_284.png"
   },
   "orientation": "default"
 }
diff --git a/apps/search/style/icons/search_126.png b/apps/search/style/icons/search_126.png
diff --git a/apps/search/style/icons/search_142.png b/apps/search/style/icons/search_142.png
diff --git a/apps/search/style/icons/search_189.png b/apps/search/style/icons/search_189.png
diff --git a/apps/search/style/icons/search_284.png b/apps/search/style/icons/search_284.png
diff --git a/apps/search/style/icons/search_84.png b/apps/search/style/icons/search_84.png