From cece543d6bb1b127c31eddf4bd11627706edd83f Mon Sep 17 00:00:00 2001 From: Teja Vojjala Date: Fri, 29 Jan 2016 20:07:15 +0530 Subject: [PATCH 01/12] Update VideoItemListActivity.java --- app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java index 446b916b5..362ee85a3 100644 --- a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java +++ b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java @@ -112,7 +112,7 @@ public class VideoItemListActivity extends AppCompatActivity //------ todo: remove this line when multiservice support is implemented ------ currentStreamingServiceId = ServiceList.getIdOfService("Youtube"); //----------------------------------------------------------------------------- - + //to solve issue 38 listFragment = (VideoItemListFragment) getSupportFragmentManager() .findFragmentById(R.id.videoitem_list); listFragment.setStreamingService(ServiceList.getService(currentStreamingServiceId)); From aa2d8d483363f45849ac2e60f639a9e0dc36d458 Mon Sep 17 00:00:00 2001 From: Teja Vojjala Date: Fri, 29 Jan 2016 20:16:57 +0530 Subject: [PATCH 02/12] Update VideoItemDetailActivity.java --- .../main/java/org/schabi/newpipe/VideoItemDetailActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java index bf28549b3..95713ae06 100644 --- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java +++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java @@ -44,7 +44,7 @@ public class VideoItemDetailActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_videoitem_detail); - + setVolumeControlStream(AudioManager.STREAM_MUSIC); // Show the Up button in the action bar. try { //noinspection ConstantConditions From 44ef04d90a9703ab7a67ffa40a52b685aca43d31 Mon Sep 17 00:00:00 2001 From: Teja Vojjala Date: Fri, 29 Jan 2016 20:19:09 +0530 Subject: [PATCH 03/12] Update PlayVideoActivity.java --- app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java b/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java index ce1cf64cd..22de5004e 100644 --- a/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java +++ b/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java @@ -78,7 +78,7 @@ public class PlayVideoActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_play_video); - + setVolumeControlStream(AudioManager.STREAM_MUSIC); isLandscape = checkIfLandscape(); hasSoftKeys = checkIfHasSoftKeys(); From b81e8cb81aac4e352dbe178a6ba6d8923df44406 Mon Sep 17 00:00:00 2001 From: Teja Vojjala Date: Fri, 29 Jan 2016 20:20:55 +0530 Subject: [PATCH 04/12] Update SettingsActivity.java --- app/src/main/java/org/schabi/newpipe/SettingsActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/org/schabi/newpipe/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/SettingsActivity.java index 5f5d17339..3e5bb1bf1 100644 --- a/app/src/main/java/org/schabi/newpipe/SettingsActivity.java +++ b/app/src/main/java/org/schabi/newpipe/SettingsActivity.java @@ -86,6 +86,7 @@ public class SettingsActivity extends PreferenceActivity { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setVolumeControlStream(AudioManager.STREAM_MUSIC); addPreferencesFromResource(R.xml.settings); final Activity activity = getActivity(); From 607408b9b9fa87db8dbc750db217573ad9177310 Mon Sep 17 00:00:00 2001 From: Teja Vojjala Date: Fri, 29 Jan 2016 20:21:44 +0530 Subject: [PATCH 05/12] Update PanicResponderActivity.java --- .../main/java/org/schabi/newpipe/PanicResponderActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/schabi/newpipe/PanicResponderActivity.java b/app/src/main/java/org/schabi/newpipe/PanicResponderActivity.java index 8a36f5d5e..8337749cc 100644 --- a/app/src/main/java/org/schabi/newpipe/PanicResponderActivity.java +++ b/app/src/main/java/org/schabi/newpipe/PanicResponderActivity.java @@ -33,7 +33,7 @@ public class PanicResponderActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - + setVolumeControlStream(AudioManager.STREAM_MUSIC); Intent intent = getIntent(); if (intent != null && PANIC_TRIGGER_ACTION.equals(intent.getAction())) { // TODO explicitly clear the search results once they are restored when the app restarts From adc98be441ecd9b472a6b7fe340767843180a1cf Mon Sep 17 00:00:00 2001 From: Teja Vojjala Date: Mon, 1 Feb 2016 14:25:23 +0530 Subject: [PATCH 06/12] Update PanicResponderActivity.java --- app/src/main/java/org/schabi/newpipe/PanicResponderActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/org/schabi/newpipe/PanicResponderActivity.java b/app/src/main/java/org/schabi/newpipe/PanicResponderActivity.java index 8337749cc..f084101d2 100644 --- a/app/src/main/java/org/schabi/newpipe/PanicResponderActivity.java +++ b/app/src/main/java/org/schabi/newpipe/PanicResponderActivity.java @@ -6,6 +6,7 @@ import android.app.Activity; import android.content.Intent; import android.os.Build; import android.os.Bundle; +import android.media.AudioManager; /** * Copyright (C) Hans-Christoph Steiner 2016 From 8c010093e8f50d2a1d2496226aa3b1e2c3ac5204 Mon Sep 17 00:00:00 2001 From: Teja Vojjala Date: Mon, 1 Feb 2016 14:27:24 +0530 Subject: [PATCH 07/12] Update SettingsActivity.java --- app/src/main/java/org/schabi/newpipe/SettingsActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/org/schabi/newpipe/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/SettingsActivity.java index 3e5bb1bf1..4761f2252 100644 --- a/app/src/main/java/org/schabi/newpipe/SettingsActivity.java +++ b/app/src/main/java/org/schabi/newpipe/SettingsActivity.java @@ -5,6 +5,7 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.res.Configuration; +import android.media.AudioManager; import android.os.Bundle; import android.os.Environment; import android.preference.CheckBoxPreference; From 2108e09e1369bfdcc3efca7b744c2dd1ce76380e Mon Sep 17 00:00:00 2001 From: Teja Vojjala Date: Mon, 1 Feb 2016 14:28:38 +0530 Subject: [PATCH 08/12] Update PlayVideoActivity.java --- app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java b/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java index 22de5004e..ae632cfc7 100644 --- a/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java +++ b/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java @@ -6,6 +6,7 @@ import android.content.SharedPreferences; import android.content.pm.ActivityInfo; import android.content.res.Configuration; import android.media.MediaPlayer; +import android.media.AudioManager; import android.net.Uri; import android.os.Build; import android.os.Bundle; From a42029970d5c063504eef6065934317276ad72c1 Mon Sep 17 00:00:00 2001 From: Teja Vojjala Date: Mon, 1 Feb 2016 14:29:28 +0530 Subject: [PATCH 09/12] Update VideoItemDetailActivity.java --- .../main/java/org/schabi/newpipe/VideoItemDetailActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java index 95713ae06..6ea3fba66 100644 --- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java +++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java @@ -1,6 +1,7 @@ package org.schabi.newpipe; import android.content.Intent; +import android.media.AudioManager; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.app.NavUtils; From e958334406aa279e1e3dda5a7c94e40a4ef8cf6d Mon Sep 17 00:00:00 2001 From: Teja Vojjala Date: Mon, 1 Feb 2016 14:29:49 +0530 Subject: [PATCH 10/12] Update VideoItemListActivity.java --- app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java index 362ee85a3..204cab503 100644 --- a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java +++ b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java @@ -2,6 +2,7 @@ package org.schabi.newpipe; import android.content.Context; import android.content.Intent; +import android.media.AudioManager; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.app.NavUtils; From d3e9f354b3564c584af9769d619f8f0daa72a453 Mon Sep 17 00:00:00 2001 From: Teja Vojjala Date: Mon, 1 Feb 2016 15:00:08 +0530 Subject: [PATCH 11/12] Update SettingsActivity.java --- app/src/main/java/org/schabi/newpipe/SettingsActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/schabi/newpipe/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/SettingsActivity.java index 4761f2252..d0cf18b31 100644 --- a/app/src/main/java/org/schabi/newpipe/SettingsActivity.java +++ b/app/src/main/java/org/schabi/newpipe/SettingsActivity.java @@ -55,6 +55,7 @@ public class SettingsActivity extends PreferenceActivity { getDelegate().installViewFactory(); getDelegate().onCreate(savedInstanceBundle); super.onCreate(savedInstanceBundle); + setVolumeControlStream(AudioManager.STREAM_MUSIC); getSupportActionBar().setDisplayHomeAsUpEnabled(true); @@ -87,7 +88,6 @@ public class SettingsActivity extends PreferenceActivity { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setVolumeControlStream(AudioManager.STREAM_MUSIC); addPreferencesFromResource(R.xml.settings); final Activity activity = getActivity(); From fddcade1fbf60c2988ce515160b40ae0810df8ed Mon Sep 17 00:00:00 2001 From: Christian Schabesberger Date: Mon, 1 Feb 2016 13:45:22 +0100 Subject: [PATCH 12/12] removed unnececeary call of setVolumeControlStream() --- app/src/main/java/org/schabi/newpipe/PanicResponderActivity.java | 1 - app/src/main/java/org/schabi/newpipe/SettingsActivity.java | 1 - 2 files changed, 2 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/PanicResponderActivity.java b/app/src/main/java/org/schabi/newpipe/PanicResponderActivity.java index f084101d2..949084c57 100644 --- a/app/src/main/java/org/schabi/newpipe/PanicResponderActivity.java +++ b/app/src/main/java/org/schabi/newpipe/PanicResponderActivity.java @@ -34,7 +34,6 @@ public class PanicResponderActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setVolumeControlStream(AudioManager.STREAM_MUSIC); Intent intent = getIntent(); if (intent != null && PANIC_TRIGGER_ACTION.equals(intent.getAction())) { // TODO explicitly clear the search results once they are restored when the app restarts diff --git a/app/src/main/java/org/schabi/newpipe/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/SettingsActivity.java index d0cf18b31..bad716bb3 100644 --- a/app/src/main/java/org/schabi/newpipe/SettingsActivity.java +++ b/app/src/main/java/org/schabi/newpipe/SettingsActivity.java @@ -55,7 +55,6 @@ public class SettingsActivity extends PreferenceActivity { getDelegate().installViewFactory(); getDelegate().onCreate(savedInstanceBundle); super.onCreate(savedInstanceBundle); - setVolumeControlStream(AudioManager.STREAM_MUSIC); getSupportActionBar().setDisplayHomeAsUpEnabled(true);