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

Commit 147bc7ef authored by William Leshner's avatar William Leshner Committed by Automerger Merge Worker
Browse files

Merge "Final icons in dream overlay status bar." into tm-dev am: 2e60d413 am: fa653c62 

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

Change-Id: Ib6168131e9039f14ef2a0f624940eb62d1f6acc0
parents 96ad0d82 fa653c62

packages/SystemUI/res/layout/dream_overlay_container.xml

+1 −30
Original line number Diff line number Diff line
@@ -34,34 +34,5 @@ 
        app:layout_constraintBottom_toBottomOf="parent"

        />



    <com.android.systemui.dreams.DreamOverlayStatusBarView

        android:id="@+id/dream_overlay_status_bar"

        android:layout_width="match_parent"

        android:layout_height="@dimen/dream_overlay_status_bar_height"

        android:paddingEnd="@dimen/dream_overlay_status_bar_margin"

        android:paddingStart="@dimen/dream_overlay_status_bar_margin"

        app:layout_constraintTop_toTopOf="parent">



        <androidx.constraintlayout.widget.ConstraintLayout

            android:id="@+id/dream_overlay_system_status"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            app:layout_constraintEnd_toEndOf="parent">



            <com.android.systemui.statusbar.AlphaOptimizedImageView

                android:id="@+id/dream_overlay_wifi_status"

                android:layout_width="@dimen/status_bar_wifi_signal_size"

                android:layout_height="match_parent"

                android:layout_marginEnd="@dimen/dream_overlay_status_icon_margin"

                android:visibility="gone"

                app:layout_constraintEnd_toStartOf="@id/dream_overlay_battery" />



            <com.android.systemui.battery.BatteryMeterView

                android:id="@+id/dream_overlay_battery"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                app:layout_constraintEnd_toEndOf="parent" />



        </androidx.constraintlayout.widget.ConstraintLayout>

    </com.android.systemui.dreams.DreamOverlayStatusBarView>

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

</com.android.systemui.dreams.DreamOverlayContainerView>
 
 No newline at end of file

packages/SystemUI/res/layout/dream_overlay_status_bar_view.xml

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

