Commit 0938b424 authored by Geoffrey Métais's avatar Geoffrey Métais

Re-set clone mode off by default

parent 27b96b97
Pipeline #4507 passed with stage
in 3 minutes and 45 seconds
...@@ -670,6 +670,7 @@ ...@@ -670,6 +670,7 @@
<string name="device_dialog_message">You just plugged a new storage device to your TV box, do you want to open it with VLC?</string> <string name="device_dialog_message">You just plugged a new storage device to your TV box, do you want to open it with VLC?</string>
<string name="videos_folders_title">Videos by folders</string> <string name="videos_folders_title">Videos by folders</string>
<string name="video_save_remote_setting">Automatically activate remote control mode?</string> <string name="video_save_remote_setting">Automatically activate remote control mode?</string>
<string name="video_save_clone_mode">Automatically activate clone mode?</string>
<string name="video_remote_enable">Switch to remote control mode</string> <string name="video_remote_enable">Switch to remote control mode</string>
<string name="video_remote_disable">Duplicate screen</string> <string name="video_remote_disable">Duplicate screen</string>
</resources> </resources>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
android:key="secondary_display_category_summary" /> android:key="secondary_display_category_summary" />
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="true" android:defaultValue="false"
android:key="enable_clone_mode" android:key="enable_clone_mode"
android:summary="@string/enable_clone_mode_summary" android:summary="@string/enable_clone_mode_summary"
android:title="@string/enable_clone_mode" /> android:title="@string/enable_clone_mode" />
......
...@@ -299,7 +299,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IPlaybackS ...@@ -299,7 +299,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IPlaybackS
mAudioMax = mAudioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC); mAudioMax = mAudioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
audioBoostEnabled = mSettings.getBoolean("audio_boost", false); audioBoostEnabled = mSettings.getBoolean("audio_boost", false);
mEnableCloneMode = clone != null ? clone : mSettings.getBoolean("enable_clone_mode", true); mEnableCloneMode = clone != null ? clone : mSettings.getBoolean("enable_clone_mode", false);
mDisplayManager = new DisplayManager(this, PlaybackService.Companion.getRenderer(), false, mEnableCloneMode, mIsBenchmark); mDisplayManager = new DisplayManager(this, PlaybackService.Companion.getRenderer(), false, mEnableCloneMode, mIsBenchmark);
setContentView(mDisplayManager.isPrimary() ? R.layout.player : R.layout.player_remote_control); setContentView(mDisplayManager.isPrimary() ? R.layout.player : R.layout.player_remote_control);
...@@ -720,11 +720,11 @@ public class VideoPlayerActivity extends AppCompatActivity implements IPlaybackS ...@@ -720,11 +720,11 @@ public class VideoPlayerActivity extends AppCompatActivity implements IPlaybackS
if (secondary) mSecondaryDisplayBtn.setImageResource(R.drawable.ic_stop_screen_share); if (secondary) mSecondaryDisplayBtn.setImageResource(R.drawable.ic_stop_screen_share);
mSecondaryDisplayBtn.setVisibility(UiTools.hasSecondaryDisplay(getApplicationContext()) ? View.VISIBLE : View.GONE); mSecondaryDisplayBtn.setVisibility(UiTools.hasSecondaryDisplay(getApplicationContext()) ? View.VISIBLE : View.GONE);
mSecondaryDisplayBtn.setContentDescription(getResources().getString(secondary ? R.string.video_remote_disable : R.string.video_remote_enable)); mSecondaryDisplayBtn.setContentDescription(getResources().getString(secondary ? R.string.video_remote_disable : R.string.video_remote_enable));
if (secondary && !mSettings.contains("enable_clone_mode")) { if (mEnableCloneMode && !mSettings.contains("enable_clone_mode")) {
UiTools.snackerConfirm(mSecondaryDisplayBtn, getString(R.string.video_save_remote_setting), new Runnable() { UiTools.snackerConfirm(mSecondaryDisplayBtn, getString(R.string.video_save_clone_mode), new Runnable() {
@Override @Override
public void run() { public void run() {
mSettings.edit().putBoolean("enable_clone_mode", false).apply(); mSettings.edit().putBoolean("enable_clone_mode", true).apply();
} }
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment