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

Commit 94f300df authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

[DO NOT MERGE] Unify QS Headers in a ConstraintLayout 

This is a POC and is missing several features:
* Tight integration with the other surfaces to set margins
* Expansion animation from QQS into QS
* Privacy indicators

To enable:
adb shell am broadcast -a com.android.systemui.action.SET_FLAG --ei id
501 --ez 1

Test: manual
Bug: 204204226

Change-Id: I5b2d5f5880ceff1adb1e4365cde15171c5c15d38
parent 94204aa4

packages/SystemUI/res/layout/combined_qs_header.xml

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

<!--

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

  -->

<androidx.constraintlayout.widget.ConstraintLayout

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

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

    android:id="@+id/split_shade_status_bar"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="@dimen/split_shade_header_min_height"

    android:clickable="false"

    android:focusable="true"

    android:paddingLeft="@dimen/qs_panel_padding"

    android:paddingRight="@dimen/qs_panel_padding"

    android:visibility="gone"

    android:theme="@style/Theme.SystemUI.QuickSettings.Header">



    <androidx.constraintlayout.widget.Guideline

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:id="@+id/center"

        app:layout_constraintGuide_percent="0.5"

        android:orientation="vertical" />



    <com.android.systemui.statusbar.policy.Clock

        android:id="@+id/clock"

        android:layout_width="wrap_content"

        android:layout_height="0dp"

        app:layout_constraintHeight_min="@dimen/split_shade_header_min_height"

        android:gravity="start|center_vertical"

        android:paddingStart="@dimen/status_bar_left_clock_starting_padding"

        android:paddingEnd="@dimen/status_bar_left_clock_end_padding"

        android:singleLine="true"

        android:textAppearance="@style/TextAppearance.QS.Status"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toStartOf="@id/date"

    />



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

        android:id="@+id/date"

        android:layout_width="wrap_content"

        android:layout_height="0dp"

        app:layout_constraintHeight_min="@dimen/split_shade_header_min_height"

        android:layout_gravity="start|center_vertical"

        android:gravity="center_vertical"

        android:singleLine="true"

        android:textAppearance="@style/TextAppearance.QS.Status"

        app:datePattern="@string/abbrev_wday_month_day_no_year_alarm"

        app:layout_constraintStart_toEndOf="@id/clock"

        app:layout_constraintEnd_toStartOf="@id/carrier_group"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintHorizontal_bias="0"

    />



    <include

        android:id="@+id/carrier_group"

        layout="@layout/qs_carrier_group"

        android:layout_width="0dp"

        android:layout_height="0dp"

        app:layout_constraintHeight_min="@dimen/split_shade_header_min_height"

        app:layout_constrainedWidth="true"

        android:layout_gravity="end|center_vertical"

        android:layout_marginStart="8dp"

        android:focusable="false"

        android:minHeight="@dimen/split_shade_header_min_height"

        android:minWidth="48dp"

        app:layout_constraintStart_toEndOf="@id/date"

        app:layout_constraintEnd_toStartOf="@id/statusIcons"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintHorizontal_bias="1"

    />



    <com.android.systemui.statusbar.phone.StatusIconContainer

        android:id="@+id/statusIcons"

        android:layout_width="wrap_content"

        android:layout_height="0dp"

        app:layout_constraintHeight_min="@dimen/split_shade_header_min_height"

        android:paddingEnd="@dimen/signal_cluster_battery_padding"

        app:layout_constraintStart_toEndOf="@id/carrier_group"

        app:layout_constraintEnd_toStartOf="@id/batteryRemainingIcon"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

    />



    <com.android.systemui.battery.BatteryMeterView

        android:id="@+id/batteryRemainingIcon"

        android:layout_width="wrap_content"

        android:layout_height="0dp"

        app:layout_constraintHeight_min="@dimen/split_shade_header_min_height"

        app:textAppearance="@style/TextAppearance.QS.Status"

        app:layout_constraintStart_toEndOf="@id/statusIcons"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

    />



</androidx.constraintlayout.widget.ConstraintLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/status_bar_expanded.xml

+5 −1
Original line number Diff line number Diff line
@@ -75,7 +75,11 @@ 
        android:clipToPadding="false"

        android:clipChildren="false">



        <include layout="@layout/split_shade_header"/>

        <ViewStub

            android:id="@+id/qs_header_stub"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

        />



        <include

            layout="@layout/keyguard_status_view"

packages/SystemUI/res/xml/qqs_header.xml

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

<!--

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

  -->



