diff options
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/res/layout/input_overlay_config_layout.xml | 27 | ||||
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputOverlayConfigButton.java | 4 |
2 files changed, 23 insertions, 8 deletions
diff --git a/Source/Android/res/layout/input_overlay_config_layout.xml b/Source/Android/res/layout/input_overlay_config_layout.xml index 29b7e578a6..f1261d3c35 100644 --- a/Source/Android/res/layout/input_overlay_config_layout.xml +++ b/Source/Android/res/layout/input_overlay_config_layout.xml @@ -1,16 +1,23 @@ -<RelativeLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/inputLayout" android:layout_width="fill_parent" - android:layout_height="fill_parent" > + android:layout_height="fill_parent" + android:clipChildren="false" + android:clipToPadding="false" > <org.dolphinemu.dolphinemu.settings.input.InputOverlayConfigButton android:id="@+id/button_a" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentBottom="false" + android:layout_alignParentEnd="false" android:layout_alignParentLeft="false" + android:layout_alignParentRight="false" + android:layout_alignParentStart="false" android:layout_alignParentTop="false" + android:layout_alignWithParentIfMissing="false" android:layout_centerHorizontal="false" + android:layout_centerInParent="false" android:layout_centerVertical="false" android:background="@drawable/button_a" /> @@ -18,22 +25,32 @@ android:id="@+id/button_b" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentBottom="false" + android:layout_alignParentEnd="false" android:layout_alignParentLeft="false" + android:layout_alignParentRight="false" + android:layout_alignParentStart="false" android:layout_alignParentTop="false" + android:layout_alignWithParentIfMissing="false" android:layout_centerHorizontal="false" + android:layout_centerInParent="false" android:layout_centerVertical="false" - android:layout_toRightOf="@+id/button_a" android:background="@drawable/button_b" /> <org.dolphinemu.dolphinemu.settings.input.InputOverlayConfigButton android:id="@+id/button_start" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentBottom="false" + android:layout_alignParentEnd="false" android:layout_alignParentLeft="false" + android:layout_alignParentRight="false" + android:layout_alignParentStart="false" android:layout_alignParentTop="false" + android:layout_alignWithParentIfMissing="false" android:layout_centerHorizontal="false" + android:layout_centerInParent="false" android:layout_centerVertical="false" - android:layout_toRightOf="@+id/button_b" android:background="@drawable/button_start" /> </RelativeLayout>
\ No newline at end of file diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputOverlayConfigButton.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputOverlayConfigButton.java index 8d95800c62..28f3bb10fc 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputOverlayConfigButton.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputOverlayConfigButton.java @@ -39,7 +39,7 @@ public final class InputOverlayConfigButton extends Button implements OnTouchLis // Get the SharedPreferences instance. sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); - + // String ID of this button. final String buttonId = getResources().getResourceEntryName(getId()); @@ -49,8 +49,6 @@ public final class InputOverlayConfigButton extends Button implements OnTouchLis // If they are not -1, then they have a previous value set. // Thus, we set those coordinate values. - // TODO: This is not always correct placement. Fix this. - // Likely something to do with the backing layout being a relative layout. if (x != -1f && y != -1f) { setX(x); |