From 1328569d330271edd11cea536761a07935f0cf4d Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Wed, 6 Aug 2014 01:35:21 +0200
Subject: [PATCH] Fix more card on Keyguard overflow.

Bug: 15719165
Change-Id: Ie1e99dd722d7fcd52c0ce2eda968885835004b2b
---
 .../status_bar_notification_keyguard_overflow.xml  | 52 ++++++++++++++--------
 .../statusbar/NotificationOverflowContainer.java   |  1 +
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml b/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml
index f0f50e11fb65..eff37588cf6d 100644
--- a/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml
+++ b/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml
@@ -30,25 +30,39 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         />
-    <TextView
-        android:id="@+id/more_text"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_marginStart="20dp"
-        android:layout_gravity="center_vertical"
-        android:background="@drawable/keyguard_overflow_number_background"
-        android:gravity="center"
-        android:textColor="#ff686868"
-        android:textStyle="bold"
-        android:textSize="14dp"
-        />
-    <com.android.systemui.statusbar.NotificationOverflowIconsView
-        android:id="@+id/overflow_icons_view"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="68dp"
-        android:layout_width="120dp"
-        android:layout_height="wrap_content"
-        />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <TextView
+            android:id="@+id/more_text"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="16dp"
+            android:layout_gravity="center_vertical"
+            android:background="@drawable/keyguard_overflow_number_background"
+            android:gravity="center"
+            android:textColor="#ff686868"
+            android:textStyle="bold"
+            android:textSize="14dp"
+            />
+        <com.android.systemui.statusbar.StatusBarIconView
+            android:id="@+id/more_icon_overflow"
+            android:layout_width="@dimen/status_bar_icon_size"
+            android:layout_height="match_parent"
+            android:src="@drawable/stat_notify_more"
+            android:tint="@color/keyguard_overflow_content_color"
+            android:visibility="gone"
+            />
+        <com.android.systemui.statusbar.NotificationOverflowIconsView
+            android:id="@+id/overflow_icons_view"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="8dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            />
+    </LinearLayout>
 
     <com.android.systemui.statusbar.NotificationScrimView
         android:id="@+id/scrim_view"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationOverflowContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationOverflowContainer.java
index 451c5c560171..edfd205e3676 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationOverflowContainer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationOverflowContainer.java
@@ -38,6 +38,7 @@ public class NotificationOverflowContainer extends ActivatableNotificationView {
         super.onFinishInflate();
         mIconsView = (NotificationOverflowIconsView) findViewById(R.id.overflow_icons_view);
         mIconsView.setMoreText((TextView) findViewById(R.id.more_text));
+        mIconsView.setOverflowIndicator(findViewById(R.id.more_icon_overflow));
     }
 
     public NotificationOverflowIconsView getIconsView() {
-- 
2.11.0