Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a7b8d8f authored by Danny Baumann's avatar Danny Baumann Committed by Steve Kondik
Browse files

Make buttons more touch friendly. 

Do this by replacing margins and empty space around buttons by padding.
Doing this also makes the ripple touch feedback look better.

Change-Id: I7f2e933b9f7b481c9456f56860483c2e5e96b67b
parent 81e13fbe

res/layout/activity_player_fragment.xml

+8 −12
Original line number Diff line number Diff line
@@ -146,20 +146,20 @@ 


            <!-- divider -->

            <View

                android:id="@+id/action_button_left_top_divider"

                android:layout_height="@dimen/audio_player_divider_height"

                android:layout_width="@dimen/audio_player_divider_length"

                android:layout_marginRight="@dimen/audio_player_divider_horizontal_offset"

                android:layout_marginBottom="@dimen/audio_player_divider_vertical_offset"

                android:layout_alignParentRight="true"

                android:layout_above="@id/audio_player_current_time"

                android:background="@color/now_playing_divider" />



            <!-- divider -->

            <View

                android:id="@+id/action_button_left_bottom_divider"

                android:layout_height="@dimen/audio_player_divider_height"

                android:layout_width="@dimen/audio_player_divider_length"

                android:layout_marginRight="@dimen/audio_player_divider_horizontal_offset"

                android:layout_marginTop="@dimen/audio_player_divider_vertical_offset"

                android:layout_alignParentRight="true"

                android:layout_below="@id/audio_player_current_time"

                android:background="@color/now_playing_divider" />
@@ -168,10 +168,9 @@ 
                android:id="@+id/action_button_browse"

                android:layout_width="@dimen/audio_player_controls_end_button_width"

                android:layout_height="@dimen/audio_player_controls_end_button_height"

                android:layout_above="@id/action_button_previous"

                android:layout_above="@id/action_button_left_top_divider"

                android:layout_alignLeft="@id/action_button_previous"

                android:layout_marginLeft="@dimen/audio_player_controls_end_button_half_width"

                android:layout_marginBottom="@dimen/audio_player_secondary_control_offset"

                android:contentDescription="@string/accessibility_browse"

                android:focusable="true"

                android:scaleType="fitCenter"
@@ -181,10 +180,9 @@ 
                android:id="@+id/action_button_shuffle"

                android:layout_width="@dimen/audio_player_controls_end_button_width"

                android:layout_height="@dimen/audio_player_controls_end_button_height"

                android:layout_below="@id/action_button_previous"

                android:layout_below="@id/action_button_left_bottom_divider"

                android:layout_alignLeft="@id/action_button_previous"

                android:layout_marginLeft="@dimen/audio_player_controls_end_button_half_width"

                android:layout_marginTop="@dimen/audio_player_secondary_control_offset"

                android:contentDescription="@string/accessibility_shuffle"

                android:scaleType="fitCenter"

                android:src="@drawable/btn_playback_shuffle_all" />
@@ -220,20 +218,20 @@ 


            <!-- divider -->

            <View

                android:id="@+id/action_button_right_top_divider"

                android:layout_height="@dimen/audio_player_divider_height"

                android:layout_width="@dimen/audio_player_divider_length"

                android:layout_marginLeft="@dimen/audio_player_divider_horizontal_offset"

                android:layout_marginBottom="@dimen/audio_player_divider_vertical_offset"

                android:layout_alignParentLeft="true"

                android:layout_above="@id/audio_player_total_time"

                android:background="@color/now_playing_divider" />



            <!-- divider -->

            <View

                android:id="@+id/action_button_right_bottom_divider"

                android:layout_height="@dimen/audio_player_divider_height"

                android:layout_width="@dimen/audio_player_divider_length"

                android:layout_marginLeft="@dimen/audio_player_divider_horizontal_offset"

                android:layout_marginTop="@dimen/audio_player_divider_vertical_offset"

                android:layout_alignParentLeft="true"

                android:layout_below="@id/audio_player_total_time"

                android:background="@color/now_playing_divider" />
@@ -242,10 +240,9 @@ 
                android:id="@+id/action_button_queue"

                android:layout_width="@dimen/audio_player_controls_end_button_width"

                android:layout_height="@dimen/audio_player_controls_end_button_height"

                android:layout_above="@id/action_button_next"

                android:layout_above="@id/action_button_right_top_divider"

                android:layout_alignRight="@id/action_button_next"

                android:layout_marginRight="@dimen/audio_player_controls_end_button_half_width"

                android:layout_marginBottom="@dimen/audio_player_secondary_control_offset"

                android:contentDescription="@string/accessibility_queue"

                android:focusable="true"

                android:scaleType="fitCenter"
@@ -255,10 +252,9 @@ 
                android:id="@+id/action_button_repeat"

                android:layout_width="@dimen/audio_player_controls_end_button_width"

                android:layout_height="@dimen/audio_player_controls_end_button_height"

                android:layout_below="@id/action_button_next"

                android:layout_below="@id/action_button_right_bottom_divider"

                android:layout_alignRight="@id/action_button_next"

                android:layout_marginRight="@dimen/audio_player_controls_end_button_half_width"

                android:layout_marginTop="@dimen/audio_player_secondary_control_offset"

                android:contentDescription="@string/accessibility_repeat"

                android:focusable="true"

                android:scaleType="fitCenter"

