Make round the border of on-preview text label.

Bug: 3298451
Change-Id: Ie3129d6a358f24d1ebbdd60417b0cd7ca8dbdd01

7 files changed, 68 insertions, 5 deletions

diff --git a/res/drawable-xlarge/btn_review_control.xml b/res/drawable-xlarge/btn_review_control.xml
index 98a44d5..1dd81ca 100644
--- a/res/drawable-xlarge/btn_review_control.xml
+++ b/res/drawable-xlarge/btn_review_control.xml
@@ -15,7 +15,7 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@color/review_control_pressed_color" />
-    <item android:drawable="@android:color/transparent" />
+    <item android:state_pressed="true" android:drawable="@drawable/bg_text_on_preview_pressed" />
+    <item android:drawable="@drawable/bg_text_on_preview_transparent" />
 </selector>
 
diff --git a/res/drawable/bg_text_on_preview.xml b/res/drawable/bg_text_on_preview.xml
new file mode 100644
index 0000000..cdc2b04
--- /dev/null
+++ b/res/drawable/bg_text_on_preview.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+        android:shape="rectangle">
+   <solid android:color="@color/on_viewfinder_label_background_color"/>
+   <corners android:radius="3dp"/>
+</shape>
diff --git a/res/drawable/bg_text_on_preview_pressed.xml b/res/drawable/bg_text_on_preview_pressed.xml
new file mode 100644
index 0000000..7d653d1
--- /dev/null
+++ b/res/drawable/bg_text_on_preview_pressed.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+        android:shape="rectangle">
+   <solid android:color="@color/review_control_pressed_color"/>
+   <corners android:radius="3dp"/>
+</shape>
diff --git a/res/drawable/bg_text_on_preview_transparent.xml b/res/drawable/bg_text_on_preview_transparent.xml
new file mode 100644
index 0000000..21893c6
--- /dev/null
+++ b/res/drawable/bg_text_on_preview_transparent.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+        android:shape="rectangle">
+   <solid android:color="@android:color/transparent"/>
+   <corners android:radius="3dp"/>
+</shape>
diff --git a/res/layout-xlarge/preview_frame_video.xml b/res/layout-xlarge/preview_frame_video.xml
index 33b9a19..a7d9d13 100644
--- a/res/layout-xlarge/preview_frame_video.xml
+++ b/res/layout-xlarge/preview_frame_video.xml
@@ -56,7 +56,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
-                android:background="@color/on_viewfinder_label_background_color"
+                android:background="@drawable/bg_text_on_preview"
                 android:visibility="gone">
             <ImageView style="@style/ReviewControlIcon"
                     android:id="@+id/btn_play"
diff --git a/res/layout-xlarge/review_control.xml b/res/layout-xlarge/review_control.xml
index 83b3175..63415d3 100644
--- a/res/layout-xlarge/review_control.xml
+++ b/res/layout-xlarge/review_control.xml
@@ -22,7 +22,7 @@
         android:layout_alignParentRight="true"
         android:layout_marginRight="20dp"
         android:layout_marginTop="20dp"
-        android:background="@color/on_viewfinder_label_background_color">
+        android:background="@drawable/bg_text_on_preview">
 
     <LinearLayout style="@style/ReviewControlGroup"
             android:visibility="gone">
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d6519f3..aabc62d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -117,6 +117,6 @@
         <item name="android:paddingBottom">3dp</item>
         <item name="android:textColor">@android:color/white</item>
         <item name="android:textSize">16dp</item>
-        <item name="android:background">@color/on_viewfinder_label_background_color</item>
+        <item name="android:background">@drawable/bg_text_on_preview</item>
     </style>
 </resources>