<!--

  ~ Copyright (C) 2022 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.dreams.DreamOverlayStatusBarView

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

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

    android:id="@+id/dream_overlay_status_bar"

    android:layout_width="match_parent"

    android:layout_height="@dimen/dream_overlay_status_bar_height"

    android:paddingEnd="@dimen/dream_overlay_status_bar_margin"

    android:paddingStart="@dimen/dream_overlay_status_bar_margin"

    app:layout_constraintTop_toTopOf="parent">



    <com.android.systemui.dreams.DreamOverlayDotImageView

        android:id="@+id/dream_overlay_notification_indicator"

        android:layout_width="@dimen/dream_overlay_notification_indicator_size"

        android:layout_height="@dimen/dream_overlay_notification_indicator_size"

        android:visibility="gone"

        android:contentDescription="@string/dream_overlay_status_bar_notification_indicator"

        app:dotColor="@android:color/white"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent" />



    <LinearLayout

        android:id="@+id/dream_overlay_system_status"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:orientation="horizontal"

        app:layout_constraintEnd_toEndOf="parent">



        <com.android.systemui.statusbar.AlphaOptimizedImageView

            android:id="@+id/dream_overlay_assistant_guest_mode_enabled"

            android:layout_width="@dimen/dream_overlay_status_bar_icon_size"

            android:layout_height="match_parent"

            android:layout_marginEnd="@dimen/dream_overlay_status_icon_margin"

            android:src="@drawable/ic_account_circle"

            android:tint="@android:color/white"

            android:visibility="gone"

            android:contentDescription=

                "@string/dream_overlay_status_bar_assistant_guest_mode_enabled" />



        <com.android.systemui.statusbar.AlphaOptimizedImageView

            android:id="@+id/dream_overlay_alarm_set"

            android:layout_width="@dimen/dream_overlay_status_bar_icon_size"

            android:layout_height="match_parent"

            android:layout_marginEnd="@dimen/dream_overlay_status_icon_margin"

            android:src="@drawable/ic_alarm"

            android:tint="@android:color/white"

            android:visibility="gone"

            android:contentDescription="@string/dream_overlay_status_bar_alarm_set" />



        <com.android.systemui.statusbar.AlphaOptimizedImageView

            android:id="@+id/dream_overlay_priority_mode"

            android:layout_width="@dimen/dream_overlay_status_bar_icon_size"

            android:layout_height="match_parent"

            android:layout_marginEnd="@dimen/dream_overlay_status_icon_margin"

            android:src="@drawable/ic_remove_circle"

            android:tint="@android:color/white"

            android:visibility="gone"

            android:contentDescription="@string/dream_overlay_status_bar_priority_mode" />



        <com.android.systemui.statusbar.AlphaOptimizedImageView

            android:id="@+id/dream_overlay_wifi_status"

            android:layout_width="@dimen/dream_overlay_status_bar_icon_size"

            android:layout_height="match_parent"

            android:layout_marginEnd="@dimen/dream_overlay_status_icon_margin"

            android:src="@drawable/ic_signal_wifi_off"

            android:visibility="gone"

            android:contentDescription="@string/dream_overlay_status_bar_wifi_off" />



        <com.android.systemui.dreams.DreamOverlayDotImageView

            android:id="@+id/dream_overlay_camera_mic_off"

            android:layout_width="@dimen/dream_overlay_camera_mic_off_indicator_size"

            android:layout_height="@dimen/dream_overlay_camera_mic_off_indicator_size"

            android:layout_gravity="center_vertical"

            android:layout_marginEnd="@dimen/dream_overlay_status_icon_margin"

            android:visibility="gone"

            android:contentDescription="@string/dream_overlay_status_bar_camera_mic_off"

            app:dotColor="@color/dream_overlay_camera_mic_off_dot_color" />



    </LinearLayout>

</com.android.systemui.dreams.DreamOverlayStatusBarView>

packages/SystemUI/res/values/attrs.xml

+4 −0
Original line number Diff line number Diff line
@@ -199,5 +199,9 @@ 
    </declare-styleable>



    <attr name="overlayButtonTextColor" format="color" />



    <declare-styleable name="DreamOverlayDotImageView">

        <attr name="dotColor" format="color" />

    </declare-styleable>

</resources>

packages/SystemUI/res/values/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -225,4 +225,6 @@ 
    <color name="settingslib_track_off_color">@color/settingslib_track_off</color>

    <color name="connected_network_primary_color">#191C18</color>

    <color name="connected_network_secondary_color">#41493D</color>



    <color name="dream_overlay_camera_mic_off_dot_color">#FCBE03</color>

</resources>

packages/SystemUI/res/values/dimens.xml

+5 −1
Original line number Diff line number Diff line
@@ -1332,12 +1332,16 @@ 
    <dimen name="fgs_manager_min_width_minor">100%</dimen>



    <!-- Dream overlay related dimensions -->

    <dimen name="dream_overlay_status_bar_height">80dp</dimen>

    <dimen name="dream_overlay_status_bar_height">60dp</dimen>

    <dimen name="dream_overlay_status_bar_margin">40dp</dimen>

    <dimen name="dream_overlay_status_icon_margin">8dp</dimen>

    <dimen name="dream_overlay_status_bar_icon_size">

        @*android:dimen/status_bar_system_icon_size</dimen>

    <!-- Height of the area at the top of the dream overlay to allow dragging down the notifications

         shade. -->

    <dimen name="dream_overlay_notifications_drag_area_height">100dp</dimen>

    <dimen name="dream_overlay_camera_mic_off_indicator_size">8dp</dimen>

    <dimen name="dream_overlay_notification_indicator_size">6dp</dimen>



    <!-- Dream overlay complications related dimensions -->

    <dimen name="dream_overlay_complication_clock_time_text_size">72sp</dimen>