diff options
-rw-r--r-- | res/layout/scene_mode_label.xml | 12 | ||||
-rw-r--r-- | src/com/android/camera/CaptureUI.java | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/res/layout/scene_mode_label.xml b/res/layout/scene_mode_label.xml index aa5ef211c..e0d8d43b8 100644 --- a/res/layout/scene_mode_label.xml +++ b/res/layout/scene_mode_label.xml @@ -33,7 +33,8 @@ android:layout_height="wrap_content" android:layout_marginRight="20dp" android:background="#90000000" - android:orientation="horizontal"> + android:orientation="horizontal" + android:gravity="center_vertical"> <TextView android:id="@+id/scene_mode_label" android:singleLine="true" @@ -43,8 +44,13 @@ style="@style/OnViewfinderSceneLabel" /> <ImageView android:id="@+id/scene_mode_label_close" - android:src="@drawable/x" - style="@style/OnViewfinderSceneLabel"/> + android:layout_width="15dp" + android:layout_height="15dp" + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:layout_marginTop="5dp" + android:layout_marginBottom="5dp" + android:src="@drawable/x" /> </LinearLayout> </com.android.camera.ui.RotateLayout> </LinearLayout>
\ No newline at end of file diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index 8d54d1691..1bb20e9f7 100644 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -659,7 +659,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, (LayoutInflater)mActivity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); View view = inflater.inflate(R.layout.scene_mode_instructional, null); - int index = mSettingsManager.getValueIndex(SettingsManager.KEY_SCENE_MODE); + final int index = mSettingsManager.getValueIndex(SettingsManager.KEY_SCENE_MODE); TextView name = (TextView)view.findViewById(R.id.scene_mode_name); CharSequence sceneModeNameArray[] = mSettingsManager.getEntries(SettingsManager.KEY_SCENE_MODE); |