diff options
author | ben <ben@chromium.org> | 2015-06-10 15:00:06 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-10 22:00:39 +0000 |
commit | 97b605952161914d7d5b6229bad8ff6e76de6712 (patch) | |
tree | 9ac17f35b08f99742fc109827ae37b64d9dadb44 /mandoline | |
parent | f7262a1ce8f256c5a30a32b2cd6c8bd361d5738e (diff) | |
download | chromium_src-97b605952161914d7d5b6229bad8ff6e76de6712.zip chromium_src-97b605952161914d7d5b6229bad8ff6e76de6712.tar.gz chromium_src-97b605952161914d7d5b6229bad8ff6e76de6712.tar.bz2 |
Some dogfooding improvements to our APK:
- an application icon (artist: me)
- the apk now shows up in the launcher
- the apk can now be run directly from the launcher with no args (i.e. without having to run android_run_mandoline.py on your desktop)
BUG=
Review URL: https://codereview.chromium.org/1173833002
Cr-Commit-Position: refs/heads/master@{#333814}
Diffstat (limited to 'mandoline')
-rw-r--r-- | mandoline/app/android/BUILD.gn | 6 | ||||
-rw-r--r-- | mandoline/app/android/apk/AndroidManifest.xml | 7 | ||||
-rw-r--r-- | mandoline/app/android/apk/res/drawable/mandoline.png | bin | 0 -> 1412 bytes |
3 files changed, 12 insertions, 1 deletions
diff --git a/mandoline/app/android/BUILD.gn b/mandoline/app/android/BUILD.gn index 198b0c1..4b577f8b 100644 --- a/mandoline/app/android/BUILD.gn +++ b/mandoline/app/android/BUILD.gn @@ -88,6 +88,11 @@ generate_mojo_shell_assets_list("build_mandoline_assets") { dir = mandoline_assets_dir } +android_resources("mandoline_apk_resources") { + custom_package = "org.chromium.mandoline" + resource_dirs = [ "apk/res" ] +} + android_apk("mandoline_apk") { apk_name = "Mandoline" @@ -100,6 +105,7 @@ android_apk("mandoline_apk") { deps = [ ":build_mandoline_assets", ":copy_mandoline_runner", + ":mandoline_apk_resources", "//mojo/runner:java", "//mojo/runner:resources", "//base:base_java", diff --git a/mandoline/app/android/apk/AndroidManifest.xml b/mandoline/app/android/apk/AndroidManifest.xml index a4158f1..7bcab91 100644 --- a/mandoline/app/android/apk/AndroidManifest.xml +++ b/mandoline/app/android/apk/AndroidManifest.xml @@ -14,7 +14,8 @@ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> <application android:name="org.chromium.mojo.shell.MojoShellApplication" - android:label="Mandoline"> + android:label="Mandoline" + android:icon="@drawable/mandoline"> <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" /> <meta-data android:name="mojo_lib" @@ -25,6 +26,10 @@ android:configChanges="orientation|keyboardHidden|keyboard|screenSize" android:hardwareAccelerated="true"> <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + <intent-filter> <action android:name="android.intent.action.VIEW"/> <category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.BROWSABLE"/> diff --git a/mandoline/app/android/apk/res/drawable/mandoline.png b/mandoline/app/android/apk/res/drawable/mandoline.png Binary files differnew file mode 100644 index 0000000..129bc15 --- /dev/null +++ b/mandoline/app/android/apk/res/drawable/mandoline.png |