summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ui/IndicatorButton.java
diff options
context:
space:
mode:
authorChung-yih Wang <cywang@google.com>2011-09-19 09:05:56 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-19 09:05:56 -0700
commit6e48f6c9ef082b2beb0145ebc28189c3d1a4f072 (patch)
tree18c21ee783218d953ace423fe415cf3180ee499e /src/com/android/camera/ui/IndicatorButton.java
parentcfa5dfffd63fe94f66b981bd72d50e293fe58f32 (diff)
parentdb3556078a75be0bd4a08195d90f060724034e88 (diff)
downloadLegacyCamera-6e48f6c9ef082b2beb0145ebc28189c3d1a4f072.zip
LegacyCamera-6e48f6c9ef082b2beb0145ebc28189c3d1a4f072.tar.gz
LegacyCamera-6e48f6c9ef082b2beb0145ebc28189c3d1a4f072.tar.bz2
Merge "Fix indicator bar height in video mode." into ics-factoryrom
Diffstat (limited to 'src/com/android/camera/ui/IndicatorButton.java')
-rw-r--r--src/com/android/camera/ui/IndicatorButton.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/ui/IndicatorButton.java b/src/com/android/camera/ui/IndicatorButton.java
index 6685358..880a650 100644
--- a/src/com/android/camera/ui/IndicatorButton.java
+++ b/src/com/android/camera/ui/IndicatorButton.java
@@ -100,7 +100,7 @@ public class IndicatorButton extends AbstractIndicatorButton implements BasicSet
protected void initializePopup() {
LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(
Context.LAYOUT_INFLATER_SERVICE);
- ViewGroup root = (ViewGroup) getRootView().findViewById(R.id.frame);
+ ViewGroup root = (ViewGroup) getRootView().findViewById(R.id.frame_layout);
BasicSettingPopup popup = (BasicSettingPopup) inflater.inflate(
R.layout.basic_setting_popup, root, false);