Fix the NPE in IndicatorControlBarContainer.

bug:5299759

move the view inits to onFinishInflate().

Change-Id: I3a3adb01805fbfb5e22d58f86c9d5da3ce3585a6

2 files changed, 27 insertions, 20 deletions

diff --git a/src/com/android/camera/ui/IndicatorControlBar.java b/src/com/android/camera/ui/IndicatorControlBar.java
index ff986ee..3838508 100644
--- a/src/com/android/camera/ui/IndicatorControlBar.java
+++ b/src/com/android/camera/ui/IndicatorControlBar.java
@@ -39,6 +39,14 @@ public class IndicatorControlBar extends IndicatorControl implements
         super(context, attrs);
     }
 
+    @Override
+    protected void onFinishInflate() {
+        mZoomIcon = (ImageView) findViewById(R.id.zoom_control_icon);
+        mSecondLevelIcon = (ImageView)
+                findViewById(R.id.second_level_indicator_bar_icon);
+        mSecondLevelIcon.setOnClickListener(this);
+    }
+
     public void initialize(Context context, PreferenceGroup group,
             String flashSetting, boolean zoomSupported) {
         // From UI spec, we have camera_flash setting on the first level.
@@ -50,13 +58,10 @@ public class IndicatorControlBar extends IndicatorControl implements
 
         // add Zoom Icon.
         if (zoomSupported) {
-            mZoomIcon = (ImageView) findViewById(R.id.zoom_control_icon);
             mZoomIcon.setOnTouchListener(this);
             mZoomIcon.setVisibility(View.VISIBLE);
         }
 
-        mSecondLevelIcon = (ImageView) findViewById(R.id.second_level_indicator_bar_icon);
-        mSecondLevelIcon.setOnClickListener(this);
         requestLayout();
     }
 
diff --git a/src/com/android/camera/ui/IndicatorControlBarContainer.java b/src/com/android/camera/ui/IndicatorControlBarContainer.java
index b06c63f..d425c59 100644
--- a/src/com/android/camera/ui/IndicatorControlBarContainer.java
+++ b/src/com/android/camera/ui/IndicatorControlBarContainer.java
@@ -43,36 +43,38 @@ public class IndicatorControlBarContainer extends IndicatorControlContainer
 
     public IndicatorControlBarContainer(Context context, AttributeSet attrs) {
         super(context, attrs);
+        mFadeIn = AnimationUtils.loadAnimation(
+                context, R.anim.grow_fade_in_from_bottom);
+        mFadeOut = AnimationUtils.loadAnimation(
+                context, R.anim.shrink_fade_out_from_top);
     }
 
     @Override
-    public void initialize(Context context, PreferenceGroup group,
-            String flashSetting, boolean isZoomSupported,
-            String[] secondLevelKeys, String[] secondLevelOtherSettingKeys) {
-        mZoomControlBar = (ZoomControlBar)
-                findViewById(R.id.zoom_control);
+    protected void onFinishInflate() {
+        mZoomControlBar = (ZoomControlBar) findViewById(R.id.zoom_control);
         mZoomControlBar.setOnIndicatorEventListener(this);
         mZoomIndexBar = (ZoomIndexBar) findViewById(R.id.zoom_index_bar);
         mZoomControlBar.setOnZoomIndexChangeListener(mZoomIndexBar);
-
-        // We need to show/hide the zoom slider icon accordingly.
-        // From UI spec, we have camera_flash setting on the first level.
         mIndicatorControlBar = (IndicatorControlBar)
                 findViewById(R.id.indicator_bar);
-        mIndicatorControlBar.initialize(context, group, flashSetting,
-                isZoomSupported);
         mIndicatorControlBar.setOnIndicatorEventListener(this);
-
         mSecondLevelIndicatorControlBar = (SecondLevelIndicatorControlBar)
                 findViewById(R.id.second_level_indicator_bar);
-        mSecondLevelIndicatorControlBar.initialize(context, group, secondLevelKeys,
-                secondLevelOtherSettingKeys);
         mSecondLevelIndicatorControlBar.setOnIndicatorEventListener(this);
+    }
 
-        mFadeIn = AnimationUtils.loadAnimation(
-                context, R.anim.grow_fade_in_from_bottom);
-        mFadeOut = AnimationUtils.loadAnimation(
-                context, R.anim.shrink_fade_out_from_top);
+    @Override
+    public void initialize(Context context, PreferenceGroup group,
+            String flashSetting, boolean isZoomSupported,
+            String[] secondLevelKeys, String[] secondLevelOtherSettingKeys) {
+
+        // We need to show/hide the zoom slider icon accordingly.
+        // From UI spec, we have camera_flash setting on the first level.
+        mIndicatorControlBar.initialize(context, group, flashSetting,
+                isZoomSupported);
+
+        mSecondLevelIndicatorControlBar.initialize(context, group,
+                secondLevelKeys, secondLevelOtherSettingKeys);
     }
 
     public void setDegree(int degree) {