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

Commit 95dcde18 authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Merging from ub-launcher3-master @ build 6294827 

Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-master_rvc-dev_6294827.html

Change-Id: I609b18fdd9d2aab235dde92a46cc9dd9160a5cdf
parents 39eaaeb8 d3f6449d

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ LOCAL_USE_AAPT2 := true 
LOCAL_MODULE_TAGS := optional



LOCAL_STATIC_ANDROID_LIBRARIES := WallpaperPicker2CommonDepsLib

LOCAL_STATIC_JAVA_LIBRARIES := styleprotosnano SystemUI-statsd

LOCAL_STATIC_JAVA_LIBRARIES := styleprotosnano SystemUI-statsd SystemUISharedLib

LOCAL_PROGUARD_ENABLED := disabled



LOCAL_PACKAGE_NAME := ThemePicker

res/color/option_border_color.xml

deleted100644 → 0
+0 −28
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");

     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.

-->

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

    <item

        android:state_activated="true"

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

    <item

        android:state_activated="false"

        android:alpha="0.24"

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

    <item

        android:alpha="0.05"

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

</selector>

res/drawable/option_border.xml

deleted100644 → 0
+0 −25
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");

     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.

-->

<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 android:drawable="@drawable/option_border_edge" />

</ripple>

res/drawable/option_border_edge.xml

deleted100644 → 0
+0 −34
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");

     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.

-->

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

    <item android:state_activated="true">

        <shape android:shape="rectangle">

            <stroke

                android:color="@color/option_border_color"

                android:width="@dimen/option_selected_border_width" />

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

        </shape>

    </item>

    <item android:state_activated="false">

        <shape android:shape="rectangle">

            <stroke

                android:color="@color/option_border_color"

                android:width="@dimen/option_border_width" />

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

        </shape>

    </item>

</selector>

res/layout/activity_customization_picker_main.xml

+2 −0
Original line number Diff line number Diff line
@@ -36,4 +36,6 @@ 
        app:labelVisibilityMode="labeled"

        app:menu="@menu/bottom_navigation_menu"/>



    <include layout="@layout/bottom_action_bar" />



</FrameLayout>