[MediaWiki-commits] [Gerrit] Add developer settings to Gingerbread - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged. Change subject: Add developer settings to Gingerbread .. Add developer settings to Gingerbread - Add developer setting support for Gingerbread devices. - Add single Fragment Activity components and apply pattern to settings and developer settings. - Fix invalidateOptionsMenu() crash bug in API 14 devices in SettingsFragment. - Move ActivityUtil to activity package. - Rename SettingsUI to SettingsPreferenceLoader. Developer settings Gingerbread support added in response to initial patch feedback. Change-Id: Icf9a33bac98c5e39d54553b87634a521b9b833f7 --- M wikipedia/AndroidManifest.xml D wikipedia/res/layout/activity_settings.xml M wikipedia/res/layout/activity_single_fragment.xml R wikipedia/src/main/java/org/wikipedia/activity/ActivityUtil.java A wikipedia/src/main/java/org/wikipedia/activity/BaseSingleFragmentActivity.java A wikipedia/src/main/java/org/wikipedia/activity/CompatSingleFragmentActivity.java A wikipedia/src/main/java/org/wikipedia/activity/PlatformSingleFragmentActivity.java M wikipedia/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java M wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java M wikipedia/src/main/java/org/wikipedia/settings/AboutActivity.java A wikipedia/src/main/java/org/wikipedia/settings/BasePreferenceLoader.java M wikipedia/src/main/java/org/wikipedia/settings/DeveloperSettingsActivity.java A wikipedia/src/main/java/org/wikipedia/settings/DeveloperSettingsActivityGB.java M wikipedia/src/main/java/org/wikipedia/settings/DeveloperSettingsFragment.java A wikipedia/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java A wikipedia/src/main/java/org/wikipedia/settings/LegacyPreferenceActivity.java A wikipedia/src/main/java/org/wikipedia/settings/PreferenceLoader.java A wikipedia/src/main/java/org/wikipedia/settings/PreferenceLoaderFragment.java M wikipedia/src/main/java/org/wikipedia/settings/SettingsActivity.java M wikipedia/src/main/java/org/wikipedia/settings/SettingsActivityGB.java M wikipedia/src/main/java/org/wikipedia/settings/SettingsFragment.java R wikipedia/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java M wikipedia/src/main/java/org/wikipedia/tooltip/ToolTipUtil.java 23 files changed, 324 insertions(+), 153 deletions(-) Approvals: Dbrant: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia/AndroidManifest.xml b/wikipedia/AndroidManifest.xml index 461e7fa..49fcb25 100644 --- a/wikipedia/AndroidManifest.xml +++ b/wikipedia/AndroidManifest.xml @@ -85,6 +85,11 @@ android:configChanges=orientation|keyboardHidden|keyboard|screenSize android:exported=false / +activity android:name=.settings.DeveloperSettingsActivityGB +android:label=@string/developer_settings_activity_title + android:configChanges=orientation|keyboardHidden|keyboard|screenSize +android:exported=false +/ activity android:name=.settings.AboutActivity android:label=@string/about_activity_title android:exported=false diff --git a/wikipedia/res/layout/activity_settings.xml b/wikipedia/res/layout/activity_settings.xml deleted file mode 100644 index 3df4b3e..000 --- a/wikipedia/res/layout/activity_settings.xml +++ /dev/null @@ -1,14 +0,0 @@ -?xml version=1.0 encoding=utf-8? - -LinearLayout xmlns:android=http://schemas.android.com/apk/res/android; -android:layout_width=match_parent -android:layout_height=match_parent -android:background=?attr/window_background_color -android:orientation=vertical - -fragment -android:id=@+id/settings_fragment -android:name=org.wikipedia.settings.SettingsFragment -android:layout_width=match_parent -android:layout_height=match_parent / -/LinearLayout diff --git a/wikipedia/res/layout/activity_single_fragment.xml b/wikipedia/res/layout/activity_single_fragment.xml index 6b4891e..0659c5a 100644 --- a/wikipedia/res/layout/activity_single_fragment.xml +++ b/wikipedia/res/layout/activity_single_fragment.xml @@ -5,4 +5,4 @@ android:id=@+id/fragment_container android:layout_width=match_parent android:layout_height=match_parent -tools:context=.activity.ThemedActionBarActivity / +tools:context=.activity.BaseSingleFragmentActivity / diff --git a/wikipedia/src/main/java/org/wikipedia/util/ActivityUtil.java b/wikipedia/src/main/java/org/wikipedia/activity/ActivityUtil.java similarity index 68% rename from wikipedia/src/main/java/org/wikipedia/util/ActivityUtil.java rename to wikipedia/src/main/java/org/wikipedia/activity/ActivityUtil.java index f0163d2..0e9e7af 100644 --- a/wikipedia/src/main/java/org/wikipedia/util/ActivityUtil.java +++ b/wikipedia/src/main/java/org/wikipedia/activity/ActivityUtil.java @@ -1,4 +1,4 @@ -package
[MediaWiki-commits] [Gerrit] Add developer settings to Gingerbread - change (apps...wikipedia)
Niedzielski has uploaded a new change for review. https://gerrit.wikimedia.org/r/223501 Change subject: Add developer settings to Gingerbread .. Add developer settings to Gingerbread - Add developer setting support for Gingerbread devices. - Add single Fragment Activity components and apply pattern to settings and developer settings. - Fix invalidateOptionsMenu() crash bug in API 14 devices in SettingsFragment. - Move ActivityUtil to activity package. - Rename SettingsUI to SettingsPreferenceLoader. Developer settings Gingerbread support added in response to initial patch feedback. Change-Id: Icf9a33bac98c5e39d54553b87634a521b9b833f7 --- M wikipedia/AndroidManifest.xml D wikipedia/res/layout/activity_settings.xml M wikipedia/res/layout/activity_single_fragment.xml R wikipedia/src/main/java/org/wikipedia/activity/ActivityUtil.java A wikipedia/src/main/java/org/wikipedia/activity/BaseSingleFragmentActivity.java A wikipedia/src/main/java/org/wikipedia/activity/CompatSingleFragmentActivity.java A wikipedia/src/main/java/org/wikipedia/activity/PlatformSingleFragmentActivity.java M wikipedia/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java M wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java M wikipedia/src/main/java/org/wikipedia/settings/AboutActivity.java A wikipedia/src/main/java/org/wikipedia/settings/BasePreferenceLoader.java M wikipedia/src/main/java/org/wikipedia/settings/DeveloperSettingsActivity.java A wikipedia/src/main/java/org/wikipedia/settings/DeveloperSettingsActivityGB.java M wikipedia/src/main/java/org/wikipedia/settings/DeveloperSettingsFragment.java A wikipedia/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java A wikipedia/src/main/java/org/wikipedia/settings/LegacyPreferenceActivity.java A wikipedia/src/main/java/org/wikipedia/settings/PreferenceLoader.java A wikipedia/src/main/java/org/wikipedia/settings/PreferenceLoaderFragment.java M wikipedia/src/main/java/org/wikipedia/settings/SettingsActivity.java M wikipedia/src/main/java/org/wikipedia/settings/SettingsActivityGB.java M wikipedia/src/main/java/org/wikipedia/settings/SettingsFragment.java R wikipedia/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java M wikipedia/src/main/java/org/wikipedia/tooltip/ToolTipUtil.java 23 files changed, 324 insertions(+), 153 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/01/223501/1 diff --git a/wikipedia/AndroidManifest.xml b/wikipedia/AndroidManifest.xml index 3189543..253b5bc 100644 --- a/wikipedia/AndroidManifest.xml +++ b/wikipedia/AndroidManifest.xml @@ -84,6 +84,11 @@ android:configChanges=orientation|keyboardHidden|keyboard|screenSize android:exported=false / +activity android:name=.settings.DeveloperSettingsActivityGB +android:label=@string/developer_settings_activity_title + android:configChanges=orientation|keyboardHidden|keyboard|screenSize +android:exported=false +/ activity android:name=.settings.AboutActivity android:label=@string/about_activity_title android:exported=false diff --git a/wikipedia/res/layout/activity_settings.xml b/wikipedia/res/layout/activity_settings.xml deleted file mode 100644 index 3df4b3e..000 --- a/wikipedia/res/layout/activity_settings.xml +++ /dev/null @@ -1,14 +0,0 @@ -?xml version=1.0 encoding=utf-8? - -LinearLayout xmlns:android=http://schemas.android.com/apk/res/android; -android:layout_width=match_parent -android:layout_height=match_parent -android:background=?attr/window_background_color -android:orientation=vertical - -fragment -android:id=@+id/settings_fragment -android:name=org.wikipedia.settings.SettingsFragment -android:layout_width=match_parent -android:layout_height=match_parent / -/LinearLayout diff --git a/wikipedia/res/layout/activity_single_fragment.xml b/wikipedia/res/layout/activity_single_fragment.xml index 6b4891e..0659c5a 100644 --- a/wikipedia/res/layout/activity_single_fragment.xml +++ b/wikipedia/res/layout/activity_single_fragment.xml @@ -5,4 +5,4 @@ android:id=@+id/fragment_container android:layout_width=match_parent android:layout_height=match_parent -tools:context=.activity.ThemedActionBarActivity / +tools:context=.activity.BaseSingleFragmentActivity / diff --git a/wikipedia/src/main/java/org/wikipedia/util/ActivityUtil.java b/wikipedia/src/main/java/org/wikipedia/activity/ActivityUtil.java similarity index 68% rename from wikipedia/src/main/java/org/wikipedia/util/ActivityUtil.java rename to wikipedia/src/main/java/org/wikipedia/activity/ActivityUtil.java index f0163d2..0e9e7af 100644 --- a/wikipedia/src/main/java/org/wikipedia/util/ActivityUtil.java +++
