diff options
author | Raj Yengisetty <rajesh@cyngn.com> | 2015-02-26 17:02:14 -0800 |
---|---|---|
committer | Raj Yengisetty <rajesh@cyngn.com> | 2015-03-06 15:37:44 -0800 |
commit | f4784dd14191cbc433becaa651b2a92fa5950f47 (patch) | |
tree | ee392e838b3c84146e30dc579c34c578975c1578 /res | |
parent | d9324529ed3b5dcd23f10f1c147b783725deedee (diff) | |
download | android_packages_apps_Trebuchet-f4784dd14191cbc433becaa651b2a92fa5950f47.tar.gz android_packages_apps_Trebuchet-f4784dd14191cbc433becaa651b2a92fa5950f47.tar.bz2 android_packages_apps_Trebuchet-f4784dd14191cbc433becaa651b2a92fa5950f47.zip |
Trebuchet: App Drawer - clean up open/close animations
Change-Id: Ia1bcaec9cf5bdcd9ca61137aa45f91819fb2e94d
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/empty_seek_bar.xml | 19 | ||||
-rw-r--r-- | res/drawable/scrubber_back.xml | 3 | ||||
-rw-r--r-- | res/drawable/seek_back.xml | 21 | ||||
-rw-r--r-- | res/layout/app_drawer_container.xml | 47 | ||||
-rw-r--r-- | res/layout/app_drawer_item.xml | 4 | ||||
-rw-r--r-- | res/layout/scrub_layout.xml | 86 | ||||
-rw-r--r-- | res/values/colors.xml | 4 |
7 files changed, 104 insertions, 80 deletions
diff --git a/res/drawable/empty_seek_bar.xml b/res/drawable/empty_seek_bar.xml new file mode 100644 index 000000000..e3cf61d64 --- /dev/null +++ b/res/drawable/empty_seek_bar.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="#00000000"/> +</shape>
\ No newline at end of file diff --git a/res/drawable/scrubber_back.xml b/res/drawable/scrubber_back.xml index 56cf5af73..c5022dec5 100644 --- a/res/drawable/scrubber_back.xml +++ b/res/drawable/scrubber_back.xml @@ -15,6 +15,5 @@ limitations under the License. --> <shape xmlns:android="http://schemas.android.com/apk/res/android"> - <solid android:color="#99333333"/> - <corners android:radius="5dip"/> + <solid android:color="@color/scrubber_background"/> </shape> diff --git a/res/drawable/seek_back.xml b/res/drawable/seek_back.xml index a49796c05..d97a870ea 100644 --- a/res/drawable/seek_back.xml +++ b/res/drawable/seek_back.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright (C) 2014 The CyanogenMod Project + 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. @@ -14,8 +14,17 @@ See the License for the specific language governing permissions and limitations under the License. --> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="line"> - <stroke android:width="4dp" android:color="#FFF"/> - <size android:height="2dp" /> -</shape> + +<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/app_drawer_container.xml b/res/layout/app_drawer_container.xml index c0eb97a99..3706e448d 100644 --- a/res/layout/app_drawer_container.xml +++ b/res/layout/app_drawer_container.xml @@ -31,4 +31,51 @@ android:visibility="invisible" android:clipToPadding="false" /> </FrameLayout> + <FrameLayout + android:id="@+id/app_drawer_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:clipChildren="false" + android:clipToPadding="false"> + <android.support.v7.widget.RecyclerView + android:id="@+id/app_drawer_recyclerview" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:clipToPadding="false" + android:overScrollMode="never"/> + </FrameLayout> + + <RelativeLayout + 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.AppDrawerScrubber + android:id="@+id/app_drawer_scrubber" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom"/> + </FrameLayout> + + <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:clickable="false" + android:layout_marginBottom="-20dp" + android:visibility="invisible" + android:layout_height="100dp" /> + </RelativeLayout> </FrameLayout>
\ No newline at end of file diff --git a/res/layout/app_drawer_item.xml b/res/layout/app_drawer_item.xml index 37bdeea6a..e2d105f5a 100644 --- a/res/layout/app_drawer_item.xml +++ b/res/layout/app_drawer_item.xml @@ -34,7 +34,9 @@ android:gravity="start|top" android:singleLine="true" autofit:minTextSize="8sp" - android:textSize="35sp" + android:textSize="24sp" + android:layout_gravity="center" + android:fontFamily="sans-serif-light" android:textColor="@android:color/white"/> <LinearLayout android:id="@+id/drawer_item_flow" diff --git a/res/layout/scrub_layout.xml b/res/layout/scrub_layout.xml index e8761e306..4b10e45d7 100644 --- a/res/layout/scrub_layout.xml +++ b/res/layout/scrub_layout.xml @@ -15,86 +15,30 @@ limitations under the License. --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" + android:id="@+id/app_drawer_scrubber_container" android:layout_width="match_parent" - android:layout_marginRight="20dp" - android:layout_marginLeft="20dp" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:background="@drawable/seek_back" + android:layout_alignParentBottom="true"> <LinearLayout android:clickable="true" - android:layout_marginTop="-5dp" - android:layout_below="@+id/scrubberIndicator" android:orientation="horizontal" - android:background="@drawable/scrubber_back" android:layout_width="match_parent" - android:layout_height="50dp"> - - <Space - android:layout_weight="0.1" - android:layout_width="0dp" - android:layout_height="match_parent" /> - - <TextView - android:id="@+id/firstSection" - android:gravity="center" - android:textColor="@android:color/white" - android:paddingRight="10dp" - android:textStyle="bold" - style="?android:attr/textAppearanceLarge" - android:layout_width="wrap_content" - android:layout_height="match_parent" /> - - <LinearLayout - android:layout_weight="0.9" - android:layout_width="0dp" + android:layout_marginLeft="20dp" + android:layout_marginRight="20dp" + android:layout_height="48dp"> + + <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:orientation="vertical" - android:layout_height="match_parent"> - - <SeekBar - android:id="@+id/scrubber" - android:paddingLeft="0dp" - android:paddingRight="0dp" - android:layout_marginRight="-10dp" - android:layout_marginLeft="-10dp" - android:thumb="@android:color/transparent" - android:thumbOffset="-10dp" - android:progressDrawable="@drawable/seek_back" - android:layout_width="match_parent" - android:layout_gravity="center" - android:layout_height="match_parent" /> - - </LinearLayout> - - - <TextView - android:gravity="center" - android:id="@+id/lastSection" - android:paddingLeft="10dp" - android:textColor="@android:color/white" - android:textStyle="bold" - style="?android:attr/textAppearanceLarge" - android:layout_width="wrap_content" - android:layout_height="match_parent" /> - - <Space - android:layout_weight="0.1" - android:layout_width="0dp" android:layout_height="match_parent" /> </LinearLayout> - <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:clickable="false" - android:layout_marginBottom="-20dp" - android:visibility="invisible" - android:layout_height="100dp" /> - </RelativeLayout> diff --git a/res/values/colors.xml b/res/values/colors.xml index 948801f5b..3cf7d39a6 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -49,4 +49,8 @@ <color name="dynamic_grid_preview_background">#FFFFFFFF</color> <color name="dynamic_grid_preview_foreground">#FF000000</color> + + <color name="app_drawer_background">#76000000</color> + + <color name="scrubber_background">#CC14191E</color> </resources> |