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

Commit b55bc336 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Controls UI - Redline adjustment for structure switching + overflow"... 

Merge "Controls UI - Redline adjustment for structure switching + overflow" into rvc-dev am: 528e5209 am: 0480875f am: c1aa0dff

Change-Id: Ie2667a4617040508437566fefdd656a715bce712
parents c52ba3eb c1aa0dff

packages/SystemUI/res/drawable/control_spinner_background.xml

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


<layer-list xmlns:android="http://schemas.android.com/apk/res/android"

            android:paddingMode="stack"

            android:paddingStart="0dp"

            android:paddingStart="40dp"

            android:paddingEnd="40dp"

            android:paddingLeft="0dp"

            android:paddingRight="0dp">

packages/SystemUI/res/drawable/controls_list_divider_inset.xml

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

<!-- Copyright (C) 2020 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.

-->

<inset

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

    android:drawable="@drawable/controls_list_divider"

    android:insetRight="@dimen/control_spinner_padding_horizontal"

    android:insetLeft="@dimen/control_spinner_padding_horizontal" />

packages/SystemUI/res/layout/controls_more_item.xml

+0 −1
Original line number Diff line number Diff line
@@ -18,6 +18,5 @@ 
    style="@style/Control.MenuItem"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:padding="24dp"

    android:layout_gravity="start" />

packages/SystemUI/res/layout/controls_spinner_item.xml

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:padding="8dp">

    android:paddingVertical="@dimen/control_spinner_padding_vertical"

    android:paddingHorizontal="@dimen/control_spinner_padding_horizontal">



  <LinearLayout

      android:orientation="horizontal"

packages/SystemUI/res/layout/controls_with_favorites.xml

+3 −14
Original line number Diff line number Diff line
@@ -21,14 +21,14 @@ 
      android:layout_height="match_parent"

      android:orientation="horizontal"

      android:layout_marginTop="@dimen/controls_top_margin"

      android:layout_marginEnd="@dimen/controls_header_side_margin"

      android:layout_marginStart="@dimen/controls_header_side_margin">

      android:layout_marginBottom="@dimen/controls_header_bottom_margin">



    <!-- make sure the header stays centered in the layout by adding a spacer -->

    <Space

        android:layout_width="@dimen/controls_header_menu_size"

        android:layout_height="1dp" />



    <!-- need to keep this outer view in order to have a correctly sized anchor

         for the dropdown menu, as well as dropdown background in the right place -->

    <LinearLayout

        android:id="@+id/controls_header"

        android:orientation="horizontal"
@@ -38,15 +38,6 @@ 
        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:gravity="center">



      <ImageView

          android:id="@+id/app_icon"

          android:layout_gravity="center"

          android:layout_width="@dimen/controls_header_app_icon_size"

          android:layout_height="@dimen/controls_header_app_icon_size"

          android:contentDescription="@null"

          android:layout_marginEnd="10dp" />



      <TextView

          style="@style/Control.Spinner.Header"

          android:clickable="false"
@@ -55,7 +46,6 @@ 
          android:layout_height="wrap_content"

          android:layout_gravity="center" />

    </LinearLayout>



    <ImageView

        android:id="@+id/controls_more"

        android:src="@drawable/ic_more_vert"
@@ -73,7 +63,6 @@ 
      android:layout_width="match_parent"

      android:layout_height="wrap_content"

      android:orientation="vertical"

      android:paddingTop="30dp"

      android:layout_marginLeft="@dimen/global_actions_side_margin"

      android:layout_marginRight="@dimen/global_actions_side_margin" />

</merge>