Brion VIBBER has submitted this change and it was merged. Change subject: Set app name to Wikipedia & kill unused menus ......................................................................
Set app name to Wikipedia & kill unused menus Change-Id: Iedab69121583d4bde898c807598c7cc85dcbef65 --- D wikipedia/res/menu/main.xml M wikipedia/res/values/strings.xml M wikipedia/src/main/java/org/wikimedia/wikipedia/PageActivity.java 3 files changed, 1 insertion(+), 29 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/wikipedia/res/menu/main.xml b/wikipedia/res/menu/main.xml deleted file mode 100644 index d227c49..0000000 --- a/wikipedia/res/menu/main.xml +++ /dev/null @@ -1,9 +0,0 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android"; > - - <item - android:id="@+id/action_settings" - android:orderInCategory="100" - android:showAsAction="never" - android:title="@string/action_settings"/> - -</menu> \ No newline at end of file diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml index 679f3bf..5311111 100644 --- a/wikipedia/res/values/strings.xml +++ b/wikipedia/res/values/strings.xml @@ -1,9 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - - <string name="app_name">Hello Maven</string> - <string name="hello">Hello wikipedia!</string> - <string name="action_settings">Settings</string> - <string name="hello_world">Hello world!</string> - + <string name="app_name">Wikipedia</string> </resources> \ No newline at end of file diff --git a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageActivity.java b/wikipedia/src/main/java/org/wikimedia/wikipedia/PageActivity.java index e30fba9..23a7cf1 100644 --- a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageActivity.java +++ b/wikipedia/src/main/java/org/wikimedia/wikipedia/PageActivity.java @@ -39,18 +39,4 @@ public void onBackPressed() { getSupportFragmentManager().popBackStack(); } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.main, menu); - return true; - } - - @Override - public boolean onMenuItemSelected(int featureId, MenuItem item) { -// PageViewFragment viewFragment = (PageViewFragment) getSupportFragmentManager().findFragmentById(R.id.testFragment); -// viewFragment.displayPage(new PageTitle(null, "India")); - return super.onMenuItemSelected(featureId, item); - } } -- To view, visit https://gerrit.wikimedia.org/r/94856 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iedab69121583d4bde898c807598c7cc85dcbef65 Gerrit-PatchSet: 2 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Yuvipanda <[email protected]> Gerrit-Reviewer: Brion VIBBER <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
