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

Commit 2b5124ec authored by Alina Zaidi's avatar Alina Zaidi
Browse files

Fix some bugs in widget pickers. 

- Update color of Educational tip view contents. Background colorAccentSecondary
in NexusLauncher above S, colorAccent otherwise (b/185834169)
- Update widget picker search bar color and its text font and color. (b/186423026)
- Update button padding and text in pin widget picker. (b/182994384, b/183601584)

Bug: 185834169
Bug: 186423026
Bug: 182994384
Bug: 183601584
Test: Manually tested
Change-Id: I36cd3ed2285677d0c164db8f57f6c90a5f247982
parent 9f531ee6

res/color/arrow_tip_view_bg.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2021, 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:color="?android:attr/colorAccent" />

</selector>

res/color/arrow_tip_view_content.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2021, 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:color="@android:color/white" />

</selector>

res/drawable/arrow_toast_rounded_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,6 +14,6 @@ 
    limitations under the License.

-->

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

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

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

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

</shape>

res/drawable/bg_widgets_searchbox.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,6 +14,6 @@ 
     limitations under the License.

-->

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

    <solid android:color="?android:attr/textColorPrimaryInverse" />

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

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

</shape>
 
 No newline at end of file

res/layout/add_item_confirmation_activity.xml

+3 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
            style="@style/Widget.DeviceDefault.Button.Rounded.Colored"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingHorizontal="16dp"

            android:onClick="onCancelClick"

            android:text="@android:string/cancel" />
@@ -64,7 +65,8 @@ 
            style="@style/Widget.DeviceDefault.Button.Rounded.Colored"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingHorizontal="16dp"

            android:onClick="onPlaceAutomaticallyClick"

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

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

    </LinearLayout>

</LinearLayout>