Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #10089 from osmandapp/master

Browse source 
update test branch
This commit is contained in:
Hardy 2020-10-27 10:42:00 +01:00 committed by GitHub
commit 1c1ef4878b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/xml/settings_main_screen.xml
View file

@ -58,7 +58,7 @@
android:layout="@layout/preference_button" android:layout="@layout/preference_button"
android:persistent="false" android:persistent="false"
android:title="@string/reorder_profiles" android:title="@string/reorder_profiles"
app:fragment="net.osmand.plus.profiles.fragments.EditProfilesFragment" app:fragment="net.osmand.plus.profiles.EditProfilesFragment"
tools:icon="@drawable/ic_action_edit_dark" /> tools:icon="@drawable/ic_action_edit_dark" />
<Preference <Preference

2
OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java
View file

@ -899,7 +899,7 @@ public abstract class BaseSettingsFragment extends PreferenceFragmentCompat impl
} }
public static boolean showInstance(FragmentActivity activity, SettingsScreenType screenType, @Nullable ApplicationMode appMode) { public static boolean showInstance(FragmentActivity activity, SettingsScreenType screenType, @Nullable ApplicationMode appMode) {
return showInstance(activity, screenType, null, new Bundle()); return showInstance(activity, screenType, appMode, new Bundle());
} }
public static boolean showInstance(FragmentActivity activity, SettingsScreenType screenType, public static boolean showInstance(FragmentActivity activity, SettingsScreenType screenType,