Merge pull request #5947 from mahdihijazi/cleanup
[Android] Cleanup unused resources & code
|
@ -1,28 +0,0 @@
|
|||
package org.dolphinemu.dolphinemu.utils;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.res.Resources;
|
||||
import android.util.DisplayMetrics;
|
||||
|
||||
public final class Pixels
|
||||
{
|
||||
private Pixels()
|
||||
{
|
||||
}
|
||||
|
||||
public static float convertDpToPx(float original, Context context)
|
||||
{
|
||||
Resources resources = context.getResources();
|
||||
DisplayMetrics metrics = resources.getDisplayMetrics();
|
||||
|
||||
return original * metrics.density;
|
||||
}
|
||||
|
||||
public static float convertPxToDp(float original, Context context)
|
||||
{
|
||||
Resources resources = context.getResources();
|
||||
DisplayMetrics metrics = resources.getDisplayMetrics();
|
||||
|
||||
return original / metrics.density;
|
||||
}
|
||||
}
|
Before Width: | Height: | Size: 220 B |
Before Width: | Height: | Size: 726 B |
Before Width: | Height: | Size: 108 B |
Before Width: | Height: | Size: 287 B |
Before Width: | Height: | Size: 447 B |
Before Width: | Height: | Size: 178 B |
Before Width: | Height: | Size: 144 B |
Before Width: | Height: | Size: 262 B |
Before Width: | Height: | Size: 934 B |
Before Width: | Height: | Size: 115 B |
Before Width: | Height: | Size: 306 B |
Before Width: | Height: | Size: 555 B |
Before Width: | Height: | Size: 157 B |
Before Width: | Height: | Size: 350 B |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 119 B |
Before Width: | Height: | Size: 229 B |
Before Width: | Height: | Size: 429 B |
Before Width: | Height: | Size: 440 B |
|
@ -1,33 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<org.dolphinemu.dolphinemu.ui.settings.SettingsFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginEnd="@dimen/activity_horizontal_margin"
|
||||
android:layout_marginStart="@dimen/activity_horizontal_margin"
|
||||
android:background="@android:color/white"
|
||||
android:elevation="@dimen/elevation_high"
|
||||
android:orientation="vertical">
|
||||
|
||||
<include
|
||||
android:id="@+id/list_item_controller_one"
|
||||
layout="@layout/list_item_setting"/>
|
||||
|
||||
<include
|
||||
android:id="@+id/list_item_controller_two"
|
||||
layout="@layout/list_item_setting"/>
|
||||
|
||||
<include
|
||||
android:id="@+id/list_item_controller_two"
|
||||
layout="@layout/list_item_setting"/>
|
||||
|
||||
<include
|
||||
android:id="@+id/list_item_controller_two"
|
||||
layout="@layout/list_item_setting"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</org.dolphinemu.dolphinemu.ui.settings.SettingsFrameLayout>
|
|
@ -1,4 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<transitionSet>
|
||||
<changeImageTransform/>
|
||||
</transitionSet>
|
|
@ -1,19 +1,11 @@
|
|||
<resources>
|
||||
<!-- Default screen margins, per the Android Design guidelines. -->
|
||||
<dimen name="activity_horizontal_margin">16dp</dimen>
|
||||
<dimen name="activity_vertical_margin">16dp</dimen>
|
||||
|
||||
<dimen name="diameter">48dp</dimen>
|
||||
<dimen name="elevation_low">1dp</dimen>
|
||||
<dimen name="elevation_high">4dp</dimen>
|
||||
<dimen name="add_button_margin">16dp</dimen>
|
||||
|
||||
<dimen name="main_appbar_height">128dp</dimen>
|
||||
|
||||
<dimen name="spacing_xsmall">2dp</dimen>
|
||||
<dimen name="spacing_small">4dp</dimen>
|
||||
<dimen name="spacing_medium">8dp</dimen>
|
||||
<dimen name="spacing_medlarge">12dp</dimen>
|
||||
<dimen name="spacing_large">16dp</dimen>
|
||||
<dimen name="spacing_xlarge">32dp</dimen>
|
||||
</resources>
|
||||
|
|
|
@ -52,23 +52,8 @@
|
|||
</style>
|
||||
|
||||
<!-- Themes for Dialogs -->
|
||||
<style name="DolphinDialogBase" parent="Theme.AppCompat.Light.Dialog">
|
||||
<item name="colorPrimary">@color/dolphin_blue</item>
|
||||
<item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
|
||||
</style>
|
||||
|
||||
<!-- Inherit from the Base Dolphin Dialog Theme -->
|
||||
<style name="DolphinDialogWii" parent="DolphinDialogBase">
|
||||
<item name="colorAccent">@color/dolphin_accent_wii</item>
|
||||
</style>
|
||||
|
||||
<style name="DolphinDialogGamecube" parent="DolphinDialogBase">
|
||||
<item name="colorAccent">@color/dolphin_accent_gamecube</item>
|
||||
</style>
|
||||
|
||||
<style name="DolphinDialogWiiware" parent="DolphinDialogBase">
|
||||
<item name="colorAccent">@color/dolphin_accent_wiiware</item>
|
||||
</style>
|
||||
|
||||
<style name="DolphinEmulationBase" parent="Theme.AppCompat.Light.DarkActionBar">
|
||||
<item name="colorPrimary">@color/dolphin_blue</item>
|
||||
|
|