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

Commit 4c84a8c4 authored by Winson's avatar Winson
Browse files

Fixing some small issues with the overlay. 

- Should be updating the app text color to match the activity text color
- Fixing issue with indicator showing when fast toggle is disabled but
  the indicator flag is enabled
- Tweaking layout so that the buttons are flush with the borders so that
  we capture the full area for press/long press

Change-Id: Ia9b081883562ef4fd1c01fd42bc786a1feeb0854
parent c5ef63f4

packages/SystemUI/res/layout/recents_task_view_header.xml

+10 −13
Original line number Diff line number Diff line
@@ -23,12 +23,10 @@ 
    <com.android.systemui.recents.views.FixedSizeImageView

        android:id="@+id/icon"

        android:contentDescription="@string/recents_app_info_button_label"

        android:layout_width="@dimen/recents_task_view_application_icon_size"

        android:layout_height="@dimen/recents_task_view_application_icon_size"

        android:layout_marginStart="8dp"

        android:layout_width="@dimen/recents_task_view_header_icon_width"

        android:layout_height="@dimen/recents_task_view_header_icon_height"

        android:layout_gravity="center_vertical|start"

        android:padding="8dp"

        android:background="@drawable/recents_button_bg" />

        android:padding="9dp" />

    <TextView

        android:id="@+id/title"

        android:layout_width="match_parent"
@@ -46,21 +44,20 @@ 
        android:fadingEdge="horizontal" />

    <com.android.systemui.recents.views.FixedSizeImageView

        android:id="@+id/move_task"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_marginEnd="52dp"

        android:layout_width="@dimen/recents_task_view_header_button_width"

        android:layout_height="@dimen/recents_task_view_header_button_height"

        android:layout_marginEnd="@dimen/recents_task_view_header_button_width"

        android:layout_gravity="center_vertical|end"

        android:padding="12dp"

        android:padding="15dp"

        android:background="@drawable/recents_button_bg"

        android:src="@drawable/star"

        android:visibility="gone" />

    <com.android.systemui.recents.views.FixedSizeImageView

        android:id="@+id/dismiss_task"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_marginEnd="4dp"

        android:layout_width="@dimen/recents_task_view_header_button_width"

        android:layout_height="@dimen/recents_task_view_header_button_height"

        android:layout_gravity="center_vertical|end"

        android:padding="12dp"

        android:padding="15dp"

        android:background="@drawable/recents_button_bg"

        android:visibility="invisible"

        android:src="@drawable/recents_dismiss_light" />

packages/SystemUI/res/layout/recents_task_view_header_overlay.xml

+7 −10
Original line number Diff line number Diff line
@@ -16,16 +16,14 @@ 
<FrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:visibility="gone">

    android:layout_height="match_parent">

    <com.android.systemui.recents.views.FixedSizeImageView

        android:id="@+id/app_icon"

        android:contentDescription="@string/recents_app_info_button_label"

        android:layout_width="@dimen/recents_task_view_application_icon_size"

        android:layout_height="@dimen/recents_task_view_application_icon_size"

        android:layout_marginStart="8dp"

        android:layout_width="@dimen/recents_task_view_header_icon_width"

        android:layout_height="@dimen/recents_task_view_header_icon_height"

        android:layout_gravity="center_vertical|start"

        android:padding="8dp" />

        android:padding="9dp" />

    <TextView

        android:id="@+id/app_title"

        android:layout_width="match_parent"
@@ -43,11 +41,10 @@ 
        android:fadingEdge="horizontal" />

    <com.android.systemui.recents.views.FixedSizeImageView

        android:id="@+id/app_info"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_marginEnd="4dp"

        android:layout_width="@dimen/recents_task_view_header_button_width"

        android:layout_height="@dimen/recents_task_bar_height"

        android:layout_gravity="center_vertical|end"

        android:padding="12dp"

        android:padding="15dp"

        android:background="@drawable/recents_button_bg"

        android:src="@drawable/recents_info_light" />

</FrameLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/recents_task_view_header_progress_bar.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,4 +19,4 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:indeterminateOnly="false"

    android:visibility="gone" />
 
 No newline at end of file
 
    android:visibility="invisible" />
 
 No newline at end of file

packages/SystemUI/res/values/dimens.xml

+7 −2
Original line number Diff line number Diff line
@@ -191,8 +191,13 @@ 
    <!-- Default distance from each snap target that GlowPadView considers a "hit" -->

    <dimen name="glowpadview_inner_radius">15dip</dimen>



    <!-- The size of the application icon in the recents task view. -->

    <dimen name="recents_task_view_application_icon_size">48dp</dimen>

    <!-- The size of the icon in the recents task view header. -->

    <dimen name="recents_task_view_header_icon_width">64dp</dimen>

    <dimen name="recents_task_view_header_icon_height">@dimen/recents_task_bar_height</dimen>



    <!-- The size of a button in the recents task view header. -->

    <dimen name="recents_task_view_header_button_width">@dimen/recents_task_bar_height</dimen>

    <dimen name="recents_task_view_header_button_height">@dimen/recents_task_bar_height</dimen>



    <!-- The radius of the rounded corners on a task view. -->

    <dimen name="recents_task_view_rounded_corners_radius">2dp</dimen>

packages/SystemUI/src/com/android/systemui/recents/RecentsDebugFlags.java

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ public class RecentsDebugFlags implements TunerService.Tunable { 
     * @return whether we are enabling the fast toggle indicator.

     */

    public boolean isFastToggleIndicatorEnabled() {

        return mFastToggleIndicator;

        return mFastToggleRecents && mFastToggleIndicator;

    }



    /**