From acab44fc939b4083ab7ec889b0c6d4fe0db00cca Mon Sep 17 00:00:00 2001
From: cretin45 <cretin45@gmail.com>
Date: Fri, 13 Nov 2015 16:51:43 -0800
Subject:  Reimplement the CM scrubber against the new Launcher

PS4: Implement RTL support

Change-Id: I4456d54b5924913d1b36e1cfa9a2269150f6fb3e
---
 res/drawable-hdpi/letter_indicator.png   | Bin 0 -> 21583 bytes
 res/drawable-mdpi/letter_indicator.png   | Bin 0 -> 4095 bytes
 res/drawable-xhdpi/letter_indicator.png  | Bin 0 -> 25268 bytes
 res/drawable-xxhdpi/letter_indicator.png | Bin 0 -> 34597 bytes
 res/drawable/scrubber_back.xml           |  19 +++++++++++
 res/drawable/seek_back.xml               |  30 +++++++++++++++++
 res/layout/all_apps_container.xml        |   9 ++++++
 res/layout/scrub_layout.xml              |  44 +++++++++++++++++++++++++
 res/layout/scrubber_container.xml        |  53 +++++++++++++++++++++++++++++++
 res/layout/widgets_view.xml              |   9 ++++++
 res/values/attrs.xml                     |   6 ++++
 res/values/colors.xml                    |   8 ++++-
 res/values/dimens.xml                    |  12 ++++++-
 13 files changed, 188 insertions(+), 2 deletions(-)
 create mode 100644 res/drawable-hdpi/letter_indicator.png
 create mode 100644 res/drawable-mdpi/letter_indicator.png
 create mode 100644 res/drawable-xhdpi/letter_indicator.png
 create mode 100644 res/drawable-xxhdpi/letter_indicator.png
 create mode 100644 res/drawable/scrubber_back.xml
 create mode 100644 res/drawable/seek_back.xml
 create mode 100644 res/layout/scrub_layout.xml
 create mode 100644 res/layout/scrubber_container.xml

(limited to 'res')

diff --git a/res/drawable-hdpi/letter_indicator.png b/res/drawable-hdpi/letter_indicator.png
new file mode 100644
index 000000000..4770d819d
Binary files /dev/null and b/res/drawable-hdpi/letter_indicator.png differ
diff --git a/res/drawable-mdpi/letter_indicator.png b/res/drawable-mdpi/letter_indicator.png
new file mode 100644
index 000000000..2ecfe7c34
Binary files /dev/null and b/res/drawable-mdpi/letter_indicator.png differ
diff --git a/res/drawable-xhdpi/letter_indicator.png b/res/drawable-xhdpi/letter_indicator.png
new file mode 100644
index 000000000..6f2186017
Binary files /dev/null and b/res/drawable-xhdpi/letter_indicator.png differ
diff --git a/res/drawable-xxhdpi/letter_indicator.png b/res/drawable-xxhdpi/letter_indicator.png
new file mode 100644
index 000000000..acbacb067
Binary files /dev/null and b/res/drawable-xxhdpi/letter_indicator.png differ
diff --git a/res/drawable/scrubber_back.xml b/res/drawable/scrubber_back.xml
new file mode 100644
index 000000000..c5022dec5
--- /dev/null
+++ b/res/drawable/scrubber_back.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Copyright (C) 2015 The CyanogenMod 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.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/scrubber_background"/>
+</shape>
diff --git a/res/drawable/seek_back.xml b/res/drawable/seek_back.xml
new file mode 100644
index 000000000..d97a870ea
--- /dev/null
+++ b/res/drawable/seek_back.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The CyanogenMod 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="360dp"
+    android:height="48dp"
+    android:viewportWidth="360"
+    android:viewportHeight="48">
+
+    <path
+        android:strokeColor="#FFFFFF"
+        android:strokeWidth="2"
+        android:strokeMiterLimit="10"
+        android:strokeLineCap="round"
+        android:pathData="M16,24h328" />
+</vector>
\ No newline at end of file
diff --git a/res/layout/all_apps_container.xml b/res/layout/all_apps_container.xml
index 626edafab..3a2c96cd0 100644
--- a/res/layout/all_apps_container.xml
+++ b/res/layout/all_apps_container.xml
@@ -35,4 +35,13 @@
         android:focusable="true"
         android:descendantFocusability="afterDescendants" />
 
