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

Commit 55d2d764 authored by Joe Onorato's avatar Joe Onorato
Browse files

Notification updates. 

When the drawer is open, hide the icons & toasts.
Move Clear button to the bottom and add DND button.

Change-Id: I8b3253eb8f2ff3b1e11a819d58b202e023f00710
parent 81859bc3

packages/SystemUI/res/anim/notification_buttons_in.xml

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

<!-- Copyright (C) 2010 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.

-->



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

    >

    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"

        android:duration="@android:integer/config_longAnimTime" 

        />

</set>

packages/SystemUI/res/anim/notification_buttons_out.xml

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

<!-- Copyright (C) 2010 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.

-->



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

    >

    <alpha android:toAlpha="0.0" android:fromAlpha="1.0"

        android:duration="@android:integer/config_longAnimTime" 

        />

</set>

packages/SystemUI/res/anim/notification_icons_in.xml

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

<!-- Copyright (C) 2010 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.

-->



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

    >

    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"

        android:duration="@android:integer/config_longAnimTime" 

        />

</set>

packages/SystemUI/res/anim/notification_icons_out.xml

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

<!-- Copyright (C) 2010 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.

-->



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

    >

    <alpha android:toAlpha="0.0" android:fromAlpha="1.0"

        android:duration="@android:integer/config_longAnimTime" 

        />

</set>

packages/SystemUI/res/layout-xlarge/status_bar.xml

+50 −10
Original line number Diff line number Diff line
@@ -27,23 +27,64 @@ 
        android:layout_height="match_parent"

        >



        <com.android.systemui.statusbar.tablet.NotificationIconArea

            android:id="@+id/notificationIcons"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_alignParentLeft="true"

            android:paddingLeft="6dip"

            android:gravity="center_vertical"

            android:orientation="horizontal"

            >

        <ImageView

            class="com.android.systemui.statusbar.tablet.NotificationIconArea$MoreView"

            android:id="@+id/expand"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:src="@drawable/ic_sysbar_open"

            android:paddingLeft="6dip"

            android:onClick="notificationIconsClicked"

            />



        <LinearLayout

            android:id="@+id/notificationButtons"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_toRightOf="@+id/expand"

            android:layout_toLeftOf="@+id/systemInfo"

            android:gravity="center_vertical"

            android:orientation="horizontal"

            android:visibility="gone"

            >



            <TextView android:id="@+id/do_not_disturb"

                style="?android:attr/textAppearance"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="right|center_vertical"

                android:layout_marginTop="2dip"

                android:layout_marginBottom="1dip"

                android:layout_marginRight="10dip"

                android:padding="6dip"

                android:textSize="14sp"

                android:text="@string/status_bar_do_not_disturb_button"

                />



            <TextView android:id="@+id/clear_all_button"

                style="?android:attr/textAppearance"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="right|center_vertical"

                android:layout_marginTop="2dip"

                android:layout_marginBottom="1dip"

                android:layout_marginRight="10dip"

                android:padding="6dip"

                android:textSize="14sp"

                android:text="@string/status_bar_clear_all_button"

                />



        </LinearLayout>



        <com.android.systemui.statusbar.tablet.NotificationIconArea

            android:id="@+id/notificationIcons"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_toRightOf="@+id/expand"

            android:layout_toLeftOf="@+id/systemInfo"

            android:gravity="center_vertical"

            android:orientation="horizontal"

            >

            <view

                class="com.android.systemui.statusbar.tablet.NotificationIconArea$IconLayout"

                android:id="@+id/icons"
@@ -59,7 +100,6 @@ 
                android:background="@drawable/sysbar_hidenotification_handle"

                android:layout_marginLeft="8dip"

                />



        </com.android.systemui.statusbar.tablet.NotificationIconArea>



        <FrameLayout