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

Commit 2945e95c authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Make the new QS the new QS"

parents 709bf2a3 deba7a42

packages/SystemUI/res/drawable/header_dot.xml

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

<!--

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

-->

<shape

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

    android:shape="oval">



    <solid 

        android:color="#FFFFFF"/>



    <size 

        android:width="3dp"

        android:height="3dp"/>

</shape>

packages/SystemUI/res/layout/qs_panel.xml

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@drawable/qs_background_primary"

        android:paddingTop="8dp"

        android:paddingBottom="8dp"

        android:elevation="2dp">

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

+38 −36
Original line number Diff line number Diff line
@@ -33,16 +33,6 @@ 
    android:focusable="true"

    >



    <com.android.systemui.qs.QuickQSPanel

        android:id="@+id/quick_qs_panel"

        android:background="#0000"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_alignParentEnd="true"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:layout_marginEnd="12dp" />



    <LinearLayout

        android:id="@+id/expanded_group"

        android:layout_width="wrap_content"
@@ -52,7 +42,8 @@ 
        android:clipToPadding="false"

        android:orientation="horizontal"

        android:layout_alignParentEnd="true"

        android:layout_marginEnd="12dp">

        android:layout_marginTop="30dp"

        android:layout_marginEnd="16dp">



        <com.android.systemui.statusbar.AlphaOptimizedFrameLayout

            android:id="@+id/settings_button_container"
@@ -87,49 +78,60 @@ 
            android:tint="@android:color/white" />

    </LinearLayout>



    <FrameLayout

        android:id="@+id/date_group"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginBottom="@dimen/clock_collapsed_bottom_margin"

        android:layout_alignParentBottom="true">

        <com.android.systemui.statusbar.policy.DateView android:id="@+id/date_collapsed"

    <include layout="@layout/split_clock_view"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="16dp"

            android:singleLine="true"

            android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date"

            android:layout_below="@id/clock"

            systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm"

        android:layout_marginTop="2dp"

        android:layout_alignParentStart="true"

        android:layout_alignParentTop="true"

        android:id="@+id/clock"

        />

    </FrameLayout>



    <include layout="@layout/split_clock_view"

    <com.android.systemui.statusbar.policy.DateView

        android:id="@+id/date"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="16dp"

        android:layout_above="@id/date_group"

        android:id="@+id/clock"

        android:layout_marginStart="6dp"

        android:layout_marginTop="8dp"

        android:layout_toEndOf="@id/clock"

        android:layout_alignParentTop="true"

        android:drawableStart="@drawable/header_dot"

        android:drawablePadding="6dp"

        android:singleLine="true"

        android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Clock"

        android:textSize="@dimen/qs_time_collapsed_size"

        systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm"

        />



    <com.android.systemui.statusbar.AlphaOptimizedButton android:id="@+id/alarm_status"

    <com.android.systemui.statusbar.AlphaOptimizedButton

        android:id="@+id/alarm_status"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentBottom="true"

        android:layout_toEndOf="@id/date_group"

        android:layout_marginBottom="4dp"

        android:layout_alignParentTop="true"

        android:layout_toEndOf="@id/date"

        android:drawablePadding="6dp"

        android:drawableStart="@drawable/ic_access_alarms_small"

        android:textColor="#64ffffff"

        android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date"

        android:paddingEnd="6dp"

        android:minHeight="36dp"

        android:paddingStart="6dp"

        android:paddingTop="16dp"

        android:paddingBottom="16dp"

        android:background="?android:attr/selectableItemBackground"

        android:visibility="gone"

        />



    <com.android.systemui.qs.QuickQSPanel

        android:id="@+id/quick_qs_panel"

        android:background="#0000"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="30dp"

        android:layout_marginStart="8dp"

        android:layout_marginEnd="8dp"

        android:layout_alignParentEnd="true"

        android:clipChildren="false"

        android:clipToPadding="false" />



    <include

        android:id="@+id/qs_detail_header"

        layout="@layout/qs_detail_header"

packages/SystemUI/res/layout/split_clock_view.xml

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
        android:layout_height="wrap_content"

        android:singleLine="true"

        android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Clock"

        android:textSize="@dimen/qs_time_collapsed_size"

        />

    <TextClock

        android:id="@+id/am_pm_view"

packages/SystemUI/res/values-h560dp/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ 


<resources>

    <!-- The maximum number of items to be displayed in quick settings -->

    <integer name="quick_settings_detail_max_item_count">8</integer>

    <integer name="quick_settings_detail_max_item_count">6</integer>

</resources>