[MediaWiki-commits] [Gerrit] Add simple Edit Summary option to preview window - change (apps...wikipedia)

2014-03-11 Thread Yuvipanda (Code Review) 
Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/118057

Change subject: Add simple Edit Summary option to preview window
..

Add simple Edit Summary option to preview window

Change-Id: I321f8e79bab9f6684e66e76f1e300a52d68bb2e8
---
M wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/TriggerAbuseFilterTest.java
M wikipedia-it/src/main/java/org/wikipedia/test/TriggerEditCaptchaTest.java
M wikipedia/res/layout/activity_edit_section.xml
M wikipedia/res/values/strings.xml
M wikipedia/src/main/java/org/wikipedia/editing/DoEditTask.java
M wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
7 files changed, 31 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/57/118057/1

diff --git a/wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java 
b/wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
index 71072c0..f26c7d5 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
@@ -27,7 +27,7 @@
 app.getEditTokenStorage().get(title.getSite(), new 
EditTokenStorage.TokenRetreivedCallback() {
 @Override
 public void onTokenRetreived(String token) {
-new 
DoEditTask(getInstrumentation().getTargetContext(), title, wikitext, 3, token) {
+new 
DoEditTask(getInstrumentation().getTargetContext(), title, wikitext, 3, token, 
) {
 @Override
 public void onFinish(EditingResult result) {
 assertNotNull(result);
diff --git 
a/wikipedia-it/src/main/java/org/wikipedia/test/TriggerAbuseFilterTest.java 
b/wikipedia-it/src/main/java/org/wikipedia/test/TriggerAbuseFilterTest.java
index c711c84..91780be 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/TriggerAbuseFilterTest.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/TriggerAbuseFilterTest.java
@@ -23,7 +23,7 @@
 runTestOnUiThread(new Runnable() {
 @Override
 public void run() {
-new DoEditTask(getInstrumentation().getTargetContext(), title, 
wikitext, 0, +\\) {
+new DoEditTask(getInstrumentation().getTargetContext(), title, 
wikitext, 0, +\\, ) {
 @Override
 public void onFinish(EditingResult result) {
 assertNotNull(result);
@@ -45,7 +45,7 @@
 runTestOnUiThread(new Runnable() {
 @Override
 public void run() {
-new DoEditTask(getInstrumentation().getTargetContext(), title, 
wikitext, 0, +\\) {
+new DoEditTask(getInstrumentation().getTargetContext(), title, 
wikitext, 0, +\\, ) {
 @Override
 public void onFinish(EditingResult result) {
 assertNotNull(result);
diff --git 
a/wikipedia-it/src/main/java/org/wikipedia/test/TriggerEditCaptchaTest.java 
b/wikipedia-it/src/main/java/org/wikipedia/test/TriggerEditCaptchaTest.java
index 35648cc..4be0494 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/TriggerEditCaptchaTest.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/TriggerEditCaptchaTest.java
@@ -23,7 +23,7 @@
 runTestOnUiThread(new Runnable() {
 @Override
 public void run() {
-new DoEditTask(getInstrumentation().getTargetContext(), title, 
wikitext, 0, +\\) {
+new DoEditTask(getInstrumentation().getTargetContext(), title, 
wikitext, 0, +\\, ) {
 @Override
 public void onFinish(EditingResult result) {
 assertNotNull(result);
diff --git a/wikipedia/res/layout/activity_edit_section.xml 
b/wikipedia/res/layout/activity_edit_section.xml
index c243235..6c959c5 100644
--- a/wikipedia/res/layout/activity_edit_section.xml
+++ b/wikipedia/res/layout/activity_edit_section.xml
@@ -78,8 +78,18 @@
 /LinearLayout
 /ScrollView
 
-fragment android:layout_width=match_parent 
android:layout_height=match_parent
-  android:id=@+id/edit_section_preview_fragment
-  class=org.wikipedia.editing.EditPreviewFragment
-/
+LinearLayout
+android:layout_width=match_parent
+android:layout_height=match_parent
+android:id=@+id/edit_section_preview_container
+android:orientation=vertical
+
+fragment android:layout_width=match_parent
+  android:layout_height=0dp
+  android:layout_weight=1
+  android:id=@+id/edit_section_preview_fragment
+

[MediaWiki-commits] [Gerrit] Add simple Edit Summary option to preview window - change (apps...wikipedia)

2014-03-11 Thread Brion VIBBER (Code Review) 
Brion VIBBER has submitted this change and it was merged.

Change subject: Add simple Edit Summary option to preview window
..


Add simple Edit Summary option to preview window

Change-Id: I321f8e79bab9f6684e66e76f1e300a52d68bb2e8
---
M wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/TriggerAbuseFilterTest.java
M wikipedia-it/src/main/java/org/wikipedia/test/TriggerEditCaptchaTest.java
M wikipedia/res/layout/activity_edit_section.xml
A wikipedia/res/layout/group_edit_summary.xml
M wikipedia/res/values/strings.xml
M wikipedia/src/main/java/org/wikipedia/editing/DoEditTask.java
M wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
A wikipedia/src/main/java/org/wikipedia/editing/EditSummaryHandler.java
A 
wikipedia/src/main/java/org/wikipedia/styledviews/StyledAutocompleteEditText.java
10 files changed, 133 insertions(+), 16 deletions(-)

Approvals:
  Brion VIBBER: Verified; Looks good to me, approved



diff --git a/wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java 
b/wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
index 71072c0..f26c7d5 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
@@ -27,7 +27,7 @@
 app.getEditTokenStorage().get(title.getSite(), new 
EditTokenStorage.TokenRetreivedCallback() {
 @Override
 public void onTokenRetreived(String token) {
-new 
DoEditTask(getInstrumentation().getTargetContext(), title, wikitext, 3, token) {
+new 
DoEditTask(getInstrumentation().getTargetContext(), title, wikitext, 3, token, 
) {
 @Override
 public void onFinish(EditingResult result) {
 assertNotNull(result);
diff --git 
a/wikipedia-it/src/main/java/org/wikipedia/test/TriggerAbuseFilterTest.java 
b/wikipedia-it/src/main/java/org/wikipedia/test/TriggerAbuseFilterTest.java
index c711c84..91780be 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/TriggerAbuseFilterTest.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/TriggerAbuseFilterTest.java
@@ -23,7 +23,7 @@
 runTestOnUiThread(new Runnable() {
 @Override
 public void run() {
-new DoEditTask(getInstrumentation().getTargetContext(), title, 
wikitext, 0, +\\) {
+new DoEditTask(getInstrumentation().getTargetContext(), title, 
wikitext, 0, +\\, ) {
 @Override
 public void onFinish(EditingResult result) {
 assertNotNull(result);
@@ -45,7 +45,7 @@
 runTestOnUiThread(new Runnable() {
 @Override
 public void run() {
-new DoEditTask(getInstrumentation().getTargetContext(), title, 
wikitext, 0, +\\) {
+new DoEditTask(getInstrumentation().getTargetContext(), title, 
wikitext, 0, +\\, ) {
 @Override
 public void onFinish(EditingResult result) {
 assertNotNull(result);
diff --git 
a/wikipedia-it/src/main/java/org/wikipedia/test/TriggerEditCaptchaTest.java 
b/wikipedia-it/src/main/java/org/wikipedia/test/TriggerEditCaptchaTest.java
index 35648cc..4be0494 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/TriggerEditCaptchaTest.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/TriggerEditCaptchaTest.java
@@ -23,7 +23,7 @@
 runTestOnUiThread(new Runnable() {
 @Override
 public void run() {
-new DoEditTask(getInstrumentation().getTargetContext(), title, 
wikitext, 0, +\\) {
+new DoEditTask(getInstrumentation().getTargetContext(), title, 
wikitext, 0, +\\, ) {
 @Override
 public void onFinish(EditingResult result) {
 assertNotNull(result);
diff --git a/wikipedia/res/layout/activity_edit_section.xml 
b/wikipedia/res/layout/activity_edit_section.xml
index c243235..6c959c5 100644
--- a/wikipedia/res/layout/activity_edit_section.xml
+++ b/wikipedia/res/layout/activity_edit_section.xml
@@ -78,8 +78,18 @@
 /LinearLayout
 /ScrollView
 
-fragment android:layout_width=match_parent 
android:layout_height=match_parent
-  android:id=@+id/edit_section_preview_fragment
-  class=org.wikipedia.editing.EditPreviewFragment
-/
+LinearLayout
+android:layout_width=match_parent
+android:layout_height=match_parent
+android:id=@+id/edit_section_preview_container
+android:orientation=vertical
+
+fragment android:layout_width=match_parent
+  android:layout_height=0dp
+