summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/camera_controls.xml14
-rw-r--r--res/layout/camera_filmstrip.xml5
-rw-r--r--res/layout/countdown_setting_popup.xml4
-rw-r--r--res/layout/crop_actionbar.xml2
-rw-r--r--res/layout/crop_activity.xml2
-rw-r--r--res/layout/in_line_setting_menu.xml1
-rw-r--r--res/layout/list_menu_item.xml2
-rw-r--r--res/layout/placeholder_progressbar.xml3
-rw-r--r--res/layout/rotate_dialog.xml2
-rw-r--r--res/layout/rotate_text_toast.xml5
-rw-r--r--res/layout/tinyplanet_editor.xml6
11 files changed, 21 insertions, 25 deletions
diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml
index 9d6ebf090..a1f311fe2 100644
--- a/res/layout/camera_controls.xml
+++ b/res/layout/camera_controls.xml
@@ -34,10 +34,8 @@
layout="@layout/menu_indicators" />
<com.android.camera.ui.RotateImageView
- android:id="@+id/menu"
- style="@style/MenuButton"
- android:contentDescription="@string/accessibility_menu_button"
- android:src="@drawable/ic_settings" />
+ android:id="@+id/filter_mode_switcher"
+ style="@style/ToggleButton" />
<com.android.camera.ui.RotateImageView
android:id="@+id/mute_button"
@@ -59,6 +57,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"
@@ -97,11 +96,14 @@
<com.android.camera.ui.RotateImageView
android:id="@+id/scene_mode_switcher"
+ android:src="@drawable/ic_sce"
style="@style/ToggleButton" />
<com.android.camera.ui.RotateImageView
- android:id="@+id/filter_mode_switcher"
- style="@style/ToggleButton" />
+ android:id="@+id/menu"
+ style="@style/MenuButton"
+ android:contentDescription="@string/accessibility_menu_button"
+ android:src="@drawable/ic_settings" />
<com.android.camera.ui.RotateImageView
android:id="@+id/ts_makeup_switcher"
diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml
index 00bbcdb7f..2075a94f4 100644
--- a/res/layout/camera_filmstrip.xml
+++ b/res/layout/camera_filmstrip.xml
@@ -48,9 +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"
@@ -61,7 +60,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/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_actionbar.xml b/res/layout/crop_actionbar.xml
index 1259d3f95..4d0e9359a 100644
--- a/res/layout/crop_actionbar.xml
+++ b/res/layout/crop_actionbar.xml
@@ -22,4 +22,4 @@
android:gravity="center_vertical"
android:textSize="14sp"
android:drawableLeft="@drawable/menu_save_photo"
- android:drawablePadding="8dip" /> \ No newline at end of file
+ android:drawablePadding="8dip" />
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/in_line_setting_menu.xml b/res/layout/in_line_setting_menu.xml
index f45f10ff7..4a5409739 100644
--- a/res/layout/in_line_setting_menu.xml
+++ b/res/layout/in_line_setting_menu.xml
@@ -24,4 +24,3 @@
style="@style/SettingItemText" />
</com.android.camera.ui.InLineSettingMenu>
-
diff --git a/res/layout/list_menu_item.xml b/res/layout/list_menu_item.xml
index fdf63f778..53ef47682 100644
--- a/res/layout/list_menu_item.xml
+++ b/res/layout/list_menu_item.xml
@@ -61,7 +61,7 @@
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/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..d0e117aed 100644
--- a/res/layout/rotate_text_toast.xml
+++ b/res/layout/rotate_text_toast.xml
@@ -30,10 +30,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:textAppearanceMedium"
- android:textColor="@android:color/white"
- android:shadowColor="#BB000000"
+ android:textColor="@color/white"
android:shadowRadius="2.75" />
</FrameLayout>
</com.android.camera.ui.RotateLayout>
-
-
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-20 00:15:27 +0000