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

Commit 1f24c7e3 authored by Winson Chung's avatar Winson Chung
Browse files

Initial changes to support lock-to-app on the foremost task. (Bug 16221876)

parent 5aa5f494
Loading
Loading
Loading
Loading
+28 −0
Original line number Diff line number Diff line
<!--
Copyright (C) 2014 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.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android" >
    <size
        android:width="24.0dp"
        android:height="24.0dp"/>

    <viewport
        android:viewportWidth="24.0"
        android:viewportHeight="24.0"/>

    <path
        android:fill="@color/recents_task_view_lock_to_app_button_color"
        android:pathData="M18.0,8.0l-1.0,0.0L17.0,6.0c0.0,-2.8 -2.2,-5.0 -5.0,-5.0C9.2,1.0 7.0,3.2 7.0,6.0l0.0,2.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.1 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0C20.0,8.9 19.1,8.0 18.0,8.0zM12.0,17.0c-1.1,0.0 -2.0,-0.9 -2.0,-2.0s0.9,-2.0 2.0,-2.0c1.1,0.0 2.0,0.9 2.0,2.0S13.1,17.0 12.0,17.0zM15.1,8.0L8.9,8.0L8.9,6.0c0.0,-1.7 1.4,-3.1 3.1,-3.1c1.7,0.0 3.1,1.4 3.1,3.1L15.1,8.0z"/>
</vector>
+20 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 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="#ffdadada">
    <item android:drawable="@color/recents_task_view_lock_to_app_button_background_color" />
</ripple>
 No newline at end of file
+21 −0
Original line number Diff line number Diff line
@@ -62,6 +62,27 @@
            android:visibility="invisible"
            android:src="@drawable/recents_dismiss_light" />
    </com.android.systemui.recents.views.TaskBarView>
    <FrameLayout
        android:id="@+id/lock_to_app"
        android:layout_width="match_parent"
        android:layout_height="@dimen/recents_task_view_lock_to_app_button_height"
        android:layout_gravity="center_horizontal|bottom"
        android:background="@drawable/recents_lock_to_task_button_bg"
        android:visibility="invisible">
        <TextView
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
            android:layout_gravity="center_horizontal"
            android:gravity="center"
            android:drawableLeft="@drawable/ic_lock_to_app_24dp"
            android:drawablePadding="8dp"
            android:textSize="16sp"
            android:textColor="@color/recents_task_view_lock_to_app_button_color"
            android:text="@string/recents_lock_to_app_button_label"
            android:fontFamily="sans-serif-medium"
            android:singleLine="true"
            android:textAllCaps="true" />
    </FrameLayout>
</com.android.systemui.recents.views.TaskView>

+6 −2
Original line number Diff line number Diff line
@@ -53,13 +53,17 @@
    <!-- The recents task bar light text color to be drawn on top of dark backgrounds. -->
    <color name="recents_task_bar_light_text_color">#ffeeeeee</color>
    <!-- The recents task bar dark text color to be drawn on top of light backgrounds. -->
    <color name="recents_task_bar_dark_text_color">#ff333333</color>
    <color name="recents_task_bar_dark_text_color">#cc000000</color>
    <!-- The recents task bar light dismiss icon color to be drawn on top of dark backgrounds. -->
    <color name="recents_task_bar_light_dismiss_color">#ffeeeeee</color>
    <!-- The recents task bar dark dismiss icon color to be drawn on top of light backgrounds. -->
    <color name="recents_task_bar_dark_dismiss_color">#ff333333</color>
    <color name="recents_task_bar_dark_dismiss_color">#cc000000</color>
    <!-- The recents task bar highlight color. -->
    <color name="recents_task_bar_highlight_color">#28ffffff</color>
    <!-- The lock to task button background color. -->
    <color name="recents_task_view_lock_to_app_button_background_color">#ffe6e6e6</color>
    <!-- The lock to task button foreground color. -->
    <color name="recents_task_view_lock_to_app_button_color">#ff666666</color>

    <color name="keyguard_affordance">#ffffffff</color>

+4 −0
Original line number Diff line number Diff line
@@ -127,6 +127,10 @@
    <integer name="recents_animate_task_enter_from_home_duration">275</integer>
    <!-- The animation stagger to apply to each task animation when transitioning from home. -->
    <integer name="recents_animate_task_enter_from_home_delay">10</integer>
    <!-- The short duration when animating in/out the lock to app button. -->
    <integer name="recents_animate_lock_to_app_button_short_duration">150</integer>
    <!-- The long duration when animating in/out the lock to app button. -->
    <integer name="recents_animate_lock_to_app_button_long_duration">300</integer>
    <!-- The min animation duration for animating the nav bar scrim in. -->
    <integer name="recents_nav_bar_scrim_enter_duration">400</integer>
    <!-- The animation duration for animating the removal of a task view. -->
Loading