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

Commit 6ea5f721 authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Adjust task menu text size and colors 

Fixes: 189855320
Fixes: 189855322
Change-Id: I0df4109f91ab09211b3cb5f3d18ad7374fa3f68c
parent d9463fbf

quickstep/res/layout/task_menu.xml

+5 −5
Original line number Diff line number Diff line
@@ -25,15 +25,15 @@ 


    <TextView

        android:id="@+id/task_name"

        android:background="?android:attr/textColorPrimary"

        android:textColor="?android:attr/textColorPrimaryInverse"

        android:background="?android:attr/colorPrimary"

        android:textColor="?android:attr/textColorPrimary"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:gravity="center"

        android:layout_marginBottom="2dp"

        android:paddingTop="@dimen/task_card_menu_option_vertical_padding"

        android:paddingBottom="@dimen/task_card_menu_option_vertical_padding"

        android:textSize="24sp"/>

        android:paddingTop="@dimen/task_menu_vertical_padding"

        android:paddingBottom="@dimen/task_menu_vertical_padding"

        android:textSize="16sp"/>



    <LinearLayout

        android:id="@+id/menu_option_layout"

quickstep/res/layout/task_view_menu_option.xml

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    android:orientation="vertical"

    android:paddingTop="@dimen/task_card_menu_option_vertical_padding"

    android:paddingBottom="@dimen/task_card_menu_option_vertical_padding"

    android:background="?android:attr/textColorPrimary"

    android:background="?android:attr/colorPrimary"

    android:theme="@style/PopupItem" >



    <View
@@ -30,7 +30,7 @@ 
      android:layout_height="@dimen/system_shortcut_icon_size"

      android:layout_marginStart="@dimen/task_menu_option_start_margin"

      android:layout_gravity="center_horizontal"

      android:backgroundTint="?android:attr/textColorPrimaryInverse"/>

      android:backgroundTint="?android:attr/textColorPrimary"/>



    <TextView

        style="@style/BaseIcon"
@@ -39,7 +39,7 @@ 
        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/task_menu_option_start_margin"

        android:textSize="14sp"

        android:textColor="?android:attr/textColorPrimaryInverse"

        android:textColor="?android:attr/textColorPrimary"

        android:focusable="false" />



</LinearLayout>

quickstep/res/values/dimens.xml

+2 −1
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ 


    <!-- Total space (start + end) between the task card and the edge of the screen

         in various configurations -->

    <dimen name="task_card_menu_option_vertical_padding">8dp</dimen>

    <dimen name="task_card_menu_option_vertical_padding">16dp</dimen>

    <dimen name="task_menu_vertical_padding">8dp</dimen>

    <dimen name="task_card_margin">8dp</dimen>

    <dimen name="task_card_menu_shadow_height">3dp</dimen>

    <dimen name="task_menu_option_start_margin">12dp</dimen>

quickstep/src/com/android/quickstep/views/TaskMenuView.java

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange 
        Rect insets = mActivity.getDragLayer().getInsets();

        BaseDragLayer.LayoutParams params = (BaseDragLayer.LayoutParams) getLayoutParams();

        int padding = getResources()

                .getDimensionPixelSize(R.dimen.task_card_menu_option_vertical_padding);

                .getDimensionPixelSize(R.dimen.task_menu_vertical_padding);

        params.width = orientationHandler.getTaskMenuWidth(taskView.getThumbnail()) - (2 * padding);

        // Gravity set to Left instead of Start as sTempRect.left measures Left distance not Start

        params.gravity = Gravity.LEFT;