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

Commit f5dd83bc authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Revert "Merging from ub-launcher3-master @ build 6294827" am: 61cbcf31 

Change-Id: I26c219617c5bb926b14e88abde09bbfb6f51b43f
parents 9a7f81e3 61cbcf31

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 SystemUISharedLib

LOCAL_STATIC_JAVA_LIBRARIES := styleprotosnano SystemUI-statsd

LOCAL_PROGUARD_ENABLED := disabled



LOCAL_PACKAGE_NAME := ThemePicker

res/color/option_border_color.xml

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

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

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

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

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



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



</FrameLayout>