summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2018-11-07 13:26:26 +0100
committerGitHub <noreply@github.com>2018-11-07 13:26:26 +0100
commit2e370b4ec3427637da4e19e7c3fdc7d9467a2cbc (patch)
tree16327caf7923d2540f39c60c9f62fea99bf10be8 /Source
parentc52bdba28a2cadbcc897d633f8619da083c51122 (diff)
parent47d9e8208cee6d6b8e20681650131718191e3571 (diff)
Merge pull request #7532 from mahdihijazi/mahdi/remove_cxl_btn
Android: Remove the cancel button from the file browser
Diffstat (limited to 'Source')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/CustomFilePickerFragment.java23
1 files changed, 9 insertions, 14 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/CustomFilePickerFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/CustomFilePickerFragment.java
index 3f7913ca41..372d9854ca 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/CustomFilePickerFragment.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/CustomFilePickerFragment.java
@@ -28,22 +28,17 @@ public class CustomFilePickerFragment extends FilePickerFragment
file);
}
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
+ @Override public void onActivityCreated(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);
+ super.onActivityCreated(savedInstanceState);
- ok.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
- cancel.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
+ if (mode == MODE_DIR)
+ {
+ TextView ok = getActivity().findViewById(R.id.nnf_button_ok);
+ ok.setText(R.string.select_dir);
- ok.setAllCaps(false);
- cancel.setAllCaps(false);
- ok.setText(R.string.select_dir);
- return view;
+ TextView cancel = getActivity().findViewById(R.id.nnf_button_cancel);
+ cancel.setVisibility(View.GONE);
+ }
}
}