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

Commit 3947c9b5 authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Automerger Merge Worker
Browse files

Merge "Adding more icons to split shade header" into sc-v2-dev am: 390ae0ce am: da314cd3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15243871

Change-Id: Ieba292bf14d679d561a5fdc9162dfb7b934d28ce
parents c3d0d780 da314cd3

packages/SystemUI/res/layout/quick_qs_status_icons.xml

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    android:layout_height="@*android:dimen/quick_qs_offset_height"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:minHeight="48dp"

    android:minHeight="@dimen/qs_header_row_min_height"

    android:clickable="false"

    android:focusable="true"

    android:theme="@style/Theme.SystemUI.QuickSettings.Header">
@@ -31,7 +31,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:minWidth="48dp"

        android:minHeight="48dp"

        android:minHeight="@dimen/qs_header_row_min_height"

        android:gravity="center_vertical|start"

        android:paddingStart="@dimen/status_bar_left_clock_starting_padding"

        android:paddingEnd="@dimen/status_bar_left_clock_end_padding"
@@ -43,7 +43,7 @@ 
        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:minHeight="48dp"

        android:minHeight="@dimen/qs_header_row_min_height"

        android:minWidth="48dp"

        android:layout_marginStart="8dp"

        android:layout_gravity="end|center_vertical"

packages/SystemUI/res/layout/split_shade_header.xml

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

-->

<LinearLayout

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

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

    android:id="@+id/split_shade_status_bar"

    android:layout_width="match_parent"

    android:layout_height="@dimen/split_shade_header_height"

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



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

        android:id="@+id/clock"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:minWidth="48dp"

        android:minHeight="@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" />



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

        android:id="@+id/date"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="start|center_vertical"

        android:gravity="center_vertical"

        android:singleLine="true"

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

        systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm" />



    <FrameLayout

        android:id="@+id/rightLayout"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:gravity="end">



        <LinearLayout

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_gravity="end|center_vertical">



            <include

                android:id="@+id/carrier_group"

                layout="@layout/qs_carrier_group"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:layout_gravity="end|center_vertical"

                android:layout_marginStart="8dp"

                android:focusable="false"

                android:minHeight="@dimen/split_shade_header_min_height"

                android:minWidth="48dp" />



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

                android:id="@+id/statusIcons"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:paddingEnd="@dimen/signal_cluster_battery_padding" />



            <com.android.systemui.BatteryMeterView

                android:id="@+id/batteryRemainingIcon"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                systemui:textAppearance="@style/TextAppearance.QS.Status" />

        </LinearLayout>

    </FrameLayout>



</LinearLayout>

packages/SystemUI/res/layout/status_bar_expanded.xml

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

        android:clipChildren="false">



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

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



        <include

            layout="@layout/keyguard_status_view"

packages/SystemUI/res/values/dimens.xml

+3 −1
Original line number Diff line number Diff line
@@ -461,7 +461,8 @@ 
    <dimen name="match_parent">-1px</dimen>



    <!-- Height of status bar in split shade mode - visible only on large screens -->

    <dimen name="split_shade_status_bar_height">@*android:dimen/quick_qs_offset_height</dimen>

    <dimen name="split_shade_header_height">@*android:dimen/quick_qs_offset_height</dimen>

    <dimen name="split_shade_header_min_height">@dimen/qs_header_row_min_height</dimen>



    <!-- The top margin of the panel that holds the list of notifications. -->

    <dimen name="notification_panel_margin_top">0dp</dimen>
@@ -631,6 +632,7 @@ 
    <dimen name="qs_footer_icon_size">20dp</dimen>

    <dimen name="qs_header_top_padding">15dp</dimen>

    <dimen name="qs_header_bottom_padding">14dp</dimen>

    <dimen name="qs_header_row_min_height">48dp</dimen>



    <dimen name="qs_footer_padding">20dp</dimen>

    <dimen name="qs_security_footer_height">88dp</dimen>

packages/SystemUI/src/com/android/systemui/BatteryMeterView.java

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ public class BatteryMeterView extends LinearLayout implements 
     * 0 - No preference

     * 1 - Force on

     * 2 - Force off

     * 3 - Estimate

     * @param mode desired mode (none, on, off)

     */

    public void setPercentShowMode(@BatteryPercentMode int mode) {