|
7 | 7 |
|
8 | 8 | import androidx.appcompat.app.ActionBar; |
9 | 9 | import androidx.appcompat.app.AppCompatActivity; |
10 | | -import androidx.appcompat.widget.Toolbar; |
11 | 10 | import androidx.fragment.app.Fragment; |
12 | 11 | import androidx.preference.Preference; |
13 | 12 | import androidx.preference.PreferenceFragmentCompat; |
14 | 13 |
|
15 | 14 | import org.schabi.newpipe.R; |
| 15 | +import org.schabi.newpipe.databinding.SettingsLayoutBinding; |
16 | 16 | import org.schabi.newpipe.util.DeviceUtils; |
17 | 17 | import org.schabi.newpipe.util.ThemeHelper; |
18 | 18 | import org.schabi.newpipe.views.FocusOverlayView; |
@@ -51,10 +51,12 @@ protected void onCreate(final Bundle savedInstanceBundle) { |
51 | 51 | setTheme(ThemeHelper.getSettingsThemeStyle(this)); |
52 | 52 | assureCorrectAppLanguage(this); |
53 | 53 | super.onCreate(savedInstanceBundle); |
54 | | - setContentView(R.layout.settings_layout); |
55 | 54 |
|
56 | | - final Toolbar toolbar = findViewById(R.id.toolbar); |
57 | | - setSupportActionBar(toolbar); |
| 55 | + final SettingsLayoutBinding settingsLayoutBinding = |
| 56 | + SettingsLayoutBinding.inflate(getLayoutInflater()); |
| 57 | + setContentView(settingsLayoutBinding.getRoot()); |
| 58 | + |
| 59 | + setSupportActionBar(settingsLayoutBinding.toolbarLayout.toolbar); |
58 | 60 |
|
59 | 61 | if (savedInstanceBundle == null) { |
60 | 62 | getSupportFragmentManager().beginTransaction() |
|
0 commit comments