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

Commit b5bb99ff authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Controls UI - Move 'add controls' to popup menu" into rvc-dev am: 2ca22c98 

Change-Id: I9421f4c01c238e6e89cb145e524f74e9659b6a9b
parents 369cc02a 2ca22c98

packages/SystemUI/res/drawable/ic_more_vert.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

     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.

-->

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

  <path

      android:fillColor="#FF000000"

      android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>

</vector>

packages/SystemUI/res/layout/controls_more_item.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<!--

  ~ 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.

  -->

<TextView

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

    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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:padding="4dp">

    android:padding="8dp">



  <LinearLayout

      android:orientation="horizontal"

packages/SystemUI/res/layout/controls_with_favorites.xml

+12 −0
Original line number Diff line number Diff line
@@ -51,6 +51,18 @@ 
          android:layout_gravity="center" />

    </LinearLayout>



    <ImageView

        android:id="@+id/controls_more"

        android:src="@drawable/ic_more_vert"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:padding="12dp"

        android:layout_marginEnd="@dimen/controls_list_side_margin"

        android:tint="@color/control_more_vert"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintRight_toRightOf="parent"

        app:layout_constraintTop_toTopOf="parent" />



  </androidx.constraintlayout.widget.ConstraintLayout>



  <LinearLayout

packages/SystemUI/res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ 
    <color name="control_default_background">@color/GM2_grey_900</color>

    <color name="control_list_popup_background">@*android:color/background_floating_material_dark</color>

    <color name="control_spinner_dropdown">@*android:color/foreground_material_dark</color>

    <color name="control_more_vert">@*android:color/foreground_material_dark</color>

    <color name="control_enabled_light_background">@color/GM2_yellow_200</color>

    <color name="control_enabled_thermo_heat_background">@color/GM2_red_200</color>

    <color name="control_enabled_thermo_cool_background">@color/GM2_blue_200</color>