mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1224 from lioncash/android

Browse Source 
Android: Fix Javadoc references
This commit is contained in:
Twinaphex 2014-11-06 15:35:22 +01:00
commit 07956ca806
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/phoenix/src/com/retroarch/browser/dirfragment/DirectoryFragment.java
View File

@ -318,7 +318,7 @@ public class DirectoryFragment extends DialogFragment
* It is possible to specify more than one allowed extension by * It is possible to specify more than one allowed extension by
* simply calling this method with a different file extension specified. * simply calling this method with a different file extension specified.
* *
* @param ext The file extension(s) to allow being shown in this DirectoryFragment. * @param exts The file extension(s) to allow being shown in this DirectoryFragment.
*/ */
public void addAllowedExts(String... exts) public void addAllowedExts(String... exts)
{ {

17
android/phoenix/src/com/retroarch/browser/preferences/fragments/util/PreferenceManagerCompat.java
View File

@ -127,11 +127,10 @@ class PreferenceManagerCompat
* If a preference hierarchy is given, the new preference hierarchies will * If a preference hierarchy is given, the new preference hierarchies will
* be merged in. * be merged in.
* *
* @param queryIntent The intent to match activities. * @param manager {@link PreferenceManager} context to use.
* @param rootPreferences Optional existing hierarchy to merge the new * @param intent The intent to match activities.
* hierarchies into. *
* @return The root hierarchy (if one was not provided, the new hierarchy's * @return The root hierarchy (if one was not provided, the new hierarchy's root).
* root).
*/ */
static PreferenceScreen inflateFromIntent(PreferenceManager manager, Intent intent, PreferenceScreen screen) static PreferenceScreen inflateFromIntent(PreferenceManager manager, Intent intent, PreferenceScreen screen)
{ {
@ -153,10 +152,8 @@ class PreferenceManagerCompat
* Inflates a preference hierarchy from XML. If a preference hierarchy is * Inflates a preference hierarchy from XML. If a preference hierarchy is
* given, the new preference hierarchies will be merged in. * given, the new preference hierarchies will be merged in.
* *
* @param context The context of the resource. * @param manager The context of the resource.
* @param resId The resource ID of the XML to inflate. * @param resId The resource ID of the XML to inflate.
* @param rootPreferences Optional existing hierarchy to merge the new
* hierarchies into.
* @return The root hierarchy (if one was not provided, the new hierarchy's * @return The root hierarchy (if one was not provided, the new hierarchy's
* root). * root).
* @hide * @hide
@ -255,7 +252,9 @@ class PreferenceManagerCompat
/** /**
* Sets the root of the preference hierarchy. * Sets the root of the preference hierarchy.
* *
* @param preferenceScreen The root {@link PreferenceScreen} of the preference hierarchy. * @param manager {@link PreferenceManager} context.
* @param screen The root {@link PreferenceScreen} of the preference hierarchy.
*
* @return Whether the {@link PreferenceScreen} given is different than the previous. * @return Whether the {@link PreferenceScreen} given is different than the previous.
*/ */
static boolean setPreferences(PreferenceManager manager, PreferenceScreen screen) static boolean setPreferences(PreferenceManager manager, PreferenceScreen screen)