Merge "Browser: Add tips for new message received in full-screen mode"

4 files changed, 68 insertions, 0 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8c88f437..0dc3ccc2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -281,6 +281,12 @@
             </intent-filter>
         </receiver>
 
+        <receiver android:name=".MessagesReceiver">
+            <intent-filter>
+                <action android:name="com.android.mms.transaction.MESSAGE_RECEIVED" />
+            </intent-filter>
+        </receiver>
+
         <receiver android:name=".PreloadRequestReceiver"
              android:permission="com.android.browser.permission.PRELOAD" >
              <intent-filter>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e3df6d7e..7d0223c7 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -459,4 +459,6 @@
     <string name="download_path_unavailable_dlg_title">浏览器的下载路径不可达</string>
     <string name="download_path_unavailable_dlg_msg">请重新设置浏览器的下载路径</string>
     <string name="activity_not_found">没有找到处理 Intent <xliff:g id="NOACTIVITY">%s</xliff:g> 的Activity.</string>
+    <!-- Toast message displayed when the full screen received message -->
+    <string name="received_message_full_screen">收到来自: <xliff:g id="FROM">%s</xliff:g> 的一条消息.</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1b7fe73b..fa46467e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1076,4 +1076,6 @@
     <string name="download_path_unavailable_dlg_msg">Please modify the Download Directory of Browser</string>
     <string name="activity_not_found">Activity Not Found to Handle Intent <xliff:g id="NOACTIVITY">%s</xliff:g>.</string>
     <string name="network_switch_remind_type">wifi_browser_interaction_remind</string>
+    <!-- Toast message displayed when the full screen received message -->
+    <string name="received_message_full_screen">Receive a message from: <xliff:g id="FROM">%s</xliff:g>.</string>
 </resources>
diff --git a/src/com/android/browser/MessagesReceiver.java b/src/com/android/browser/MessagesReceiver.java
new file mode 100644
index 00000000..876efdfb
--- /dev/null
+++ b/src/com/android/browser/MessagesReceiver.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2013, The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer in the documentation and/or other materials provided
+ *      with the distribution.
+ *    * Neither the name of The Linux Foundation nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.android.browser;
+
+import org.w3c.dom.Text;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.text.TextUtils;
+import android.util.Log;
+import android.widget.Toast;
+
+public class MessagesReceiver extends BroadcastReceiver {
+    private static final String TAG = "MessagesReceiver";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Log.d(TAG, "onReceive: " + intent.getAction());
+        if ((intent == null) || TextUtils.isEmpty(intent.getStringExtra("from"))) {
+            return;
+        }
+
+        if (BrowserSettings.getInstance().useFullscreen()) {
+            String from = intent.getStringExtra("from");
+            Log.d(TAG, "the message from: " + from);
+            Toast.makeText(context, context.getString(R.string.received_message_full_screen, from),
+                    Toast.LENGTH_LONG).show();
+        }
+    }
+}