Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-31 15:34:23 +00:00
committed by Android (Google) Code Review
parent db3f08a280 942f930f76
commit 54eba052c4
4 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/values-night/colors.xml
View File

@@ -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>

8
packages/SystemUI/res/values-night/styles.xml
View File

@@ -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>

6
packages/SystemUI/res/values/styles.xml
View File

@@ -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>

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

@@ -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);