Merge 0e13f5a5b5098b78d6c446e201f0ef7be8db2d0e on remote branch

Change-Id: I02c670e385625c9eef7dd6b6dd7032d23a7a47c1

1 files changed, 17 insertions, 0 deletions

diff --git a/src/com/android/gallery3d/app/GalleryActivity.java b/src/com/android/gallery3d/app/GalleryActivity.java
index 16920b942..c4b9564d1 100755
--- a/src/com/android/gallery3d/app/GalleryActivity.java
+++ b/src/com/android/gallery3d/app/GalleryActivity.java
@@ -25,6 +25,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnCancelListener;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.UriMatcher;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
@@ -618,4 +619,20 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On
         }
         return super.onGenericMotionEvent(event);
     }
+
+    public void registerHomeButtonReceiver(TimeLinePage.HomeIconActionReceiver receiver) {
+        IntentFilter filter = new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
+        registerReceiver(receiver, filter);
+    }
+
+    public void unregisterHomeButtonReceiver(TimeLinePage.HomeIconActionReceiver receiver) {
+        if (receiver == null) {
+            return;
+        }
+        try {
+            unregisterReceiver(receiver);
+        } catch (Exception e) {
+            Log.w(TAG, "unregister HomeIconActionReceiver failed");
+        }
+    }
 }