Updating lock-to-app look.

- Adding seek bars for tweaking values when in debug mode

Change-Id: I92ae7b431ee170f5d8b31f34349d51a6b7f9ddef

12 files changed, 100 insertions, 82 deletions

diff --git a/packages/SystemUI/res/drawable-hdpi/btn_fab_recents.png b/packages/SystemUI/res/drawable-hdpi/btn_fab_recents.png
new file mode 100644
index 0000000..b95fde5
--- /dev/null
+++ b/packages/SystemUI/res/drawable-hdpi/btn_fab_recents.png
diff --git a/packages/SystemUI/res/drawable-mdpi/btn_fab_recents.png b/packages/SystemUI/res/drawable-mdpi/btn_fab_recents.png
new file mode 100644
index 0000000..6bbed06
--- /dev/null
+++ b/packages/SystemUI/res/drawable-mdpi/btn_fab_recents.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/btn_fab_recents.png b/packages/SystemUI/res/drawable-xhdpi/btn_fab_recents.png
new file mode 100644
index 0000000..4cdd0aa
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xhdpi/btn_fab_recents.png
diff --git a/packages/SystemUI/res/drawable-xxhdpi/btn_fab_recents.png b/packages/SystemUI/res/drawable-xxhdpi/btn_fab_recents.png
new file mode 100644
index 0000000..2220d60
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xxhdpi/btn_fab_recents.png
diff --git a/packages/SystemUI/res/drawable/recents_dismiss_dark.xml b/packages/SystemUI/res/drawable/recents_dismiss_dark.xml
index 337c028..ba09ebe 100644
--- a/packages/SystemUI/res/drawable/recents_dismiss_dark.xml
+++ b/packages/SystemUI/res/drawable/recents_dismiss_dark.xml
@@ -1,29 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!--
+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
+   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
+         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.
+    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"
-        android:height="16dp"
-        android:width="16dp"
-        android:viewportHeight="100"
-        android:viewportWidth="100" >
-
+        android:width="48.0dp"
+        android:height="48.0dp"
+        android:viewportWidth="48.0"
+        android:viewportHeight="48.0">
     <path
-        android:name="x"
-        android:pathData="M0,0L100,100M0,100L100,0z"
-        android:strokeColor="@color/recents_task_bar_dark_dismiss_color"
-        android:strokeWidth="8.0"
-        android:strokeLineCap="square" />
-
+        android:fillColor="@color/recents_task_bar_dark_dismiss_color"
+        android:pathData="M38.000000,12.800000l-2.799999,-2.800000 -11.200001,11.200001 -11.200000,-11.200001 -2.800000,2.800000 11.200001,11.200000 -11.200001,11.200001 2.800000,2.799999 11.200000,-11.200001 11.200001,11.200001 2.799999,-2.799999 -11.200001,-11.200001z"/>
 </vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/recents_dismiss_light.xml b/packages/SystemUI/res/drawable/recents_dismiss_light.xml
index 963ccf7..be0825c 100644
--- a/packages/SystemUI/res/drawable/recents_dismiss_light.xml
+++ b/packages/SystemUI/res/drawable/recents_dismiss_light.xml
@@ -1,30 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!--
+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
+   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
+         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.
+    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"
-        android:height="16dp"
-        android:width="16dp"
-        android:viewportHeight="100"
-        android:viewportWidth="100" >
-
-
+        android:width="48.0dp"
+        android:height="48.0dp"
+        android:viewportWidth="48.0"
+        android:viewportHeight="48.0">
     <path
-        android:name="x"
-        android:pathData="M0,0L100,100M0,100L100,0z"
-        android:strokeColor="@color/recents_task_bar_light_dismiss_color"
-        android:strokeWidth="8.0"
-        android:strokeLineCap="square" />
-
+        android:fillColor="@color/recents_task_bar_light_dismiss_color"
+        android:pathData="M38.000000,12.800000l-2.799999,-2.800000 -11.200001,11.200001 -11.200000,-11.200001 -2.800000,2.800000 11.200001,11.200000 -11.200001,11.200001 2.800000,2.799999 11.200000,-11.200001 11.200001,11.200001 2.799999,-2.799999 -11.200001,-11.200001z"/>
 </vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/recents_lock_to_app_pin.xml b/packages/SystemUI/res/drawable/recents_lock_to_app_pin.xml
