diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-08-06 11:43:02 -0700 |
|---|---|---|
| committer | Sascha Haeberling <haeberling@google.com> | 2013-08-06 11:43:02 -0700 |
| commit | 8e963a5a6016d246184ed65906f9d103e92b17e2 (patch) | |
| tree | 02eb244ea4a20d9aa8e43916a40b876be8935d11 /src/com/android/camera/ui/EffectSettingPopup.java | |
| parent | 4fc90b07dcf316c7ce6c5313af8202e84bc85603 (diff) | |
| download | android_packages_apps_Snap-8e963a5a6016d246184ed65906f9d103e92b17e2.tar.gz android_packages_apps_Snap-8e963a5a6016d246184ed65906f9d103e92b17e2.tar.bz2 android_packages_apps_Snap-8e963a5a6016d246184ed65906f9d103e92b17e2.zip | |
This removes all non-Camera stuff from Camera2.
Note: Camera2 is a clone of Gallery2 right now.
Note 2: I will bring .mk files back later.
Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
Diffstat (limited to 'src/com/android/camera/ui/EffectSettingPopup.java')
| -rw-r--r-- | src/com/android/camera/ui/EffectSettingPopup.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/camera/ui/EffectSettingPopup.java b/src/com/android/camera/ui/EffectSettingPopup.java index 568781a01..d51803a83 100644 --- a/src/com/android/camera/ui/EffectSettingPopup.java +++ b/src/com/android/camera/ui/EffectSettingPopup.java @@ -16,6 +16,9 @@ package com.android.camera.ui; +import java.util.ArrayList; +import java.util.HashMap; + import android.annotation.TargetApi; import android.content.Context; import android.util.AttributeSet; @@ -26,13 +29,9 @@ import android.widget.GridView; import android.widget.SimpleAdapter; import com.android.camera.IconListPreference; - -import com.android.gallery3d.R; +import com.android.camera2.R; import com.android.gallery3d.common.ApiHelper; -import java.util.ArrayList; -import java.util.HashMap; - // A popup window that shows video effect setting. It has two grid view. // One shows the goofy face effects. The other shows the background replacer // effects. |