Upstream merge

This commit is contained in:
NerdNumber9
2019-03-31 00:23:44 -04:00
178 changed files with 12799 additions and 8435 deletions

View File

@@ -43,8 +43,7 @@
android:resource="@xml/shortcuts" />
</activity>
<activity
android:name=".ui.reader.ReaderActivity"
android:theme="@style/Theme.Reader" />
android:name=".ui.reader.ReaderActivity" />
<activity
android:name=".widget.CustomLayoutPickerActivity"
android:label="@string/app_name"
@@ -76,14 +75,6 @@
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/provider_paths" />
</provider>
<provider
android:name=".util.ZipContentProvider"
android:authorities="${applicationId}.zip-provider"
android:exported="false" />
<provider
android:name=".util.RarContentProvider"
android:authorities="${applicationId}.rar-provider"
android:exported="false" />
<receiver
android:name=".data.notification.NotificationReceiver"