Browse Source

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

master
Lyubomir Marinov 9 years ago
parent
commit
d15413cd18

+ 3
- 1
android/app/src/main/AndroidManifest.xml View File

29
         android:name=".MainActivity">
29
         android:name=".MainActivity">
30
         <intent-filter>
30
         <intent-filter>
31
             <action android:name="android.intent.action.MAIN" />
31
             <action android:name="android.intent.action.MAIN" />
32
+            <category android:name="android.intent.category.LAUNCHER" />
33
+        </intent-filter>
34
+        <intent-filter>
32
             <action android:name="android.intent.action.VIEW" />
35
             <action android:name="android.intent.action.VIEW" />
33
             <category android:name="android.intent.category.BROWSABLE" />
36
             <category android:name="android.intent.category.BROWSABLE" />
34
             <category android:name="android.intent.category.DEFAULT" />
37
             <category android:name="android.intent.category.DEFAULT" />
35
-            <category android:name="android.intent.category.LAUNCHER" />
36
             <data android:host="beta.meet.jit.si" android:scheme="https" />
38
             <data android:host="beta.meet.jit.si" android:scheme="https" />
37
             <data android:host="chaos.hipchat.me" android:scheme="https" />
39
             <data android:host="chaos.hipchat.me" android:scheme="https" />
38
             <data android:host="enso.me" android:scheme="https" />
40
             <data android:host="enso.me" android:scheme="https" />

+ 1
- 1
react/features/base/fontIcons/Icon.js View File

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

Loading…
Cancel
Save