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

Commit 50cde75e authored by Fan Zhang's avatar Fan Zhang
Browse files

Update suggestion/support UI to use more negative space. 

Bug: 28435214

-- Tweaked layout and padding in suggestions and support tab.
-- Added support to show different text color in SlidingTabLayout.

Change-Id: If5d90ec5360e35565176aae7475e355c27fcef7c
parent 28c44ebf

res/color/sliding_tab_title_text_color.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2016 Android Open Source 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.

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_selected="false"

          android:color="#b3ffffff"/>

    <item android:color="@android:color/white"/>

</selector>

res/drawable/selectable_card_grey.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2016 The Android Open Source 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.

-->



<ripple

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:color="?android:attr/colorControlHighlight">

    <item android:drawable="@color/card_background_grey"/>

</ripple>

res/layout/dashboard_spacer.xml

+5 −3
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
     limitations under the License.

-->



<View xmlns:android="http://schemas.android.com/apk/res/android"

<View

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

        android:layout_height="6dp" />
 
    android:layout_height="6dp"

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

res/layout/sliding_tab_title_view.xml

+7 −6
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 Android Open Source Project

<!--

     Copyright (C) 2016 Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -19,10 +20,10 @@ 
    android:layout_width="0dp"

    android:layout_weight="1"

    android:layout_height="wrap_content"

    android:background="?android:attr/selectableItemBackground"

    android:ellipsize="end"

    android:maxLines="1"

    android:textColor="@android:color/white"

    android:gravity="center"

    android:background="?android:attr/selectableItemBackground"

    android:textAllCaps="true"

    android:padding="@dimen/pager_tabs_title_padding"/>
 
 No newline at end of file
 
    android:maxLines="1"

    android:padding="@dimen/pager_tabs_title_padding"

    android:textColor="@color/sliding_tab_title_text_color"

    android:textAllCaps="true"/>

res/layout/suggestion_header.xml

+22 −17
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project

<!--

     Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -20,27 +21,31 @@ 
    android:layout_height="@dimen/dashboard_category_height"

    android:clickable="true"

    android:focusable="true"

    android:background="@drawable/selectable_card"

    android:elevation="@dimen/dashboard_category_elevation"

    android:background="@drawable/selectable_card_grey"

    android:gravity="center_vertical" >



    <TextView android:id="@android:id/title"

    <ImageView

        android:id="@android:id/icon"

        android:layout_width="@dimen/dashboard_tile_image_size"

        android:layout_height="@dimen/dashboard_tile_image_size"

        android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"

        android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"

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

    <TextView

        android:id="@android:id/title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:paddingStart="16dp"

        android:singleLine="true"

        android:textAppearance="@style/TextAppearance.TileTitle"

        android:textColor="?android:attr/colorAccent"

        android:alpha=".87"

        android:ellipsize="marquee"

        android:fadingEdge="horizontal"/>



    <ImageView android:id="@android:id/icon"

        android:layout_width="@dimen/dashboard_tile_image_size"

        android:layout_height="@dimen/dashboard_tile_image_size"

        android:layout_marginStart="@dimen/suggestion_arrow_margin"

        android:layout_marginEnd="@dimen/suggestion_arrow_margin"

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



    <TextView

        android:id="@android:id/summary"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:gravity="end"

        android:paddingEnd="16dp"

        android:textAppearance="@style/TextAppearance.TileTitle"

        android:textColor="?android:attr/colorAccent"/>

</LinearLayout>