From 007eb0da4bdfa6d76b62a21a863f067d9c298d44 Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Tue, 3 Aug 2021 17:56:11 +0800 Subject: [PATCH] [Provider Model] 1.Fix the color of the dark mode 2.Fix RTL layout Bug: 194982368 Test: manual test Change-Id: I912e8d21d19be0a82d7f3b3f8398808f335b42de Merged-In: I912e8d21d19be0a82d7f3b3f8398808f335b42de (cherry picked from commit 528298596fbbb1dc66a3442b55b4f6eb307a5238) --- .../layout/internet_connectivity_dialog.xml | 41 +++++++++++-------- .../res/layout/internet_list_item.xml | 12 +++--- packages/SystemUI/res/values/colors.xml | 4 +- .../qs/tiles/dialog/InternetAdapter.java | 2 +- .../qs/tiles/dialog/InternetDialog.java | 29 +++++++------ .../dialog/InternetDialogController.java | 16 +++++--- .../dialog/InternetDialogControllerTest.java | 4 +- 7 files changed, 64 insertions(+), 44 deletions(-) diff --git a/packages/SystemUI/res/layout/internet_connectivity_dialog.xml b/packages/SystemUI/res/layout/internet_connectivity_dialog.xml index f7919d43c551b..f23085a66903f 100644 --- a/packages/SystemUI/res/layout/internet_connectivity_dialog.xml +++ b/packages/SystemUI/res/layout/internet_connectivity_dialog.xml @@ -94,8 +94,8 @@ android:background="?android:attr/selectableItemBackground" android:layout_gravity="center_vertical|start" android:orientation="horizontal" - android:layout_marginRight="@dimen/settingslib_switchbar_margin" - android:layout_marginLeft="@dimen/settingslib_switchbar_margin" + android:layout_marginEnd="@dimen/settingslib_switchbar_margin" + android:layout_marginStart="@dimen/settingslib_switchbar_margin" android:layout_marginTop="16dp" android:paddingStart="22dp" android:paddingEnd="22dp"> @@ -107,6 +107,7 @@ android:layout_gravity="center_vertical|start"> @@ -122,10 +123,11 @@ android:gravity="start|center_vertical"> @@ -182,6 +185,7 @@ android:layout_height="match_parent"> @@ -244,10 +248,11 @@ android:gravity="start|center_vertical"> + android:layout_marginStart="16dp"> ?androidprv:attr/colorAccentPrimaryVariant ?androidprv:attr/colorAccentSecondaryVariant - #ff000000 - #808080 + #191C18 + #41493D diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetAdapter.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetAdapter.java index 13ee155d5af26..e346044e746de 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetAdapter.java @@ -215,7 +215,7 @@ public class InternetAdapter extends RecyclerView.Adapter shared = new AtomicReference<>(); shared.set(drawable); return shared.get(); 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 2a962bc90bab2..a63d1f80f3947 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 @@ -341,14 +341,17 @@ public class InternetDialog extends SystemUIDialog implements mMobileSummaryText.setVisibility(View.GONE); } mSignalIcon.setImageDrawable(getSignalStrengthDrawable()); - int titleColor = isCellularNetwork ? mContext.getColor( - R.color.connected_network_primary_color) : Utils.getColorAttrDefaultColor( - mContext, android.R.attr.textColorPrimary); - int summaryColor = isCellularNetwork ? mContext.getColor( - R.color.connected_network_tertiary_color) : Utils.getColorAttrDefaultColor( - mContext, android.R.attr.textColorTertiary); - mMobileTitleText.setTextColor(titleColor); - mMobileSummaryText.setTextColor(summaryColor); + if (mInternetDialogController.isNightMode()) { + int titleColor = isCellularNetwork ? mContext.getColor( + R.color.connected_network_primary_color) : Utils.getColorAttrDefaultColor( + mContext, android.R.attr.textColorPrimary); + int summaryColor = isCellularNetwork ? mContext.getColor( + R.color.connected_network_secondary_color) : Utils.getColorAttrDefaultColor( + mContext, android.R.attr.textColorSecondary); + + mMobileTitleText.setTextColor(titleColor); + mMobileSummaryText.setTextColor(summaryColor); + } mMobileNetworkLayout.setBackground(isCellularNetwork ? mBackgroundOn : null); mMobileDataToggle.setVisibility(mCanConfigMobileData ? View.VISIBLE : View.INVISIBLE); @@ -366,10 +369,12 @@ public class InternetDialog extends SystemUIDialog implements mConnectedWifiSummaryText.setText(getConnectedWifiSummary()); mConnectedWifiIcon.setImageDrawable( mInternetDialogController.getConnectedWifiDrawable(mConnectedWifiEntry)); - mConnectedWifiTitleText.setTextColor( - mContext.getColor(R.color.connected_network_primary_color)); - mConnectedWifiSummaryText.setTextColor( - mContext.getColor(R.color.connected_network_tertiary_color)); + if (mInternetDialogController.isNightMode()) { + mConnectedWifiTitleText.setTextColor( + mContext.getColor(R.color.connected_network_primary_color)); + mConnectedWifiSummaryText.setTextColor( + mContext.getColor(R.color.connected_network_secondary_color)); + } mWifiSettingsIcon.setColorFilter( mContext.getColor(R.color.connected_network_primary_color)); mConnectedWifListLayout.setBackground(mBackgroundOn); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java index 5c22e855a3d0f..890dcfd46f78b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java @@ -23,6 +23,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.content.res.Configuration; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; @@ -323,11 +324,15 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, if (drawable == null) { return null; } - drawable.setTint(Utils.getColorAttrDefaultColor(mContext, - com.android.internal.R.attr.colorControlNormal)); + drawable.setTint(mContext.getColor(R.color.connected_network_primary_color)); return drawable; } + boolean isNightMode() { + return (mContext.getResources().getConfiguration().uiMode + & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES; + } + Drawable getSignalStrengthDrawable() { Drawable drawable = mContext.getDrawable( R.drawable.ic_signal_strength_zero_bar_no_internet); @@ -345,8 +350,9 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, drawable = shared.get(); } - drawable.setTint( - Utils.getColorAttrDefaultColor(mContext, android.R.attr.colorControlNormal)); + drawable.setTint(activeNetworkIsCellular() ? mContext.getColor( + R.color.connected_network_primary_color) : Utils.getColorAttrDefaultColor( + mContext, android.R.attr.textColorTertiary)); } catch (Throwable e) { e.printStackTrace(); } @@ -393,7 +399,7 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, // Set the signal strength icon at the bottom right icons.setLayerGravity(1 /* index of SignalDrawable */, Gravity.BOTTOM | Gravity.RIGHT); icons.setLayerSize(1 /* index of SignalDrawable */, iconSize, iconSize); - icons.setTintList(Utils.getColorAttr(context, android.R.attr.colorControlNormal)); + icons.setTintList(Utils.getColorAttr(context, android.R.attr.textColorTertiary)); return icons; } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java index cdd6d66c45d2f..f876a43f75d40 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java @@ -35,6 +35,7 @@ import com.android.internal.logging.UiEventLogger; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.settingslib.Utils; import com.android.settingslib.wifi.WifiUtils; +import com.android.systemui.R; import com.android.systemui.SysuiTestCase; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.dagger.qualifiers.Main; @@ -288,8 +289,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { mInternetDialogController.getConnectedWifiDrawable(mConnectedEntry); verify(mWifiIconInjector).getIcon(eq(false), anyInt()); - verify(drawable).setTint(Utils.getColorAttrDefaultColor(mContext, - com.android.internal.R.attr.colorControlNormal)); + verify(drawable).setTint(mContext.getColor(R.color.connected_network_primary_color)); } @Test