Trying to assuage gits conflict adverse attitude

This commit is contained in:
dhk2 2020-07-03 16:15:15 -07:00
parent 46f6cf5169
commit 63469d12be

View File

@ -140,6 +140,7 @@ public class VideoPlayActivity extends AppCompatActivity {
registerReceiver(receiver, filter); registerReceiver(receiver, filter);
Log.v(TAG, "switched to pip "); Log.v(TAG, "switched to pip ");
floatMode=true;
// videoPlayerFragment.useController(false); // videoPlayerFragment.useController(false);
} }
public void changedToNormalMode(){ public void changedToNormalMode(){
@ -151,6 +152,7 @@ public class VideoPlayActivity extends AppCompatActivity {
unregisterReceiver(receiver); unregisterReceiver(receiver);
} }
Log.v(TAG,"switched to normal"); Log.v(TAG,"switched to normal");
floatMode=false;
// videoPlayerFragment.useController(true); // videoPlayerFragment.useController(true);
} }
@Override @Override