XinyueZ has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/327376 )
Change subject: Fixed to re-get toolbar(actionbar) in EditSectionActivity
......................................................................
Fixed to re-get toolbar(actionbar) in EditSectionActivity
Change-Id: Ia92b248e795bf25244e15fd2be5087b063dbe2d7
---
M app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
M app/src/main/res/layout/activity_edit_section.xml
2 files changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/76/327376/1
diff --git a/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
b/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
index 8d43837..c97682d 100644
--- a/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
+++ b/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
@@ -11,6 +11,7 @@
import android.support.annotation.Nullable;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.Toolbar;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@@ -130,7 +131,8 @@
progressDialog.setCancelable(false);
progressDialog.setMessage(getString(R.string.dialog_saving_in_progress));
- final ActionBar supportActionBar = getSupportActionBar();
+ setSupportActionBar((Toolbar)findViewById(R.id.toolbar));
+ ActionBar supportActionBar = getSupportActionBar();
if (supportActionBar != null) {
supportActionBar.setTitle("");
}
diff --git a/app/src/main/res/layout/activity_edit_section.xml
b/app/src/main/res/layout/activity_edit_section.xml
index 0a29d4e..c400919 100644
--- a/app/src/main/res/layout/activity_edit_section.xml
+++ b/app/src/main/res/layout/activity_edit_section.xml
@@ -4,6 +4,8 @@
xmlns:tools="http://schemas.android.com/tools";
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/window_background_color">
+
+
<ProgressBar
android:id="@+id/edit_section_load_progress"
android:layout_gravity="center"
@@ -122,4 +124,9 @@
</LinearLayout>
</ScrollView>
+ <android.support.v7.widget.Toolbar
+ android:theme="@style/AppTheme.ToolbarTheme"
+ android:id="@+id/toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="?attr/actionBarSize" />
</FrameLayout>
--
To view, visit https://gerrit.wikimedia.org/r/327376
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia92b248e795bf25244e15fd2be5087b063dbe2d7
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: XinyueZ <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