res/layout/audio_player_header_bar.xml

+3 −9
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
    android:layout_height="@dimen/header_bar_height"

    android:orientation="horizontal"

    android:paddingStart="@dimen/header_bar_padding_left"

    android:paddingEnd="@dimen/header_bar_padding_right"

    android:elevation="@dimen/action_bar_elevation"

    android:background="@android:color/transparent">
@@ -35,11 +34,9 @@ 
        <ImageView

            android:id="@+id/header_bar_add_button"

            android:layout_width="@dimen/header_bar_custom_button_width"

            android:layout_height="@dimen/header_bar_custom_button_height"

            android:layout_height="@dimen/header_bar_button_height"

            android:layout_gravity="center_vertical"

            android:layout_weight="0"

            android:layout_marginStart="@dimen/header_bar_button_padding"

            android:layout_marginEnd="@dimen/header_bar_button_padding"

            android:background="@drawable/selectable_background"

            android:src="@drawable/btn_add_to_playlist"

            android:scaleType="centerInside" />
@@ -47,11 +44,9 @@ 
        <ImageView

            android:id="@+id/header_bar_search_button"

            android:layout_width="@dimen/header_bar_custom_button_width"

            android:layout_height="@dimen/header_bar_custom_button_height"

            android:layout_height="@dimen/header_bar_button_height"

            android:layout_gravity="center_vertical"

            android:layout_weight="0"

            android:layout_marginStart="@dimen/header_bar_button_padding"

            android:layout_marginEnd="@dimen/header_bar_button_padding"

            android:background="@drawable/selectable_background"

            android:src="@drawable/ic_action_search"

            android:scaleType="centerInside" />
@@ -59,11 +54,10 @@ 
        <ImageView

            android:id="@+id/header_bar_menu_button"

            android:layout_width="@dimen/header_bar_menu_button_width"

            android:layout_height="@dimen/header_bar_menu_button_height"

            android:layout_height="@dimen/header_bar_button_height"

            android:layout_gravity="center_vertical"

            android:layout_weight="0"

            android:scaleType="centerInside"

            android:layout_marginStart="@dimen/header_bar_button_padding"

            android:background="@drawable/selectable_background"

            android:src="@drawable/menu_button_light"/>

    </LinearLayout>

res/layout/edit_queue_list_item.xml

+2 −3
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_toRightOf="@+id/edit_track_list_item_handle"

        android:gravity="center_vertical"

        android:paddingRight="@dimen/list_item_general_margin" >

        android:gravity="center_vertical">



        <include layout="@layout/list_item_queue" />

    </FrameLayout>

res/layout/grid_items_normal.xml

+1 −2
Original line number Diff line number Diff line
@@ -59,8 +59,7 @@ 
            <com.cyanogenmod.eleven.widgets.PopupMenuButton

                android:id="@+id/popup_menu_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_vertical"

                android:layout_height="match_parent"

                android:paddingRight="@dimen/grid_item_padding_right"

                android:src="@drawable/menu_button" />

res/layout/header_bar.xml

+3 −8
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
    android:gravity="center_vertical"

    android:orientation="horizontal"

    android:paddingStart="@dimen/drag_and_drop_width"

    android:paddingEnd="@dimen/header_bar_padding_right"

    android:background="@color/header_action_bar_color"

    android:elevation="@dimen/action_bar_elevation"

    android:theme="@android:style/ThemeOverlay.Material.Dark.ActionBar">
@@ -29,10 +28,9 @@ 
    <ImageView

        android:id="@+id/header_bar_up"

        android:layout_width="@dimen/header_bar_up_width"

        android:layout_height="@dimen/header_bar_up_height"

        android:layout_height="@dimen/header_bar_button_height"

        android:layout_gravity="center_vertical"

        android:layout_weight="0"

        android:layout_marginRight="@dimen/header_bar_button_padding"

        android:scaleType="centerCrop"

        android:background="@drawable/selectable_background"

        android:src="@drawable/btn_header_collapse"/>
@@ -52,11 +50,9 @@ 
    <ImageView

        android:id="@+id/header_bar_search_button"

        android:layout_width="@dimen/header_bar_custom_button_width"

        android:layout_height="@dimen/header_bar_custom_button_height"

        android:layout_height="@dimen/header_bar_button_height"

        android:layout_gravity="center_vertical"

        android:layout_weight="0"

        android:layout_marginStart="@dimen/header_bar_button_padding"

        android:layout_marginEnd="@dimen/header_bar_button_padding"

        android:src="@drawable/ic_action_search"

        android:background="@drawable/selectable_background"

        android:scaleType="centerInside" />
@@ -64,11 +60,10 @@ 
    <ImageView

        android:id="@+id/header_bar_menu_button"

        android:layout_width="@dimen/header_bar_menu_button_width"

        android:layout_height="@dimen/header_bar_menu_button_height"

        android:layout_height="@dimen/header_bar_button_height"

        android:layout_gravity="center_vertical"

        android:layout_weight="0"

        android:scaleType="centerInside"

        android:layout_marginStart="@dimen/header_bar_button_padding"

        android:background="@drawable/selectable_background"

        android:src="@drawable/menu_button_light"/>