merge file picker

weihuoya · Nov 7, 2018 · ea29f95 · ea29f95
2 parents db7a0a8 + 2e370b4
commit ea29f95
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 29 deletions.
diff --git a/...droid/app/src/main/java/org/dolphinemu/dolphinemu/fragments/CustomFilePickerFragment.java b/...droid/app/src/main/java/org/dolphinemu/dolphinemu/fragments/CustomFilePickerFragment.java
@@ -1,16 +1,8 @@
 package org.dolphinemu.dolphinemu.fragments;
 
 import android.net.Uri;
-import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.content.FileProvider;
-import android.util.TypedValue;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import org.dolphinemu.dolphinemu.R;
 
 import com.nononsenseapps.filepicker.FilePickerFragment;
 
@@ -27,22 +19,4 @@ public Uri toUri(@NonNull final File file)
         getContext().getApplicationContext().getPackageName() + ".filesprovider",
         file);
   }
-
-  @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
-  {
-    View view = super.onCreateView(inflater, container, savedInstanceState);
-    if (view == null)
-      return null;
-
-    TextView ok = view.findViewById(R.id.nnf_button_ok);
-    TextView cancel = view.findViewById(R.id.nnf_button_cancel);
-
-    ok.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
-    cancel.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
-
-    ok.setAllCaps(false);
-    cancel.setAllCaps(false);
-    return view;
-  }
 }
diff --git a/Source/Android/app/src/main/res/layout/nnf_fragment_filepicker.xml b/Source/Android/app/src/main/res/layout/nnf_fragment_filepicker.xml
@@ -11,7 +11,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".FilePickerActivity">
+    tools:context="com.nononsenseapps.filepicker.FilePickerActivity">
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/nnf_picker_toolbar"

diff --git a/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp b/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp
@@ -281,7 +281,7 @@ void FIFOAnalyzer::UpdateDetails()
       {
         u32 cmd2 = Common::swap32(objectdata);
         objectdata += 4;
-        new_label = QStringLiteral("BP  %02 %06")
+        new_label = QStringLiteral("BP  %1 %2")
                         .arg(cmd2 >> 24, 2, 16, QLatin1Char('0'))
                         .arg(cmd2 & 0xFFFFFF, 6, 16, QLatin1Char('0'));
       }
@@ -474,7 +474,7 @@ void FIFOAnalyzer::UpdateDescription()
 
     text = tr("BP register ");
     text += name.empty() ?
-                QStringLiteral("UNKNOWN_%02X").arg(*(cmddata + 1), 2, 16, QLatin1Char('0')) :
+                QStringLiteral("UNKNOWN_%1").arg(*(cmddata + 1), 2, 16, QLatin1Char('0')) :
                 QString::fromStdString(name);
     text += QStringLiteral("\n");