mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2026-09-27 12:46:49 -05:00
Merge pull request #11385 from JosJuice/android-input-overhaul
Android input overhaul
This commit is contained in:
9
Source/Android/app/src/main/res/drawable/ic_delete.xml
Normal file
9
Source/Android/app/src/main/res/drawable/ic_delete.xml
Normal file
@@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="?attr/colorControlNormal"
|
||||
android:pathData="M7,21Q6.175,21 5.588,20.413Q5,19.825 5,19V6H4V4H9V3H15V4H20V6H19V19Q19,19.825 18.413,20.413Q17.825,21 17,21ZM17,6H7V19Q7,19 7,19Q7,19 7,19H17Q17,19 17,19Q17,19 17,19ZM9,17H11V8H9ZM13,17H15V8H13ZM7,6V19Q7,19 7,19Q7,19 7,19Q7,19 7,19Q7,19 7,19Z"/>
|
||||
</vector>
|
||||
9
Source/Android/app/src/main/res/drawable/ic_more.xml
Normal file
9
Source/Android/app/src/main/res/drawable/ic_more.xml
Normal file
@@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportHeight="24"
|
||||
android:viewportWidth="24">
|
||||
<path
|
||||
android:fillColor="?attr/colorControlNormal"
|
||||
android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
|
||||
</vector>
|
||||
9
Source/Android/app/src/main/res/drawable/ic_save.xml
Normal file
9
Source/Android/app/src/main/res/drawable/ic_save.xml
Normal file
@@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportHeight="24"
|
||||
android:viewportWidth="24">
|
||||
<path
|
||||
android:fillColor="?attr/colorControlNormal"
|
||||
android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z" />
|
||||
</vector>
|
||||
@@ -0,0 +1,56 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout android:id="@+id/root"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?android:attr/selectableItemBackground"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:nextFocusLeft="@id/button_advanced_settings">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/text_setting_name"
|
||||
style="@style/TextAppearance.MaterialComponents.Headline5"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_marginEnd="@dimen/spacing_large"
|
||||
android:layout_marginStart="@dimen/spacing_large"
|
||||
android:layout_marginTop="@dimen/spacing_large"
|
||||
android:textSize="16sp"
|
||||
android:textAlignment="viewStart"
|
||||
android:layout_toStartOf="@+id/button_more_settings"
|
||||
tools:text="Setting Name" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/text_setting_description"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignStart="@+id/text_setting_name"
|
||||
android:layout_below="@+id/text_setting_name"
|
||||
android:layout_marginBottom="@dimen/spacing_large"
|
||||
android:layout_marginEnd="@dimen/spacing_large"
|
||||
android:layout_marginStart="@dimen/spacing_large"
|
||||
android:layout_marginTop="@dimen/spacing_small"
|
||||
android:layout_toStartOf="@+id/button_advanced_settings"
|
||||
android:textAlignment="viewStart"
|
||||
tools:text="@string/overclock_enable_description" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_advanced_settings"
|
||||
style="?attr/materialIconButtonStyle"
|
||||
android:contentDescription="@string/advanced_settings"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginEnd="@dimen/spacing_small"
|
||||
android:nextFocusRight="@id/root"
|
||||
app:icon="@drawable/ic_more"
|
||||
app:iconTint="?attr/colorOnPrimaryContainer" />
|
||||
|
||||
</RelativeLayout>
|
||||
@@ -39,6 +39,18 @@
|
||||
android:layout_height="match_parent"
|
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/old_controller_settings_warning"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="bottom"
|
||||
android:background="?attr/colorErrorContainer"
|
||||
android:text="@string/old_controller_settings"
|
||||
android:textColor="?attr/colorOnErrorContainer"
|
||||
android:visibility="invisible"
|
||||
android:clickable="true"
|
||||
android:focusable="false" />
|
||||
|
||||
<View
|
||||
android:id="@+id/workaround_view"
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:paddingHorizontal="@dimen/spacing_large"
|
||||
android:paddingTop="@dimen/spacing_medlarge">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/list_control"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_above="@+id/expression"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_below="@+id/device" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/device"
|
||||
style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentTop="true"
|
||||
android:hint="@string/input_device">
|
||||
|
||||
<com.google.android.material.textfield.MaterialAutoCompleteTextView
|
||||
android:id="@+id/dropdown_device"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="none" />
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/expression"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:hint="@string/input_expression">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/edit_expression"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="start"
|
||||
android:importantForAutofill="no"
|
||||
android:typeface="monospace" />
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<androidx.appcompat.widget.LinearLayoutCompat
|
||||
android:id="@+id/profile_sheet"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<com.google.android.material.bottomsheet.BottomSheetDragHandleView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal" />
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/profile_list"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
</androidx.appcompat.widget.LinearLayoutCompat>
|
||||
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
@@ -1,132 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1">
|
||||
|
||||
<com.google.android.material.slider.Slider
|
||||
android:id="@+id/slider_yaw"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintEnd_toStartOf="@id/text_ir_yaw"
|
||||
app:layout_constraintStart_toEndOf="@id/text_ir_yaw_units"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/text_ir_yaw"
|
||||
android:layout_width="26dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="24dp"
|
||||
android:layout_marginStart="@dimen/spacing_medlarge"
|
||||
android:gravity="end"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/slider_yaw"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/slider_yaw"
|
||||
app:layout_constraintTop_toTopOf="@+id/slider_yaw"
|
||||
tools:text="100" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/text_ir_yaw_units"
|
||||
android:layout_width="92dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="24dp"
|
||||
android:layout_marginEnd="@dimen/spacing_medlarge"
|
||||
android:textAlignment="viewStart"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/slider_yaw"
|
||||
app:layout_constraintEnd_toStartOf="@id/slider_yaw"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/slider_yaw"
|
||||
tools:text="Total Yaw" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1">
|
||||
|
||||
<com.google.android.material.slider.Slider
|
||||
android:id="@+id/slider_pitch"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintEnd_toStartOf="@id/text_ir_pitch"
|
||||
app:layout_constraintStart_toEndOf="@id/text_ir_pitch_units"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/text_ir_pitch"
|
||||
android:layout_width="26dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="24dp"
|
||||
android:layout_marginStart="@dimen/spacing_medlarge"
|
||||
android:gravity="end"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/slider_pitch"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/slider_pitch"
|
||||
app:layout_constraintTop_toTopOf="@+id/slider_pitch"
|
||||
tools:text="100" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/text_ir_pitch_units"
|
||||
android:layout_width="92dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="24dp"
|
||||
android:layout_marginEnd="@dimen/spacing_medlarge"
|
||||
android:textAlignment="viewStart"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/slider_pitch"
|
||||
app:layout_constraintEnd_toStartOf="@id/slider_pitch"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/slider_pitch"
|
||||
tools:text="Total Pitch" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1">
|
||||
|
||||
<com.google.android.material.slider.Slider
|
||||
android:id="@+id/slider_vertical_offset"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintEnd_toStartOf="@id/text_ir_vertical_offset"
|
||||
app:layout_constraintStart_toEndOf="@id/text_ir_vertical_offset_units"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/text_ir_vertical_offset"
|
||||
android:layout_width="26dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="24dp"
|
||||
android:layout_marginStart="@dimen/spacing_medlarge"
|
||||
android:gravity="end"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/slider_vertical_offset"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/slider_vertical_offset"
|
||||
app:layout_constraintTop_toTopOf="@+id/slider_vertical_offset"
|
||||
tools:text="100" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/text_ir_vertical_offset_units"
|
||||
android:layout_width="92dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="24dp"
|
||||
android:layout_marginEnd="@dimen/spacing_medlarge"
|
||||
android:textAlignment="viewStart"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/slider_vertical_offset"
|
||||
app:layout_constraintEnd_toStartOf="@id/slider_vertical_offset"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/slider_vertical_offset"
|
||||
tools:text="Vertical Offset" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,27 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:minHeight="54dp"
|
||||
android:background="?android:attr/selectableItemBackground"
|
||||
android:focusable="true"
|
||||
android:clickable="true">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/TextAppearance.MaterialComponents.Headline5"
|
||||
tools:text="Button A"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_marginStart="@dimen/spacing_large"
|
||||
android:layout_marginEnd="@dimen/spacing_large"
|
||||
android:layout_marginTop="@dimen/spacing_large"
|
||||
android:id="@+id/text_name"
|
||||
android:textAlignment="viewStart"
|
||||
android:textSize="16sp" />
|
||||
|
||||
</RelativeLayout>
|
||||
56
Source/Android/app/src/main/res/layout/list_item_mapping.xml
Normal file
56
Source/Android/app/src/main/res/layout/list_item_mapping.xml
Normal file
@@ -0,0 +1,56 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout android:id="@+id/root"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?android:attr/selectableItemBackground"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:nextFocusRight="@id/button_advanced_settings">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/text_setting_name"
|
||||
style="@style/TextAppearance.MaterialComponents.Headline5"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_marginEnd="@dimen/spacing_large"
|
||||
android:layout_marginStart="@dimen/spacing_large"
|
||||
android:layout_marginTop="@dimen/spacing_large"
|
||||
android:textSize="16sp"
|
||||
android:textAlignment="viewStart"
|
||||
android:layout_toStartOf="@+id/button_advanced_settings"
|
||||
tools:text="Setting Name" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/text_setting_description"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignStart="@+id/text_setting_name"
|
||||
android:layout_below="@+id/text_setting_name"
|
||||
android:layout_marginBottom="@dimen/spacing_large"
|
||||
android:layout_marginEnd="@dimen/spacing_large"
|
||||
android:layout_marginStart="@dimen/spacing_large"
|
||||
android:layout_marginTop="@dimen/spacing_small"
|
||||
android:layout_toStartOf="@+id/button_advanced_settings"
|
||||
android:textAlignment="viewStart"
|
||||
tools:text="@string/overclock_enable_description" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_advanced_settings"
|
||||
style="?attr/materialIconButtonStyle"
|
||||
android:contentDescription="@string/advanced_settings"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginEnd="@dimen/spacing_small"
|
||||
android:nextFocusLeft="@id/root"
|
||||
app:icon="@drawable/ic_more"
|
||||
app:iconTint="?attr/colorOnPrimaryContainer" />
|
||||
|
||||
</RelativeLayout>
|
||||
69
Source/Android/app/src/main/res/layout/list_item_profile.xml
Normal file
69
Source/Android/app/src/main/res/layout/list_item_profile.xml
Normal file
@@ -0,0 +1,69 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/root"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingHorizontal="@dimen/spacing_medlarge"
|
||||
android:paddingVertical="@dimen/spacing_medlarge">
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/text_name"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_marginEnd="@dimen/spacing_large"
|
||||
android:layout_marginStart="@dimen/spacing_small"
|
||||
android:textColor="?attr/colorOnSurface"
|
||||
android:textSize="16sp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@id/button_delete"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:text="Wii Remote with Motion Plus Pointing" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_delete"
|
||||
style="?attr/materialIconButtonFilledTonalStyle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/spacing_small"
|
||||
android:contentDescription="@string/input_profile_delete"
|
||||
android:tooltipText="@string/input_profile_delete"
|
||||
app:icon="@drawable/ic_delete"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@id/button_load"
|
||||
app:layout_constraintStart_toEndOf="@id/text_name"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_load"
|
||||
style="?attr/materialIconButtonFilledTonalStyle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/spacing_small"
|
||||
android:contentDescription="@string/input_profile_load"
|
||||
android:tooltipText="@string/input_profile_load"
|
||||
app:icon="@drawable/ic_load"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@id/button_save"
|
||||
app:layout_constraintStart_toEndOf="@id/button_delete"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_save"
|
||||
style="?attr/materialIconButtonFilledTonalStyle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/spacing_small"
|
||||
android:contentDescription="@string/input_profile_save"
|
||||
android:tooltipText="@string/input_profile_save"
|
||||
app:icon="@drawable/ic_save"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/button_load"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -20,9 +20,8 @@
|
||||
android:title="@string/emulation_control_joystick_rel_center"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_emulation_rumble"
|
||||
android:checkable="true"
|
||||
android:title="@string/emulation_control_rumble"/>
|
||||
android:id="@+id/menu_emulation_choose_controller"
|
||||
android:title="@string/emulation_choose_controller"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_emulation_reset_overlay"
|
||||
|
||||
@@ -19,21 +19,12 @@
|
||||
android:id="@+id/menu_emulation_joystick_rel_center"
|
||||
android:checkable="true"
|
||||
android:title="@string/emulation_control_joystick_rel_center"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_emulation_rumble"
|
||||
android:checkable="true"
|
||||
android:title="@string/emulation_control_rumble"/>
|
||||
</group>
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_emulation_choose_controller"
|
||||
android:title="@string/emulation_choose_controller"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_emulation_motion_controls"
|
||||
android:title="@string/emulation_motion_controls"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_emulation_ir_group"
|
||||
android:title="@string/emulation_ir_group">
|
||||
@@ -45,9 +36,6 @@
|
||||
<item
|
||||
android:id="@+id/menu_emulation_set_ir_mode"
|
||||
android:title="@string/emulation_ir_mode"/>
|
||||
<item
|
||||
android:id="@+id/menu_emulation_set_ir_sensitivity"
|
||||
android:title="@string/emulation_ir_sensitivity"/>
|
||||
<item
|
||||
android:id="@+id/menu_emulation_choose_doubletap"
|
||||
android:title="@string/emulation_choose_doubletap"/>
|
||||
|
||||
@@ -210,14 +210,14 @@
|
||||
<item>@string/extension_drums</item>
|
||||
<item>@string/extension_turntable</item>
|
||||
</string-array>
|
||||
<string-array name="wiimoteExtensionsValues">
|
||||
<item>None</item>
|
||||
<item>Nunchuk</item>
|
||||
<item>Classic</item>
|
||||
<item>Guitar</item>
|
||||
<item>Drums</item>
|
||||
<item>Turntable</item>
|
||||
</string-array>
|
||||
<integer-array name="wiimoteExtensionsValues">
|
||||
<item>0</item>
|
||||
<item>1</item>
|
||||
<item>2</item>
|
||||
<item>3</item>
|
||||
<item>4</item>
|
||||
<item>5</item>
|
||||
</integer-array>
|
||||
|
||||
<!-- Texture Cache Accuracy Preference -->
|
||||
<string-array name="textureCacheAccuracyEntries">
|
||||
@@ -386,23 +386,6 @@
|
||||
<item>2</item>
|
||||
</integer-array>
|
||||
|
||||
<string-array name="controllersEntries">
|
||||
<item>@string/controller_gc</item>
|
||||
<item>@string/controller_wiimote</item>
|
||||
<item>@string/controller_horizontal_wiimote</item>
|
||||
<item>@string/controller_wiimote_plus_nunchuk</item>
|
||||
<item>@string/controller_classic</item>
|
||||
<item>@string/controller_none</item>
|
||||
</string-array>
|
||||
<string-array name="controllersValues">
|
||||
<item>None</item>
|
||||
<item>None</item>
|
||||
<item>None</item>
|
||||
<item>Nunchuk</item>
|
||||
<item>Classic</item>
|
||||
<item>None</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="gcpadButtons">
|
||||
<item>A</item>
|
||||
<item>B</item>
|
||||
|
||||
@@ -6,109 +6,55 @@
|
||||
<string name="host">app</string>
|
||||
<string name="scheme">dolphinemu</string>
|
||||
|
||||
<string name="none">None</string>
|
||||
|
||||
<string name="controller_0">GameCube Controller 1</string>
|
||||
<string name="controller_1">GameCube Controller 2</string>
|
||||
<string name="controller_2">GameCube Controller 3</string>
|
||||
<string name="controller_3">GameCube Controller 4</string>
|
||||
|
||||
<string name="controller_control">Control Stick</string>
|
||||
<string name="controller_c">C Stick</string>
|
||||
<string name="controller_trig">Triggers</string>
|
||||
<string name="controller_dpad">D-Pad</string>
|
||||
<string name="modifier_range">Modifier Range</string>
|
||||
<string name="analog_radius">Analog Radius (High value = High sensitivity)</string>
|
||||
<string name="analog_threshold">Analog Threshold (Low value = High sensitivity)</string>
|
||||
<string name="wiimote_0">Wii Remote 1</string>
|
||||
<string name="wiimote_1">Wii Remote 2</string>
|
||||
<string name="wiimote_2">Wii Remote 3</string>
|
||||
<string name="wiimote_3">Wii Remote 4</string>
|
||||
|
||||
<string name="wiimote_4">Wii Remote 1</string>
|
||||
<string name="wiimote_5">Wii Remote 2</string>
|
||||
<string name="wiimote_6">Wii Remote 3</string>
|
||||
<string name="wiimote_7">Wii Remote 4</string>
|
||||
|
||||
<string name="wiimote_extension_4">Wii Remote Extension 1</string>
|
||||
<string name="wiimote_extension_5">Wii Remote Extension 2</string>
|
||||
<string name="wiimote_extension_6">Wii Remote Extension 3</string>
|
||||
<string name="wiimote_extension_7">Wii Remote Extension 4</string>
|
||||
<string name="wiimote_extension_0">Wii Remote Extension 1</string>
|
||||
<string name="wiimote_extension_1">Wii Remote Extension 2</string>
|
||||
<string name="wiimote_extension_2">Wii Remote Extension 3</string>
|
||||
<string name="wiimote_extension_3">Wii Remote Extension 4</string>
|
||||
|
||||
<string name="wiimote">Wii Remote</string>
|
||||
<string name="wiimote_general">Buttons</string>
|
||||
<string name="wiimote_motion_simulation">Motion Simulation</string>
|
||||
<string name="wiimote_motion_input">Motion Input</string>
|
||||
<string name="wiimote_extensions">Extension</string>
|
||||
<string name="wiimote_extensions_description">Choose and bind the Wii Remote extension.</string>
|
||||
<string name="wiimote_ir">IR</string>
|
||||
<string name="wiimote_swing">Swing</string>
|
||||
<string name="wiimote_tilt">Tilt</string>
|
||||
<string name="wiimote_shake">Shake</string>
|
||||
|
||||
<string name="input_device">Device</string>
|
||||
<string name="input_device_all_devices">Create Mappings for Other Devices</string>
|
||||
<string name="input_device_all_devices_description">Detects inputs from all devices, not just the selected device.</string>
|
||||
<string name="input_profile">Profile</string>
|
||||
<string name="input_profiles_empty">You haven\'t created any profiles yet.</string>
|
||||
<string name="input_profiles">Profiles</string>
|
||||
<string name="input_profile_new">(New Profile)</string>
|
||||
<string name="input_profile_load">Load</string>
|
||||
<string name="input_profile_save">Save</string>
|
||||
<string name="input_profile_delete">Delete</string>
|
||||
<string name="input_profile_confirm_load">Do you want to discard your current controller settings and load the profile \"%1$s\"?</string>
|
||||
<string name="input_profile_confirm_save">Do you want to overwrite the profile \"%1$s\"?</string>
|
||||
<string name="input_profile_confirm_delete">Do you want to delete the profile \"%1$s\"?</string>
|
||||
<string name="input_reset_to_default">Default</string>
|
||||
<string name="input_reset_to_default_description">Reset settings for this controller to the default.</string>
|
||||
<string name="input_clear">Clear</string>
|
||||
<string name="input_clear_description">Clear settings for this controller.</string>
|
||||
<string name="input_reset_warning">Are you sure? Your current controller settings will be deleted.</string>
|
||||
<string name="old_controller_settings">Your controller settings are from an old version of Dolphin and won\'t work in this version. Press \"Default\" to start over with new settings.</string>
|
||||
|
||||
<string name="input_binding">Input Binding</string>
|
||||
<string name="input_binding_description">Press or move an input to bind it to %1$s.</string>
|
||||
<string name="input_rumble_description">Press or move any input to set rumble.</string>
|
||||
|
||||
<!-- Generic buttons (Shared with lots of stuff) -->
|
||||
<string name="generic_buttons">Buttons</string>
|
||||
<string name="generic_up">Up</string>
|
||||
<string name="generic_down">Down</string>
|
||||
<string name="generic_left">Left</string>
|
||||
<string name="generic_right">Right</string>
|
||||
<string name="generic_forward">Forward</string>
|
||||
<string name="generic_backward">Backward</string>
|
||||
<string name="generic_stick">Stick</string>
|
||||
<string name="generic_green">Green</string>
|
||||
<string name="generic_red">Red</string>
|
||||
<string name="generic_yellow">Yellow</string>
|
||||
<string name="generic_blue">Blue</string>
|
||||
<string name="generic_orange">Orange</string>
|
||||
|
||||
<!-- GameCube buttons (May be shared with other stuff too) -->
|
||||
<string name="button_a">A</string>
|
||||
<string name="button_b">B</string>
|
||||
<string name="button_start">START</string>
|
||||
<string name="button_x">X</string>
|
||||
<string name="button_y">Y</string>
|
||||
<string name="button_z">Z</string>
|
||||
<string name="trigger_left">L</string>
|
||||
<string name="trigger_right">R</string>
|
||||
|
||||
<!-- Wii Remote buttons (May be shared with other stuff too) -->
|
||||
<string name="button_one">1</string>
|
||||
<string name="button_two">2</string>
|
||||
<string name="button_minus">-</string>
|
||||
<string name="button_plus">+</string>
|
||||
<string name="button_home">HOME</string>
|
||||
<string name="ir_hide">Hide</string>
|
||||
<string name="tilt_modifier">Modifier</string>
|
||||
<string name="shake_x">X</string>
|
||||
<string name="shake_y">Y</string>
|
||||
<string name="shake_z">Z</string>
|
||||
|
||||
<!-- Nunchuk only buttons -->
|
||||
<string name="nunchuk_button_c">C</string>
|
||||
|
||||
<!-- Classic only buttons -->
|
||||
<string name="classic_button_zl">ZL</string>
|
||||
<string name="classic_button_zr">ZR</string>
|
||||
<string name="classic_leftstick">Left Stick</string>
|
||||
<string name="classic_rightstick">Right Stick</string>
|
||||
|
||||
<!-- Guitar only buttons -->
|
||||
<string name="guitar_frets">Frets</string>
|
||||
<string name="guitar_strum">Strum</string>
|
||||
<string name="guitar_whammy">Whammy</string>
|
||||
<string name="guitar_whammy_bar">Bar</string>
|
||||
|
||||
<!-- Drums only buttons -->
|
||||
<string name="drums_pads">Pads</string>
|
||||
<string name="drums_pad_bass">Bass</string>
|
||||
|
||||
<!-- Turntable only buttons -->
|
||||
<string name="turntable_button_green_left">Green Left</string>
|
||||
<string name="turntable_button_red_left">Red Left</string>
|
||||
<string name="turntable_button_blue_left">Blue Left</string>
|
||||
<string name="turntable_button_green_right">Green Right</string>
|
||||
<string name="turntable_button_red_right">Red Right</string>
|
||||
<string name="turntable_button_blue_right">Blue Right</string>
|
||||
<string name="turntable_button_euphoria">Euphoria</string>
|
||||
<string name="turntable_table_left">Table Left</string>
|
||||
<string name="turntable_table_right">Table Right</string>
|
||||
<string name="turntable_effect">Effect</string>
|
||||
<string name="turntable_effect_dial">Dial</string>
|
||||
<string name="turntable_crossfade">Crossfade</string>
|
||||
<string name="input_binding_no_device">You need to select a device first!</string>
|
||||
<string name="input_configure_input">Configure Input</string>
|
||||
<string name="input_configure_output">Configure Output</string>
|
||||
<string name="input_expression">Expression</string>
|
||||
|
||||
<!-- Main Preference Fragment -->
|
||||
<string name="settings">Settings</string>
|
||||
@@ -479,6 +425,7 @@
|
||||
<string name="other">Other</string>
|
||||
<string name="continue_anyway">Continue Anyway</string>
|
||||
<string name="more_settings">More Settings</string>
|
||||
<string name="advanced_settings">Advanced Settings</string>
|
||||
|
||||
<!-- Game Grid Screen-->
|
||||
<string name="platform_gamecube">GameCube Games</string>
|
||||
@@ -528,7 +475,6 @@
|
||||
<string name="preferences_save_exit">Save and Exit</string>
|
||||
<string name="preferences_game_properties">Game Properties</string>
|
||||
<string name="preferences_game_properties_with_game_id">Game Properties: %1$s</string>
|
||||
<string name="preferences_extensions">Extension Bindings</string>
|
||||
<string name="game_ini_junk_title">Junk Data Found</string>
|
||||
<string name="game_ini_junk_question">The settings file for this game contains extraneous data added by an old version of Dolphin. This will likely prevent global settings from working as intended.\n\nWould you like to fix this by deleting the settings file for this game? All game-specific settings and cheats that you have added will be removed. This cannot be undone.</string>
|
||||
|
||||
@@ -626,8 +572,8 @@ It can efficiently compress both junk data and encrypted Wii data.
|
||||
<string name="emulation_control_opacity">Opacity</string>
|
||||
<string name="emulation_control_adjustments">Adjust Controls</string>
|
||||
<string name="emulation_control_joystick_rel_center">Relative Stick Center</string>
|
||||
<string name="emulation_control_rumble">Rumble</string>
|
||||
<string name="emulation_choose_controller">Choose Controller</string>
|
||||
<string name="emulation_more_controller_settings">More Settings</string>
|
||||
<string name="emulation_menu_help">Press Back to access the menu.\nLong press Back to exit emulation.</string>
|
||||
<string name="emulation_touch_overlay_reset">Reset Overlay</string>
|
||||
<string name="emulation_ir_group">Touch IR Pointer</string>
|
||||
@@ -635,7 +581,6 @@ It can efficiently compress both junk data and encrypted Wii data.
|
||||
<string name="emulation_ir_mode">IR Mode</string>
|
||||
<string name="emulation_ir_sensitivity">IR Sensitivity</string>
|
||||
<string name="emulation_choose_doubletap">Double tap button</string>
|
||||
<string name="emulation_motion_controls">Motion Controls</string>
|
||||
|
||||
<!-- GC Adapter Menu-->
|
||||
<string name="gc_adapter_rumble">Enable Vibration</string>
|
||||
@@ -643,13 +588,6 @@ It can efficiently compress both junk data and encrypted Wii data.
|
||||
<string name="gc_adapter_bongos">Bongo Controller</string>
|
||||
<string name="gc_adapter_bongos_description">Enable this if you are using bongos on this port.</string>
|
||||
|
||||
<!-- Wii Remote Input Menu-->
|
||||
<string name="header_wiimote_general">General</string>
|
||||
<string name="header_controllers">Controllers</string>
|
||||
|
||||
<!-- Rumble -->
|
||||
<string name="rumble_not_found">Device rumble not found</string>
|
||||
|
||||
<string name="path_not_changeable_scoped_storage">Due to the Scoped Storage policy in Android 11 and newer, you can\'t change this path.</string>
|
||||
<string name="load_settings">Loading Settings…</string>
|
||||
<string name="setting_not_runtime_editable">This setting can\'t be changed while a game is running.</string>
|
||||
@@ -674,14 +612,12 @@ It can efficiently compress both junk data and encrypted Wii data.
|
||||
<string name="unavailable_paths">Dolphin does not have permission to access one or more configured paths. Would you like to fix this before starting?</string>
|
||||
|
||||
<!-- Misc -->
|
||||
<string name="pitch">Total Pitch</string>
|
||||
<string name="yaw">Total Yaw</string>
|
||||
<string name="vertical_offset">Vertical Offset</string>
|
||||
<string name="enabled">Enabled</string>
|
||||
<string name="default_values">Default Values</string>
|
||||
<string name="slider_setting_value">%1$d%2$s</string>
|
||||
<string name="disc_number">Disc %1$d</string>
|
||||
<string name="replug_gc_adapter">GameCube Adapter couldn\'t be opened. Please re-plug the device.</string>
|
||||
<string name="disabled_gc_overlay_notice">GameCube Controller 1 is set to \"None\"</string>
|
||||
<string name="disabled_gc_overlay_notice">The selected GameCube controller is set to \"None\"</string>
|
||||
<string name="ignore_warning_alert_messages">Ignore for this session</string>
|
||||
|
||||
<!-- UI CPU Core selection -->
|
||||
@@ -825,14 +761,6 @@ It can efficiently compress both junk data and encrypted Wii data.
|
||||
<string name="wiimote_emulated">Emulated</string>
|
||||
<string name="wiimote_real">Real Wii Remote (DolphinBar required)</string>
|
||||
|
||||
<!-- Controller Types -->
|
||||
<string name="controller_gc">GameCube Controller</string>
|
||||
<string name="controller_wiimote">Wii Remote</string>
|
||||
<string name="controller_horizontal_wiimote">Horizontal Wii Remote</string>
|
||||
<string name="controller_wiimote_plus_nunchuk">Wii Remote + Nunchuk</string>
|
||||
<string name="controller_classic">Classic Controller</string>
|
||||
<string name="controller_none">None</string>
|
||||
|
||||
<!-- Gamepad Controls -->
|
||||
<string name="gamepad_start">Start</string>
|
||||
<string name="gamepad_d_pad">D-Pad</string>
|
||||
|
||||
Reference in New Issue
Block a user