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

Commit 9a0a4c9d authored by Adrian Roos's avatar Adrian Roos
Browse files

Enable quick settings from lockscreen and merge into one shade. 

Change-Id: Ic5b5f54bcfe3816549287f707715e29340522d9b
parent 6e0f14e7

packages/SystemUI/res/drawable/ic_notify_button_bg.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ 
-->



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

    <item android:state_pressed="true"  android:drawable="@*android:drawable/list_selector_pressed_holo_dark" />

    <item                               android:drawable="@*android:drawable/list_selector_disabled_holo_dark" />

    <item android:state_pressed="true"

          android:drawable="@*android:drawable/list_selector_pressed_holo_dark" />

</selector>

packages/SystemUI/res/layout-sw600dp/super_status_bar.xml

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

<!--

**

** Copyright 2012, 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.

*/

-->



<!-- This is the combined status bar / notification panel window. -->

<com.android.systemui.statusbar.phone.StatusBarWindowView

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:focusable="true"

    android:descendantFocusability="afterDescendants"

    >



    <include layout="@layout/status_bar"

        android:layout_width="match_parent"

        android:layout_height="@*android:dimen/status_bar_height"

        />



    <com.android.systemui.statusbar.phone.PanelHolder

        android:id="@+id/panel_holder"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginTop="@*android:dimen/status_bar_height"

        android:layout_marginBottom="@*android:dimen/navigation_bar_height"

        >

        <include layout="@layout/status_bar_expanded"

            android:layout_width="@dimen/notification_panel_width"

            android:layout_height="wrap_content"

            android:layout_gravity="start|top"

            />

        <include layout="@layout/quick_settings"

            android:layout_width="@dimen/notification_panel_width"

            android:layout_height="wrap_content"

            android:layout_gravity="end|top"

            />

    </com.android.systemui.statusbar.phone.PanelHolder>



</com.android.systemui.statusbar.phone.StatusBarWindowView>

packages/SystemUI/res/layout/status_bar_expanded.xml

+8 −0
Original line number Diff line number Diff line
@@ -36,6 +36,14 @@ 
        android:layout_gravity="bottom"

        />



    <ViewStub android:id="@+id/keyguard_flip_stub"

        android:layout="@layout/status_bar_flip_button"

        android:layout_width="50dp"

        android:layout_height="50dp"

        android:layout_gravity="right|top"

        android:layout_marginTop="@*android:dimen/status_bar_height"

        android:visibility="gone" />



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

packages/SystemUI/res/layout/status_bar_expanded_header.xml

+3 −22
Original line number Diff line number Diff line
@@ -83,27 +83,8 @@ 
        android:contentDescription="@string/accessibility_clear_all"

        />



    <FrameLayout android:id="@+id/settings_button_holder"

    <include layout="@layout/status_bar_flip_button"

        android:layout_width="50dp"

        android:layout_height="50dp"

        android:layout_marginStart="12dp"

        >

        <ImageView android:id="@+id/settings_button"

            android:layout_width="50dp"

            android:layout_height="50dp"

            android:scaleType="center"

            android:src="@drawable/ic_notify_settings"

            android:background="@drawable/ic_notify_button_bg"

            android:contentDescription="@string/accessibility_desc_quick_settings"

            />

        <ImageView android:id="@+id/notification_button"

            android:layout_width="50dp"

            android:layout_height="50dp"

            android:scaleType="center"

            android:src="@drawable/ic_notifications"

            android:background="@drawable/ic_notify_button_bg"

            android:visibility="gone"

            android:contentDescription="@string/accessibility_notifications_button"

            />

    </FrameLayout>

        android:layout_marginStart="12dp" />

</LinearLayout>

packages/SystemUI/res/layout/status_bar_flip_button.xml

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

<!--

  ~ Copyright (C) 2014 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:id="@+id/settings_button_holder"

        android:layout_width="50dp"

        android:layout_height="50dp">

    <ImageView android:id="@+id/settings_button"

        android:layout_width="50dp"

        android:layout_height="50dp"

        android:scaleType="center"

        android:src="@drawable/ic_notify_settings"

        android:background="@drawable/ic_notify_button_bg"

        android:contentDescription="@string/accessibility_desc_quick_settings" />

    <ImageView android:id="@+id/notification_button"

        android:layout_width="50dp"

        android:layout_height="50dp"

        android:scaleType="center"

        android:src="@drawable/ic_notifications"

        android:background="@drawable/ic_notify_button_bg"

        android:visibility="gone"

        android:contentDescription="@string/accessibility_notifications_button" />

</FrameLayout>
 
 No newline at end of file