diff options
Diffstat (limited to 'res/layout')
-rwxr-xr-x | res/layout/camera_controls.xml | 8 | ||||
-rw-r--r-- | res/layout/menu_indicators.xml | 57 | ||||
-rw-r--r-- | res/layout/menu_indicators_keyguard.xml | 57 |
3 files changed, 0 insertions, 122 deletions
diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml index fee20f183..a59725aed 100755 --- a/res/layout/camera_controls.xml +++ b/res/layout/camera_controls.xml @@ -25,14 +25,6 @@ android:layout_gravity="bottom" android:clickable="true" /> - <include - android:layout_width="64dip" - android:layout_height="64dip" - android:layout_gravity="bottom|right" - android:layout_marginBottom="8dip" - android:layout_marginRight="-8dip" - layout="@layout/menu_indicators" /> - <com.android.camera.ui.RotateImageView android:id="@+id/menu" style="@style/MenuButton" diff --git a/res/layout/menu_indicators.xml b/res/layout/menu_indicators.xml deleted file mode 100644 index 037700349..000000000 --- a/res/layout/menu_indicators.xml +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/on_screen_indicators" - android:layout_width="64dip" - android:layout_height="64dip" > - - <ImageView - android:id="@+id/menu_scenemode_indicator" - style="@style/MenuIndicator" - android:layout_gravity="left|top" - android:src="@drawable/ic_indicator_sce_off" /> - - <ImageView - android:id="@+id/menu_timer_indicator" - style="@style/MenuIndicator" - android:layout_gravity="center_horizontal|top" - android:src="@drawable/ic_indicator_timer_off" /> - - <ImageView - android:id="@+id/menu_flash_indicator" - style="@style/MenuIndicator" - android:layout_gravity="right|top" - android:src="@drawable/ic_indicator_flash_off" /> - - <ImageView - android:id="@+id/menu_exposure_indicator" - style="@style/MenuIndicator" - android:layout_gravity="left|bottom" - android:src="@drawable/ic_indicator_ev_0" /> - - <ImageView - android:id="@+id/menu_location_indicator" - style="@style/MenuIndicator" - android:layout_gravity="center_horizontal|bottom" - android:src="@drawable/ic_indicator_loc_on" /> - - <ImageView - android:id="@+id/menu_wb_indicator" - style="@style/MenuIndicator" - android:layout_gravity="right|bottom" - android:src="@drawable/ic_indicator_wb_off" /> - -</FrameLayout> diff --git a/res/layout/menu_indicators_keyguard.xml b/res/layout/menu_indicators_keyguard.xml deleted file mode 100644 index f3631f67e..000000000 --- a/res/layout/menu_indicators_keyguard.xml +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/on_screen_indicators" - android:layout_width="64dip" - android:layout_height="64dip" > - - <ImageView - android:id="@+id/menu_scenemode_indicator" - style="@style/MenuIndicator" - android:layout_gravity="left|top" - android:src="@drawable/ic_indicator_sce_off" /> - - <ImageView - android:id="@+id/menu_timer_indicator" - style="@style/MenuIndicator" - android:layout_gravity="center_horizontal|top" - android:src="@drawable/ic_indicator_timer_off" /> - - <ImageView - android:id="@+id/menu_flash_indicator" - style="@style/MenuIndicator" - android:layout_gravity="right|top" - android:src="@drawable/ic_indicator_flash_off" /> - - <ImageView - android:id="@+id/menu_exposure_indicator" - style="@style/MenuIndicator" - android:layout_gravity="left|bottom" - android:src="@drawable/ic_indicator_ev_0" /> - - <ImageView - android:id="@+id/menu_location_indicator" - style="@style/MenuIndicator" - android:layout_gravity="center_horizontal|bottom" - android:src="@drawable/ic_indicator_loc_on" /> - - <ImageView - android:id="@+id/menu_wb_indicator" - style="@style/MenuIndicator" - android:layout_gravity="right|bottom" - android:src="@drawable/ic_indicator_wb_off" /> - -</FrameLayout> |