Merge "Removing contentDescription as compilation fix"
This commit is contained in:
commit
82c22a853d
|
@ -42,12 +42,12 @@
|
||||||
android:layout_gravity="right|top"
|
android:layout_gravity="right|top"
|
||||||
android:layout_marginRight="2dip" />
|
android:layout_marginRight="2dip" />
|
||||||
|
|
||||||
<com.android.camera.ui.ModuleSwitcher
|
<!--com.android.camera.ui.ModuleSwitcher
|
||||||
android:id="@+id/camera_switcher"
|
android:id="@+id/camera_switcher"
|
||||||
style="@style/SwitcherButton"
|
style="@style/SwitcherButton"
|
||||||
android:layout_gravity="right|bottom"
|
android:layout_gravity="right|bottom"
|
||||||
android:layout_marginRight="2dip"
|
android:layout_marginRight="2dip"
|
||||||
android:contentDescription="@string/accessibility_mode_picker" />
|
android:contentDescription="@string/accessibility_mode_picker" /-->
|
||||||
|
|
||||||
<com.android.camera.ShutterButton
|
<com.android.camera.ShutterButton
|
||||||
android:id="@+id/shutter_button"
|
android:id="@+id/shutter_button"
|
||||||
|
|
|
@ -42,12 +42,12 @@
|
||||||
android:layout_marginBottom="2dip"
|
android:layout_marginBottom="2dip"
|
||||||
android:contentDescription="@string/accessibility_menu_button" />
|
android:contentDescription="@string/accessibility_menu_button" />
|
||||||
|
|
||||||
<com.android.camera.ui.ModuleSwitcher
|
<!--com.android.camera.ui.ModuleSwitcher
|
||||||
android:id="@+id/camera_switcher"
|
android:id="@+id/camera_switcher"
|
||||||
style="@style/SwitcherButton"
|
style="@style/SwitcherButton"
|
||||||
android:layout_gravity="bottom|left"
|
android:layout_gravity="bottom|left"
|
||||||
android:layout_marginBottom="2dip"
|
android:layout_marginBottom="2dip"
|
||||||
android:contentDescription="@string/accessibility_mode_picker" />
|
android:contentDescription="@string/accessibility_mode_picker" /-->
|
||||||
|
|
||||||
<com.android.camera.ShutterButton
|
<com.android.camera.ShutterButton
|
||||||
android:id="@+id/shutter_button"
|
android:id="@+id/shutter_button"
|
||||||
|
|
Loading…
Reference in New Issue