<ConstraintSet

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

    xmlns:app="http://schemas.android.com/apk/res-auto">



    <Constraint

        android:id="@+id/clock"

        android:layout_width="wrap_content"

        android:layout_height="0dp"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toStartOf="@id/date"

        app:layout_constraintHorizontal_bias="0"

        app:layout_constraintHorizontal_chainStyle="packed"

    />



    <Constraint

        android:id="@+id/date"

        android:layout_width="wrap_content"

        android:layout_height="0dp"

        app:layout_constraintStart_toEndOf="@id/clock"

        app:layout_constraintEnd_toStartOf="@id/carrier_group"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintHorizontal_bias="0"

    />



    <Constraint

        android:id="@+id/carrier_group"

        android:layout_width="0dp"

        android:layout_height="0dp"

        app:layout_constrainedWidth="true"

        android:layout_gravity="end|center_vertical"

        android:layout_marginStart="8dp"

        app:layout_constraintStart_toEndOf="@id/date"

        app:layout_constraintEnd_toStartOf="@id/statusIcons"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        android:visibility="invisible"

        app:layout_constraintHorizontal_bias="1"

    />



    <Constraint

        android:id="@+id/statusIcons"

        android:layout_width="wrap_content"

        android:layout_height="0dp"

        app:layout_constraintStart_toEndOf="@id/carrier_group"

        app:layout_constraintEnd_toStartOf="@id/batteryRemainingIcon"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintHorizontal_bias="1"

    />



    <Constraint

        android:id="@+id/batteryRemainingIcon"

        android:layout_width="wrap_content"

        android:layout_height="0dp"

        app:layout_constraintStart_toEndOf="@id/statusIcons"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintHorizontal_bias="1"

    />



</ConstraintSet>
 
 No newline at end of file

packages/SystemUI/res/xml/qs_header.xml

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

<!--

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

  -->



<ConstraintSet

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

    xmlns:app="http://schemas.android.com/apk/res-auto">



    <Constraint

        android:id="@+id/clock"

        android:layout_width="wrap_content"

        android:layout_height="48dp"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toBottomOf="@id/date"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toStartOf="@id/carrier_group"

        app:layout_constraintHorizontal_bias="0"

    />



    <Constraint

        android:id="@+id/date"

        android:layout_width="wrap_content"

        android:layout_height="48dp"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toTopOf="@id/clock"

        app:layout_constraintHorizontal_bias="0"

    />



    <Constraint

        android:id="@+id/carrier_group"

        android:layout_width="0dp"

        android:layout_height="48dp"

        app:layout_constrainedWidth="true"

        android:layout_gravity="end|center_vertical"

        android:layout_marginStart="8dp"

        app:layout_constraintStart_toEndOf="@id/clock"

        app:layout_constraintEnd_toStartOf="@id/statusIcons"

        app:layout_constraintTop_toTopOf="@id/clock"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintHorizontal_bias="1"

    />



    <Constraint

        android:id="@+id/statusIcons"

        android:layout_width="wrap_content"

        android:layout_height="48dp"

        app:layout_constraintStart_toEndOf="@id/carrier_group"

        app:layout_constraintEnd_toStartOf="@id/batteryRemainingIcon"

        app:layout_constraintTop_toTopOf="@id/clock"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintHorizontal_bias="1"

    />



    <Constraint

        android:id="@+id/batteryRemainingIcon"

        android:layout_width="wrap_content"

        android:layout_height="48dp"

        app:layout_constraintStart_toEndOf="@id/statusIcons"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="@id/clock"

        app:layout_constraintBottom_toBottomOf="parent"

    />



</ConstraintSet>
 
 No newline at end of file

packages/SystemUI/res/xml/split_header.xml

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

<!--

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

  -->



<ConstraintSet

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

    xmlns:app="http://schemas.android.com/apk/res-auto">



    <Constraint

        android:id="@+id/clock"

        android:layout_width="wrap_content"

        android:layout_height="0dp"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toStartOf="@id/date"

    />



    <Constraint

        android:id="@+id/date"

        android:layout_width="wrap_content"

        android:layout_height="0dp"

        app:layout_constraintStart_toEndOf="@id/clock"

        app:layout_constraintEnd_toStartOf="@id/carrier_group"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintHorizontal_bias="0"

    />



    <Constraint

        android:id="@+id/carrier_group"

        android:layout_width="0dp"

        android:layout_height="0dp"

        app:layout_constrainedWidth="true"

        android:layout_gravity="end|center_vertical"

        android:layout_marginStart="8dp"

        app:layout_constraintStart_toEndOf="@id/date"

        app:layout_constraintEnd_toStartOf="@id/statusIcons"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintHorizontal_bias="1"

    />



    <Constraint

        android:id="@+id/statusIcons"

        android:layout_width="wrap_content"

        android:layout_height="0dp"

        app:layout_constraintStart_toEndOf="@id/carrier_group"

        app:layout_constraintEnd_toStartOf="@id/batteryRemainingIcon"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

    />



    <Constraint

        android:id="@+id/batteryRemainingIcon"

        android:layout_width="wrap_content"

        android:layout_height="0dp"

        app:layout_constraintStart_toEndOf="@id/statusIcons"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

    />



</ConstraintSet>
 
 No newline at end of file