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

Unified Diff: remoting/android/cast/AndroidManifest.xml.jinja2

Issue 451973002: Capabilities + Extensions + Cast Host Extension Support for Android client (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Minor Fix Created 6 years, 4 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 | remoting/android/cast/src/org/chromium/chromoting/CastExtensionHandler.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/android/cast/AndroidManifest.xml.jinja2
diff --git a/remoting/android/java/AndroidManifest.xml.jinja2 b/remoting/android/cast/AndroidManifest.xml.jinja2
similarity index 88%
copy from remoting/android/java/AndroidManifest.xml.jinja2
copy to remoting/android/cast/AndroidManifest.xml.jinja2
index 22795747b9136ae76b3d5575499ee871fb0a4ab3..f1ed533c83ddfe8cfa212128ed3fd1d99dc6ec9d 100644
--- a/remoting/android/java/AndroidManifest.xml.jinja2
+++ b/remoting/android/cast/AndroidManifest.xml.jinja2
@@ -11,6 +11,9 @@
android:icon="@drawable/chromoting128"
android:theme="@android:style/Theme.Holo"
android:allowBackup="false">
+ <meta-data
+ android:name="com.google.android.gms.version"
+ android:value="@integer/google_play_services_version" />
<activity android:name="org.chromium.chromoting.Chromoting"
android:configChanges="orientation|screenSize"
android:theme="@style/MainTheme"
@@ -34,7 +37,8 @@
</activity>
<activity android:name="org.chromium.chromoting.Desktop"
android:configChanges="orientation|screenSize"
- android:windowSoftInputMode="adjustResize"/>
+ android:windowSoftInputMode="adjustResize"
+ android:theme="@style/Theme.AppCompat"/>
<activity android:name="org.chromium.chromoting.HelpActivity"
android:configChanges="orientation|screenSize"
android:uiOptions="splitActionBarWhenNarrow"/>
« no previous file with comments | « no previous file | remoting/android/cast/src/org/chromium/chromoting/CastExtensionHandler.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698