From 4649c8d53ffaf9972ddb9e23d27a886ad939e1d6 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Wed, 9 Jul 2014 17:04:01 +0200
Subject: [PATCH] Fix overlapping status bar icons.

Change-Id: I9ca4b9e026cb3cccdf9e30ab350d10d46b98d47e
---
 packages/SystemUI/res/layout/status_bar.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml
index ec62ae166dc3d..595d731d56d01 100644
--- a/packages/SystemUI/res/layout/status_bar.xml
+++ b/packages/SystemUI/res/layout/status_bar.xml
@@ -48,7 +48,7 @@
         android:orientation="horizontal"
         >
 
-        <com.android.systemui.statusbar.AlphaOptimizedLinearLayout
+        <com.android.systemui.statusbar.AlphaOptimizedFrameLayout
             android:id="@+id/notification_icon_area"
             android:layout_width="0dip"
             android:layout_height="match_parent"
@@ -57,7 +57,7 @@
             >
             <!-- The alpha of this area is both controlled from PhoneStatusBarTransitions and
                  PhoneStatusBar (DISABLE_NOTIFICATION_ICONS), so we need two views here. -->
-            <com.android.systemui.statusbar.AlphaOptimizedFrameLayout
+            <com.android.systemui.statusbar.AlphaOptimizedLinearLayout
                 android:id="@+id/notification_icon_area_inner"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -74,8 +74,8 @@
                     android:layout_alignParentStart="true"
                     android:gravity="center_vertical"
                     android:orientation="horizontal"/>
-            </com.android.systemui.statusbar.AlphaOptimizedFrameLayout>
-        </com.android.systemui.statusbar.AlphaOptimizedLinearLayout>
+            </com.android.systemui.statusbar.AlphaOptimizedLinearLayout>
+        </com.android.systemui.statusbar.AlphaOptimizedFrameLayout>
 
         <com.android.systemui.statusbar.AlphaOptimizedLinearLayout android:id="@+id/system_icon_area"
             android:layout_width="wrap_content"