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

Commit 6828156f authored by Amin Shaikh's avatar Amin Shaikh
Browse files

Merging ub-launcher3-qt-dev, build 5497005 

Test: Manual

Bug:124472228
 Bug:126897804
 Bug:130753131
 Bug:130758665
 Bug:130759176
 Bug:130759508
 Bug:130759539
 Bug:130760161
 Bug:130760271
 Bug:130761292
 Bug:130761402
 Bug:130762720
 Bug:130763331
 Bug:130763336
 Bug:130763472
 Bug:130795531
 Bug:64712476

Change-Id: Idcc99f55285f05edc6da4e2553521410abe44843
parents e179ae0a 3d41214e

res/drawable/ic_add_24px.xml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<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="@android:color/white"

      android:pathData="M20,13h-7v7h-2v-7H4v-2h7V4h2v7h7V13z"/>

</vector>

res/drawable/ic_check_circle_filled_24px.xml

0 → 100644
+28 −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.

-->

<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="@color/selected_check_background_color"

      android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10s10,-4.5 10,-10S17.5,2 12,2zM10,17l-4,-4l1.4,-1.4l2.6,2.6l6.6,-6.6L18,9L10,17z"/>

  <path

      android:pathData="m8.0085,14.9866 l-1.9939,-1.994 0.6892,-0.6889 0.6892,-0.6889 1.2925,1.2926c0.7109,0.711 1.3035,1.2926 1.3169,1.2926 0.0134,0 1.5034,-1.4789 3.3111,-3.2865l3.2866,-3.2865 0.689,0.689 0.689,0.689 -3.9878,3.9878 -3.9878,3.9878z"

      android:strokeWidth="0.02439024"

      android:fillColor="@color/selected_check_color"/>

</vector>

res/drawable/ic_tune_24px.xml→res/drawable/ic_tune.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
     limitations under the License.

-->

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

    android:width="24dp"

    android:height="24dp"

    android:width="20dp"

    android:height="20dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

  <path

res/drawable/option_border.xml

+15 −5
Original line number Diff line number Diff line
@@ -13,8 +13,18 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

    android:shape="rectangle">

    <stroke android:color="@color/option_border_color" android:width="2dp" />

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

    android:color="?android:attr/colorControlHighlight">

    <item android:id="@android:id/mask">

        <shape android:shape="rectangle">

            <solid android:color="@android:color/white"/>

            <corners android:radius="4dp" />

        </shape>

    </item>

    <item>

        <shape android:shape="rectangle">

            <stroke android:color="@color/option_border_color" android:width="@dimen/option_border_width" />

            <corners android:radius="4dp" />

        </shape>

    </item>

</ripple>

res/layout/activity_custom_theme.xml

+7 −0
Original line number Diff line number Diff line
@@ -34,6 +34,13 @@ 
        android:layout_width="match_parent"

        android:layout_height="@dimen/custom_theme_nav_height"

        android:layout_marginHorizontal="12dp">

        <Button

            android:id="@+id/previous_button"

            style="@style/ActionSecondaryButton"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="start|center_vertical"

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

        <Button

            android:id="@+id/next_button"

            style="@style/ActionPrimaryButton"