diff options
4 files changed, 6 insertions, 22 deletions
diff --git a/packages/SystemUI/res/values-night/colors.xml b/packages/SystemUI/res/values-night/colors.xml index 5efcef376817..99311e3d1e1b 100644 --- a/packages/SystemUI/res/values-night/colors.xml +++ b/packages/SystemUI/res/values-night/colors.xml @@ -100,4 +100,8 @@ <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> + + <!-- 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> diff --git a/packages/SystemUI/res/values-night/styles.xml b/packages/SystemUI/res/values-night/styles.xml index 99bc794547f2..b6971d3c1fa4 100644 --- a/packages/SystemUI/res/values-night/styles.xml +++ b/packages/SystemUI/res/values-night/styles.xml @@ -58,17 +58,13 @@ <style name="TextAppearance.InternetDialog.Active"> <item name="android:fontFamily">@*android:string/config_headlineFontFamily</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> </style> <style name="TextAppearance.InternetDialog.Secondary.Active"> <item name="android:textSize">14sp</item> - <item name="android:textColor">?android:attr/textColorSecondaryInverse</item> - </style> - - <style name="InternetDialog.Divider.Active"> - <item name="android:background">?android:attr/textColorSecondaryInverse</item> + <item name="android:textColor">@color/material_dynamic_secondary80</item> </style> </resources> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index cee21353bd68..cb5342a0d66b 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -1183,12 +1183,6 @@ <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"> <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item> <item name="android:textStyle">bold</item> diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java index 380b85cb5504..ad658458d330 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java @@ -20,7 +20,6 @@ import static com.android.systemui.qs.tiles.dialog.InternetDialogController.MAX_ import android.app.AlertDialog; import android.content.Context; -import android.content.res.TypedArray; import android.graphics.drawable.Drawable; import android.net.Network; import android.net.NetworkCapabilities; @@ -58,7 +57,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.internal.logging.UiEvent; import com.android.internal.logging.UiEventLogger; -import com.android.settingslib.Utils; import com.android.settingslib.wifi.WifiEnterpriseRestrictionUtils; import com.android.systemui.Prefs; 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); mMobileToggleDivider.setVisibility( mCanConfigMobileData ? View.VISIBLE : View.INVISIBLE); |