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

Commit 1d047cac authored by Shubham Basu's avatar Shubham Basu Committed by Android (Google) Code Review
Browse files

Merge "material next changes for profile tab" into sc-mainline-prod

parents fbc23bb0 de879071

res/color/profile_tab_selector.xml

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

<!-- Copyright (C) 2015 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.

-->



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

    <item

        android:state_selected="true"

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

    <item

        android:color="@color/tab_default_background_color"/>

</selector>

res/drawable/tab_border_rounded.xml

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

<!-- Copyright (C) 2018 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.

-->



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

    android:shape="rectangle">



   <solid

       android:color="@color/profile_tab_selector"/>

   <corners android:radius="12dp"/>

</shape>

res/layout/directory_header.xml

+5 −2
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
        android:clipChildren="true"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingLeft="@dimen/profile_tab_padding"

        android:paddingRight="@dimen/profile_tab_padding"

        android:orientation="vertical">



        <com.google.android.material.tabs.TabLayout
@@ -47,11 +49,12 @@ 
            app:tabGravity="fill"

            app:tabMode="fixed"

            app:tabIndicatorColor="?android:attr/colorAccent"

            app:tabSelectedTextColor="?android:attr/colorAccent"

            app:tabIndicatorHeight="@dimen/tab_selector_indicator_height"

            app:tabSelectedTextColor="@color/tab_selected_text_color"

            app:tabTextAppearance="@style/TabTextAppearance"

            app:tabTextColor="?android:attr/textColorSecondary"/>



        <View

            android:id="@+id/tab_separator"

            android:layout_width="match_parent"

            android:layout_height="1dp"

            android:background="?android:attr/listDivider"/>

res/values-v31/colors.xml

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

<!-- Copyright (C) 2013 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.

-->



<resources>

    <color name="tab_selected_text_color">@android:color/white</color>

</resources>

res/values-v31/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -17,4 +17,6 @@ 
    <dimen name="action_bar_elevation">0dp</dimen>

    <dimen name="action_bar_margin">0dp</dimen>

    <dimen name="button_corner_radius">20dp</dimen>

    <dimen name="tab_selector_indicator_height">0dp</dimen>

    <dimen name="profile_tab_padding">20dp</dimen>

</resources>