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

Commit d55e3e75 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Iac1c21ce,I2329432a 

* changes:
  Add relevant SysUI values to notch emulation packages
  Move QS height values to frameworks/base/core/res/
parents 8e1e5e0d 4451fa26

core/res/res/values/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ 
    <dimen name="toast_y_offset">24dp</dimen>

    <!-- Height of the status bar -->

    <dimen name="status_bar_height">24dp</dimen>

    <!-- Height of area above QQS where battery/time go -->

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

    <!-- Total height of QQS (quick_qs_offset_height + 128) -->

    <dimen name="quick_qs_total_height">176dp</dimen>

    <!-- Height of the bottom navigation / system bar. -->

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

    <!-- Height of the bottom navigation bar in portrait; often the same as @dimen/navigation_bar_height -->

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1636,6 +1636,7 @@ 
  <java-symbol type="dimen" name="navigation_bar_height_landscape_car_mode" />

  <java-symbol type="dimen" name="navigation_bar_width_car_mode" />

  <java-symbol type="dimen" name="status_bar_height" />

  <java-symbol type="dimen" name="quick_qs_total_height" />

  <java-symbol type="drawable" name="ic_jog_dial_sound_off" />

  <java-symbol type="drawable" name="ic_jog_dial_sound_on" />

  <java-symbol type="drawable" name="ic_jog_dial_unlock" />

packages/SystemUI/res/layout/keyguard_status_bar.xml

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 


    <LinearLayout android:id="@+id/system_icons_super_container"

        android:layout_width="wrap_content"

        android:layout_height="@dimen/status_bar_header_height"

        android:layout_height="@*android:dimen/quick_qs_total_height"

        android:layout_toStartOf="@id/multi_user_switch"

        android:layout_alignWithParentIfMissing="true"

        android:layout_marginStart="@dimen/system_icons_super_container_margin_start"

packages/SystemUI/res/layout/qs_panel.xml

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
    <View

        android:id="@+id/quick_settings_status_bar_background"

        android:layout_width="match_parent"

        android:layout_height="@dimen/qs_header_system_icons_area_height"

        android:layout_height="@*android:dimen/quick_qs_offset_height"

        android:clipToPadding="false"

        android:clipChildren="false"

        android:background="#ff000000" />
@@ -43,7 +43,7 @@ 
        android:id="@+id/quick_settings_gradient_view"

        android:layout_width="match_parent"

        android:layout_height="126dp"

        android:layout_marginTop="@dimen/qs_header_system_icons_area_height"

        android:layout_marginTop="@*android:dimen/quick_qs_offset_height"

        android:clipToPadding="false"

        android:clipChildren="false"

        android:background="@drawable/qs_bg_gradient" />
@@ -51,7 +51,7 @@ 


    <com.android.systemui.qs.QSPanel

        android:id="@+id/quick_settings_panel"

        android:layout_marginTop="@dimen/qs_header_system_icons_area_height"

        android:layout_marginTop="@*android:dimen/quick_qs_offset_height"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="48dp"

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/header"

    android:layout_width="match_parent"

    android:layout_height="@dimen/status_bar_header_height"

    android:layout_height="@*android:dimen/quick_qs_total_height"

    android:layout_gravity="@integer/notification_panel_layout_gravity"

    android:baselineAligned="false"

    android:clickable="false"