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

Commit 54eba052 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update the colors of the Internet Panel" into udc-dev

parents db3f08a2 942f930f

packages/SystemUI/res/values-night/colors.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -100,4 +100,8 @@ 
    <color name="accessibility_floating_menu_message_text">@*android:color/primary_text_default_material_dark</color>

    <color name="accessibility_floating_menu_message_text">@*android:color/primary_text_default_material_dark</color>





    <color name="people_tile_background">@color/material_dynamic_secondary20</color>

    <color name="people_tile_background">@color/material_dynamic_secondary20</color>



    <!-- Internet Dialog -->

    <color name="connected_network_primary_color">@color/material_dynamic_primary80</color>

    <color name="connected_network_secondary_color">@color/material_dynamic_secondary80</color>

</resources>
 
</resources>

packages/SystemUI/res/values-night/styles.xml

+2 −6
Original line number Original line Diff line number Diff line
@@ -58,17 +58,13 @@ 
    <style name="TextAppearance.InternetDialog.Active">

    <style name="TextAppearance.InternetDialog.Active">

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

        <item name="android:textSize">16sp</item>

        <item name="android:textSize">16sp</item>

        <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>

        <item name="android:textColor">@color/material_dynamic_primary80</item>

        <item name="android:textDirection">locale</item>

        <item name="android:textDirection">locale</item>

    </style>

    </style>





    <style name="TextAppearance.InternetDialog.Secondary.Active">

    <style name="TextAppearance.InternetDialog.Secondary.Active">

        <item name="android:textSize">14sp</item>

        <item name="android:textSize">14sp</item>

        <item name="android:textColor">?android:attr/textColorSecondaryInverse</item>

        <item name="android:textColor">@color/material_dynamic_secondary80</item>

    </style>



    <style name="InternetDialog.Divider.Active">

        <item name="android:background">?android:attr/textColorSecondaryInverse</item>

    </style>

    </style>





</resources>
 
</resources>

packages/SystemUI/res/values/styles.xml

+0 −6
Original line number Original line Diff line number Diff line
@@ -1183,12 +1183,6 @@ 




    <style name="TextAppearance.InternetDialog.Secondary.Active"/>

    <style name="TextAppearance.InternetDialog.Secondary.Active"/>





    <style name="InternetDialog.Divider">

        <item name="android:background">?android:attr/textColorSecondary</item>

    </style>



    <style name="InternetDialog.Divider.Active"/>



    <style name="FgsManagerDialogTitle">

    <style name="FgsManagerDialogTitle">

        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>

        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>

        <item name="android:textStyle">bold</item>

        <item name="android:textStyle">bold</item>

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java

+0 −10
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@ import static com.android.systemui.qs.tiles.dialog.InternetDialogController.MAX_ 




import android.app.AlertDialog;

import android.app.AlertDialog;

import android.content.Context;

import android.content.Context;

import android.content.res.TypedArray;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.net.Network;

import android.net.Network;

import android.net.NetworkCapabilities;

import android.net.NetworkCapabilities;
@@ -58,7 +57,6 @@ import androidx.recyclerview.widget.RecyclerView; 




import com.android.internal.logging.UiEvent;

import com.android.internal.logging.UiEvent;

import com.android.internal.logging.UiEventLogger;

import com.android.internal.logging.UiEventLogger;

import com.android.settingslib.Utils;

import com.android.settingslib.wifi.WifiEnterpriseRestrictionUtils;

import com.android.settingslib.wifi.WifiEnterpriseRestrictionUtils;

import com.android.systemui.Prefs;

import com.android.systemui.Prefs;

import com.android.systemui.R;

import com.android.systemui.R;
@@ -419,14 +417,6 @@ public class InternetDialog extends SystemUIDialog implements 
                });

                });

            });

            });





            TypedArray array = mContext.obtainStyledAttributes(

                    R.style.InternetDialog_Divider_Active, new int[]{android.R.attr.background});

            int dividerColor = Utils.getColorAttrDefaultColor(mContext,

                    android.R.attr.textColorSecondary);

            mMobileToggleDivider.setBackgroundColor(isNetworkConnected

                    ? array.getColor(0, dividerColor) : dividerColor);

            array.recycle();



            mMobileDataToggle.setVisibility(mCanConfigMobileData ? View.VISIBLE : View.INVISIBLE);

            mMobileDataToggle.setVisibility(mCanConfigMobileData ? View.VISIBLE : View.INVISIBLE);

            mMobileToggleDivider.setVisibility(

            mMobileToggleDivider.setVisibility(

                    mCanConfigMobileData ? View.VISIBLE : View.INVISIBLE);

                    mCanConfigMobileData ? View.VISIBLE : View.INVISIBLE);