diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/keyguard_widget.xml | 63 | ||||
-rw-r--r-- | res/layout-port/keyguard_widget.xml | 60 | ||||
-rw-r--r-- | 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 | ||||
-rw-r--r-- | res/values-large/dimens.xml | 1 | ||||
-rw-r--r-- | res/values-sw600dp/dimens.xml | 1 | ||||
-rw-r--r-- | res/values-sw640dp/dimens.xml | 2 | ||||
-rw-r--r-- | res/values-xlarge/dimens.xml | 2 | ||||
-rwxr-xr-x | res/values/dimens.xml | 5 |
10 files changed, 0 insertions, 256 deletions
diff --git a/res/layout-land/keyguard_widget.xml b/res/layout-land/keyguard_widget.xml deleted file mode 100644 index 31569004a..000000000 --- a/res/layout-land/keyguard_widget.xml +++ /dev/null @@ -1,63 +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. ---> -<RelativeLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/camera_controls" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/default_background" > - - <ImageView - android:id="@+id/shutter_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_alignParentRight="true" - android:layout_marginRight="@dimen/shutter_offset" - android:contentDescription="@string/accessibility_shutter_button" - android:scaleType="center" - android:src="@drawable/btn_new_shutter" /> - - <include - android:layout_width="64dip" - android:layout_height="64dip" - android:layout_above="@id/shutter_button" - android:layout_alignParentRight="true" - android:layout_marginRight="6dip" - android:layout_marginTop="-5dip" - layout="@layout/menu_indicators_keyguard" /> - - <ImageView - android:id="@+id/camera_switcher" - style="@style/SwitcherButton" - android:layout_below="@id/shutter_button" - android:layout_alignParentRight="true" - android:layout_marginRight="2dip" - android:contentDescription="@string/accessibility_mode_picker" - android:scaleType="center" - android:src="@drawable/ic_switch_camera" /> - - <ImageView - android:id="@+id/camera_switcher_ind" - style="@style/SwitcherButton" - android:layout_below="@id/shutter_button" - android:layout_alignParentRight="true" - android:layout_marginRight="2dip" - android:contentDescription="@string/accessibility_mode_picker" - android:scaleType="center" - android:src="@android:color/transparent" /> - -</RelativeLayout> diff --git a/res/layout-port/keyguard_widget.xml b/res/layout-port/keyguard_widget.xml deleted file mode 100644 index 04816a35d..000000000 --- a/res/layout-port/keyguard_widget.xml +++ /dev/null @@ -1,60 +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. ---> -<RelativeLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/camera_controls" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/default_background" > - - <ImageView - android:id="@+id/shutter" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_centerHorizontal="true" - android:layout_marginBottom="@dimen/shutter_offset" - android:src="@drawable/btn_new_shutter" /> - - <include layout="@layout/menu_indicators_keyguard" - android:layout_width="64dip" - android:layout_height="64dip" - android:layout_toRightOf="@id/shutter" - android:layout_alignParentBottom="true" - android:layout_marginBottom="9dip" - android:layout_marginRight="-5dip" /> - - <ImageView - android:id="@+id/camera_switcher" - style="@style/SwitcherButton" - android:layout_toLeftOf="@id/shutter" - android:layout_alignParentBottom="true" - android:layout_marginBottom="3dip" - android:scaleType="center" - android:contentDescription="@string/accessibility_mode_picker" - android:src="@drawable/ic_switch_camera" /> - - <ImageView - android:id="@+id/camera_switcher_ind" - style="@style/SwitcherButton" - android:layout_toLeftOf="@id/shutter" - android:layout_alignParentBottom="true" - android:layout_marginBottom="3dip" - android:scaleType="center" - android:contentDescription="@string/accessibility_mode_picker" - android:src="@android:color/transparent" /> - -</RelativeLayout> diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml index 6be2af985..2d5712b79 100644 --- 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> diff --git a/res/values-large/dimens.xml b/res/values-large/dimens.xml index d663a9d42..adecc58e7 100644 --- a/res/values-large/dimens.xml +++ b/res/values-large/dimens.xml @@ -18,5 +18,4 @@ <dimen name="setting_row_height">@dimen/setting_row_height_large</dimen> <dimen name="setting_popup_window_width">@dimen/setting_popup_window_width_large</dimen> <dimen name="setting_item_icon_width">@dimen/setting_item_icon_width_large</dimen> - <dimen name="onscreen_indicators_height">@dimen/onscreen_indicators_height_large</dimen> </resources> diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index 5ec2f19b4..d8e88c47a 100644 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -18,7 +18,6 @@ <dimen name="setting_row_height">@dimen/setting_row_height_large</dimen> <dimen name="setting_popup_window_width">@dimen/setting_popup_window_width_large</dimen> <dimen name="setting_item_icon_width">@dimen/setting_item_icon_width_large</dimen> - <dimen name="onscreen_indicators_height">@dimen/onscreen_indicators_height_large</dimen> <dimen name="shutter_offset">-33dp</dimen> <dimen name="capture_size">80dip</dimen> <dimen name="capture_margin_top">16dip</dimen> diff --git a/res/values-sw640dp/dimens.xml b/res/values-sw640dp/dimens.xml index 51b3dad21..8c5272daa 100644 --- a/res/values-sw640dp/dimens.xml +++ b/res/values-sw640dp/dimens.xml @@ -35,7 +35,5 @@ <dimen name="effect_setting_clear_text_size">@dimen/effect_setting_clear_text_size_xlarge</dimen> <dimen name="effect_setting_clear_text_min_height">@dimen/effect_setting_clear_text_min_height_xlarge</dimen> <dimen name="effect_setting_type_text_left_padding">@dimen/effect_setting_type_text_left_padding_xlarge</dimen> - <dimen name="onscreen_indicators_height">@dimen/onscreen_indicators_height_xlarge</dimen> - <dimen name="onscreen_exposure_indicator_text_size">@dimen/onscreen_exposure_indicator_text_size_xlarge</dimen> </resources> diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml index 51b3dad21..8c5272daa 100644 --- a/res/values-xlarge/dimens.xml +++ b/res/values-xlarge/dimens.xml @@ -35,7 +35,5 @@ <dimen name="effect_setting_clear_text_size">@dimen/effect_setting_clear_text_size_xlarge</dimen> <dimen name="effect_setting_clear_text_min_height">@dimen/effect_setting_clear_text_min_height_xlarge</dimen> <dimen name="effect_setting_type_text_left_padding">@dimen/effect_setting_type_text_left_padding_xlarge</dimen> - <dimen name="onscreen_indicators_height">@dimen/onscreen_indicators_height_xlarge</dimen> - <dimen name="onscreen_exposure_indicator_text_size">@dimen/onscreen_exposure_indicator_text_size_xlarge</dimen> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 86654591d..6a62f6ab9 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -38,8 +38,6 @@ <dimen name="effect_setting_clear_text_size">20dp</dimen> <dimen name="effect_setting_clear_text_min_height">45dp</dimen> <dimen name="effect_setting_type_text_left_padding">16dp</dimen> - <dimen name="onscreen_indicators_height">28dp</dimen> - <dimen name="onscreen_exposure_indicator_text_size">15dp</dimen> <dimen name="switch_padding">16dp</dimen> <dimen name="switch_min_width">96dp</dimen> <dimen name="switch_text_max_width">44dp</dimen> @@ -50,7 +48,6 @@ <dimen name="setting_popup_window_width_large">260dp</dimen> <dimen name="indicator_bar_width_large">72dp</dimen> <dimen name="setting_item_icon_width_large">48dp</dimen> - <dimen name="onscreen_indicators_height_large">36dp</dimen> <dimen name="pano_mosaic_surface_height_xlarge">480dp</dimen> <dimen name="pano_review_button_width_xlarge">180dp</dimen> <dimen name="pano_review_button_height_xlarge">115dp</dimen> @@ -72,8 +69,6 @@ <dimen name="effect_setting_clear_text_size_xlarge">23dp</dimen> <dimen name="effect_setting_clear_text_min_height_xlarge">44dp</dimen> <dimen name="effect_setting_type_text_left_padding_xlarge">26dp</dimen> - <dimen name="onscreen_indicators_height_xlarge">36dp</dimen> - <dimen name="onscreen_exposure_indicator_text_size_xlarge">18dp</dimen> <dimen name="pie_progress_radius">25dp</dimen> <dimen name="pie_progress_width">3dp</dimen> <dimen name="pie_radius_start">80dp</dimen> |