commit e571ed0668642784e814d27c7ca94fb85861a64c
author Jorim Jaggi <jjaggi@google.com> Tue Sep 16 17:53:26 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 16 17:53:27 2014 +0000
tree 0e7044e8c38cfa9506e1628921bea9ccac20f581
parent 1dd9048b3ffc8380e9ce63c8e627499a8402d71a
parent 072707dfad1da6f49f4d3ce58ca104f6c46a7266

Merge "Use RenderThread for navigation bar ripples" into lmp-dev

packages/SystemUI/res/layout/zen_mode_panel.xml

diff --git a/packages/SystemUI/res/layout/zen_mode_panel.xml b/packages/SystemUI/res/layout/zen_mode_panel.xml
index 14bf10e..bfeac9d 100644
--- a/packages/SystemUI/res/layout/zen_mode_panel.xml
+++ b/packages/SystemUI/res/layout/zen_mode_panel.xml
@@ -40,7 +40,7 @@
             android:clipChildren="false" />
     </FrameLayout>
 
-    <FrameLayout
+    <RelativeLayout
         android:id="@+id/zen_subhead"
         android:layout_width="match_parent"
         android:layout_height="62dp"
@@ -73,13 +73,14 @@
             android:id="@+id/zen_more_settings"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:layout_gravity="end|center_vertical"
+            android:layout_alignParentEnd="true"
             android:background="@drawable/btn_borderless_rect"
             android:clickable="true"
             android:contentDescription="@null"
             android:scaleType="center"
             android:src="@drawable/ic_settings" />
-    </FrameLayout>
+
+    </RelativeLayout>
 
     <LinearLayout
         android:id="@+id/zen_conditions"