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

Commit 4b8ad343 authored by arangelov's avatar arangelov Committed by Antoan Angelov
Browse files

Make tabs respect the device default style. 

Also make "Turn on" work profile button and spinner
use the system accent color.

Test: none
Fixes: 149737133
Fixes: 151686022
Change-Id: I218de254ef87d5fc62d230d39fbe7a7e8b544766
parent 7d528431

core/java/com/android/internal/app/ResolverActivity.java

+14 −2
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import android.content.pm.ResolveInfo; 
import android.content.pm.UserInfo;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.graphics.Insets;

import android.net.Uri;

import android.os.Build;
@@ -65,6 +66,7 @@ import android.stats.devicepolicy.DevicePolicyEnums; 
import android.text.TextUtils;

import android.util.Log;

import android.util.Slog;

import android.util.TypedValue;

import android.view.Gravity;

import android.view.LayoutInflater;

import android.view.View;
@@ -1606,7 +1608,10 @@ public class ResolverActivity extends Activity implements 
        for (int i = 0; i < tabWidget.getChildCount(); i++) {

            View tabView = tabWidget.getChildAt(i);

            TextView title = tabView.findViewById(android.R.id.title);

            title.setTextColor(getColor(R.color.resolver_tabs_inactive_color));

            title.setTextAppearance(android.R.style.TextAppearance_DeviceDefault_DialogWindowTitle);

            title.setTextColor(getAttrColor(this, android.R.attr.textColorTertiary));

            title.setTextSize(TypedValue.COMPLEX_UNIT_PX,

                    getResources().getDimension(R.dimen.resolver_tab_text_size));

            if (title.getText().equals(getString(R.string.resolver_personal_tab))) {

                tabView.setContentDescription(personalContentDescription);

            } else if (title.getText().equals(getString(R.string.resolver_work_tab))) {
@@ -1615,10 +1620,17 @@ public class ResolverActivity extends Activity implements 
        }

    }



    private static int getAttrColor(Context context, int attr) {

        TypedArray ta = context.obtainStyledAttributes(new int[]{attr});

        int colorAccent = ta.getColor(0, 0);

        ta.recycle();

        return colorAccent;

    }



    private void updateActiveTabStyle(TabHost tabHost) {

        TextView title = tabHost.getTabWidget().getChildAt(tabHost.getCurrentTab())

                .findViewById(android.R.id.title);

        title.setTextColor(getColor(R.color.resolver_tabs_active_color));

        title.setTextColor(getAttrColor(this, android.R.attr.colorAccent));

    }



    private void setupViewVisibilities() {

core/res/res/drawable/tab_indicator_resolver.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    </item>

    <item android:gravity="bottom">

        <shape android:shape="rectangle"

               android:tint="@color/resolver_tabs_active_color">

               android:tint="?attr/colorAccent">

            <size android:height="2dp" />

            <solid android:color="@color/tab_indicator_material" />

        </shape>

core/res/res/layout/resolver_empty_states.xml

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
        android:background="@null"

        android:fontFamily="@string/config_headlineFontFamilyMedium"

        android:textSize="14sp"

        android:textColor="@color/resolver_tabs_active_color"

        android:textColor="?attr/colorAccent"

        android:layout_centerHorizontal="true" />

    <ProgressBar

        android:id="@+id/resolver_empty_state_progress"
@@ -71,5 +71,5 @@ 
        android:indeterminate="true"

        android:layout_centerHorizontal="true"

        android:layout_below="@+id/resolver_empty_state_subtitle"

        android:indeterminateTint="@color/resolver_tabs_active_color"/>

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

</RelativeLayout>
 
 No newline at end of file

core/res/res/values-night/colors.xml

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
    <color name="chooser_gradient_background">@color/loading_gradient_background_color_dark</color>

    <color name="chooser_gradient_highlight">@color/loading_gradient_highlight_color_dark</color>



    <color name="resolver_tabs_active_color">#FF8AB4F8</color>

    <color name="resolver_empty_state_text">#FFFFFF</color>

    <color name="resolver_empty_state_icon">#FFFFFF</color>

</resources>

core/res/res/values/colors.xml

+0 −2
Original line number Diff line number Diff line
@@ -224,8 +224,6 @@ 


    <!-- Resolver/Chooser -->

    <color name="resolver_text_color_secondary_dark">#ffC4C6C6</color>

    <color name="resolver_tabs_active_color">#FF1A73E8</color>

    <color name="resolver_tabs_inactive_color">#FF80868B</color>

    <color name="resolver_empty_state_text">#FF202124</color>

    <color name="resolver_empty_state_icon">#FF5F6368</color>

</resources>