gello: add specific cm branding

define with *GYP_DEFINES="$GYP_DEFINES OS=android swe_channel=cm" gclient runhooks*

revert 7cec21ae543c5597a5ae5b3d4ddcf0e4a0c4e1d6

Change-Id: Id5e3cd964fbb9475742845dbf3ff8ef954f780c3
Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>

23 files changed, 36 insertions, 26 deletions

diff --git a/src/channels/beta/branding/BRANDING b/src/channels/beta/branding/BRANDING
index 9f1efec0..a6c8e2dc 100644
--- a/src/channels/beta/branding/BRANDING
+++ b/src/channels/beta/branding/BRANDING
@@ -1,10 +1,10 @@
-COMPANY_FULLNAME=The CyanogenMod Project
-COMPANY_SHORTNAME=The CyanogenMod Project
-PRODUCT_FULLNAME=CyanogenMod
-PRODUCT_SHORTNAME=CM
+COMPANY_FULLNAME=The Linux Foundation
+COMPANY_SHORTNAME=The Linux Foundation
+PRODUCT_FULLNAME=Snapdragon
+PRODUCT_SHORTNAME=Snapdragon
 PRODUCT_INSTALLER_FULLNAME=Snapdragon Installer
 PRODUCT_INSTALLER_SHORTNAME=Snapdragon Installer
-COPYRIGHT=Copyright (c) 2015 The CyanogenMod Project. All rights reserved.
+COPYRIGHT=Copyright (c) 2015 The Linux Foundation. All rights reserved.
 PACKAGE_NAME=org.codeaurora.swe.browser.beta
 APK_LABEL=@string/application_name
-APK_AUTHORITIES=cyanogenmod.browser.beta
+APK_AUTHORITIES=swe.browser.beta
diff --git a/src/channels/beta/res/mipmap-hdpi/ic_launcher_browser.png b/src/channels/beta/res/mipmap-hdpi/ic_launcher_browser.png
index 5cb9cf89..895022a6 100644
--- a/src/channels/beta/res/mipmap-hdpi/ic_launcher_browser.png
+++ b/src/channels/beta/res/mipmap-hdpi/ic_launcher_browser.png
diff --git a/src/channels/beta/res/mipmap-mdpi/ic_launcher_browser.png b/src/channels/beta/res/mipmap-mdpi/ic_launcher_browser.png
index d19c7e86..b4a5f2fc 100644
--- a/src/channels/beta/res/mipmap-mdpi/ic_launcher_browser.png
+++ b/src/channels/beta/res/mipmap-mdpi/ic_launcher_browser.png
diff --git a/src/channels/beta/res/mipmap-xhdpi/ic_launcher_browser.png b/src/channels/beta/res/mipmap-xhdpi/ic_launcher_browser.png
index 1222762a..7447103b 100644
--- a/src/channels/beta/res/mipmap-xhdpi/ic_launcher_browser.png
+++ b/src/channels/beta/res/mipmap-xhdpi/ic_launcher_browser.png
diff --git a/src/channels/beta/res/mipmap-xxhdpi/ic_launcher_browser.png b/src/channels/beta/res/mipmap-xxhdpi/ic_launcher_browser.png
index 45e93528..37df800d 100644
--- a/src/channels/beta/res/mipmap-xxhdpi/ic_launcher_browser.png
+++ b/src/channels/beta/res/mipmap-xxhdpi/ic_launcher_browser.png
diff --git a/src/channels/cm/branding/BRANDING b/src/channels/cm/branding/BRANDING
new file mode 100644
index 00000000..757d7edb
--- /dev/null
+++ b/src/channels/cm/branding/BRANDING
@@ -0,0 +1,10 @@
+COMPANY_FULLNAME=The CyanogenMod Project
+COMPANY_SHORTNAME=The CyanogenMod Project
+PRODUCT_FULLNAME=CyanogenMod
+PRODUCT_SHORTNAME=CM
+PRODUCT_INSTALLER_FULLNAME=CM Installer
+PRODUCT_INSTALLER_SHORTNAME=CM Installer
+COPYRIGHT=Copyright (c) 2015 The CyanogenMod Project. All rights reserved.
+PACKAGE_NAME=org.cyanogenmod.gello.browser
+APK_LABEL=@string/application_name
+APK_AUTHORITIES=cyanogenmod.browser
diff --git a/src/channels/cm/res/mipmap-hdpi/ic_launcher_browser.png b/src/channels/cm/res/mipmap-hdpi/ic_launcher_browser.png
new file mode 100644
index 00000000..5cb9cf89
--- /dev/null
+++ b/src/channels/cm/res/mipmap-hdpi/ic_launcher_browser.png
diff --git a/src/channels/cm/res/mipmap-mdpi/ic_launcher_browser.png b/src/channels/cm/res/mipmap-mdpi/ic_launcher_browser.png
new file mode 100644
index 00000000..d19c7e86
--- /dev/null
+++ b/src/channels/cm/res/mipmap-mdpi/ic_launcher_browser.png
diff --git a/src/channels/cm/res/mipmap-xhdpi/ic_launcher_browser.png b/src/channels/cm/res/mipmap-xhdpi/ic_launcher_browser.png
new file mode 100644
index 00000000..1222762a
--- /dev/null
+++ b/src/channels/cm/res/mipmap-xhdpi/ic_launcher_browser.png
diff --git a/src/channels/cm/res/mipmap-xxhdpi/ic_launcher_browser.png b/src/channels/cm/res/mipmap-xxhdpi/ic_launcher_browser.png
new file mode 100644
index 00000000..45e93528
--- /dev/null
+++ b/src/channels/cm/res/mipmap-xxhdpi/ic_launcher_browser.png
diff --git a/src/channels/cm/res/mipmap-xxxhdpi/ic_launcher_browser.png b/src/channels/cm/res/mipmap-xxxhdpi/ic_launcher_browser.png
new file mode 100644
index 00000000..e23deeb3
--- /dev/null
+++ b/src/channels/cm/res/mipmap-xxxhdpi/ic_launcher_browser.png
diff --git a/src/channels/dev/branding/BRANDING b/src/channels/dev/branding/BRANDING
index 62f41181..4396f93f 100644
--- a/src/channels/dev/branding/BRANDING
+++ b/src/channels/dev/branding/BRANDING
@@ -1,10 +1,10 @@
-COMPANY_FULLNAME=The CyanogenMod Project
-COMPANY_SHORTNAME=The CyanogenMod Project
-PRODUCT_FULLNAME=CyanogenMod
-PRODUCT_SHORTNAME=CM
+COMPANY_FULLNAME=The Linux Foundation
+COMPANY_SHORTNAME=The Linux Foundation
+PRODUCT_FULLNAME=Snapdragon
+PRODUCT_SHORTNAME=Snapdragon
 PRODUCT_INSTALLER_FULLNAME=Snapdragon Installer
 PRODUCT_INSTALLER_SHORTNAME=Snapdragon Installer
