tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into fix/boot-widgets

Browse source
This commit is contained in:
Eugene Cheung 2017-06-12 23:24:54 -04:00 • committed by GitHub
commit 790410ce20
147 changed files with 353 additions and 344 deletions
Download patch file Download diff file Expand all files Collapse all files

57
app/src/main/AndroidManifest.xml
View file

@ -21,6 +21,7 @@
android:supportsRtl="true"
android:theme="@style/Theme.Phonograph.Light"
tools:ignore="UnusedAttribute">
<activity android:name=".ui.activities.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -94,6 +95,31 @@
</activity>
<activity android:name=".ui.activities.AlbumDetailActivity" />
<activity android:name=".ui.activities.ArtistDetailActivity" />
<activity android:name=".ui.activities.PlaylistDetailActivity" />
<activity
android:name=".ui.activities.tageditor.SongTagEditorActivity"
android:windowSoftInputMode="adjustResize" />
<activity
android:name=".ui.activities.tageditor.AlbumTagEditorActivity"
android:windowSoftInputMode="adjustResize" />
<activity android:name=".ui.activities.SearchActivity" />
<activity
android:name=".ui.activities.SettingsActivity"
android:label="@string/action_settings" />
<activity
android:name=".ui.activities.AboutActivity"
android:label="@string/action_about" />
<activity
android:name=".ui.activities.intro.AppIntroActivity"
android:label="@string/intro_label"
android:theme="@style/Theme.Intro" />
<activity
android:name=".ui.activities.bugreport.BugReportActivity"
android:label="@string/report_an_issue" />
<activity
android:name=".appshortcuts.AppShortcutLauncherActivity"
android:launchMode="singleInstance"
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
<service
android:name=".service.MusicService"
@ -120,23 +146,14 @@
<meta-data
android:name="com.bumptech.glide.integration.okhttp3.OkHttpGlideModule"
android:value="GlideModule" />
<activity
android:name=".ui.activities.tageditor.SongTagEditorActivity"
android:windowSoftInputMode="adjustResize" />
<activity
android:name=".ui.activities.tageditor.AlbumTagEditorActivity"
android:windowSoftInputMode="adjustResize" />
<activity android:name=".ui.activities.SearchActivity" />
<!-- Widgets -->
<receiver android:name=".appwidgets.BootReceiver" >
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
<action android:name="android.intent.action.QUICKBOOT_POWERON" />
</intent-filter>
</receiver>
<receiver
android:name=".appwidgets.AppWidgetBig"
android:exported="false"
@ -174,24 +191,6 @@
android:resource="@xml/app_widget_small_info" />
</receiver>
<activity
android:name=".ui.activities.SettingsActivity"
android:label="@string/action_settings" />
<activity android:name=".ui.activities.PlaylistDetailActivity" />
<activity
android:name=".ui.activities.AboutActivity"
android:label="@string/action_about" />
<activity
android:name=".ui.activities.intro.AppIntroActivity"
android:label="@string/intro_label"
android:theme="@style/Theme.Intro" />
<activity
android:name=".ui.activities.bugreport.BugReportActivity"
android:label="@string/report_an_issue" />
<activity
android:name=".appshortcuts.AppShortcutLauncherActivity"
android:theme="@android:style/Theme.Translucent.NoTitleBar"
android:launchMode="singleInstance"/>
</application>
</manifest>