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

Commit 50728832 authored by John Spurlock's avatar John Spurlock
Browse files

Remove obsolete settings panel artifacts. 

I don't always have quick settings.  But when I do,
they live in a flip view, not a separate panel.

Bug:14133785
Change-Id: I3df11d7de308a36a800eb7582a71e3febc897fec
parent 307ad092

packages/SystemUI/res/layout/flip_settings.xml

+1 −0
Original line number Diff line number Diff line
@@ -22,4 +22,5 @@ 
    android:layout_height="wrap_content"

    android:background="#5f000000"

    android:animateLayoutChanges="true"

    android:visibility="gone"

    android:columnCount="@integer/quick_settings_num_columns" />
 
 No newline at end of file

packages/SystemUI/res/layout/quick_settings.xml

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

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

-->



<com.android.systemui.statusbar.phone.SettingsPanelView 

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:id="@+id/settings_panel"

    android:background="@drawable/notification_panel_bg"

    >

    <!-- TODO: Put into ScrollView -->

    <com.android.systemui.statusbar.phone.QuickSettingsScrollView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="@dimen/close_handle_underlap"

        android:overScrollMode="ifContentScrolls"

        >

        <com.android.systemui.statusbar.phone.QuickSettingsContainerView

            android:id="@+id/quick_settings_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:animateLayoutChanges="true"

            android:columnCount="@integer/quick_settings_num_columns"

            />

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



    <View

        android:id="@+id/handle"

        android:layout_width="match_parent"

        android:layout_height="@dimen/close_handle_height"

        android:background="@drawable/status_bar_close"

        android:visibility="invisible"

        />



</com.android.systemui.statusbar.phone.SettingsPanelView >
 
 No newline at end of file

packages/SystemUI/res/layout/status_bar_expanded.xml

+5 −4
Original line number Diff line number Diff line
@@ -36,8 +36,9 @@ 
        android:layout_gravity="bottom"

        />



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

        android:layout="@layout/status_bar_flip_button"

    <include

        layout="@layout/status_bar_flip_button"

        android:id="@+id/keyguard_flipper"

        android:layout_width="50dp"

        android:layout_height="50dp"

        android:layout_gravity="right|top"
@@ -76,8 +77,8 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            >

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

                android:layout="@layout/flip_settings"

            <include

                layout="@layout/flip_settings"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                />

packages/SystemUI/res/layout/status_bar_expanded_header.xml

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ 
        />



    <include layout="@layout/status_bar_flip_button"

        android:id="@+id/header_flipper"

        android:layout_width="50dp"

        android:layout_height="50dp"

        android:layout_marginStart="12dp" />

packages/SystemUI/res/layout/status_bar_flip_button.xml

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
  -->



<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"