-COPYRIGHT=Copyright (c) 2015 The CyanogenMod Project. All rights reserved.
+COPYRIGHT=Copyright (c) 2015 The Linux Foundation. All rights reserved.
 PACKAGE_NAME=org.codeaurora.swe.browser.dev
 APK_LABEL=@string/application_name
-APK_AUTHORITIES=cyanogenmod.browser.dev
+APK_AUTHORITIES=swe.browser.dev
diff --git a/src/channels/dev/res/mipmap-hdpi/ic_launcher_browser.png b/src/channels/dev/res/mipmap-hdpi/ic_launcher_browser.png
index 5cb9cf89..47f21f44 100644
--- a/src/channels/dev/res/mipmap-hdpi/ic_launcher_browser.png
+++ b/src/channels/dev/res/mipmap-hdpi/ic_launcher_browser.png
diff --git a/src/channels/dev/res/mipmap-mdpi/ic_launcher_browser.png b/src/channels/dev/res/mipmap-mdpi/ic_launcher_browser.png
index d19c7e86..ed2fc3b0 100644
--- a/src/channels/dev/res/mipmap-mdpi/ic_launcher_browser.png
+++ b/src/channels/dev/res/mipmap-mdpi/ic_launcher_browser.png
diff --git a/src/channels/dev/res/mipmap-xhdpi/ic_launcher_browser.png b/src/channels/dev/res/mipmap-xhdpi/ic_launcher_browser.png
index 1222762a..c712cd68 100644
--- a/src/channels/dev/res/mipmap-xhdpi/ic_launcher_browser.png
+++ b/src/channels/dev/res/mipmap-xhdpi/ic_launcher_browser.png
diff --git a/src/channels/dev/res/mipmap-xxhdpi/ic_launcher_browser.png b/src/channels/dev/res/mipmap-xxhdpi/ic_launcher_browser.png
index 45e93528..516d7be3 100644
--- a/src/channels/dev/res/mipmap-xxhdpi/ic_launcher_browser.png
+++ b/src/channels/dev/res/mipmap-xxhdpi/ic_launcher_browser.png
diff --git a/src/channels/release/branding/BRANDING b/src/channels/release/branding/BRANDING
index ec5058b9..eeda1c7c 100644
--- a/src/channels/release/branding/BRANDING
+++ b/src/channels/release/branding/BRANDING
@@ -1,10 +1,10 @@
-COMPANY_FULLNAME=The CyanogenMod Project
-COMPANY_SHORTNAME=The CyanogenMod Project
-PRODUCT_FULLNAME=CyanogenMod
-PRODUCT_SHORTNAME=CM
+COMPANY_FULLNAME=The Linux Foundation
+COMPANY_SHORTNAME=The Linux Foundation
+PRODUCT_FULLNAME=Snapdragon
+PRODUCT_SHORTNAME=Snapdragon
 PRODUCT_INSTALLER_FULLNAME=Snapdragon Installer
 PRODUCT_INSTALLER_SHORTNAME=Snapdragon Installer
