From 764b07e6d5143b09c6f1bdd5504a89b81f7a7e74 Mon Sep 17 00:00:00 2001 From: Sascha Haeberling Date: Tue, 6 Aug 2013 17:27:55 -0700 Subject: Remove refocus icon if it's not enabled or present. Change-Id: I0c885a7a56abfe2365d832fa5ca8c1d74ce2edc8 --- .../com/android/camera/util/PhotoSphereHelper.java | 17 ++++++++++++++++- src_pd/com/android/camera/util/RefocusHelper.java | 22 ++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) (limited to 'src_pd/com') diff --git a/src_pd/com/android/camera/util/PhotoSphereHelper.java b/src_pd/com/android/camera/util/PhotoSphereHelper.java index 570e95ff7..2b9016d72 100644 --- a/src_pd/com/android/camera/util/PhotoSphereHelper.java +++ b/src_pd/com/android/camera/util/PhotoSphereHelper.java @@ -1,5 +1,20 @@ -package com.android.camera.util; +/* + * 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.camera.util; import android.app.Activity; import android.content.ContentResolver; diff --git a/src_pd/com/android/camera/util/RefocusHelper.java b/src_pd/com/android/camera/util/RefocusHelper.java index 4de7d1a8c..3640a70ca 100644 --- a/src_pd/com/android/camera/util/RefocusHelper.java +++ b/src_pd/com/android/camera/util/RefocusHelper.java @@ -1,5 +1,22 @@ +/* + * Copyright (C) 2013 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.content.Context; import com.android.camera.CameraModule; @@ -7,4 +24,9 @@ public class RefocusHelper { public static CameraModule createRefocusModule() { return null; } + + public static boolean hasRefocusCapture(Context context) { + return false; + } + } -- cgit v1.2.3