diff options
Diffstat (limited to 'res/layout')
28 files changed, 62 insertions, 293 deletions
diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml index 59f395b19..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" @@ -59,6 +51,7 @@ android:layout_height="@dimen/shutter_size" android:layout_gravity="bottom|center_horizontal" android:layout_marginBottom="@dimen/shutter_offset" + android:layout_marginTop="@dimen/shutter_offset_top" android:clickable="true" android:contentDescription="@string/accessibility_shutter_button" android:focusable="true" @@ -72,6 +65,7 @@ android:layout_height="@dimen/shutter_size" android:layout_gravity="bottom|center_horizontal" android:layout_marginBottom="@dimen/shutter_offset" + android:layout_marginTop="@dimen/shutter_offset_top" android:clickable="true" android:contentDescription="@string/accessibility_shutter_button" android:focusable="true" diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml index 00bbcdb7f..cb49367d0 100644 --- a/res/layout/camera_filmstrip.xml +++ b/res/layout/camera_filmstrip.xml @@ -48,12 +48,8 @@ <TextView android:id="@+id/pano_stitching_progress_text" android:text="@string/rendering_photo_sphere" - android:textColor="#ffffffff" + android:textColor="@color/white" android:textSize="14sp" - android:shadowColor="#ff000000" - android:shadowDx="0" - android:shadowDy="0" - android:shadowRadius="2" android:layout_width="wrap_content" android:layout_height="wrap_content" android:visibility="visible" @@ -61,7 +57,7 @@ <ProgressBar android:id="@+id/pano_stitching_progress_bar" - style="@android:style/Widget.Holo.Light.ProgressBar.Horizontal" + style="@android:style/Widget.Material.Light.ProgressBar.Horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="visible" diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml index 1c012c5c7..a1257a1be 100755 --- a/res/layout/capture_module.xml +++ b/res/layout/capture_module.xml @@ -24,7 +24,6 @@ layout. --> <merge xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center"> @@ -108,6 +107,10 @@ android:layout_height="200dip" android:layout_marginTop="50dip" android:layout_marginLeft="15dip" /> + <com.android.camera.ui.focus.FocusRingView + android:id="@+id/focus_ring" + android:layout_width="match_parent" + android:layout_height="match_parent" /> </FrameLayout> <com.android.camera.ui.RenderOverlay @@ -165,11 +168,6 @@ layout="@layout/one_ui_layout" android:layout_gravity="center" /> - <include - style="@style/CameraControls" - layout="@layout/menu_help" - android:layout_gravity="center" /> - <FrameLayout android:id="@+id/preview_of_intent" android:layout_height="match_parent" diff --git a/res/layout/countdown_setting_popup.xml b/res/layout/countdown_setting_popup.xml index 22acd9251..9baa88217 100644 --- a/res/layout/countdown_setting_popup.xml +++ b/res/layout/countdown_setting_popup.xml @@ -66,7 +66,7 @@ android:orientation="vertical" > <View - android:background="#40ffffff" + android:background="@color/white" android:layout_width="match_parent" android:layout_height="1dip" /> <LinearLayout @@ -84,7 +84,7 @@ </LinearLayout> <View - android:background="#40ffffff" + android:background="@color/white" android:layout_width="match_parent" android:layout_height="1dip" /> diff --git a/res/layout/crop_activity.xml b/res/layout/crop_activity.xml index a2841e61a..3871d32e5 100644 --- a/res/layout/crop_activity.xml +++ b/res/layout/crop_activity.xml @@ -39,7 +39,7 @@ <ProgressBar android:id="@+id/loading" - style="@android:style/Widget.Holo.ProgressBar.Large" + style="@android:style/Widget.Material.ProgressBar.Large" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" diff --git a/res/layout/filmstrip_bottom_controls.xml b/res/layout/filmstrip_bottom_controls.xml index 1ad07aee9..ef370a327 100644 --- a/res/layout/filmstrip_bottom_controls.xml +++ b/res/layout/filmstrip_bottom_controls.xml @@ -26,17 +26,13 @@ <ImageButton android:id="@+id/filmstrip_bottom_control_edit" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_width="48dp" + android:layout_height="48dp" android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:background="@drawable/photopage_bottom_button_background" - android:paddingBottom="5dp" - android:paddingLeft="15dp" - android:paddingRight="15dp" - android:paddingTop="5dp" - android:src="@drawable/ic_menu_edit_holo_dark" + android:background="?android:attr/selectableItemBackgroundBorderless" + android:src="@drawable/ic_menu_edit" android:visibility="gone" /> <ImageButton @@ -52,16 +48,12 @@ <ImageButton android:id="@+id/filmstrip_bottom_control_tiny_planet" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_width="48dp" + android:layout_height="48dp" android:layout_alignParentBottom="true" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" - android:background="@drawable/photopage_bottom_button_background" - android:paddingBottom="5dp" - android:paddingLeft="15dp" - android:paddingRight="15dp" - android:paddingTop="5dp" + android:background="?android:attr/selectableItemBackgroundBorderless" android:src="@drawable/ic_menu_tiny_planet" android:visibility="gone" /> diff --git a/res/layout/filter_mode_view.xml b/res/layout/filter_mode_view.xml index 558d7ce77..d4128f533 100644 --- a/res/layout/filter_mode_view.xml +++ b/res/layout/filter_mode_view.xml @@ -35,24 +35,21 @@ <LinearLayout android:layout_width="@dimen/filter_mode_width" android:layout_height="@dimen/filter_mode_height" - android:orientation="vertical"> + android:background="@drawable/scene_filter_item_bg" + android:orientation="vertical" + android:padding="2dp"> <ImageView android:id="@+id/image" android:layout_width="80dp" android:layout_height="80dp" - android:layout_gravity="center" - android:padding="2dp" /> + android:layout_gravity="center" /> <TextView android:id="@+id/label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:shadowColor="@android:color/black" - android:shadowDx="1" - android:shadowDy="1" - android:shadowRadius="2" android:singleLine="true" android:textColor="@android:color/white" android:textSize="13sp" diff --git a/res/layout/horiz_grid.xml b/res/layout/horiz_grid.xml index 910b0ea66..63dc5cf3c 100644 --- a/res/layout/horiz_grid.xml +++ b/res/layout/horiz_grid.xml @@ -29,7 +29,6 @@ <HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:alpha="0.85" android:background="@color/popup_background" android:scrollbars="none" > diff --git a/res/layout/list_menu.xml b/res/layout/list_menu.xml index e110fd571..dd4354456 100644 --- a/res/layout/list_menu.xml +++ b/res/layout/list_menu.xml @@ -29,7 +29,6 @@ <com.android.camera.ui.ListMenu xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="@dimen/big_setting_popup_window_width" android:layout_height="wrap_content" - android:alpha="0.85" android:background="@color/popup_background" android:scrollbars="none" > diff --git a/res/layout/list_menu_item.xml b/res/layout/list_menu_item.xml index fdf63f778..070ffe5d9 100644 --- a/res/layout/list_menu_item.xml +++ b/res/layout/list_menu_item.xml @@ -29,7 +29,7 @@ <com.android.camera.ui.ListMenuItem xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="horizontal" + android:background="@drawable/setting_list_item_bg" android:padding="5dip" > <ImageView @@ -37,6 +37,7 @@ android:layout_width="@dimen/setting_item_icon_width" android:layout_height="@dimen/setting_item_icon_width" android:layout_alignParentStart="true" + android:layout_centerVertical="true" android:layout_marginEnd="15dp" android:gravity="center" /> @@ -44,7 +45,6 @@ android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignTop="@+id/list_image" android:layout_toEndOf="@+id/list_image" android:textColor="@android:color/white" android:textStyle="bold" /> @@ -56,12 +56,8 @@ android:layout_below="@id/title" android:layout_marginTop="1dip" android:layout_toEndOf="@+id/list_image" - android:shadowColor="@android:color/black" - android:shadowDx="1" - android:shadowDy="1" - android:shadowRadius="2" android:text="@string/crop_save" - android:textColor="#33b5e5" + android:textColor="@color/white" android:textSize="10dip" android:textStyle="bold" /> diff --git a/res/layout/list_sub_menu.xml b/res/layout/list_sub_menu.xml index eaab0948e..6d4ff1aff 100644 --- a/res/layout/list_sub_menu.xml +++ b/res/layout/list_sub_menu.xml @@ -29,11 +29,8 @@ <com.android.camera.ui.ListSubMenu xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:alpha="0.85" android:background="@drawable/list_border" - android:divider="@color/list_divider_color" - android:dividerHeight="1dp" - android:listSelector="@drawable/list_selector" + android:choiceMode="singleChoice" android:scrollbars="none" > </com.android.camera.ui.ListSubMenu> diff --git a/res/layout/list_sub_menu_item.xml b/res/layout/list_sub_menu_item.xml index db417d689..f5f5f63c6 100644 --- a/res/layout/list_sub_menu_item.xml +++ b/res/layout/list_sub_menu_item.xml @@ -45,10 +45,6 @@ android:id="@+id/text" style="@style/CustomSettingItemTitle" android:layout_toRightOf="@+id/image" - android:shadowColor="@android:color/transparent" - android:shadowDx="1" - android:shadowDy="1" - android:shadowRadius="2" android:textColor="@android:color/white" android:textStyle="bold" /> diff --git a/res/layout/menu_help.xml b/res/layout/menu_help.xml deleted file mode 100644 index aa6b97ac5..000000000 --- a/res/layout/menu_help.xml +++ /dev/null @@ -1,69 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -Copyright (c) 2016, The Linux Foundation. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of The Linux Foundation nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---> -<com.android.camera.ui.MenuHelp xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/menu_help" - android:visibility="gone" - android:layout_width="match_parent" - android:layout_height="match_parent"> - <View - android:id="@+id/background" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="bottom"/> - <com.android.camera.ui.Arrows - android:id="@+id/arrows" - android:layout_width="match_parent" - android:layout_height="match_parent"/> - <com.android.camera.ui.RotateLayout - android:id="@+id/help_text_0_0" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - style="@style/MenuButton"/> - <com.android.camera.ui.RotateLayout - android:id="@+id/help_text_1_0" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - style="@style/MenuButton"/> - <com.android.camera.ui.RotateLayout - android:id="@+id/help_text_3_0" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - style="@style/MenuButton"/> - <com.android.camera.ui.RotateLayout - android:id="@+id/help_text_4_6" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - style="@style/MenuButton"/> - <com.android.camera.ui.RotateLayout - android:id="@+id/help_ok_2_4" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - style="@style/MenuButton"/> -</com.android.camera.ui.MenuHelp> 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/layout/one_ui_layout.xml b/res/layout/one_ui_layout.xml index a10d56549..1c4f52f47 100755 --- a/res/layout/one_ui_layout.xml +++ b/res/layout/one_ui_layout.xml @@ -48,9 +48,9 @@ android:contentDescription="@string/accessibility_shutter_button" android:focusable="true" android:scaleType="fitCenter" - android:src="@drawable/photo_capture" /> + android:src="@drawable/btn_new_shutter" /> - <com.android.camera.ui.RotateImageView + <ImageView android:id="@+id/video_button" android:layout_width="@dimen/one_ui_bottom_small" android:layout_height="@dimen/one_ui_bottom_small" @@ -58,7 +58,7 @@ android:contentDescription="@string/accessibility_shutter_button" android:focusable="true" android:scaleType="fitCenter" - android:src="@drawable/video_capture" /> + android:src="@drawable/btn_new_shutter_video" /> <com.android.camera.PauseButton android:id="@+id/video_pause" diff --git a/res/layout/pano_module_capture.xml b/res/layout/pano_module_capture.xml index b67315cd3..7b2108484 100644 --- a/res/layout/pano_module_capture.xml +++ b/res/layout/pano_module_capture.xml @@ -16,6 +16,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/panorama_capture_layout" + android:background="@android:color/black" android:layout_width="match_parent" android:layout_height="match_parent" > @@ -23,7 +24,7 @@ android:id="@+id/pano_preview_layout" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_gravity="center" > + android:layout_gravity="center_vertical|center_horizontal" > <TextureView android:id="@+id/pano_preview_textureview" @@ -32,10 +33,17 @@ <View android:id="@+id/pano_preview_area_border" - android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_width="64dp" + android:layout_height="64dp" android:background="@drawable/ic_pan_border_fast" android:visibility="gone" /> + + <View + android:id="@+id/preview_cover" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@android:color/black" /> + </FrameLayout> <LinearLayout @@ -73,9 +81,7 @@ style="@style/PanoViewHorizontalBar" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_weight="1" - android:gravity="top" - android:paddingTop="20dp" > + android:layout_weight="1"> <LinearLayout android:layout_width="match_parent" diff --git a/res/layout/pano_module_review.xml b/res/layout/pano_module_review.xml index aecf6f8b2..0a5f164f1 100644 --- a/res/layout/pano_module_review.xml +++ b/res/layout/pano_module_review.xml @@ -18,6 +18,7 @@ android:id="@+id/pano_review_layout" android:orientation="vertical" android:visibility="invisible" + android:background="@android:color/black" android:layout_height="match_parent" android:layout_width="match_parent"> diff --git a/res/layout/pano_review_control.xml b/res/layout/pano_review_control.xml index eeb2ebee4..4b51bda3b 100644 --- a/res/layout/pano_review_control.xml +++ b/res/layout/pano_review_control.xml @@ -29,5 +29,5 @@ style="@style/ReviewControlIcon" android:contentDescription="@string/accessibility_review_cancel" android:layout_gravity="center_horizontal|bottom" - android:src="@drawable/ic_menu_cancel_holo_light" /> + android:src="@drawable/exit_panorama" /> </merge> diff --git a/res/layout/panorama_module.xml b/res/layout/panorama_module.xml index 5ae300272..d8748cc8b 100644 --- a/res/layout/panorama_module.xml +++ b/res/layout/panorama_module.xml @@ -19,12 +19,6 @@ android:layout_width="match_parent" android:layout_height="match_parent"> <include layout="@layout/pano_module_capture" /> - <View - android:id="@+id/preview_cover" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@android:color/black" - android:visibility="gone" /> <com.android.camera.ui.RotateLayout android:id="@+id/waitingDialog" diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml index d65dbd4f6..ba5758747 100755 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -45,16 +45,6 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> - <ProgressBar - style="?android:attr/progressBarStyleHorizontal" - android:id="@+id/progress" - android:orientation="vertical" - android:layout_width="200dip" - android:layout_height="wrap_content" - android:layout_marginTop="14dip" - android:layout_marginBottom="14dip" - android:layout_marginLeft="30dip" - android:layout_marginRight="30dip" /> <com.android.camera.GraphView android:id="@+id/graph_view" android:layout_width="200dip" @@ -68,6 +58,10 @@ android:layout_marginTop="50dip" android:layout_marginLeft="15dip" /> </RelativeLayout> + <com.android.camera.ui.focus.FocusRingView + android:id="@+id/focus_ring" + android:layout_width="match_parent" + android:layout_height="match_parent" /> <com.android.camera.ui.RotateImageView android:id="@+id/review_image" android:layout_width="match_parent" @@ -100,9 +94,7 @@ <include layout="@layout/camera_controls" android:layout_gravity="center" style="@style/CameraControls"/> - <include layout="@layout/menu_help" - android:layout_gravity="center" - style="@style/CameraControls"/> + <RelativeLayout android:id="@+id/id_tsmakeup_level_layout_root" android:layout_width="match_parent" diff --git a/res/layout/placeholder_progressbar.xml b/res/layout/placeholder_progressbar.xml index 45eadfbe0..762186e42 100644 --- a/res/layout/placeholder_progressbar.xml +++ b/res/layout/placeholder_progressbar.xml @@ -17,7 +17,7 @@ <ProgressBar xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/placeholder_progress" - style="@android:style/Widget.Holo.ProgressBar.Large" + style="@android:style/Widget.Material.ProgressBar.Large" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|center_horizontal" @@ -26,4 +26,3 @@ android:indeterminate="true" android:indeterminateOnly="true" android:background="@null"/> - diff --git a/res/layout/rotate_dialog.xml b/res/layout/rotate_dialog.xml index c62ce915b..48a6e69d6 100644 --- a/res/layout/rotate_dialog.xml +++ b/res/layout/rotate_dialog.xml @@ -18,7 +18,7 @@ android:clickable="true" android:gravity="center" android:visibility="gone" - android:background="#55000000" + android:background="@color/black" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/res/layout/rotate_text_toast.xml b/res/layout/rotate_text_toast.xml index 2c89b6f59..474ea575d 100644 --- a/res/layout/rotate_text_toast.xml +++ b/res/layout/rotate_text_toast.xml @@ -24,16 +24,14 @@ <FrameLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/toast_frame_holo"> + android:background="@drawable/toast_frame"> <TextView android:id="@+id/message" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?android:textAppearanceMedium" - android:textColor="@android:color/white" + android:textAppearance="@style/ToastTextAppearance" + android:textColor="@color/toast_text" android:shadowColor="#BB000000" android:shadowRadius="2.75" /> </FrameLayout> </com.android.camera.ui.RotateLayout> - - diff --git a/res/layout/scene_mode_view.xml b/res/layout/scene_mode_view.xml index d4c2a259c..88d6e89d4 100644 --- a/res/layout/scene_mode_view.xml +++ b/res/layout/scene_mode_view.xml @@ -30,15 +30,13 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="center" - android:orientation="vertical" android:padding="@dimen/scene_mode_padding" > <LinearLayout - android:id="@+id/border" android:layout_width="@dimen/scene_mode_width" android:layout_height="@dimen/scene_mode_height" android:layout_gravity="center" - android:background="@drawable/scene_mode_view_border" + android:background="@drawable/scene_filter_item_bg" android:orientation="vertical" android:padding="2dp" > @@ -54,10 +52,6 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:gravity="center" - android:shadowColor="@android:color/black" - android:shadowDx="1" - android:shadowDy="1" - android:shadowRadius="2" android:singleLine="true" android:textColor="@android:color/white" android:textSize="13sp" diff --git a/res/layout/tinyplanet_editor.xml b/res/layout/tinyplanet_editor.xml index 8880c2cfb..f5bd5d2a3 100644 --- a/res/layout/tinyplanet_editor.xml +++ b/res/layout/tinyplanet_editor.xml @@ -37,7 +37,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/tiny_planet_zoom" - android:textColor="#FFF" /> + android:textColor="@color/white" /> <SeekBar android:id="@+id/zoomSlider" @@ -52,7 +52,7 @@ android:layout_height="wrap_content" android:layout_marginTop="5dp" android:text="@string/tiny_planet_rotate" - android:textColor="#FFF" /> + android:textColor="@color/white" /> <SeekBar android:id="@+id/angleSlider" @@ -70,4 +70,4 @@ android:text="@string/create_tiny_planet" /> </LinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/vertical_grid.xml b/res/layout/vertical_grid.xml index 0754d0483..9c746f9ed 100644 --- a/res/layout/vertical_grid.xml +++ b/res/layout/vertical_grid.xml @@ -29,7 +29,6 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:alpha="0.85" android:background="@color/popup_background" android:scrollbars="none" > diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml index 56f585787..0d8c4cb30 100755 --- a/res/layout/video_module.xml +++ b/res/layout/video_module.xml @@ -97,6 +97,11 @@ android:onClick="onReviewPlayClicked"/> </FrameLayout> + <com.android.camera.ui.focus.FocusRingView + android:id="@+id/focus_ring" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + <include layout="@layout/camera_controls" android:layout_gravity="center" style="@style/CameraControls"/> |