+    <ViewStub
+        android:id="@+id/scrubber_container_stub"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inflatedId="@+id/scrubber_container"
+        android:layout="@layout/scrubber_container"
+        android:layout_gravity="bottom"
+        android:clipToPadding="false"/>
+
 </com.android.launcher3.allapps.AllAppsRecyclerViewContainerView>
\ No newline at end of file
diff --git a/res/layout/scrub_layout.xml b/res/layout/scrub_layout.xml
new file mode 100644
index 000000000..11ee381d0
--- /dev/null
+++ b/res/layout/scrub_layout.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The CyanogenMod 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.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/app_drawer_scrubber_container"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/scrubber_height"
+    android:paddingLeft="@dimen/app_drawer_scrubber_padding"
+    android:paddingRight="@dimen/app_drawer_scrubber_padding"
+    android:layout_alignParentBottom="true"
+    android:background="@drawable/seek_back">
+
+    <com.android.launcher3.AutoExpandTextView
+        android:id="@+id/scrubberText"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:textColor="@android:color/white"
+        android:maxLines="1"
+        android:lines="1"
+        android:textSize="8sp" />
+
+    <SeekBar
+        android:id="@+id/scrubber"
+        android:thumb="@android:color/transparent"
+        android:progressDrawable="@android:color/transparent"
+        android:layout_width="match_parent"
+        android:layout_gravity="center"
+        android:layout_height="match_parent" />
+
+</FrameLayout>
diff --git a/res/layout/scrubber_container.xml b/res/layout/scrubber_container.xml
new file mode 100644
index 000000000..4fe84755f
--- /dev/null
+++ b/res/layout/scrubber_container.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The CyanogenMod 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.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:id="@+id/scrubber_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:clipToPadding="false">
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_below="@+id/scrubberIndicator"
+        android:background="@drawable/scrubber_back"
+        android:clipToPadding="false">
+
+        <com.android.launcher3.BaseRecyclerViewScrubber
+            android:id="@+id/base_scrubber"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clickable="true"
+            android:layout_gravity="bottom"/>
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/scrubberIndicator"
+        android:background="@drawable/letter_indicator"
+        android:layout_width="100dp"
+        android:layout_marginLeft="@dimen/app_drawer_scrubber_padding"
+        android:layout_marginRight="@dimen/app_drawer_scrubber_padding"
+        android:paddingTop="18dp"
+        android:textSize="24sp"
+        android:gravity="center_horizontal|top"
+        android:textColor="@android:color/black"
+        android:clickable="false"
+        android:layout_marginBottom="-40dp"
+        android:visibility="invisible"
+        android:layout_height="100dp" />
+</RelativeLayout>
diff --git a/res/layout/widgets_view.xml b/res/layout/widgets_view.xml
index 755634f82..1f276adb9 100644
--- a/res/layout/widgets_view.xml
+++ b/res/layout/widgets_view.xml
@@ -46,6 +46,15 @@
             android:layout_gravity="center"
             android:elevation="15dp"
             android:visibility="gone" />
+
+        <ViewStub
+            android:id="@+id/scrubber_container_stub"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inflatedId="@+id/scrubber_container"
+            android:layout="@layout/scrubber_container"
+            android:layout_gravity="bottom"
+            android:clipToPadding="false"/>
     </FrameLayout>
 
 </com.android.launcher3.widget.WidgetsContainerView>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 7ffebce9b..d7f9ef4fa 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -128,4 +128,10 @@
         <attr name="layout_ignoreTopInsets" />
         <attr name="layout_ignoreBottomInsets" />
     </declare-styleable>
