| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <manifest xmlns:android="http://schemas.android.com/apk/res/android" | 2 <manifest xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 package="{{ APK_PACKAGE_NAME }}"> | 3 package="{{ APK_PACKAGE_NAME }}"> |
| 4 <uses-sdk android:minSdkVersion="14" | 4 <uses-sdk android:minSdkVersion="14" |
| 5 android:targetSdkVersion="23"/> | 5 android:targetSdkVersion="23"/> |
| 6 <uses-permission android:name="android.permission.GET_ACCOUNTS"/> | 6 <uses-permission android:name="android.permission.GET_ACCOUNTS"/> |
| 7 <uses-permission android:name="android.permission.INTERNET"/> | 7 <uses-permission android:name="android.permission.INTERNET"/> |
| 8 {% if ENABLE_CARDBOARD == "1" %} | |
| 9 <uses-permission android:name="android.permission.NFC" /> | |
| 10 <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> | |
| 11 <uses-permission android:name="android.permission.RECORD_AUDIO" /> | |
| 12 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> | |
| 13 {% endif %} | |
| 14 | 8 |
| 15 <application android:label="@string/product_name_android" | 9 <application android:label="@string/product_name_android" |
| 16 android:name="org.chromium.chromoting.RemotingApplication" | 10 android:name="org.chromium.chromoting.RemotingApplication" |
| 17 android:icon="@mipmap/logo_remote_desktop_launcher" | 11 android:icon="@mipmap/logo_remote_desktop_launcher" |
| 18 android:theme="@style/BaseTheme" | 12 android:theme="@style/BaseTheme" |
| 19 android:allowBackup="false"> | 13 android:allowBackup="false"> |
| 20 <meta-data | 14 <meta-data |
| 21 android:name="com.google.android.gms.version" | 15 android:name="com.google.android.gms.version" |
| 22 android:value="@integer/google_play_services_version"/> | 16 android:value="@integer/google_play_services_version"/> |
| 23 <meta-data | |
| 24 android:name="enable_cardboard" | |
| 25 android:value="{{ ENABLE_CARDBOARD }}"/> | |
| 26 <activity android:name="org.chromium.chromoting.Chromoting" | 17 <activity android:name="org.chromium.chromoting.Chromoting" |
| 27 android:configChanges="orientation|screenSize" | 18 android:configChanges="orientation|screenSize" |
| 28 android:theme="@style/BaseTheme.NavigationDrawer" | 19 android:theme="@style/BaseTheme.NavigationDrawer" |
| 29 android:launchMode="singleTask"> | 20 android:launchMode="singleTask"> |
| 30 <intent-filter> | 21 <intent-filter> |
| 31 <action android:name="android.intent.action.MAIN"/> | 22 <action android:name="android.intent.action.MAIN"/> |
| 32 <category android:name="android.intent.category.LAUNCHER"/> | 23 <category android:name="android.intent.category.LAUNCHER"/> |
| 33 </intent-filter> | 24 </intent-filter> |
| 34 </activity> | 25 </activity> |
| 35 <activity | 26 <activity |
| 36 android:name="org.chromium.chromoting.ThirdPartyTokenFetcher$OAuthRe
directActivity" | 27 android:name="org.chromium.chromoting.ThirdPartyTokenFetcher$OAuthRe
directActivity" |
| 37 android:enabled="false" | 28 android:enabled="false" |
| 38 android:noHistory="true"> | 29 android:noHistory="true"> |
| 39 <!-- TODO(kevinp): suppress once crbug.com/501593 is fixed. --> | 30 <!-- TODO(kevinp): suppress once crbug.com/501593 is fixed. --> |
| 40 <!--suppress AppIndexingError --> | 31 <!--suppress AppIndexingError --> |
| 41 <intent-filter> | 32 <intent-filter> |
| 42 <action android:name="android.intent.action.VIEW"/> | 33 <action android:name="android.intent.action.VIEW"/> |
| 43 <category android:name="android.intent.category.DEFAULT"/> | 34 <category android:name="android.intent.category.DEFAULT"/> |
| 44 <category android:name="android.intent.category.BROWSABLE"/> | 35 <category android:name="android.intent.category.BROWSABLE"/> |
| 45 <data android:scheme="{{ APK_PACKAGE_NAME }}"/> | 36 <data android:scheme="{{ APK_PACKAGE_NAME }}"/> |
| 46 <data android:path="/oauthredirect/"/> | 37 <data android:path="/oauthredirect/"/> |
| 47 </intent-filter> | 38 </intent-filter> |
| 48 </activity> | 39 </activity> |
| 49 <activity android:name="org.chromium.chromoting.Desktop" | 40 <activity android:name="org.chromium.chromoting.Desktop" |
| 50 android:windowSoftInputMode="adjustResize"/> | 41 android:windowSoftInputMode="adjustResize"/> |
| 51 {% if ENABLE_CARDBOARD == "1" %} | |
| 52 <activity android:name="org.chromium.chromoting.cardboard.DesktopActivit
y" | |
| 53 android:windowSoftInputMode="adjustResize" | |
| 54 android:screenOrientation="sensorLandscape"> | |
| 55 <intent-filter> | |
| 56 <category android:name="com.google.intent.category.CARDBOARD" />
| |
| 57 </intent-filter> | |
| 58 </activity> | |
| 59 {% endif %} | |
| 60 <activity android:name="org.chromium.chromoting.help.HelpActivity" | 42 <activity android:name="org.chromium.chromoting.help.HelpActivity" |
| 61 android:configChanges="orientation|screenSize" | 43 android:configChanges="orientation|screenSize" |
| 62 android:uiOptions="splitActionBarWhenNarrow"> | 44 android:uiOptions="splitActionBarWhenNarrow"> |
| 63 </activity> | 45 </activity> |
| 64 <activity android:name="org.chromium.chromoting.help.CreditsActivity"/> | 46 <activity android:name="org.chromium.chromoting.help.CreditsActivity"/> |
| 65 </application> | 47 </application> |
| 66 </manifest> | 48 </manifest> |
| OLD | NEW |