summaryrefslogtreecommitdiff
path: root/Source/Android/app/src
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Android/app/src')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFrameLayout.java56
-rw-r--r--Source/Android/app/src/main/res/layout/fragment_settings.xml4
2 files changed, 2 insertions, 58 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFrameLayout.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFrameLayout.java
deleted file mode 100644
index 61746a7217..0000000000
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFrameLayout.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.dolphinemu.dolphinemu.features.settings.ui;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.FrameLayout;
-
-/**
- * FrameLayout subclass with few Properties added to simplify animations.
- */
-public final class SettingsFrameLayout extends FrameLayout
-{
- public SettingsFrameLayout(Context context)
- {
- super(context);
- }
-
- public SettingsFrameLayout(Context context, AttributeSet attrs)
- {
- super(context, attrs);
- }
-
- public SettingsFrameLayout(Context context, AttributeSet attrs, int defStyleAttr)
- {
- super(context, attrs, defStyleAttr);
- }
-
- public SettingsFrameLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes)
- {
- super(context, attrs, defStyleAttr, defStyleRes);
- }
-
- public float getYFraction()
- {
- return getY() / getHeight();
- }
-
- public void setYFraction(float yFraction)
- {
- final int height = getHeight();
- setY((height > 0) ? (yFraction * height) : -9999);
- }
-
- public float getVisibleness()
- {
- return 1.0f;
- }
-
- public void setVisibleness(float visibleness)
- {
- setScaleX(visibleness);
- setScaleY(visibleness);
- setAlpha(visibleness);
- }
-}
diff --git a/Source/Android/app/src/main/res/layout/fragment_settings.xml b/Source/Android/app/src/main/res/layout/fragment_settings.xml
index d7b48d8f2b..77b673b53c 100644
--- a/Source/Android/app/src/main/res/layout/fragment_settings.xml
+++ b/Source/Android/app/src/main/res/layout/fragment_settings.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<org.dolphinemu.dolphinemu.features.settings.ui.SettingsFrameLayout
+<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -11,4 +11,4 @@
android:layout_height="match_parent"
android:clipToPadding="false" />
-</org.dolphinemu.dolphinemu.features.settings.ui.SettingsFrameLayout>
+</FrameLayout>