haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mlaux-bugfix/android-launcher-intent'

This commit is contained in:
Lyubomir Marinov 2016-10-19 12:24:03 -05:00
parent 1ff0bdbcfd c18caf52d0
commit d15413cd18
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/app/src/main/AndroidManifest.xml
View File

@ -29,10 +29,12 @@
android:name=".MainActivity"> android:name=".MainActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.LAUNCHER" />
<data android:host="beta.meet.jit.si" android:scheme="https" /> <data android:host="beta.meet.jit.si" android:scheme="https" />
<data android:host="chaos.hipchat.me" android:scheme="https" /> <data android:host="chaos.hipchat.me" android:scheme="https" />
<data android:host="enso.me" android:scheme="https" /> <data android:host="enso.me" android:scheme="https" />

2
react/features/base/fontIcons/Icon.js
View File

@ -2,7 +2,7 @@
// but the file's name and/or location (within the directory structure) don't // but the file's name and/or location (within the directory structure) don't
// reflect that, it suggests the file is platform-independent. // reflect that, it suggests the file is platform-independent.
import { createIconSetFromIcoMoon } from 'react-native-vector-icons'; import { createIconSetFromIcoMoon } from 'react-native-vector-icons';
import icoMoonConfig from './fonts/selection.json'; import icoMoonConfig from './jitsi.json';
/** /**
* Creates the Jitsi icon set from the ico moon project config file. * Creates the Jitsi icon set from the ico moon project config file.