Skip to content

refactor: remove merge from toolbar.xml #20286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BrayanDSO merged 1 commit into from
Feb 3, 2026
Merged

refactor: remove merge from toolbar.xml #20286

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 26 additions & 28 deletions AnkiDroid/src/main/res/layout/toolbar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.appcompat.widget.Toolbar
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:background="?attr/appBarColor"
android:minHeight="?attr/actionBarSize"
android:theme="@style/ActionBarStyle"
app:navigationContentDescription="@string/abc_action_bar_up_description"
app:navigationIcon="?attr/homeAsUpIndicator">

<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
<com.ichi2.ui.FixedTextView
android:id="@+id/toolbar_title"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:textColor="@color/white"
android:textSize="20sp"
android:visibility="gone" />

<Spinner
android:id="@+id/toolbar_spinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:background="?attr/appBarColor"
android:minHeight="?attr/actionBarSize"
android:theme="@style/ActionBarStyle"
app:navigationContentDescription="@string/abc_action_bar_up_description"
app:navigationIcon="?attr/homeAsUpIndicator">

<com.ichi2.ui.FixedTextView
android:id="@+id/toolbar_title"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:textColor="@color/white"
android:textSize="20sp"
android:visibility="gone" />

<Spinner
android:id="@+id/toolbar_spinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:visibility="gone"
app:popupTheme="@style/ActionBar.Popup" />
</androidx.appcompat.widget.Toolbar>
</merge>
android:background="?attr/selectableItemBackground"
android:visibility="gone"
app:popupTheme="@style/ActionBar.Popup" />
</androidx.appcompat.widget.Toolbar>
Loading