summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/letter_indicator.pngbin0 -> 21583 bytes
-rw-r--r--res/drawable-mdpi/letter_indicator.pngbin0 -> 4095 bytes
-rw-r--r--res/drawable-nodpi/letter_indicator.9.pngbin3614 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/letter_indicator.pngbin0 -> 25268 bytes
-rw-r--r--res/drawable-xxhdpi/letter_indicator.pngbin0 -> 34597 bytes
-rw-r--r--res/drawable/empty_seek_bar.xml19
-rw-r--r--res/layout/app_drawer_container.xml12
-rw-r--r--res/layout/app_drawer_item.xml58
-rw-r--r--res/layout/scrub_layout.xml46
-rw-r--r--res/values/colors.xml3
-rw-r--r--res/values/dimens.xml2
11 files changed, 69 insertions, 71 deletions
diff --git a/res/drawable-hdpi/letter_indicator.png b/res/drawable-hdpi/letter_indicator.png
new file mode 100644
index 0000000..4770d81
--- /dev/null
+++ b/res/drawable-hdpi/letter_indicator.png
Binary files differ
diff --git a/res/drawable-mdpi/letter_indicator.png b/res/drawable-mdpi/letter_indicator.png
new file mode 100644
index 0000000..2ecfe7c
--- /dev/null
+++ b/res/drawable-mdpi/letter_indicator.png
Binary files differ
diff --git a/res/drawable-nodpi/letter_indicator.9.png b/res/drawable-nodpi/letter_indicator.9.png
deleted file mode 100644
index af3578e..0000000
--- a/res/drawable-nodpi/letter_indicator.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/letter_indicator.png b/res/drawable-xhdpi/letter_indicator.png
new file mode 100644
index 0000000..6f21860
--- /dev/null
+++ b/res/drawable-xhdpi/letter_indicator.png
Binary files differ
diff --git a/res/drawable-xxhdpi/letter_indicator.png b/res/drawable-xxhdpi/letter_indicator.png
new file mode 100644
index 0000000..acbacb0
--- /dev/null
+++ b/res/drawable-xxhdpi/letter_indicator.png
Binary files differ
diff --git a/res/drawable/empty_seek_bar.xml b/res/drawable/empty_seek_bar.xml
deleted file mode 100644
index e3cf61d..0000000
--- a/res/drawable/empty_seek_bar.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="#00000000"/>
-</shape> \ No newline at end of file
diff --git a/res/layout/app_drawer_container.xml b/res/layout/app_drawer_container.xml
index f5db08c..6024ddd 100644
--- a/res/layout/app_drawer_container.xml
+++ b/res/layout/app_drawer_container.xml
@@ -71,12 +71,14 @@
<TextView
android:id="@+id/scrubberIndicator"
android:background="@drawable/letter_indicator"
- android:layout_width="80dp"
- android:textSize="30sp"
- android:gravity="center"
- android:textColor="@android:color/white"
+ android:layout_width="100dp"
+ android:layout_marginLeft="@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="-20dp"
+ android:layout_marginBottom="-48dp"
android:visibility="invisible"
android:layout_height="100dp" />
</RelativeLayout>
diff --git a/res/layout/app_drawer_item.xml b/res/layout/app_drawer_item.xml
index 08043eb..43e2562 100644
--- a/res/layout/app_drawer_item.xml
+++ b/res/layout/app_drawer_item.xml
@@ -14,34 +14,44 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:autofit="http://schemas.android.com/apk/res-auto"
- android:orientation="vertical"
android:splitMotionEvents="false"
android:layout_width="match_parent"
android:layout_height="wrap_content">
+ <!-- Layout in back to front render order -->
<LinearLayout
- android:layout_marginTop="10dp"
+ android:id="@+id/drawer_item_flow"
+ android:layout_alignParentRight="true"
+ android:paddingTop="10dp"
+ android:layout_toRightOf="@+id/drawer_item_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal" >
- <com.android.launcher3.AutoFitTextView
- android:id="@+id/drawer_item_title"
- android:layout_width="30dp"
- android:layout_height="wrap_content"
- android:layout_marginLeft="10dp"
- android:includeFontPadding="false"
- android:gravity="start|top"
- android:singleLine="true"
- autofit:minTextSize="8sp"
- android:textSize="24sp"
- android:layout_gravity="center"
- android:fontFamily="sans-serif-light"
- android:textColor="@android:color/white"/>
- <LinearLayout
- android:id="@+id/drawer_item_flow"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal" />
- </LinearLayout>
-</LinearLayout>
+ android:orientation="horizontal" />
+
+ <View
+ android:id="@+id/fading_background"
+ android:alpha="0"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_alignTop="@id/drawer_item_flow"
+ android:layout_alignBottom="@id/drawer_item_flow"
+ android:background="@color/app_drawer_drag_background" />
+
+ <com.android.launcher3.AutoFitTextView
+ android:id="@+id/drawer_item_title"
+ android:layout_width="27dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_marginLeft="10dp"
+ android:layout_centerVertical="true"
+ android:includeFontPadding="false"
+ android:gravity="center"
+ android:singleLine="true"
+ autofit:minTextSize="8sp"
+ android:textSize="24sp"
+ android:layout_gravity="center"
+ android:fontFamily="sans-serif-light"
+ android:textColor="@android:color/white" />
+
+</RelativeLayout>
diff --git a/res/layout/scrub_layout.xml b/res/layout/scrub_layout.xml
index 90a9d09..11ee381 100644
--- a/res/layout/scrub_layout.xml
+++ b/res/layout/scrub_layout.xml
@@ -14,31 +14,31 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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="wrap_content"
- android:background="@drawable/seek_back"
- android:layout_alignParentBottom="true">
+ 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">
- <LinearLayout
- android:clickable="true"
- android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_marginLeft="20dp"
- android:layout_marginRight="20dp"
- android:layout_height="@dimen/scrubber_height">
-
- <SeekBar
- android:id="@+id/scrubber"
- android:paddingLeft="0dp"
- android:paddingRight="0dp"
- android:thumb="@android:color/transparent"
- android:progressDrawable="@drawable/empty_seek_bar"
- android:layout_width="match_parent"
- android:layout_gravity="center"
- android:layout_height="match_parent" />
+ <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" />
- </LinearLayout>
+ <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" />
-</RelativeLayout>
+</FrameLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 3cf7d39..082489d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -51,6 +51,9 @@
<color name="dynamic_grid_preview_foreground">#FF000000</color>
<color name="app_drawer_background">#76000000</color>
+ <color name="app_drawer_drag_background">#bf14191e</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 81e40bf..5394ea7 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -124,4 +124,6 @@
<!-- Vertical app drawer padding -->
<dimen name="vertical_app_drawer_icon_padding">5dp</dimen>
+
+ <dimen name="app_drawer_scrubber_padding">20dp</dimen>
</resources>