removing test layout again

Author: y20k

app/build.gradle

@@ -26,7 +26,6 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.android.support:appcompat-v7:' + supportLibraryVersion
     compile 'com.android.support:design:' + supportLibraryVersion
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
     compile project(":library:core")
     compile project(":library:hls")
 }

app/src/main/java/org/y20k/transistor/PlayerActivityFragment.java

@@ -180,7 +180,7 @@ public void onCreate(Bundle savedInstance) {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstance) {
 
         // inflate root view from xml
-        mRootView = inflater.inflate(R.layout.fragment_player_v2, container, false);
+        mRootView = inflater.inflate(R.layout.fragment_player, container, false);
 
         // find views for station name and image and playback indicator
         mStationNameView = (TextView) mRootView.findViewById(R.id.player_textview_stationname);
@@ -198,14 +198,14 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
             mStationImageView.setImageBitmap(stationImage);
         }
 
-//        // add listener to station info view for clipboard copy
-//        View stationInfoView = mRootView.findViewById(R.id.player_layout_station_info);
-//        stationInfoView.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//                copyToClipboard(COPY_STATION_ALL);
-//            }
-//        });
+        // add listener to station info view for clipboard copy
+        View stationInfoView = mRootView.findViewById(R.id.player_layout_station_info);
+        stationInfoView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                copyToClipboard(COPY_STATION_ALL);
+            }
+        });
 
         // get views for station data sheet
         View stationDataLayout = mRootView.findViewById(R.id.info_icon_layout);

app/src/main/java/org/y20k/transistor/PlayerService.java

@@ -287,8 +287,6 @@ public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
                 break;
 
         }
-
-
     }
 
 
@@ -324,11 +322,11 @@ public void onLoadingChanged(boolean isLoading) {
         if (isLoading) {
             state = "Media source is currently being loaded.";
         } else {
-            state = "Media source is currently not being loaded.";
-            // update controller - stop playback
-            if (mPlayback) {
-                mController.getTransportControls().stop();
-            }
+            state = "Media source is currently NOT being loaded.";
+//            // update controller - stop playback
+//            if (mPlayback) {
+//                mController.getTransportControls().stop();
+//            }
         }
         LogHelper.v(LOG_TAG, "State of loading has changed: " + state);
     }
@@ -372,12 +370,14 @@ public IBinder onBind(Intent intent) {
         return null;
     }
 
+
     @Nullable
     @Override
     public BrowserRoot onGetRoot(@NonNull String clientPackageName, int clientUid, @Nullable Bundle rootHints) {
         return new BrowserRoot(getString(R.string.app_name), null);
     }
 
+
     @Override
     public void onLoadChildren(@NonNull String rootId, @NonNull Result<List<MediaBrowserCompat.MediaItem>> result) {
         result.sendResult(null);
@@ -472,7 +472,13 @@ public static Station getStation() {
 
     /* Starts playback */
     private void startPlayback() {
-        LogHelper.v(LOG_TAG, "Starting playback.");
+        LogHelper.v(LOG_TAG, "Starting playback. Station name:" + mStation.getStationName());
+
+        // stop running mExoPlayer - request focus and initialize media mExoPlayer
+        if (mExoPlayer.getPlayWhenReady()) {
+            mExoPlayer.setPlayWhenReady(false);
+            mExoPlayer.stop();
+        }
 
         // set and save state
         mStationMetadata = mStation.getStationName();
@@ -492,13 +498,7 @@ private void startPlayback() {
             mWakeLock.acquire(); // needs android.permission.WAKE_LOCK
         }
 
-        // stop running mExoPlayer - request focus and initialize media mExoPlayer
-        if (mExoPlayer.getPlayWhenReady()) {
-            mExoPlayer.setPlayWhenReady(false);
-            mExoPlayer.stop();
-            NotificationHelper.stop();
-        }
-
+        // request focus and initialize media mExoPlayer
         if (mStreamUri != null && requestFocus()) {
             // initialize player and start playback
             initializeExoPlayer();
@@ -530,7 +530,7 @@ private void startPlayback() {
 
     /* Stops playback */
     private void stopPlayback() {
-        LogHelper.v(LOG_TAG, "Stopping playback.");
+        LogHelper.v(LOG_TAG, "Stopping playback. Station name:" + mStation.getStationName());
 
         // check for null - can happen after a crash during playback
         if (mStation == null) {