summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ui
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/ui')
-rw-r--r--src/com/android/camera/ui/BasicIndicator.java4
-rw-r--r--src/com/android/camera/ui/CamcorderHeadUpDisplay.java1
-rw-r--r--src/com/android/camera/ui/CameraHeadUpDisplay.java27
-rw-r--r--src/com/android/camera/ui/GpsIndicator.java6
-rw-r--r--src/com/android/camera/ui/HeadUpDisplay.java5
-rw-r--r--src/com/android/camera/ui/ZoomIndicator.java6
6 files changed, 34 insertions, 15 deletions
diff --git a/src/com/android/camera/ui/BasicIndicator.java b/src/com/android/camera/ui/BasicIndicator.java
index bb1102c..7630a8e 100644
--- a/src/com/android/camera/ui/BasicIndicator.java
+++ b/src/com/android/camera/ui/BasicIndicator.java
@@ -19,7 +19,6 @@ package com.android.camera.ui;
import android.content.Context;
import com.android.camera.IconListPreference;
-import com.android.camera.PreferenceGroup;
import com.android.camera.R;
import com.android.camera.Util;
import com.android.camera.ui.GLListView.OnItemSelectedListener;
@@ -34,8 +33,7 @@ class BasicIndicator extends AbstractIndicator {
private PreferenceAdapter mModel;
private String mOverride;
- public BasicIndicator(Context context,
- PreferenceGroup group, IconListPreference preference) {
+ public BasicIndicator(Context context, IconListPreference preference) {
super(context);
mPreference = preference;
mIcon = new ResourceTexture[preference.getLargeIconIds().length];
diff --git a/src/com/android/camera/ui/CamcorderHeadUpDisplay.java b/src/com/android/camera/ui/CamcorderHeadUpDisplay.java
index c90917d..8e98100 100644
--- a/src/com/android/camera/ui/CamcorderHeadUpDisplay.java
+++ b/src/com/android/camera/ui/CamcorderHeadUpDisplay.java
@@ -58,5 +58,6 @@ public class CamcorderHeadUpDisplay extends HeadUpDisplay {
addIndicator(context, group, CameraSettings.KEY_WHITE_BALANCE);
addIndicator(context, group, CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE);
addIndicator(context, group, CameraSettings.KEY_VIDEO_QUALITY);
+ addIndicator(context, group, CameraSettings.KEY_CAMERA_ID);
}
}
diff --git a/src/com/android/camera/ui/CameraHeadUpDisplay.java b/src/com/android/camera/ui/CameraHeadUpDisplay.java
index 9bdb68f..473ec2a 100644
--- a/src/com/android/camera/ui/CameraHeadUpDisplay.java
+++ b/src/com/android/camera/ui/CameraHeadUpDisplay.java
@@ -31,12 +31,21 @@ public class CameraHeadUpDisplay extends HeadUpDisplay {
private GpsIndicator mGpsIndicator;
private ZoomIndicator mZoomIndicator;
private Context mContext;
+ private float[] mInitialZoomRatios;
+ private int mInitialOrientation;
public CameraHeadUpDisplay(Context context) {
super(context);
mContext = context;
}
+ public void initialize(Context context, PreferenceGroup group,
+ float[] initialZoomRatios, int initialOrientation) {
+ mInitialZoomRatios = initialZoomRatios;
+ mInitialOrientation = initialOrientation;
+ super.initialize(context, group);
+ }
+
@Override
protected void initializeIndicatorBar(
Context context, PreferenceGroup group) {
@@ -61,12 +70,24 @@ public class CameraHeadUpDisplay extends HeadUpDisplay {
mIndicatorBar.addComponent(mOtherSettings);
mGpsIndicator = new GpsIndicator(
- context, group, (IconListPreference)
+ context, (IconListPreference)
group.findPreference(CameraSettings.KEY_RECORD_LOCATION));
mIndicatorBar.addComponent(mGpsIndicator);
addIndicator(context, group, CameraSettings.KEY_WHITE_BALANCE);
addIndicator(context, group, CameraSettings.KEY_FLASH_MODE);
+
+ if (mInitialZoomRatios != null) {
+ mZoomIndicator = new ZoomIndicator(mContext);
+ mZoomIndicator.setZoomRatios(mInitialZoomRatios);
+ mIndicatorBar.addComponent(mZoomIndicator);
+ } else {
+ mZoomIndicator = null;
+ }
+
+ addIndicator(context, group, CameraSettings.KEY_CAMERA_ID);
+
+ mIndicatorBar.setOrientation(mInitialOrientation);
}
public void setZoomListener(ZoomControllerListener listener) {
@@ -114,10 +135,6 @@ public class CameraHeadUpDisplay extends HeadUpDisplay {
}
private void setZoomRatiosLocked(float[] zoomRatios) {
- if (mZoomIndicator == null) {
- mZoomIndicator = new ZoomIndicator(mContext);
- mIndicatorBar.addComponent(mZoomIndicator);
- }
mZoomIndicator.setZoomRatios(zoomRatios);
}
}
diff --git a/src/com/android/camera/ui/GpsIndicator.java b/src/com/android/camera/ui/GpsIndicator.java
index 45f10b3..78a80b8 100644
--- a/src/com/android/camera/ui/GpsIndicator.java
+++ b/src/com/android/camera/ui/GpsIndicator.java
@@ -20,7 +20,6 @@ import android.content.Context;
import com.android.camera.R;
import com.android.camera.IconListPreference;
-import com.android.camera.PreferenceGroup;
class GpsIndicator extends BasicIndicator {
@@ -29,9 +28,8 @@ class GpsIndicator extends BasicIndicator {
private ResourceTexture mNoSignalIcon;
private boolean mHasSignal = false;
- public GpsIndicator(Context context,
- PreferenceGroup group, IconListPreference preference) {
- super(context, group, preference);
+ public GpsIndicator(Context context, IconListPreference preference) {
+ super(context, preference);
}
@Override
diff --git a/src/com/android/camera/ui/HeadUpDisplay.java b/src/com/android/camera/ui/HeadUpDisplay.java
index 05d575d..6a7c604 100644
--- a/src/com/android/camera/ui/HeadUpDisplay.java
+++ b/src/com/android/camera/ui/HeadUpDisplay.java
@@ -181,7 +181,10 @@ public class HeadUpDisplay extends GLView {
public void initialize(Context context, PreferenceGroup preferenceGroup) {
mPreferenceGroup = preferenceGroup;
mSharedPrefs = ComboPreferences.get(context);
+ mPopupWindow = null;
+ clearComponents();
initializeIndicatorBar(context, preferenceGroup);
+ requestLayout();
}
private void layoutPopupWindow(GLView anchorView) {
@@ -329,7 +332,7 @@ public class HeadUpDisplay extends GLView {
IconListPreference iconPref =
(IconListPreference) group.findPreference(key);
if (iconPref == null) return null;
- BasicIndicator indicator = new BasicIndicator(context, group, iconPref);
+ BasicIndicator indicator = new BasicIndicator(context, iconPref);
mIndicatorBar.addComponent(indicator);
return indicator;
}
diff --git a/src/com/android/camera/ui/ZoomIndicator.java b/src/com/android/camera/ui/ZoomIndicator.java
index ce6bef8..e74cefd 100644
--- a/src/com/android/camera/ui/ZoomIndicator.java
+++ b/src/com/android/camera/ui/ZoomIndicator.java
@@ -17,6 +17,7 @@
package com.android.camera.ui;
import android.content.Context;
+import android.util.Log;
import com.android.camera.R;
import com.android.camera.ui.ZoomControllerListener;
@@ -69,7 +70,7 @@ class ZoomIndicator extends AbstractIndicator {
if (mDrawIndex != mZoomIndex) {
mDrawIndex = mZoomIndex;
if (mTitle != null) mTitle.deleteFromGL();
- float value = mZoomRatios == null ? 0 : mZoomRatios[mZoomIndex];
+ float value = mZoomRatios[mZoomIndex];
mTitle = StringTexture.newInstance(
sZoomFormat.format(value), mFontSize, FONT_COLOR);
}
@@ -110,7 +111,8 @@ class ZoomIndicator extends AbstractIndicator {
public void setZoomRatios(float[] ratios) {
mZoomRatios = ratios;
- requestLayout();
+ mDrawIndex = -1;
+ invalidate();
}
private class MyZoomListener implements ZoomControllerListener {
generated by cgit v1.1 at 2025-08-17 20:36:26 +0000