Chromium Code Reviews| 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"/> |
|
aiguha
2014/08/08 05:13:50
Desktop.java is now an ActionBarActivity part of t
|
| <activity android:name="org.chromium.chromoting.HelpActivity" |
| android:configChanges="orientation|screenSize" |
| android:uiOptions="splitActionBarWhenNarrow"/> |