Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01a46f4e authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'notification_children' 

* changes:
  Follow up CL for notification children change
  Allow expanding notification groups by dragging down
  Changed the appearance of notification bundles
  Hiding subtext of children notifications now
  Hiding the children backgrounds now
  Introduced the notification header
  Slight refactoring of notification groups
  Fixed a bug where a notification could stay userlocked
parents 15ca73ac a6c6bfb6

packages/SystemUI/res/drawable/ic_collapse_children.xml

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2015 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->



<inset xmlns:android="http://schemas.android.com/apk/res/android"

       android:insetTop="2dp"

       android:drawable="@drawable/ic_expand_less"/>

packages/SystemUI/res/drawable/ic_expand_children.xml

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2015 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<inset xmlns:android="http://schemas.android.com/apk/res/android"

       android:insetTop="2dp"

       android:drawable="@drawable/ic_expand_more"/>

packages/SystemUI/res/drawable/notification_expand_more.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

Copyright (C) 2015 The Android Open Source Project



   Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="22.0dp"

    android:height="22.0dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0">

    <path

        android:pathData="M16.600000,8.600000l-4.600000,4.599999 -4.600000,-4.599999 -1.400000,1.400000 6.000000,6.000000 6.000000,-6.000000z"

        android:fillColor="#FF000000"/>

</vector>

packages/SystemUI/res/layout/notification_collapse_button.xml→packages/SystemUI/res/layout/hybrid_notification.xml

+17 −11
Original line number Diff line number Diff line
@@ -14,20 +14,26 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<FrameLayout



<com.android.systemui.statusbar.notification.HybridNotificationView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="@dimen/notification_bottom_decor_height">

    android:layout_height="@dimen/notification_max_height">

    <TextView

        android:id="@+id/notification_expand_button"

        android:id="@+id/notification_title"

        android:layout_width="wrap_content"

        android:layout_height="@dimen/notification_bottom_decor_height"

        android:background="@null"

        android:layout_gravity="top|center_horizontal"

        android:gravity="center_vertical|center_horizontal"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:singleLine="true"

        android:textAppearance="@*android:style/TextAppearance.Material.Notification.Title"

        android:text="@string/notification_collapse_button_text"

        android:drawableEnd="@drawable/ic_collapse_children"

        android:drawablePadding="1dp"

        android:paddingEnd="4dp"

    />

</FrameLayout>
 
    <TextView

        android:id="@+id/notification_text"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:textAppearance="@*android:style/TextAppearance.Material.Notification"

        android:singleLine="true"

        />

</com.android.systemui.statusbar.notification.HybridNotificationView>

packages/SystemUI/res/layout/notification_expand_button.xml

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2015 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->



<FrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="@dimen/notification_bottom_decor_height">

    <TextView

        android:id="@+id/notification_expand_button"

        android:layout_width="wrap_content"

        android:layout_height="@dimen/notification_bottom_decor_height"

        android:background="@null"

        android:layout_gravity="top|center_horizontal"

        android:gravity="center_vertical|center_horizontal"

        android:textAppearance="@*android:style/TextAppearance.Material.Notification.Title"

        android:text="@string/notification_expand_button_text"

        android:drawableEnd="@drawable/ic_expand_children"

        android:drawablePadding="1dp"

        />

    <com.android.systemui.statusbar.AlphaOptimizedView

        android:id="@+id/notification_expand_divider"

        android:layout_width="match_parent"

        android:layout_height="1dp"

        android:layout_gravity="top|center"

        android:background="@*android:drawable/notification_template_divider" />

</FrameLayout>