Add overlay folders for swe channels
Change-Id: I6c58662ccc2f508106426d7c6ee6885ffe32879c
diff --git a/AndroidManifest.xml.jinja2 b/AndroidManifest.xml.jinja2
index 09c9de8..0c421c6 100644
--- a/AndroidManifest.xml.jinja2
+++ b/AndroidManifest.xml.jinja2
@@ -55,7 +55,7 @@
defined in manifest -->
<application android:name="Browser"
android:label="{{ apk_label }}"
- android:icon="{{ apk_icon }}"
+ android:icon="@mipmap/ic_launcher_browser"
android:backupAgent=".BrowserBackupAgent"
android:hardwareAccelerated="true"
android:taskAffinity="{{ apk_task_affinity }}"
diff --git a/channels/beta/branding/BRANDING b/channels/beta/branding/BRANDING
index f4b9d77..22b8b33 100644
--- a/channels/beta/branding/BRANDING
+++ b/channels/beta/branding/BRANDING
@@ -7,5 +7,4 @@
COPYRIGHT=Copyright (c) 2015 The Linux Foundation. All rights reserved.
PACKAGE_NAME=org.codeaurora.swe.browser.beta
APK_LABEL=@string/application_name_swe
-APK_ICON=@mipmap/ic_launcher_browser_swe_beta
APK_AUTHORITIES=swe.browser.beta
\ No newline at end of file
diff --git a/res/mipmap-hdpi/ic_launcher_browser_swe_beta.png b/channels/beta/overlay/res/mipmap-hdpi/ic_launcher_browser.png
similarity index 100%
rename from res/mipmap-hdpi/ic_launcher_browser_swe_beta.png
rename to channels/beta/overlay/res/mipmap-hdpi/ic_launcher_browser.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_browser_swe_beta.png b/channels/beta/overlay/res/mipmap-mdpi/ic_launcher_browser.png
similarity index 100%
rename from res/mipmap-mdpi/ic_launcher_browser_swe_beta.png
rename to channels/beta/overlay/res/mipmap-mdpi/ic_launcher_browser.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_browser_swe_beta.png b/channels/beta/overlay/res/mipmap-xhdpi/ic_launcher_browser.png
similarity index 100%
rename from res/mipmap-xhdpi/ic_launcher_browser_swe_beta.png
rename to channels/beta/overlay/res/mipmap-xhdpi/ic_launcher_browser.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_browser_swe_beta.png b/channels/beta/overlay/res/mipmap-xxhdpi/ic_launcher_browser.png
similarity index 100%
rename from res/mipmap-xxhdpi/ic_launcher_browser_swe_beta.png
rename to channels/beta/overlay/res/mipmap-xxhdpi/ic_launcher_browser.png
Binary files differ
diff --git a/channels/dev/branding/BRANDING b/channels/dev/branding/BRANDING
index 9b0f308..48fd65d 100644
--- a/channels/dev/branding/BRANDING
+++ b/channels/dev/branding/BRANDING
@@ -7,5 +7,4 @@
COPYRIGHT=Copyright (c) 2015 The Linux Foundation. All rights reserved.
PACKAGE_NAME=org.codeaurora.swe.browser.dev
APK_LABEL=@string/application_name_swe
-APK_ICON=@mipmap/ic_launcher_browser_swe
APK_AUTHORITIES=swe.browser.dev
diff --git a/res/mipmap-hdpi/ic_launcher_browser_swe.png b/channels/dev/overlay/res/mipmap-hdpi/ic_launcher_browser.png
similarity index 100%
rename from res/mipmap-hdpi/ic_launcher_browser_swe.png
rename to channels/dev/overlay/res/mipmap-hdpi/ic_launcher_browser.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_browser_swe.png b/channels/dev/overlay/res/mipmap-mdpi/ic_launcher_browser.png
similarity index 100%
rename from res/mipmap-mdpi/ic_launcher_browser_swe.png
rename to channels/dev/overlay/res/mipmap-mdpi/ic_launcher_browser.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_browser_swe.png b/channels/dev/overlay/res/mipmap-xhdpi/ic_launcher_browser.png
similarity index 100%
rename from res/mipmap-xhdpi/ic_launcher_browser_swe.png
rename to channels/dev/overlay/res/mipmap-xhdpi/ic_launcher_browser.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_browser_swe.png b/channels/dev/overlay/res/mipmap-xxhdpi/ic_launcher_browser.png
similarity index 100%
rename from res/mipmap-xxhdpi/ic_launcher_browser_swe.png
rename to channels/dev/overlay/res/mipmap-xxhdpi/ic_launcher_browser.png
Binary files differ
diff --git a/channels/release/branding/BRANDING b/channels/release/branding/BRANDING
index bf3df6f..a41e7ed 100644
--- a/channels/release/branding/BRANDING
+++ b/channels/release/branding/BRANDING
@@ -7,5 +7,4 @@
COPYRIGHT=Copyright (c) 2015 The Linux Foundation. All rights reserved.
PACKAGE_NAME=org.codeaurora.swe.browser
APK_LABEL=@string/application_name_swe
-APK_ICON=@mipmap/ic_launcher_browser_swe
APK_AUTHORITIES=swe.browser
diff --git a/res/mipmap-hdpi/ic_launcher_browser_swe.png b/channels/release/overlay/res/mipmap-hdpi/ic_launcher_browser.png
similarity index 100%
copy from res/mipmap-hdpi/ic_launcher_browser_swe.png
copy to channels/release/overlay/res/mipmap-hdpi/ic_launcher_browser.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_browser_swe.png b/channels/release/overlay/res/mipmap-mdpi/ic_launcher_browser.png
similarity index 100%
copy from res/mipmap-mdpi/ic_launcher_browser_swe.png
copy to channels/release/overlay/res/mipmap-mdpi/ic_launcher_browser.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_browser_swe.png b/channels/release/overlay/res/mipmap-xhdpi/ic_launcher_browser.png
similarity index 100%
copy from res/mipmap-xhdpi/ic_launcher_browser_swe.png
copy to channels/release/overlay/res/mipmap-xhdpi/ic_launcher_browser.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_browser_swe.png b/channels/release/overlay/res/mipmap-xxhdpi/ic_launcher_browser.png
similarity index 100%
copy from res/mipmap-xxhdpi/ic_launcher_browser_swe.png
copy to channels/release/overlay/res/mipmap-xxhdpi/ic_launcher_browser.png
Binary files differ
diff --git a/channels/system/branding/BRANDING b/channels/system/branding/BRANDING
index c36ecca..5591769 100644
--- a/channels/system/branding/BRANDING
+++ b/channels/system/branding/BRANDING
@@ -7,5 +7,4 @@
COPYRIGHT=Copyright (c) 2015 The Linux Foundation. All rights reserved.
PACKAGE_NAME=com.android.browser
APK_LABEL=@string/application_name
-APK_ICON=@mipmap/ic_launcher_browser
APK_AUTHORITIES=browser
diff --git a/src/com/android/browser/ShareDialog.java b/src/com/android/browser/ShareDialog.java
index a4bfad7..0f44e5c 100644
--- a/src/com/android/browser/ShareDialog.java
+++ b/src/com/android/browser/ShareDialog.java
@@ -88,7 +88,7 @@
public void loadView(final AppAdapter adapter) {
AlertDialog.Builder builderSingle = new AlertDialog.Builder(activity);
- builderSingle.setIcon(R.mipmap.ic_launcher_browser_swe);
+ builderSingle.setIcon(R.mipmap.ic_launcher_browser);
builderSingle.setTitle(activity.getString(R.string.choosertitle_sharevia));
builderSingle.setAdapter(adapter, new DialogInterface.OnClickListener() {
@Override
@@ -122,4 +122,4 @@
builderSingle.show();
}
-}
\ No newline at end of file
+}
diff --git a/src/com/android/browser/UploadDialog.java b/src/com/android/browser/UploadDialog.java
index a91613e..7505ef7 100644
--- a/src/com/android/browser/UploadDialog.java
+++ b/src/com/android/browser/UploadDialog.java
@@ -65,7 +65,7 @@
R.layout.app_row, this.apps);
AlertDialog.Builder builderSingle = new AlertDialog.Builder(activity);
- builderSingle.setIcon(R.mipmap.ic_launcher_browser_swe);
+ builderSingle.setIcon(R.mipmap.ic_launcher_browser);
builderSingle.setTitle(activity.getString(R.string.choose_upload));
builderSingle.setAdapter(adapter, new DialogInterface.OnClickListener() {
@@ -88,4 +88,4 @@
builderSingle.show();
}
-}
\ No newline at end of file
+}
diff --git a/swe_android_browser.gypi b/swe_android_browser.gypi
index cb19eb7..40795cc 100644
--- a/swe_android_browser.gypi
+++ b/swe_android_browser.gypi
@@ -33,6 +33,8 @@
'additional_input_paths': [
'<@(chrome_android_pak_output_resources)',
],
+ 'res_extra_dirs': [ '<@(swe_extra_res_dirs)',
+ ],
'override_package_name': '<!(python <(swe_py_config) \
-i <(browser_config_path) \
-c PACKAGE_NAME)',
