summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/res
diff options
context:
space:
mode:
authorSelim Cinek <cinek@google.com>2014-09-01 15:11:28 +0200
committerSelim Cinek <cinek@google.com>2014-09-01 21:14:59 +0200
commit024ca598dd4b38b389251c138f4ef9882d4b68b0 (patch)
treeaf7550e33b32490571e17c6a1e814f4842c3b8de /packages/SystemUI/res
parent1cf8906231ff281dab360fc6190aa0633bb9ed18 (diff)
downloadframeworks_base-024ca598dd4b38b389251c138f4ef9882d4b68b0.zip
frameworks_base-024ca598dd4b38b389251c138f4ef9882d4b68b0.tar.gz
frameworks_base-024ca598dd4b38b389251c138f4ef9882d4b68b0.tar.bz2
Notification guts have now the actualHeight of the notifications
Before it just had the height of the notification leading to bugs in cornercases during animations and swiping. Also updated to colors to use system colors. Bug: 17333457 Change-Id: I00d87820595a789006632c582e8c35759a61969d
Diffstat (limited to 'packages/SystemUI/res')
-rw-r--r--packages/SystemUI/res/drawable/notification_guts_bg.xml3
-rw-r--r--packages/SystemUI/res/layout/notification_guts.xml5
-rw-r--r--packages/SystemUI/res/values/colors.xml4
3 files changed, 6 insertions, 6 deletions
diff --git a/packages/SystemUI/res/drawable/notification_guts_bg.xml b/packages/SystemUI/res/drawable/notification_guts_bg.xml
index 07932d1..1730dce 100644
--- a/packages/SystemUI/res/drawable/notification_guts_bg.xml
+++ b/packages/SystemUI/res/drawable/notification_guts_bg.xml
@@ -17,5 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/notification_guts_bg_color" />
- <corners android:radius="@dimen/notification_material_rounded_rect_radius" />
+ <!--The radius is 1dp smaller than the notification one, to avoid aliasing bugs on the corners -->
+ <corners android:radius="1dp" />
</shape>
diff --git a/packages/SystemUI/res/layout/notification_guts.xml b/packages/SystemUI/res/layout/notification_guts.xml
index d65a23e..05114ea 100644
--- a/packages/SystemUI/res/layout/notification_guts.xml
+++ b/packages/SystemUI/res/layout/notification_guts.xml
@@ -15,11 +15,10 @@
limitations under the License.
-->
-<FrameLayout
+<com.android.systemui.statusbar.NotificationGuts
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/notification_guts_bg"
android:id="@+id/notification_guts"
android:visibility="gone"
android:clickable="true"
@@ -87,4 +86,4 @@
android:src="@drawable/ic_settings"
/>
</LinearLayout>
-</FrameLayout>
+</com.android.systemui.statusbar.NotificationGuts>
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index 75ed81e..24520de 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -97,9 +97,9 @@
<color name="segmented_button_text_inactive">#99afbdc4</color><!-- 60% -->
<!-- The "inside" of a notification, reached via longpress -->
- <color name="notification_guts_bg_color">#ff424242</color><!-- grey 800 -->
+ <color name="notification_guts_bg_color">@color/system_secondary_color</color>
<color name="notification_guts_title_color">#FFFFFFFF</color>
- <color name="notification_guts_text_color">#99FFFFFF</color>
+ <color name="notification_guts_text_color">#b2FFFFFF</color>
<color name="notification_guts_btn_color">#FFFFFFFF</color>
<color name="search_panel_card_color">#ffffff</color>