sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up naming of demo app download components

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=193940323
This commit is contained in:
olly 2018-04-23 10:00:47 -07:00 committed by Oliver Woodman
parent f6d5cb9934
commit 79c105be59
4 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
demos/main/src/main/AndroidManifest.xml
View file

@ -76,19 +76,17 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".DownloaderActivity"/> <activity android:name="com.google.android.exoplayer2.demo.DownloadActivity"/>
<service <service android:name="com.google.android.exoplayer2.demo.DemoDownloadService"
android:exported="false" android:exported="false">
android:name=".DemoDownloadService">
<intent-filter> <intent-filter>
<action android:name="com.google.android.exoplayer.downloadService.action.INIT"/> <action android:name="com.google.android.exoplayer.downloadService.action.INIT"/>
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT"/>
</intent-filter> </intent-filter>
</service> </service>
<service <service android:name="com.google.android.exoplayer2.scheduler.PlatformScheduler$PlatformSchedulerService"
android:name="com.google.android.exoplayer2.scheduler.PlatformScheduler$PlatformSchedulerService"
android:permission="android.permission.BIND_JOB_SERVICE" android:permission="android.permission.BIND_JOB_SERVICE"
android:exported="true"/> android:exported="true"/>

2
demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
View file

@ -31,7 +31,7 @@ import com.google.android.exoplayer2.ui.DownloadNotificationUtil;
import com.google.android.exoplayer2.ui.NotificationUtil; import com.google.android.exoplayer2.ui.NotificationUtil;
import com.google.android.exoplayer2.util.ErrorMessageProvider; import com.google.android.exoplayer2.util.ErrorMessageProvider;
/** Demo DownloadService implementation. */ /** A service for downloading media. */
public class DemoDownloadService extends DownloadService { public class DemoDownloadService extends DownloadService {
private static final String CHANNEL_ID = "download_channel"; private static final String CHANNEL_ID = "download_channel";

4
demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloaderActivity.java → demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadActivity.java
View file

@ -50,8 +50,8 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/** An activity that downloads streams. */ /** An activity for downloading media. */
public class DownloaderActivity extends Activity { public class DownloadActivity extends Activity {
public static final String PLAYER_INTENT = "player_intent"; public static final String PLAYER_INTENT = "player_intent";
public static final String SAMPLE_NAME = "sample_name"; public static final String SAMPLE_NAME = "sample_name";

10
demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
View file

@ -49,9 +49,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
/** /** An activity for selecting from a list of media samples. */
* An activity for selecting from a list of samples.
*/
public class SampleChooserActivity extends Activity { public class SampleChooserActivity extends Activity {
private static final String TAG = "SampleChooserActivity"; private static final String TAG = "SampleChooserActivity";
@ -128,9 +126,9 @@ public class SampleChooserActivity extends Activity {
.show(); .show();
return; return;
} }
Intent intent = new Intent(this, DownloaderActivity.class); Intent intent = new Intent(this, DownloadActivity.class);
intent.putExtra(DownloaderActivity.SAMPLE_NAME, sample.name); intent.putExtra(DownloadActivity.SAMPLE_NAME, sample.name);
intent.putExtra(DownloaderActivity.PLAYER_INTENT, sample.buildIntent(this)); intent.putExtra(DownloadActivity.PLAYER_INTENT, sample.buildIntent(this));
startActivity(intent); startActivity(intent);
} }