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>
diff --git a/channels/beta/branding/BRANDING b/channels/beta/branding/BRANDING
index 9f1efec..a6c8e2d 100644
--- a/channels/beta/branding/BRANDING
+++ b/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/channels/beta/res/mipmap-hdpi/ic_launcher_browser.png b/channels/beta/res/mipmap-hdpi/ic_launcher_browser.png
index 5cb9cf8..895022a 100644
--- a/channels/beta/res/mipmap-hdpi/ic_launcher_browser.png
+++ b/channels/beta/res/mipmap-hdpi/ic_launcher_browser.png
Binary files differ
diff --git a/channels/beta/res/mipmap-mdpi/ic_launcher_browser.png b/channels/beta/res/mipmap-mdpi/ic_launcher_browser.png
index d19c7e8..b4a5f2f 100644
--- a/channels/beta/res/mipmap-mdpi/ic_launcher_browser.png
+++ b/channels/beta/res/mipmap-mdpi/ic_launcher_browser.png
Binary files differ
diff --git a/channels/beta/res/mipmap-xhdpi/ic_launcher_browser.png b/channels/beta/res/mipmap-xhdpi/ic_launcher_browser.png
index 1222762..7447103 100644
--- a/channels/beta/res/mipmap-xhdpi/ic_launcher_browser.png
+++ b/channels/beta/res/mipmap-xhdpi/ic_launcher_browser.png
Binary files differ
diff --git a/channels/beta/res/mipmap-xxhdpi/ic_launcher_browser.png b/channels/beta/res/mipmap-xxhdpi/ic_launcher_browser.png
index 45e9352..37df800 100644
--- a/channels/beta/res/mipmap-xxhdpi/ic_launcher_browser.png
+++ b/channels/beta/res/mipmap-xxhdpi/ic_launcher_browser.png
Binary files differ
diff --git a/channels/dev/branding/BRANDING b/channels/dev/branding/BRANDING
index 62f4118..4396f93 100644
--- a/channels/dev/branding/BRANDING
+++ b/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/channels/dev/res/mipmap-hdpi/ic_launcher_browser.png b/channels/dev/res/mipmap-hdpi/ic_launcher_browser.png
index 5cb9cf8..47f21f4 100644
--- a/channels/dev/res/mipmap-hdpi/ic_launcher_browser.png
+++ b/channels/dev/res/mipmap-hdpi/ic_launcher_browser.png
Binary files differ
diff --git a/channels/dev/res/mipmap-mdpi/ic_launcher_browser.png b/channels/dev/res/mipmap-mdpi/ic_launcher_browser.png
index d19c7e8..ed2fc3b 100644
--- a/channels/dev/res/mipmap-mdpi/ic_launcher_browser.png
+++ b/channels/dev/res/mipmap-mdpi/ic_launcher_browser.png
Binary files differ
diff --git a/channels/dev/res/mipmap-xhdpi/ic_launcher_browser.png b/channels/dev/res/mipmap-xhdpi/ic_launcher_browser.png
index 1222762..c712cd6 100644
--- a/channels/dev/res/mipmap-xhdpi/ic_launcher_browser.png
+++ b/channels/dev/res/mipmap-xhdpi/ic_launcher_browser.png
Binary files differ
diff --git a/channels/dev/res/mipmap-xxhdpi/ic_launcher_browser.png b/channels/dev/res/mipmap-xxhdpi/ic_launcher_browser.png
index 45e9352..516d7be 100644
--- a/channels/dev/res/mipmap-xxhdpi/ic_launcher_browser.png
+++ b/channels/dev/res/mipmap-xxhdpi/ic_launcher_browser.png
Binary files differ
diff --git a/channels/release/branding/BRANDING b/channels/release/branding/BRANDING
index ec5058b..eeda1c7 100644
--- a/channels/release/branding/BRANDING
+++ b/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/channels/release/res/mipmap-hdpi/ic_launcher_browser.png b/channels/release/res/mipmap-hdpi/ic_launcher_browser.png
index 5cb9cf8..47f21f4 100644
--- a/channels/release/res/mipmap-hdpi/ic_launcher_browser.png
+++ b/channels/release/res/mipmap-hdpi/ic_launcher_browser.png
Binary files differ
diff --git a/channels/release/res/mipmap-mdpi/ic_launcher_browser.png b/channels/release/res/mipmap-mdpi/ic_launcher_browser.png
index d19c7e8..ed2fc3b 100644
--- a/channels/release/res/mipmap-mdpi/ic_launcher_browser.png
+++ b/channels/release/res/mipmap-mdpi/ic_launcher_browser.png
Binary files differ
diff --git a/channels/release/res/mipmap-xhdpi/ic_launcher_browser.png b/channels/release/res/mipmap-xhdpi/ic_launcher_browser.png
index 1222762..c712cd6 100644
--- a/channels/release/res/mipmap-xhdpi/ic_launcher_browser.png
+++ b/channels/release/res/mipmap-xhdpi/ic_launcher_browser.png
Binary files differ
diff --git a/channels/release/res/mipmap-xxhdpi/ic_launcher_browser.png b/channels/release/res/mipmap-xxhdpi/ic_launcher_browser.png
index 45e9352..516d7be 100644
--- a/channels/release/res/mipmap-xxhdpi/ic_launcher_browser.png
+++ b/channels/release/res/mipmap-xxhdpi/ic_launcher_browser.png
Binary files differ
diff --git a/channels/system/branding/BRANDING b/channels/system/branding/BRANDING
index d3a17ae..dc94e02 100644
--- a/channels/system/branding/BRANDING
+++ b/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/channels/cm/branding/BRANDING b/src/channels/cm/branding/BRANDING
new file mode 100644
index 0000000..757d7ed
--- /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 0000000..5cb9cf8
--- /dev/null
+++ b/src/channels/cm/res/mipmap-hdpi/ic_launcher_browser.png
Binary files differ
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 0000000..d19c7e8
--- /dev/null
+++ b/src/channels/cm/res/mipmap-mdpi/ic_launcher_browser.png
Binary files differ
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 0000000..1222762
--- /dev/null
+++ b/src/channels/cm/res/mipmap-xhdpi/ic_launcher_browser.png
Binary files differ
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 0000000..45e9352
--- /dev/null
+++ b/src/channels/cm/res/mipmap-xxhdpi/ic_launcher_browser.png
Binary files differ
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 0000000..e23deeb
--- /dev/null
+++ b/src/channels/cm/res/mipmap-xxxhdpi/ic_launcher_browser.png
Binary files differ
diff --git a/src/gello/res/values/about.xml b/src/gello/res/values/about.xml
index 608619b..2a2ef6e 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>
