diff options
| author | Chung-yih Wang <cywang@google.com> | 2011-08-27 08:09:34 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-27 08:09:34 -0700 |
| commit | 5f47cc1a9ce83a5656751df5705674a1711687d1 (patch) | |
| tree | 76dd126dee9da6d571ecc1554bd9f153a4e900ca /src/com | |
| parent | 1a998d629d3cb28a1595ef38e41f800b289d1627 (diff) | |
| parent | f03611c90bb17682ae101b5fe6a7c45c1bf880f1 (diff) | |
| download | LegacyCamera-5f47cc1a9ce83a5656751df5705674a1711687d1.zip LegacyCamera-5f47cc1a9ce83a5656751df5705674a1711687d1.tar.gz LegacyCamera-5f47cc1a9ce83a5656751df5705674a1711687d1.tar.bz2 | |
Merge "Fix the monkey test issue."
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/camera/ui/IndicatorControlWheelContainer.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/camera/ui/IndicatorControlWheelContainer.java b/src/com/android/camera/ui/IndicatorControlWheelContainer.java index e3b3387..27f5455 100644 --- a/src/com/android/camera/ui/IndicatorControlWheelContainer.java +++ b/src/com/android/camera/ui/IndicatorControlWheelContainer.java @@ -48,12 +48,16 @@ public class IndicatorControlWheelContainer extends IndicatorControl { } @Override - public void initialize(Context context, PreferenceGroup group, - String flashSetting, String[] keys, String[] otherSettingKeys) { + protected void onFinishInflate() { mShutterButton = findViewById(R.id.shutter_button); mShutterButtonRadius = Util.dpToPixel(SHUTTER_BUTTON_RADIUS); mIndicatorControlWheel = (IndicatorControlWheel) findViewById( R.id.indicator_control_wheel); + } + + @Override + public void initialize(Context context, PreferenceGroup group, + String flashSetting, String[] keys, String[] otherSettingKeys) { mIndicatorControlWheel.initialize(context, group, flashSetting, keys, otherSettingKeys); // TODO: add ZoomControlWheel here. |