new file mode 100644
index 0000000..317f858
--- /dev/null
+++ b/packages/SystemUI/res/drawable/recents_lock_to_app_pin.xml
@@ -0,0 +1,25 @@
+<!--
+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"
+        android:width="24.0dp"
+        android:height="24.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+
+    <path
+        android:fillColor="#FFffffff"
+        android:pathData="M16.000000,12.000000L16.000000,4.000000l1.000000,0.000000L17.000000,2.000000L7.000000,2.000000l0.000000,2.000000l1.000000,0.000000l0.000000,8.000000l-2.000000,2.000000l0.000000,2.000000l5.200000,0.000000l0.000000,6.000000l1.600000,0.000000l0.000000,-6.000000L18.000000,16.000000l0.000000,-2.000000L16.000000,12.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/recents_lock_to_task_button_bg.xml b/packages/SystemUI/res/drawable/recents_lock_to_task_button_bg.xml
index d38c8a4..6424a65 100644
--- a/packages/SystemUI/res/drawable/recents_lock_to_task_button_bg.xml
+++ b/packages/SystemUI/res/drawable/recents_lock_to_task_button_bg.xml
@@ -15,6 +15,6 @@
 -->
 
 <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" />
+     android:color="#ff9cdfd9">
+    <item android:drawable="@drawable/btn_fab_recents" />
 </ripple>
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/recents.xml b/packages/SystemUI/res/layout/recents.xml
index 47740ee..8f367a6 100644
--- a/packages/SystemUI/res/layout/recents.xml
+++ b/packages/SystemUI/res/layout/recents.xml
@@ -39,9 +39,9 @@
            android:layout_width="match_parent"
            android:layout_height="match_parent" />
 
-    <!-- Fullscreen Transition View -->
-    <ViewStub android:id="@+id/fullscreen_overlay_stub"
-           android:layout="@layout/recents_fullscreen_overlay"
+    <!-- Debug Overlay View -->
+    <ViewStub android:id="@+id/debug_overlay_stub"
+           android:layout="@layout/recents_debug_overlay"
            android:layout_width="match_parent"
            android:layout_height="match_parent" />
 
diff --git a/packages/SystemUI/res/layout/recents_fullscreen_overlay.xml b/packages/SystemUI/res/layout/recents_debug_overlay.xml
index 1d021f9..d23495e 100644
--- a/packages/SystemUI/res/layout/recents_fullscreen_overlay.xml
+++ b/packages/SystemUI/res/layout/recents_debug_overlay.xml
@@ -4,24 +4,32 @@
      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.
 -->
-
-<com.android.systemui.recents.views.FullscreenTransitionOverlayView
+<com.android.systemui.recents.views.DebugOverlayView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+    android:layout_width="match_parent" 
     android:layout_height="match_parent"
-    android:visibility="gone">
-    <ImageView
-        android:id="@+id/image"
+    android:focusable="false">
+    <SeekBar
+        android:id="@+id/debug_seek_bar_1"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="fitXY" />
-</com.android.systemui.recents.views.FullscreenTransitionOverlayView>
\ No newline at end of file
+        android:layout_height="wrap_content"
+        android:layout_gravity="top"
+        android:layout_marginTop="25dp" />
+    <SeekBar
+        android:id="@+id/debug_seek_bar_2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top"
+        android:layout_marginTop="50dp" />
+</com.android.systemui.recents.views.DebugOverlayView>
+
+
diff --git a/packages/SystemUI/res/layout/recents_task_view.xml b/packages/SystemUI/res/layout/recents_task_view.xml
index 93c5538..f8dfd65 100644
--- a/packages/SystemUI/res/layout/recents_task_view.xml
+++ b/packages/SystemUI/res/layout/recents_task_view.xml
@@ -57,31 +57,27 @@
             android:layout_height="48dp"
             android:layout_marginEnd="4dp"
             android:layout_gravity="center_vertical|end"
-            android:padding="18dp"
+            android:padding="12dp"
             android:background="@drawable/recents_button_bg"
             android:visibility="invisible"
             android:src="@drawable/recents_dismiss_light" />
     </com.android.systemui.recents.views.TaskBarView>
-    <com.android.systemui.recents.views.TaskFooterView
-        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"
+    <FrameLayout
+        android:id="@+id/lock_to_app_fab"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_gravity="bottom|right"
+        android:layout_marginRight="15dp"
+        android:layout_marginBottom="15dp"
+        android:translationZ="50dp"
+        android:contentDescription="@string/recents_lock_to_app_button_label"
         android:background="@drawable/recents_lock_to_task_button_bg">
-        <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" />
-    </com.android.systemui.recents.views.TaskFooterView>
+        <ImageView
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="center"
+            android:src="@drawable/recents_lock_to_app_pin" />
+    </FrameLayout>
 </com.android.systemui.recents.views.TaskView>
 
 
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index bd10623..32474c9 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -208,7 +208,7 @@
     <dimen name="recents_task_view_remove_anim_translation_x">100dp</dimen>
 
     <!-- The amount of highlight to make on each task view. -->
-    <dimen name="recents_task_view_highlight">1dp</dimen>
+    <dimen name="recents_task_view_highlight">1.5dp</dimen>
 
     <!-- The height of the lock-to-app button. -->
     <dimen name="recents_task_view_lock_to_app_button_height">48dp</dimen>