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

Commit 9781499a authored by Xin Li's avatar Xin Li
Browse files

Merge redfin/bramble support. 

Bug: 171218636
Merged-In: I2a7aa5f17b334545f79a4552be9f8df2f91f7b82
Change-Id: Idb4bb01bdeef0d2443ba43311f240dcb8f70f2f5
parents 3740fa07 c07254e6

AndroidManifest.xml

+6 −1
Original line number Diff line number Diff line
@@ -3,11 +3,12 @@ 
          xmlns:tools="http://schemas.android.com/tools"

          package="com.android.wallpaper">



    <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="28"/>

    <uses-sdk android:targetSdkVersion="30" android:minSdkVersion="28"/>



    <uses-permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES"/>

    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>

    <uses-permission android:name="android.permission.SET_WALLPAPER_COMPONENT" />

    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />



    <application

        tools:replace="android:icon,android:name"
@@ -35,6 +36,10 @@ 
        <activity android:name="com.android.customization.picker.theme.CustomThemeActivity"

                  android:resizeableActivity="false"

                  android:theme="@style/CustomizationTheme.NoActionBar"/>



        <activity android:name="com.android.customization.picker.ViewOnlyFullPreviewActivity"

            android:resizeableActivity="false"

            android:theme="@style/CustomizationTheme.NoActionBar"/>

    </application>



</manifest>

res/color/bottom_nav_item_color.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,5 +20,5 @@ 
        android:color="?android:colorAccent" />

    <item

        android:state_checked="false"

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

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

</selector>
 
 No newline at end of file

res/drawable/color_chip_hollow.xml

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

<!--



     Copyright (C) 2019 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +14,28 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

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

    <item

        android:id="@+id/center_fill"

        android:height="@dimen/component_color_chip_size"

        android:width="@dimen/component_color_chip_size"

        android:gravity="center">

        <shape

            android:shape="oval">

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

        </shape>

    </item>

    <item

        android:height="@dimen/component_color_chip_container_size"

        android:width="@dimen/component_color_chip_container_size"

        android:gravity="center">

        <shape

            android:shape="ring"

        android:innerRadius="10dp"

        android:thickness="6dp"

            android:innerRadius="24dp"

            android:thickness="@dimen/option_border_width"

            android:useLevel="false">

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

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

        </shape>

    </item>

</layer-list>

res/drawable/ic_check_circle_filled_24px.xml

deleted100644 → 0
+0 −28
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/option_border_custom.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    <item android:id="@android:id/mask">

        <shape android:shape="rectangle">

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

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

            <corners android:radius="?android:dialogCornerRadius" />

        </shape>

    </item>

    <item android:drawable="@drawable/option_border_edge_custom" />