Add expandable commit message to abandon and restore screens

This way one can double-check that abandon/restore is done on the
correct change.

Change-Id: I91ce3d1e9f662b1b6e01946c64c820059bc46a72
Signed-off-by: Edwin Kempin <ekempin@google.com>
diff --git a/app/src/main/java/com/google/reviewit/AbandonFragment.java b/app/src/main/java/com/google/reviewit/AbandonFragment.java
index 34625e8..4233411 100644
--- a/app/src/main/java/com/google/reviewit/AbandonFragment.java
+++ b/app/src/main/java/com/google/reviewit/AbandonFragment.java
@@ -22,6 +22,7 @@
 
 import com.google.gerrit.extensions.restapi.RestApiException;
 import com.google.reviewit.app.Change;
+import com.google.reviewit.widget.ExpandableCommitMessageView;
 import com.urswolfer.gerrit.client.rest.http.HttpStatusException;
 
 /**
@@ -55,6 +56,8 @@
   }
 
   private void init(final Change change) {
+    ((ExpandableCommitMessageView)v(R.id.commitMessage)).init(change);
+
     v(R.id.abandonButton).setOnClickListener(new View.OnClickListener() {
       @Override
       public void onClick(final View v) {
diff --git a/app/src/main/java/com/google/reviewit/RestoreFragment.java b/app/src/main/java/com/google/reviewit/RestoreFragment.java
index b586d55..5ec9622 100644
--- a/app/src/main/java/com/google/reviewit/RestoreFragment.java
+++ b/app/src/main/java/com/google/reviewit/RestoreFragment.java
@@ -22,6 +22,7 @@
 
 import com.google.gerrit.extensions.restapi.RestApiException;
 import com.google.reviewit.app.Change;
+import com.google.reviewit.widget.ExpandableCommitMessageView;
 import com.urswolfer.gerrit.client.rest.http.HttpStatusException;
 
 /**
@@ -55,6 +56,8 @@
   }
 
   private void init(final Change change) {
+    ((ExpandableCommitMessageView)v(R.id.commitMessage)).init(change);
+
     v(R.id.restoreButton).setOnClickListener(new View.OnClickListener() {
       @Override
       public void onClick(final View v) {
diff --git a/app/src/main/res/layout/content_abandon.xml b/app/src/main/res/layout/content_abandon.xml
index da2b061..a1c8b7f 100644
--- a/app/src/main/res/layout/content_abandon.xml
+++ b/app/src/main/res/layout/content_abandon.xml
@@ -14,19 +14,27 @@
     See the License for the specific language governing permissions and
     limitations under the License. -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:paddingBottom="@dimen/activity_vertical_margin"
-                android:paddingLeft="@dimen/activity_horizontal_margin"
-                android:paddingRight="@dimen/activity_horizontal_margin"
-                android:paddingTop="@dimen/activity_vertical_margin"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical"
+  app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+  <com.google.reviewit.widget.ExpandableCommitMessageView
+    android:id="@+id/commitMessage"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="7dp"
+    android:background="@drawable/navigation_button_bar"/>
 
   <ScrollView
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin">
 
     <LinearLayout
       android:orientation="vertical"
@@ -58,4 +66,4 @@
         android:text="@string/abandon"/>
     </LinearLayout>
   </ScrollView>
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/content_restore.xml b/app/src/main/res/layout/content_restore.xml
index 5d6e879..e90f9a9 100644
--- a/app/src/main/res/layout/content_restore.xml
+++ b/app/src/main/res/layout/content_restore.xml
@@ -14,19 +14,27 @@
     See the License for the specific language governing permissions and
     limitations under the License. -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:paddingBottom="@dimen/activity_vertical_margin"
-                android:paddingLeft="@dimen/activity_horizontal_margin"
-                android:paddingRight="@dimen/activity_horizontal_margin"
-                android:paddingTop="@dimen/activity_vertical_margin"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+  <com.google.reviewit.widget.ExpandableCommitMessageView
+    android:id="@+id/commitMessage"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="7dp"
+    android:background="@drawable/navigation_button_bar"/>
 
   <ScrollView
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin">
 
     <LinearLayout
       android:orientation="vertical"
@@ -58,4 +66,4 @@
         android:text="@string/restore"/>
     </LinearLayout>
   </ScrollView>
-</RelativeLayout>
+</LinearLayout>