diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/app_drawer_container.xml | 12 | ||||
| -rw-r--r-- | res/layout/app_drawer_item.xml | 58 | ||||
| -rw-r--r-- | res/layout/scrub_layout.xml | 46 |
3 files changed, 64 insertions, 52 deletions
diff --git a/res/layout/app_drawer_container.xml b/res/layout/app_drawer_container.xml index f5db08ce1..6024ddd19 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 08043eb1f..43e2562ae 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 90a9d094d..11ee381d0 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> |