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

Commit 86622777 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6751875 from afe934fb to rvc-qpr1-release 

Change-Id: I07e375dc2c1e701b842ff7939f3bb040c9a1294f
parents 4ff4297c afe934fb

core/res/res/values/donottranslate.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    <!-- @hide DO NOT TRANSLATE. Control aspect ratio of lock pattern -->

    <string name="lock_pattern_view_aspect">square</string>

    <!-- @hide DO NOT TRANSLATE. ICU pattern for "Mon, 14 January" -->

    <string name="icu_abbrev_wday_month_day_no_year">eeeMMMMd</string>

    <string name="icu_abbrev_wday_month_day_no_year">EEEMMMMd</string>

    <!-- @hide DO NOT TRANSLATE. date formatting pattern for system ui.-->

    <string name="system_ui_date_pattern">@string/icu_abbrev_wday_month_day_no_year</string>

    <!-- @hide DO NOT TRANSLATE Spans within this text are applied to style composing regions

libs/hwui/service/GraphicsStatsService.cpp

+1 −0
Original line number Diff line number Diff line
@@ -559,6 +559,7 @@ void GraphicsStatsService::finishDumpInMemory(Dump* dump, AStatsEventList* data, 
        AStatsEvent_writeBool(event, !lastFullDay);

        AStatsEvent_build(event);

    }

    delete dump;

}

packages/SystemUI/res-keyguard/values/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
        <item name="android:textColor">?attr/wallpaperTextColorSecondary</item>

        <item name="android:textSize">14dp</item>

        <item name="android:background">@drawable/kg_emergency_button_background</item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

        <item name="android:paddingLeft">12dp</item>

        <item name="android:paddingRight">12dp</item>

    </style>

packages/SystemUI/res/layout/media_view.xml

+94 −4
Original line number Diff line number Diff line
@@ -210,8 +210,98 @@ 
        android:layout_width="@dimen/qs_media_icon_size"

        android:layout_height="@dimen/qs_media_icon_size" />



    <!-- Buttons to remove this view when no longer needed -->

    <include

        layout="@layout/qs_media_panel_options"

        android:visibility="gone" />

    <!-- Constraints are set here as they are the same regardless of host -->

    <TextView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/qs_media_panel_outer_padding"

        android:layout_marginStart="@dimen/qs_media_panel_outer_padding"

        android:layout_marginEnd="@dimen/qs_media_panel_outer_padding"

        android:id="@+id/media_text"

        android:fontFamily="@*android:string/config_headlineFontFamilyMedium"

        android:textColor="@color/media_primary_text"

        android:text="@string/controls_media_title"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintBottom_toTopOf="@id/remove_text"

        app:layout_constraintVertical_chainStyle="spread_inside"/>



    <TextView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/qs_media_panel_outer_padding"

        android:layout_marginEnd="@dimen/qs_media_panel_outer_padding"

        android:id="@+id/remove_text"

        android:fontFamily="@*android:string/config_headlineFontFamily"

        android:singleLine="true"

        android:textColor="@color/media_primary_text"

        android:text="@string/controls_media_close_session"

        app:layout_constraintTop_toBottomOf="@id/media_text"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintBottom_toTopOf="@id/settings"/>



    <FrameLayout

        android:id="@+id/settings"

        android:background="@drawable/qs_media_light_source"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/qs_media_panel_outer_padding"

        android:paddingBottom="@dimen/qs_media_panel_outer_padding"

        android:minWidth="48dp"

        android:minHeight="48dp"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toBottomOf="@id/remove_text">



        <TextView

            android:layout_gravity="bottom"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:fontFamily="@*android:string/config_headlineFontFamilyMedium"

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

            android:text="@string/controls_media_settings_button" />

    </FrameLayout>



    <FrameLayout

        android:id="@+id/cancel"

        android:background="@drawable/qs_media_light_source"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginEnd="@dimen/qs_media_panel_outer_padding"

        android:paddingBottom="@dimen/qs_media_panel_outer_padding"

        android:minWidth="48dp"

        android:minHeight="48dp"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toStartOf="@id/dismiss" >



        <TextView

            android:layout_gravity="bottom"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:fontFamily="@*android:string/config_headlineFontFamilyMedium"

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

            android:text="@string/cancel" />

    </FrameLayout>



    <FrameLayout

        android:id="@+id/dismiss"

        android:background="@drawable/qs_media_light_source"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginEnd="@dimen/qs_media_panel_outer_padding"

        android:paddingBottom="@dimen/qs_media_panel_outer_padding"

        android:minWidth="48dp"

        android:minHeight="48dp"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="parent">



        <TextView

            android:layout_gravity="bottom"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:fontFamily="@*android:string/config_headlineFontFamilyMedium"

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

            android:text="@string/controls_media_dismiss_button"

        />

    </FrameLayout>

</com.android.systemui.util.animation.TransitionLayout>

packages/SystemUI/res/layout/qs_media_panel_options.xml

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

<!--

  ~ Copyright (C) 2019 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:id="@+id/qs_media_controls_options"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:gravity="center"

    android:padding="16dp"

    android:orientation="vertical">

    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="48dp"

        android:layout_weight="1"

        android:minWidth="48dp"

        android:layout_gravity="start|bottom"

        android:gravity="bottom"

        android:id="@+id/remove"

        android:orientation="horizontal">

        <ImageView

            android:layout_width="18dp"

            android:layout_height="18dp"

            android:id="@+id/remove_icon"

            android:layout_marginEnd="16dp"

            android:tint="@color/media_primary_text"

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

        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:id="@+id/remove_text"

            android:fontFamily="@*android:string/config_headlineFontFamilyMedium"

            android:singleLine="true"

            android:textColor="@color/media_primary_text"

            android:text="@string/controls_media_close_session" />

    </LinearLayout>

    <TextView

        android:id="@+id/cancel"

        android:layout_width="wrap_content"

        android:layout_height="48dp"

        android:layout_weight="1"

        android:minWidth="48dp"

        android:layout_gravity="end|bottom"

        android:gravity="bottom"

        android:fontFamily="@*android:string/config_headlineFontFamilyMedium"

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

        android:text="@string/cancel" />

</LinearLayout>