Merge remote-tracking branch 'goog/master' into mergescriptpackage

Conflicts:
	java/res/values-da/strings.xml
	java/res/values-es-rUS/strings.xml
	java/res/values-fa/strings.xml
	java/res/values-ko/strings.xml
	java/res/values-pl/strings.xml
	java/res/values-sk/strings.xml
	java/res/values-sw/strings.xml

Change-Id: I1d4be3df6c54c328011c448f31f163fafb2a909a

1 files changed, 52 insertions, 0 deletions

diff --git a/java/src/com/android/inputmethod/research/FeedbackActivity.java b/java/src/com/android/inputmethod/research/FeedbackActivity.java
new file mode 100644
index 000000000..c9f3b476a
--- /dev/null
+++ b/java/src/com/android/inputmethod/research/FeedbackActivity.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.android.inputmethod.research;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.text.Editable;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.EditText;
+
+import com.android.inputmethod.latin.R;
+
+public class FeedbackActivity extends Activity {
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.research_feedback_activity);
+        final FeedbackLayout layout = (FeedbackLayout) findViewById(R.id.research_feedback_layout);
+        layout.setActivity(this);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+    }
+
+    @Override
+    public void onBackPressed() {
+        ResearchLogger.getInstance().onLeavingSendFeedbackDialog();
+        super.onBackPressed();
+    }
+}