Resolved conflict

app/src/main/java/com/vsoft/servicenow/adapters/MyRequestAdapter.java

@@ -89,6 +89,9 @@ public class MyRequestAdapter extends BaseAdapter {
             } else if (req.getApproval().equalsIgnoreCase("rejected")){
                 holder.approval.setText(mContext.getResources().getString (R.string.rejected));
                 ((GradientDrawable)holder.statusIndicator.getBackground()).setColor(Color.parseColor("#FF0000"));
+            } else if (req.getApproval().equalsIgnoreCase("not yet requested")) {
+                holder.approval.setText(mContext.getResources().getString(R.string.notrequest));
+                ((GradientDrawable) holder.statusIndicator.getBackground()).setColor(Color.parseColor("#5CE1ED"));
             }
         }
         return convertView;

app/src/main/java/com/vsoft/servicenow/speechRecognizer/DroidSpeech.java

@@ -20,6 +20,7 @@ import android.support.v4.app.FragmentManager;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.widget.LinearLayout.LayoutParams;
 import android.widget.TextView;
@@ -186,6 +187,46 @@ public class DroidSpeech {
                     }
                 });
 
+                recognitionProgressView.setOnTouchListener(new View.OnTouchListener() {
+                    @Override
+                    public boolean onTouch(View view, MotionEvent motionEvent) {
+                        if(motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
+                            dsProperties.closedByUser = true;
+
+                            // Closing droid speech operations
+                            closeDroidSpeechOperations();
+
+                            if (droidSpeechListener != null) {
+                                // Sending an update that the droid speech was closed by user
+                                droidSpeechListener.onDroidSpeechClosedByUser();
+                            } else {
+                                Log.i(TAG, "Droid speech closed");
+                            }
+                        }
+                        return false;
+                    }
+                });
+
+                recognitionProgressMsg.setOnTouchListener(new View.OnTouchListener() {
+                    @Override
+                    public boolean onTouch(View view, MotionEvent motionEvent) {
+                        if(motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
+                            dsProperties.closedByUser = true;
+
+                            // Closing droid speech operations
+                            closeDroidSpeechOperations();
+
+                            if (droidSpeechListener != null) {
+                                // Sending an update that the droid speech was closed by user
+                                droidSpeechListener.onDroidSpeechClosedByUser();
+                            } else {
+                                Log.i(TAG, "Droid speech closed");
+                            }
+                        }
+                        return false;
+                    }
+                });
+
                 speechProgressAlertDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
                     @Override
                     public void onDismiss(DialogInterface dialogInterface) {

app/src/main/res/layout/request_list_item.xml

@@ -15,7 +15,6 @@
         android:layout_alignParentTop="true"
         android:layout_marginLeft="@dimen/my_request_left"
         android:layout_marginTop="@dimen/my_request_top"
-        android:text="Large Text"
         android:textSize="@dimen/ruquest_descps_text_size"
         android:textStyle="bold" />
 
@@ -27,7 +26,6 @@
         android:layout_alignStart="@+id/number"
         android:layout_below="@+id/number"
         android:layout_marginTop="@dimen/my_request_top"
-        android:text="Large Text"
         android:textColor="#000000"
         android:textSize="@dimen/ruquest_descps_text_size"
         android:textStyle="bold" />
@@ -51,7 +49,6 @@
         android:layout_marginLeft="@dimen/my_request_right"
         android:layout_marginTop="@dimen/my_request_new_top"
         android:layout_toRightOf="@+id/approval_image"
-        android:text="Large Text"
         android:textColor="#8e8e8e"
         android:textSize="@dimen/ruquest_status_text_size" />
 </RelativeLayout>
\ No newline at end of file

app/src/main/res/layout/speech_progress_layout.xml

@@ -15,7 +15,7 @@
         android:id="@+id/recognitionProgressMsg"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/progressMsgMargin"
+        android:padding="@dimen/progressMsgMargin"
         android:gravity="center"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:text="@string/app_name"/>

app/src/main/res/values/strings.xml

@@ -86,6 +86,7 @@
 	<!--Incident screen-->
 	<string name="incident_form_report_incident_text_string">Report Incident</string>
 	<string name="incident_form_top_text_string">Create an Incident record to report and request assistance with an issue you are having\n\n. An incident record will be created and managed through to successful resolution. You will also be notified of progress.</string>
+
 	<string name="incident_form_impact_text_string">Impact &lt;font color="#FF0000"&gt;*&lt;/font&gt;</string>
 	<string name="incident_form_incident_successful_submission_string">Incident has been reported successfully</string>
 	<string name="incident_form_describe_your_issue_text_string">Please Describe Your Issue below &lt;font color="#FF0000"&gt;*&lt;/font&gt;(Max %d)</string>