+
+    <declare-styleable name="AutofitTextView">
+        <attr name="minTextSize" format="dimension" />
+        <attr name="precision" format="float" />
+        <attr name="sizeToFit" format="boolean" />
+    </declare-styleable>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 8a7f62743..b70e1f895 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -33,8 +33,9 @@
     <color name="folder_edge_effect_color">#FF757575</color>
 
     <color name="quantum_panel_text_color">#FF666666</color>
+    <color name="quantum_panel_text_color_dark">#FFF</color>
     <color name="quantum_panel_bg_color">#FFF5F5F5</color>
-    <color name="quantum_panel_bg_color_dark">#FF374248</color>
+    <color name="quantum_panel_bg_color_dark">#76000000</color>
 
     <color name="outline_color">#FFFFFFFF</color>
 
@@ -44,10 +45,15 @@
 
     <!-- All Apps -->
     <color name="all_apps_grid_section_text_color">#009688</color>
+    <color name="all_apps_grid_section_text_color_dark">#FFF</color>
     <color name="all_apps_search_market_button_focused_bg_color">#DDDDDD</color>
 
     <!-- Widgets view -->
     <color name="widgets_view_section_text_color">#FFFFFF</color>
     <color name="widgets_view_item_text_color">#C4C4C4</color>
     <color name="widgets_cell_color">#263238</color>
+
+    <color name="app_scrubber_highlight_color">@android:color/white</color>
+    <color name="app_scrubber_gray_color">@android:color/darker_gray</color>
+    <color name="scrubber_background">#CC14191E</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index e3c81941c..799ea9803 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -64,12 +64,15 @@
 
 <!-- All Apps -->
     <dimen name="all_apps_grid_view_start_margin">0dp</dimen>
+    <dimen name="all_apps_grid_view_start_margin_with_sections">36dp</dimen>
     <dimen name="all_apps_grid_section_y_offset">8dp</dimen>
     <dimen name="all_apps_grid_section_text_size">24sp</dimen>
     <dimen name="all_apps_search_bar_height">48dp</dimen>
     <dimen name="all_apps_search_bar_prediction_bar_padding">8dp</dimen>
     <dimen name="all_apps_icon_top_bottom_padding">8dp</dimen>
     <dimen name="all_apps_icon_width_gap">24dp</dimen>
+    <dimen name="all_apps_icon_width_gap_with_sections">12dp</dimen>
+    <dimen name="all_apps_icon_size_with_sections">48dp</dimen>
     <!-- The top padding should account for the existing all_apps_list_top_bottom_padding -->
     <dimen name="all_apps_prediction_icon_top_padding">8dp</dimen>
     <dimen name="all_apps_prediction_icon_bottom_padding">18dp</dimen>
@@ -78,6 +81,8 @@
     <dimen name="all_apps_empty_search_bg_top_offset">144dp</dimen>
     <dimen name="all_apps_background_canvas_width">700dp</dimen>
     <dimen name="all_apps_background_canvas_height">475dp</dimen>
+    <dimen name="all_apps_icon_size_grid">55dp</dimen>
+    <dimen name="all_apps_icon_size_ragged">48dp</dimen>
 
 <!-- Widget tray -->
     <dimen name="widget_container_inset">8dp</dimen>
@@ -140,10 +145,15 @@
     <dimen name="blur_size_click_shadow">4dp</dimen>
     <dimen name="click_shadow_high_shift">2dp</dimen>
 
-<!-- Pending widget -->
+    <dimen name="app_drawer_scrubber_padding">20dp</dimen>
     <dimen name="pending_widget_min_padding">8dp</dimen>
     <dimen name="pending_widget_elevation">2dp</dimen>
 
+    <!-- Scrubber -->
+    <dimen name="scrubber_bottom_padding">30dp</dimen>
+    <dimen name="scrubber_height">48dp</dimen>
+    <dimen name="app_drawer_scrubber_padding">20dp</dimen>
+
 <!-- Folder open animation -->
     <integer name="folder_translate_y_dist">300</integer>
     <integer name="folder_icon_translate_y_dist">100</integer>
-- 
cgit v1.2.3