-COPYRIGHT=Copyright (c) 2015 The CyanogenMod Project. All rights reserved.
+COPYRIGHT=Copyright (c) 2015 The Linux Foundation. All rights reserved.
 PACKAGE_NAME=org.codeaurora.swe.browser
 APK_LABEL=@string/application_name
-APK_AUTHORITIES=cyanogenmod.browser
+APK_AUTHORITIES=swe.browser
diff --git a/src/channels/release/res/mipmap-hdpi/ic_launcher_browser.png b/src/channels/release/res/mipmap-hdpi/ic_launcher_browser.png
index 5cb9cf89..47f21f44 100644
--- a/src/channels/release/res/mipmap-hdpi/ic_launcher_browser.png
+++ b/src/channels/release/res/mipmap-hdpi/ic_launcher_browser.png
diff --git a/src/channels/release/res/mipmap-mdpi/ic_launcher_browser.png b/src/channels/release/res/mipmap-mdpi/ic_launcher_browser.png
index d19c7e86..ed2fc3b0 100644
--- a/src/channels/release/res/mipmap-mdpi/ic_launcher_browser.png
+++ b/src/channels/release/res/mipmap-mdpi/ic_launcher_browser.png
diff --git a/src/channels/release/res/mipmap-xhdpi/ic_launcher_browser.png b/src/channels/release/res/mipmap-xhdpi/ic_launcher_browser.png
index 1222762a..c712cd68 100644
--- a/src/channels/release/res/mipmap-xhdpi/ic_launcher_browser.png
+++ b/src/channels/release/res/mipmap-xhdpi/ic_launcher_browser.png
diff --git a/src/channels/release/res/mipmap-xxhdpi/ic_launcher_browser.png b/src/channels/release/res/mipmap-xxhdpi/ic_launcher_browser.png
index 45e93528..516d7be3 100644
--- a/src/channels/release/res/mipmap-xxhdpi/ic_launcher_browser.png
+++ b/src/channels/release/res/mipmap-xxhdpi/ic_launcher_browser.png
diff --git a/src/channels/system/branding/BRANDING b/src/channels/system/branding/BRANDING
index d3a17ae6..dc94e026 100644
--- a/src/channels/system/branding/BRANDING
+++ b/src/channels/system/branding/BRANDING
@@ -1,10 +1,10 @@
-COMPANY_FULLNAME=The CyanogenMod Project
-COMPANY_SHORTNAME=The CyanogenMod Project
-PRODUCT_FULLNAME=CyanogenMod
-PRODUCT_SHORTNAME=CM
+COMPANY_FULLNAME=The Linux Foundation
+COMPANY_SHORTNAME=The Linux Foundation
+PRODUCT_FULLNAME=Snapdragon
+PRODUCT_SHORTNAME=Snapdragon
 PRODUCT_INSTALLER_FULLNAME=Snapdragon Installer
 PRODUCT_INSTALLER_SHORTNAME=Snapdragon Installer
-COPYRIGHT=Copyright (c) 2015 The CyanogenMod Project. All rights reserved.
+COPYRIGHT=Copyright (c) 2015 The Linux Foundation. All rights reserved.
 PACKAGE_NAME=org.codeaurora.swe.browser
 APK_LABEL=@string/application_name
 APK_AUTHORITIES=browser
diff --git a/src/gello/res/values/about.xml b/src/gello/res/values/about.xml
index 608619b0..2a2ef6e4 100644
--- a/src/gello/res/values/about.xml
+++ b/src/gello/res/values/about.xml
@@ -3,10 +3,10 @@
  <!-- Text to display in about dialog --> 
 <string name="about_text" formatted="false">
 
-Version: 42.0.2311.187027\n
-Built: Tue Sep  8 14:58:47 CEST 2015\n
+Version: 42.0.2311.187041\n
+Built: Mon Sep 28 21:32:13 CEST 2015\n
 Host: envy-linux\n
 User: joey\n
-Hash: ede7d44 (2311)\n
+Hash: ccad148 (2311)\n
 </string>
 </resources>