diff options
| author | Александр Зацепин <az@mapswithme.com> | 2017-09-28 19:36:23 +0300 |
|---|---|---|
| committer | Arsentiy Milchakov <milcars@mapswithme.com> | 2017-09-29 17:48:58 +0300 |
| commit | c3bd1ac79ff90130bec943143c3e0bafcaacf861 (patch) | |
| tree | cc417529b591ca5de8410fcf4173553d7dec57ca /android/AndroidManifest.xml | |
| parent | 851b67edbe8fbf3fd86cb9ac110ad3d3882e959c (diff) | |
[android] Added native facebook authentication
[android] Implemented obtaining Facebook oauth token and passing it to the core
Diffstat (limited to 'android/AndroidManifest.xml')
| -rw-r--r-- | android/AndroidManifest.xml | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 88fbde206b..3cbe93a20c 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -63,7 +63,7 @@ <meta-data android:name="com.facebook.sdk.ApplicationId" - android:value="@string/fb_app_id"/> + android:value="@string/facebook_app_id"/> <meta-data android:name="io.fabric.ApiKey" @@ -356,14 +356,7 @@ android:value="com.mapswithme.maps.MwmActivity"/> </activity> - <!-- facebook --> - <activity - android:name="com.facebook.FacebookActivity" - android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize" - android:theme="@android:style/Theme.Translucent.NoTitleBar"/> - - <activity android:name="com.mopub.common.MoPubBrowser" android:configChanges="keyboardHidden|orientation|screenSize"/> - + <!-- ugc --> <activity android:name=".ugc.UGCEditorActivity" android:configChanges="keyboardHidden|orientation|screenSize" @@ -374,6 +367,26 @@ android:value="com.mapswithme.maps.MwmActivity"/> </activity> + <!-- facebook --> + <activity + android:name="com.facebook.FacebookActivity" + android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation" + android:label="@string/app_name"/> + <activity + android:name="com.facebook.CustomTabActivity" + android:exported="true"> + <intent-filter> + <action android:name="android.intent.action.VIEW"/> + + <category android:name="android.intent.category.DEFAULT"/> + <category android:name="android.intent.category.BROWSABLE"/> + + <data android:scheme="@string/fb_login_protocol_scheme"/> + </intent-filter> + </activity> + + <activity android:name="com.mopub.common.MoPubBrowser" android:configChanges="keyboardHidden|orientation|screenSize"/> + <receiver android:name="com.mapswithme.maps.background.ConnectivityChangedReceiver" android:enabled="true" |