Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5882 from TacoTheDank/fragmentcontainerview

Browse source 
Replace FrameLayout with FragmentContainerView where applicable
This commit is contained in:
Stypox 2021-03-27 08:31:32 +01:00 • committed by GitHub
commit 08d8f2564a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
View file

@ -56,11 +56,11 @@ public class SettingsActivity extends AppCompatActivity
SettingsLayoutBinding.inflate(getLayoutInflater());
setContentView(settingsLayoutBinding.getRoot());
setSupportActionBar(settingsLayoutBinding.toolbarLayout.toolbar);
setSupportActionBar(settingsLayoutBinding.settingsToolbarLayout.toolbar);
if (savedInstanceBundle == null) {
getSupportFragmentManager().beginTransaction()
.replace(R.id.fragment_holder, new MainSettingsFragment())
.replace(R.id.settings_fragment_holder, new MainSettingsFragment())
.commit();
}
@ -102,7 +102,7 @@ public class SettingsActivity extends AppCompatActivity
getSupportFragmentManager().beginTransaction()
.setCustomAnimations(R.animator.custom_fade_in, R.animator.custom_fade_out,
R.animator.custom_fade_in, R.animator.custom_fade_out)
.replace(R.id.fragment_holder, fragment)
.replace(R.id.settings_fragment_holder, fragment)
.addToBackStack(null)
.commit();
return true;