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

Commit 7f8f22a5 authored by John Spurlock's avatar John Spurlock
Browse files

QS: Wifi control panel. 

Create first example of an inline detail view with line
items, bind to new access-point controller.

Move the common bits of all control panels into a
common abstraction.  Share common parts of layout
(More settings / done button).

Change-Id: I14a1bf548f3291dc628f97bf09dd4e38ac2fb2dc
parent 56306256

packages/SystemUI/res/layout/qs_detail.xml

+21 −26
Original line number Diff line number Diff line
@@ -17,41 +17,36 @@ 
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@color/system_primary_color" >

    android:background="@color/system_primary_color"

    android:padding="16dp" >



    <ImageView

    <TextView

        android:id="@android:id/button1"

        android:layout_width="64dp"

        android:layout_height="64dp"

        android:layout_alignParentStart="true"

        android:contentDescription="@string/accessibility_quick_settings_close"

        android:padding="@dimen/qs_panel_padding"

        android:src="@drawable/ic_qs_back" />

        style="@style/QSBorderlessButton"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:minWidth="88dp"

        android:layout_alignParentBottom="true"

        android:layout_alignParentEnd="true"

        android:text="@string/quick_settings_done"

        android:textAppearance="@style/TextAppearance.QS.DetailButton" />



    <TextView

        android:id="@android:id/title"

        android:layout_width="match_parent"

        android:layout_height="64dp"

        android:layout_alignParentTop="true"

        android:layout_toEndOf="@android:id/button1"

        android:layout_toStartOf="@android:id/checkbox"

        android:gravity="center_vertical"

        android:textAppearance="@style/TextAppearance.QS.DetailHeader" />



    <ImageView

        android:id="@android:id/custom"

        android:layout_width="match_parent"

        android:id="@android:id/button2"

        style="@style/QSBorderlessButton"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_below="@android:id/title"

        android:layout_marginLeft="16dip"

        android:layout_marginRight="16dip"

        android:scaleType="fitXY"

        android:src="?android:attr/dividerHorizontal" />

        android:layout_alignParentBottom="true"

        android:layout_marginEnd="8dp"

        android:minWidth="132dp"

        android:layout_toStartOf="@android:id/button1"

        android:text="@string/quick_settings_more_settings"

        android:textAppearance="@style/TextAppearance.QS.DetailButton" />



    <FrameLayout

        android:id="@android:id/content"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_below="@android:id/custom" />

        android:layout_above="@android:id/button1" />



</RelativeLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/qs_detail_header.xml

0 → 100644
+35 −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.

-->

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

    style="@style/BrightnessDialogContainer"

    android:background="@drawable/btn_borderless_rect" >



    <TextView

        android:id="@android:id/title"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:textAppearance="@style/TextAppearance.QS.DetailHeader" />



    <Switch

        android:id="@android:id/toggle"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:clickable="false"

        android:textAppearance="@style/TextAppearance.QS.DetailHeader" />



</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/qs_detail_item.xml

0 → 100644
+51 −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.

-->

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

    android:layout_width="match_parent"

    android:layout_height="@dimen/qs_detail_item_height"

    android:gravity="center_vertical"

    android:background="@drawable/btn_borderless_rect"

    android:clickable="true"

    android:orientation="horizontal" >



    <ImageView

        android:id="@android:id/icon"

        android:layout_width="24dp"

        android:layout_height="24dp"

        android:layout_marginEnd="12dp" />



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginStart="20dp"

        android:orientation="vertical" >



        <TextView

            android:id="@android:id/title"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textAppearance="@style/TextAppearance.QS.DetailItemPrimary" />



        <TextView

            android:id="@android:id/summary"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="2dp"

            android:textAppearance="@style/TextAppearance.QS.DetailItemSecondary" />

    </LinearLayout>



</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
    <com.android.systemui.settings.ToggleSlider

        android:id="@+id/brightness_slider"

        android:layout_width="0dp"

        android:layout_height="44dp"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_weight="1"

        systemui:text="@string/status_bar_settings_auto_brightness_label" />

packages/SystemUI/res/layout/status_bar_expanded_header.xml

+16 −7
Original line number Diff line number Diff line
@@ -135,14 +135,23 @@ 
        android:textColor="#ffffff"

        android:singleLine="true" />





        <include

            android:id="@+id/qs_detail_header"

            layout="@layout/qs_detail_header"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_alignParentBottom="true"

            />

        <include

        layout="@layout/quick_settings_brightness_dialog"

            android:id="@+id/brightness_container"

            layout="@layout/quick_settings_brightness_dialog"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_alignParentBottom="true"

            />





    <TextView

        android:id="@+id/header_debug_info"

        android:visibility="invisible"