commit f79e2d11f5ada36705bef1deb58f0f42504ef327
author Barnaby James <bjames@google.com> Wed Apr 15 15:43:30 2015 -0700
committer Barnaby James <bjames@google.com> Thu Apr 16 07:20:13 2015 -0700
tree 5cac5a4ea296a7c0aa8cdd69cc6deb82ea733c33
parent b8e02b8bd003fdcd5e680c7a6b37e1797ec12cc9

UI Tweaks to Zen Mode Voice Activity.

Small cleanup of the UI / strings.
- Cleanup of string constant names.
- Add a specific string for ZenModeVoiceActivity label.
- Change look of list position indicators.
- Add optional header to VoiceSettingsActivity.
- Fix NPE in some cases when disabling Zen mode.

Change-Id: Ic09ee2b1b5a50891b5447c2db0e3de3c475696bf

res/layout/voice_interaction.xml

diff --git a/res/layout/voice_interaction.xml b/res/layout/voice_interaction.xml
index 13c4341..ed0cd1a 100644
--- a/res/layout/voice_interaction.xml
+++ b/res/layout/voice_interaction.xml
@@ -14,10 +14,20 @@
      limitations under the License.
 -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fragment_root"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:padding="8dp"
+    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-</FrameLayout>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="@color/voice_interaction_highlight"
+        android:id="@+id/voice_fragment_header" />
+    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/voice_fragment_root"
+        android:padding="8dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>

res/layout/voice_item_row.xml

diff --git a/res/layout/voice_item_row.xml b/res/layout/voice_item_row.xml
index 8576a57..eca5ac9 100644
--- a/res/layout/voice_item_row.xml
+++ b/res/layout/voice_item_row.xml
@@ -23,8 +23,8 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="20dp">
+        android:layout_marginTop="15dp"
+        android:layout_marginBottom="15dp">
 
         <TextView
             android:layout_width="0px"
@@ -33,10 +33,10 @@
             android:id="@+id/voice_item_label" />
 
         <TextView
-            android:layout_width="100px"
-            android:layout_height="100px"
+            android:layout_width="80px"
+            android:layout_height="80px"
             android:gravity="center_horizontal|center_vertical"
-            android:background="@drawable/bg_circle_blue"
+            android:background="@drawable/bg_voice_position"
             android:textAppearance="?android:attr/textAppearanceMediumInverse"
             android:textStyle="bold"
             android:id="@+id/voice_item_position" />