Merge branch 'lollipop-mr1-release' of https://android.googlesource.com/platform/packages/apps/Camera2 into cm-12.1staging/cm-12.1

Change-Id: I24fa423d91d8d441cbf5d9e75b98037584dd2fbc

1 files changed, 41 insertions, 0 deletions

diff --git a/src_pd/com/android/camera/util/ReleaseHelper.java b/src_pd/com/android/camera/util/ReleaseHelper.java
new file mode 100644
index 000000000..dd41125b8
--- /dev/null
+++ b/src_pd/com/android/camera/util/ReleaseHelper.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2014 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.camera.util;
+
+import android.app.Activity;
+
+import com.android.camera.data.LocalData;
+import com.android.camera.settings.SettingsManager;
+
+public class ReleaseHelper {
+    public static void showReleaseInfoDialogOnStart(Activity activity,
+            SettingsManager settingsManager) {
+        // Do nothing.
+    }
+
+    public static void showReleaseInfoDialog(Activity activity, Callback<Void> callback) {
+        callback.onCallback(null);
+    }
+
+    public static boolean shouldShowReleaseInfoDialogOnShare(LocalData data) {
+        return false;
+    }
+
+    public static boolean shouldLogVerbose() {
+        return false;
+    }
+}