Skip to content

Commit 9968d0c

Browse files
Khaled Tantawyfacebook-github-bot
Khaled Tantawy
authored andcommitted
Rename dev settings menu preferences file as it conflicts with fennec's (#23123)
Summary: On Android, resources with the same name from different libraries conflict, so it's encouraged to have prefixes for resource names. This is one case where the settings menu preferences file in firefox for android is called `preferences.xml` so it conflicts with the dev support settings menu for react native. when integrating react-native to the firefox project, react native dev settings menu never shows, and the one from firefox shows up instead. This a link to a file from a fork project that I'm working on: https://github.com/ghostery/browser-android/blob/master/mozilla-release/mobile/android/app/src/main/res/xml/preferences.xml Please, let me know, if anything more needs to be changed Changelog: ----------- [Android] [Fixed] Rename dev settings menu preferences file with a RN prefix. Pull Request resolved: #23123 Differential Revision: D13781836 Pulled By: cpojer fbshipit-source-id: f27483d4eca5aa4148759b94b601673985c5aa91
1 parent 803480a commit 9968d0c

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSettingsActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ public class DevSettingsActivity extends PreferenceActivity {
2323
public void onCreate(Bundle savedInstanceState) {
2424
super.onCreate(savedInstanceState);
2525
setTitle(getApplication().getResources().getString(R.string.catalyst_settings_title));
26-
addPreferencesFromResource(R.xml.preferences);
26+
addPreferencesFromResource(R.xml.rn_dev_preferences);
2727
}
2828
}

0 commit comments

Comments
 (0)