Merge branch 'master' into pinFavorites

Conflicts: app/src/main/java/fr/neamar/kiss/result/SettingsResult.java app/src/main/java/fr/neamar/kiss/result/TogglesResult.java
Neamar · Dec 15, 2015 · e21bd71 · e21bd71
2 parents 579e0ef + 99e0f78
commit e21bd71
Show file tree

Hide file tree

Showing 40 changed files with 651 additions and 333 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -154,6 +154,15 @@
  <action android:name="com.android.launcher.action.UNINSTALL_SHORTCUT" />
  </intent-filter>
  </receiver>
+
+ <service android:name=".dataprovider.AliasProvider"/>
+ <service android:name=".dataprovider.AppProvider"/>
+ <service android:name=".dataprovider.ContactsProvider"/>
+ <service android:name=".dataprovider.PhoneProvider"/>
+ <service android:name=".dataprovider.SearchProvider"/>
+ <service android:name=".dataprovider.SettingsProvider"/>
+ <service android:name=".dataprovider.ShortcutsProvider"/>
+ <service android:name=".dataprovider.TogglesProvider"/>
  </application>
 
-</manifest>
+</manifest>