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

Commit fcc51683 authored by Santiago Etchebehere's avatar Santiago Etchebehere Committed by Hyunyoung Song
Browse files

Merging ub-launcher3-master, build 5391211 

Test: Manual

Bug: 124454263
Bug: 124796742
Bug: 126417894
Bug: 126738409
Bug: 126744145
Bug: 126791704
Bug: 126803091
Bug: 126814811
Bug: 126897804
Bug: 128623100

Change-Id: I1d65e74e6834df6877a9b3a833c97b1c0a290bb4
parents 4006b3f2 323d2a03

AndroidManifest.xml

+4 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

          xmlns:tools="http://schemas.android.com/tools"

          package="com.android.wallpaper">



    <uses-sdk android:targetSdkVersion="Q" android:minSdkVersion="28"/>
@@ -15,7 +16,9 @@ 
        android:requiredForAllUsers="true"

        android:restoreAnyVersion="true"

        android:supportsRtl="true"

        android:theme="@style/CustomizationTheme">

        android:name="com.android.customization.picker.CustomizationPickerApplication"

        android:theme="@style/CustomizationTheme"

        tools:replace="android:name">

        <activity

            android:name="com.android.customization.picker.CustomizationPickerActivity"

            android:label="@string/app_name"

res/color/indicator_arrow_color.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,5 +20,5 @@ 
        android:color="@color/preview_pager_arrow_disabled" />

    <item

        android:state_enabled="true"

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

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

</selector>

res/color/option_border_color.xml

+3 −2
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
        android:color="?android:colorAccent" />

    <item

        android:state_activated="false"

        android:color="@color/material_grey500" />

        android:alpha="0.24"

        android:color="?android:colorAccent" />

    <item

        android:color="@color/material_grey500"/>

</selector>

res/drawable/ic_font.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="36dp"

    android:height="36dp"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <!-- This path represents a square with rounded corners -->

res/drawable/ic_tune_24px.xml

0 → 100644
+24 −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="#FF000000"

      android:pathData="M3,17v2h6v-2H3zM3,5v2h10V5H3zM13,21v-2h8v-2h-8v-2h-2v6H13zM7,9v2H3v2h4v2h2V9H7zM21,13v-2H11v2H21zM15,9h2V7h4V5h-4V3h-2V9z"/>

</vector>