diff options
Diffstat (limited to 'res/layout')
| -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 |
3 files changed, 65 insertions, 72 deletions
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> |