summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ui/IndicatorWheel.java
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2011-06-30 17:27:21 +0800
committerWu-cheng Li <wuchengli@google.com>2011-07-05 12:03:07 +0800
commitc5e37cbb96b8284203560c51dd5f41c705a21f58 (patch)
treebf543e16a64dfde9925c469ed96db85de3b0caf1 /src/com/android/camera/ui/IndicatorWheel.java
parent95fd7f77171155a087b685ca405ac3891332f638 (diff)
downloadLegacyCamera-c5e37cbb96b8284203560c51dd5f41c705a21f58.zip
LegacyCamera-c5e37cbb96b8284203560c51dd5f41c705a21f58.tar.gz
LegacyCamera-c5e37cbb96b8284203560c51dd5f41c705a21f58.tar.bz2
Add expanded thumbnail in phone UI.
bug:4725968 Change-Id: I2a59a3714b93bc96f2a1689d948c9e4e0edd14cb
Diffstat (limited to 'src/com/android/camera/ui/IndicatorWheel.java')
-rw-r--r--src/com/android/camera/ui/IndicatorWheel.java29
1 files changed, 5 insertions, 24 deletions
diff --git a/src/com/android/camera/ui/IndicatorWheel.java b/src/com/android/camera/ui/IndicatorWheel.java
index 1a374da..c2d7d3c 100644
--- a/src/com/android/camera/ui/IndicatorWheel.java
+++ b/src/com/android/camera/ui/IndicatorWheel.java
@@ -16,7 +16,6 @@
package com.android.camera.ui;
-import com.android.camera.ComboPreferences;
import com.android.camera.IconListPreference;
import com.android.camera.PreferenceGroup;
import com.android.camera.R;
@@ -26,24 +25,22 @@ import android.content.res.Resources;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.RectF;
-import android.os.Handler;
import android.os.SystemClock;
import android.util.AttributeSet;
-import android.util.Log;
-import android.widget.ImageView;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
import android.view.LayoutInflater;
import android.view.MotionEvent;
-import android.view.ViewGroup;
import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
+import android.widget.ImageView;
import java.util.ArrayList;
/**
* A view that contains shutter button and camera setting indicators. The
* indicators are spreaded around the shutter button. The first child is always
- * the shutter button. The last indicator is always the share button.
+ * the shutter button.
*/
public class IndicatorWheel extends ViewGroup implements
BasicSettingPopup.Listener, OtherSettingsPopup.Listener {
@@ -98,7 +95,6 @@ public class IndicatorWheel extends ViewGroup implements
public void onSharedPreferenceChanged();
public void onRestorePreferencesClicked();
public void onOverriddenPreferencesClicked();
- public void onShareButtonClicked();
}
public void setListener(Listener listener) {
@@ -467,9 +463,6 @@ public class IndicatorWheel extends ViewGroup implements
}
mSettingPopups = new AbstractSettingPopup[len];
- // Add share button. It is always the last one.
- addIndicator(context, R.drawable.ic_viewfinder_share);
-
requestLayout();
}
@@ -494,12 +487,6 @@ public class IndicatorWheel extends ViewGroup implements
}
}
- public void onShareButtonClicked() {
- if (mListener != null) {
- mListener.onShareButtonClicked();
- }
- }
-
private void initializeSettingPopup(int index) {
LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(
Context.LAYOUT_INFLATER_SERVICE);
@@ -527,12 +514,6 @@ public class IndicatorWheel extends ViewGroup implements
private void showSettingPopup(int index) {
if (index == mSelectedIndex) return;
- // The share button is the last indicator.
- if (index == mIndicatorCount - 1) {
- onShareButtonClicked();
- return;
- }
-
if (mSettingPopups[index] == null) initializeSettingPopup(index);
if (mPrevAnimatingView != null) mPrevAnimatingView.clearAnimation();