Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(360)

Unified Diff: chrome/android/java/AndroidManifest.xml

Issue 2941173002: Prevent "Incompatible App" message when entering VR. (Closed)
Patch Set: Resolve findbugs issue. Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/AndroidManifest.xml
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index 464c9825e32fbe0ddff9ca803a5e15389b380faa..4c9366e26085fe09dc54f8955e1758394e0e20f7 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -319,7 +319,9 @@ by a child template that "extends" this file.
android:theme="@style/MainTheme"
android:exported="false"
{{ self.chrome_activity_common() }}
- {{ self.supports_video_persistence() }} >
+ {{ self.supports_video_persistence() }}
+ >
+ {{ self.supports_vr() }}
</activity>
<activity android:name="org.chromium.chrome.browser.customtabs.SeparateTaskCustomTabActivity"
android:theme="@style/MainTheme"
@@ -328,7 +330,9 @@ by a child template that "extends" this file.
android:persistableMode="persistNever"
android:autoRemoveFromRecents="false"
{{ self.chrome_activity_common() }}
- {{ self.supports_video_persistence() }} >
+ {{ self.supports_video_persistence() }}
+ >
+ {{ self.supports_vr() }}
</activity>
{% for i in range(10) %}
<activity android:name="org.chromium.chrome.browser.customtabs.SeparateTaskCustomTabActivity{{ i }}"
@@ -339,7 +343,9 @@ by a child template that "extends" this file.
android:persistableMode="persistNever"
android:taskAffinity=""
{{ self.chrome_activity_common() }}
- {{ self.supports_video_persistence() }} >
+ {{ self.supports_video_persistence() }}
+ >
+ {{ self.supports_vr() }}
</activity>
{% endfor %}
@@ -359,7 +365,19 @@ by a child template that "extends" this file.
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize|uiMode"
android:hardwareAccelerated="false"
{% endblock %}
- >
+ >
+ <!--
+ Daydream api categorizes an activity to three categories: Cardboard only, hybrid
+ or Daydream. It does so by testing if intents can be resolved by the activity
+ that requests it.
+ -->
+ {% block supports_vr %}
+ <intent-filter>
+ <action android:name="org.chromium.chrome.browser.dummy.action" />
+ <category android:name="com.google.intent.category.DAYDREAM" />
+ <category android:name="com.google.intent.category.CARDBOARD" />
+ </intent-filter>
+ {% endblock %}
</activity>
<activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity2"
android:theme="@style/TabbedModeTheme"
@@ -367,7 +385,9 @@ by a child template that "extends" this file.
android:taskAffinity="{{ manifest_package }}.ChromeTabbedActivity2"
android:launchMode="singleTask"
{{ self.chrome_activity_common() }}
- {{ self.supports_video_persistence() }}>
+ {{ self.supports_video_persistence() }}
+ >
+ {{ self.supports_vr() }}
</activity>
<activity android:name="org.chromium.chrome.browser.multiwindow.MultiInstanceChromeTabbedActivity"
android:theme="@style/TabbedModeTheme"
@@ -492,7 +512,9 @@ by a child template that "extends" this file.
android:documentLaunchMode="intoExisting"
android:persistableMode="persistNever"
{{ self.supports_video_persistence() }}
- {{ self.chrome_activity_common() }}>
+ {{ self.chrome_activity_common() }}
+ >
+ {{ self.supports_vr() }}
</activity>
<activity-alias android:name="com.google.android.apps.chrome.webapps.WebappActivity"
android:targetActivity="org.chromium.chrome.browser.webapps.WebappActivity"
@@ -508,7 +530,9 @@ by a child template that "extends" this file.
android:persistableMode="persistNever"
android:taskAffinity="{{ manifest_package }}.webapps.WebappActivity{{ i }}"
{{ self.supports_video_persistence() }}
- {{ self.chrome_activity_common() }}>
+ {{ self.chrome_activity_common() }}
+ >
+ {{ self.supports_vr() }}
</activity>
<activity-alias android:name="com.google.android.apps.chrome.webapps.WebappActivity{{ i }}"
android:targetActivity="org.chromium.chrome.browser.webapps.WebappActivity{{ i }}"
@@ -524,7 +548,9 @@ by a child template that "extends" this file.
android:documentLaunchMode="intoExisting"
android:persistableMode="persistNever"
{{ self.supports_video_persistence() }}
- {{ self.chrome_activity_common() }}>
+ {{ self.chrome_activity_common() }}
+ >
+ {{ self.supports_vr() }}
</activity>
{% for i in range(10) %}
<activity android:name="org.chromium.chrome.browser.webapps.WebApkActivity{{ i }}"
@@ -535,7 +561,9 @@ by a child template that "extends" this file.
android:persistableMode="persistNever"
android:taskAffinity="{{ manifest_package }}.webapps.WebApkActivity{{ i }}"
{{ self.supports_video_persistence() }}
- {{ self.chrome_activity_common() }}>
+ {{ self.chrome_activity_common() }}
+ >
+ {{ self.supports_vr() }}
</activity>
{% endfor %}
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698