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

Commit c0ac1dda authored by Yogisha Dixit's avatar Yogisha Dixit
Browse files

Update widget manipulation colors. 

Spec:
* Resize frame: https://docs.google.com/presentation/d/1UxdDh8EFhPbdRWRwzjbpgL-j02ew4Ew3eG3XBCeoYdo/edit#slide=id.OeO4S0j
* Drop target bar: https://docs.google.com/presentation/d/1UxdDh8EFhPbdRWRwzjbpgL-j02ew4Ew3eG3XBCeoYdo/edit#slide=id.vXfwHn8

Test: manual
Bug: 187910396
Change-Id: I6fd433796970c428841ee96e45ee4fca1ded3665
Merged-In: I6fd433796970c428841ee96e45ee4fca1ded3665
parent 61bc5c6c

res/color/drop_target_text.xml

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

<!-- Copyright (C) 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="?workspaceAccentColor" android:state_selected="false" />

    <item android:color="?dropTargetHoverTextColor" android:state_selected="true" />

</selector>
 
 No newline at end of file

res/drawable/drop_target_frame.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ 
    android:shape="rectangle">

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

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

    <stroke android:width="2dp" android:color="?android:attr/colorAccent" />

    <stroke android:width="2dp" android:color="?attr/workspaceAccentColor" />

</shape>
 
 No newline at end of file

res/drawable/drop_target_frame_hover.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
-->

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

    android:shape="rectangle">

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

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

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

</shape>
 
 No newline at end of file

res/drawable/widget_resize_frame.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ 
    android:shape="rectangle">

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

    <corners android:radius="@android:dimen/system_app_widget_background_radius" />

    <stroke android:width="2dp" android:color="?android:attr/colorAccent" />

    <stroke android:width="2dp" android:color="?attr/workspaceAccentColor" />

</shape>
 
 No newline at end of file

res/layout/app_widget_resize_frame.xml

+4 −4
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
            android:layout_gravity="left|center_vertical"

            android:layout_marginLeft="@dimen/widget_handle_margin"

            android:src="@drawable/ic_widget_resize_handle"

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

            android:tint="?attr/workspaceAccentColor" />



        <!-- Top -->

        <ImageView
@@ -51,7 +51,7 @@ 
            android:layout_gravity="top|center_horizontal"

            android:layout_marginTop="@dimen/widget_handle_margin"

            android:src="@drawable/ic_widget_resize_handle"

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

            android:tint="?attr/workspaceAccentColor" />



        <!-- Right -->

        <ImageView
@@ -61,7 +61,7 @@ 
            android:layout_gravity="right|center_vertical"

            android:layout_marginRight="@dimen/widget_handle_margin"

            android:src="@drawable/ic_widget_resize_handle"

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

            android:tint="?attr/workspaceAccentColor" />



        <!-- Bottom -->

        <ImageView
@@ -71,7 +71,7 @@ 
            android:layout_gravity="bottom|center_horizontal"

            android:layout_marginBottom="@dimen/widget_handle_margin"

            android:src="@drawable/ic_widget_resize_handle"

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

            android:tint="?attr/workspaceAccentColor" />



        <ImageButton

            android:id="@+id/widget_reconfigure_button"