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

Merge "[Provider Model] Add Ethernet network to Internet Panel" into sc-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-20 04:27:08 +00:00
committed by Android (Google) Code Review
parent 98fa7d142f d20de58a2f
commit 01841cf819
9 changed files with 278 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
packages/SystemUI/res/layout/internet_connectivity_dialog.xml
View File

@@ -39,7 +39,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="32dp" android:layout_height="32dp"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:fontFamily="google-sans" android:fontFamily="@*android:string/config_headlineFontFamily"
android:textSize="24sp"/> android:textSize="24sp"/>
<TextView <TextView
@@ -50,7 +50,7 @@
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:fontFamily="google-sans" android:fontFamily="@*android:string/config_headlineFontFamily"
android:textSize="14sp"/> android:textSize="14sp"/>
</LinearLayout> </LinearLayout>
@@ -87,24 +87,49 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:id="@+id/internet_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout
android:id="@+id/ethernet_layout"
style="@style/InternetDialog.Network"
android:background="@drawable/settingslib_switch_bar_bg_on"
android:visibility="gone">
<FrameLayout
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_vertical|start"
android:clickable="false">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:autoMirrored="true"
android:src="@drawable/stat_sys_ethernet_fully"
android:tint="@color/connected_network_primary_color"/>
</FrameLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="start|center_vertical"
android:orientation="vertical"
android:clickable="false">
<TextView
android:text="@string/ethernet_label"
style="@style/InternetDialog.NetworkTitle.Active"/>
<TextView
android:text="@string/to_switch_networks_disconnect_ethernet"
style="@style/InternetDialog.NetworkSummary.Active"/>
</LinearLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/mobile_network_layout" android:id="@+id/mobile_network_layout"
android:layout_width="match_parent" style="@style/InternetDialog.Network">
android:layout_height="88dp"
android:clickable="true"
android:focusable="true"
android:background="?android:attr/selectableItemBackground"
android:layout_gravity="center_vertical|start"
android:orientation="horizontal"
android:layout_marginEnd="@dimen/internet_dialog_network_layout_margin"
android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"
android:paddingStart="22dp"
android:paddingEnd="22dp">
<FrameLayout <FrameLayout
android:layout_width="24dp" android:layout_width="24dp"
@@ -121,7 +146,6 @@
<LinearLayout <LinearLayout
android:layout_weight="1" android:layout_weight="1"
android:id="@+id/mobile_network_list"
android:orientation="vertical" android:orientation="vertical"
android:clickable="false" android:clickable="false"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -129,28 +153,10 @@
android:gravity="start|center_vertical"> android:gravity="start|center_vertical">
<TextView <TextView
android:id="@+id/mobile_title" android:id="@+id/mobile_title"
android:textDirection="locale" style="@style/InternetDialog.NetworkTitle"/>
android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"
android:layout_marginEnd="7dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|start"
android:ellipsize="end"
android:textColor="?android:attr/textColorPrimary"
android:textSize="16sp"
android:fontFamily="google-sans"/>
<TextView <TextView
android:id="@+id/mobile_summary" android:id="@+id/mobile_summary"
android:textDirection="locale" style="@style/InternetDialog.NetworkSummary"/>
android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"
android:layout_marginEnd="34dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|start"
android:ellipsize="end"
android:textColor="?android:attr/textColorTertiary"
android:textSize="14sp"
android:fontFamily="google-sans"/>
</LinearLayout> </LinearLayout>
<FrameLayout <FrameLayout
@@ -172,17 +178,9 @@
<LinearLayout <LinearLayout
android:id="@+id/turn_on_wifi_layout" android:id="@+id/turn_on_wifi_layout"
android:layout_width="match_parent" style="@style/InternetDialog.Network"
android:layout_height="72dp" android:layout_height="72dp"
android:clickable="true" android:gravity="center">
android:focusable="true"
android:background="?android:attr/selectableItemBackground"
android:gravity="center"
android:orientation="horizontal"
android:layout_marginEnd="@dimen/internet_dialog_network_layout_margin"
android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"
android:paddingStart="22dp"
android:paddingEnd="22dp">
<FrameLayout <FrameLayout
android:layout_weight="1" android:layout_weight="1"
@@ -193,13 +191,10 @@
<TextView <TextView
android:id="@+id/wifi_toggle_title" android:id="@+id/wifi_toggle_title"
android:text="@string/turn_on_wifi" android:text="@string/turn_on_wifi"
android:textDirection="locale"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:textColor="?android:attr/textColorPrimary" android:textAppearance="@style/TextAppearance.InternetDialog"/>
android:textSize="16sp"
android:fontFamily="google-sans"/>
</FrameLayout> </FrameLayout>
<FrameLayout <FrameLayout
@@ -222,18 +217,12 @@
<LinearLayout <LinearLayout
android:id="@+id/wifi_connected_layout" android:id="@+id/wifi_connected_layout"
android:layout_width="match_parent" style="@style/InternetDialog.Network"
android:layout_height="72dp" android:layout_height="72dp"
android:layout_gravity="center_vertical|start"
android:clickable="true"
android:focusable="true"
android:visibility="gone"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"
android:layout_marginEnd="@dimen/internet_dialog_network_layout_margin"
android:paddingStart="20dp" android:paddingStart="20dp"
android:paddingEnd="24dp"> android:paddingEnd="24dp"
android:background="@drawable/settingslib_switch_bar_bg_on"
android:visibility="gone">
<FrameLayout <FrameLayout
android:layout_width="24dp" android:layout_width="24dp"
@@ -248,7 +237,6 @@
</FrameLayout> </FrameLayout>
<LinearLayout <LinearLayout
android:id="@+id/wifi_connected_list"
android:orientation="vertical" android:orientation="vertical"
android:clickable="false" android:clickable="false"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -258,26 +246,11 @@
android:gravity="start|center_vertical"> android:gravity="start|center_vertical">
<TextView <TextView
android:id="@+id/wifi_connected_title" android:id="@+id/wifi_connected_title"
android:textDirection="locale" style="@style/InternetDialog.NetworkTitle.Active"
android:layout_width="wrap_content" android:textSize="14sp"/>
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|start"
android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"
android:ellipsize="end"
android:textColor="?android:attr/textColorPrimary"
android:textSize="14sp"
android:fontFamily="google-sans"/>
<TextView <TextView
android:id="@+id/wifi_connected_summary" android:id="@+id/wifi_connected_summary"
android:textDirection="locale" style="@style/InternetDialog.NetworkSummary.Active"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|start"
android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"
android:ellipsize="end"
android:textColor="?android:attr/textColorTertiary"
android:textSize="14sp"
android:fontFamily="google-sans"/>
</LinearLayout> </LinearLayout>
<FrameLayout <FrameLayout
@@ -340,13 +313,11 @@
android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"> android:layout_marginStart="@dimen/internet_dialog_network_layout_margin">
<TextView <TextView
android:text="@string/see_all_networks" android:text="@string/see_all_networks"
android:textDirection="locale"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:textColor="?android:attr/textColorPrimary" android:textAppearance="@style/TextAppearance.InternetDialog"
android:textSize="14sp" android:textSize="14sp"/>
android:fontFamily="google-sans"/>
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>
@@ -366,7 +337,7 @@
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:text="@string/inline_done_button" android:text="@string/inline_done_button"
android:textSize="14sp" android:textSize="14sp"
android:fontFamily="google-sans"/> android:fontFamily="@*android:string/config_headlineFontFamily"/>
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>

37
packages/SystemUI/res/layout/internet_list_item.xml
View File

@@ -24,21 +24,15 @@
<LinearLayout <LinearLayout
android:id="@+id/wifi_list" android:id="@+id/wifi_list"
android:layout_width="match_parent" style="@style/InternetDialog.Network"
android:layout_height="72dp" android:layout_height="72dp"
android:layout_gravity="center_vertical|start"
android:clickable="true"
android:focusable="true"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:paddingStart="20dp" android:paddingStart="20dp"
android:paddingEnd="40dp"> android:paddingEnd="24dp">
<FrameLayout <FrameLayout
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:clickable="false" android:clickable="false"
android:layout_gravity="center_vertical|start" android:layout_gravity="center_vertical|start">
android:layout_marginStart="@dimen/internet_dialog_network_layout_margin">
<ImageView <ImageView
android:id="@+id/wifi_icon" android:id="@+id/wifi_icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -52,31 +46,16 @@
android:clickable="false" android:clickable="false"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="72dp" android:layout_height="72dp"
android:layout_marginEnd="30dp"
android:layout_weight="1" android:layout_weight="1"
android:gravity="start|center_vertical" android:gravity="start|center_vertical">
android:layout_marginStart="@dimen/internet_dialog_network_layout_margin">
<TextView <TextView
android:id="@+id/wifi_title" android:id="@+id/wifi_title"
android:textDirection="locale" style="@style/InternetDialog.NetworkTitle"
android:layout_width="wrap_content" android:textSize="14sp"/>
android:layout_height="20dp"
android:gravity="start|center_vertical"
android:ellipsize="end"
android:textColor="?android:attr/textColorPrimary"
android:textSize="14sp"
android:fontFamily="google-sans"
android:layout_marginEnd="18dp"/>
<TextView <TextView
android:id="@+id/wifi_summary" android:id="@+id/wifi_summary"
android:textDirection="locale" style="@style/InternetDialog.NetworkSummary"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start|center_vertical"
android:ellipsize="end"
android:textColor="?android:attr/textColorSecondary"
android:textSize="14sp"
android:fontFamily="google-sans"
android:layout_marginEnd="18dp"/>
</LinearLayout> </LinearLayout>
<FrameLayout <FrameLayout

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

@@ -48,4 +48,16 @@
<item name="android:windowLightStatusBar">false</item> <item name="android:windowLightStatusBar">false</item>
</style> </style>
<style name="TextAppearance.InternetDialog.Active">
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/connected_network_primary_color</item>
<item name="android:textDirection">locale</item>
</style>
<style name="TextAppearance.InternetDialog.Secondary.Active">
<item name="android:textSize">14sp</item>
<item name="android:textColor">@color/connected_network_secondary_color</item>
</style>
</resources> </resources>

2
packages/SystemUI/res/values/strings.xml
View File

@@ -3027,4 +3027,6 @@
<string name="wifi_failed_connect_message">Failed to connect to network</string> <string name="wifi_failed_connect_message">Failed to connect to network</string>
<!-- Provider Model: Title to see all the networks [CHAR LIMIT=50] --> <!-- Provider Model: Title to see all the networks [CHAR LIMIT=50] -->
<string name="see_all_networks">See all</string> <string name="see_all_networks">See all</string>
<!-- Summary for warning to disconnect ethernet first then switch to other networks. [CHAR LIMIT=60] -->
<string name="to_switch_networks_disconnect_ethernet">To switch networks, disconnect ethernet</string>
</resources> </resources>

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

@@ -951,4 +951,60 @@
<item name="android:maxHeight">4dp</item> <item name="android:maxHeight">4dp</item>
</style> </style>
<!-- Internet Dialog -->
<style name="InternetDialog">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_gravity">center_vertical|start</item>
<item name="android:layout_marginStart">@dimen/internet_dialog_network_layout_margin</item>
</style>
<style name="InternetDialog.Network">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">88dp</item>
<item name="android:layout_marginEnd">@dimen/internet_dialog_network_layout_margin</item>
<item name="android:paddingStart">22dp</item>
<item name="android:paddingEnd">22dp</item>
<item name="android:orientation">horizontal</item>
<item name="android:focusable">true</item>
<item name="android:clickable">true</item>
</style>
<style name="InternetDialog.NetworkTitle">
<item name="android:layout_marginEnd">7dp</item>
<item name="android:ellipsize">end</item>
<item name="android:textAppearance">@style/TextAppearance.InternetDialog</item>
</style>
<style name="InternetDialog.NetworkTitle.Active">
<item name="android:textAppearance">@style/TextAppearance.InternetDialog.Active</item>
</style>
<style name="InternetDialog.NetworkSummary">
<item name="android:layout_marginEnd">34dp</item>
<item name="android:ellipsize">end</item>
<item name="android:textAppearance">@style/TextAppearance.InternetDialog.Secondary</item>
</style>
<style name="InternetDialog.NetworkSummary.Active">
<item name="android:textAppearance">@style/TextAppearance.InternetDialog.Secondary.Active
</item>
</style>
<style name="TextAppearance.InternetDialog">
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
<item name="android:textSize">16sp</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textDirection">locale</item>
</style>
<style name="TextAppearance.InternetDialog.Secondary">
<item name="android:textSize">14sp</item>
<item name="android:textColor">?android:attr/textColorTertiary</item>
</style>
<style name="TextAppearance.InternetDialog.Active"/>
<style name="TextAppearance.InternetDialog.Secondary.Active"/>
</resources> </resources>

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

@@ -52,6 +52,7 @@ import android.widget.ProgressBar;
import android.widget.Switch; import android.widget.Switch;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.MainThread;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.annotation.WorkerThread; import androidx.annotation.WorkerThread;
@@ -60,7 +61,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.systemui.Prefs; import com.android.systemui.Prefs;
import com.android.systemui.R; import com.android.systemui.R;
import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.SysUISingleton;
@@ -105,12 +105,10 @@ public class InternetDialog extends SystemUIDialog implements
private View mDivider; private View mDivider;
private ProgressBar mProgressBar; private ProgressBar mProgressBar;
private LinearLayout mInternetDialogLayout; private LinearLayout mInternetDialogLayout;
private LinearLayout mInternetListLayout;
private LinearLayout mConnectedWifListLayout; private LinearLayout mConnectedWifListLayout;
private LinearLayout mConnectedWifList;
private LinearLayout mMobileNetworkLayout; private LinearLayout mMobileNetworkLayout;
private LinearLayout mMobileNetworkList;
private LinearLayout mTurnWifiOnLayout; private LinearLayout mTurnWifiOnLayout;
private LinearLayout mEthernetLayout;
private TextView mWifiToggleTitleText; private TextView mWifiToggleTitleText;
private LinearLayout mSeeAllLayout; private LinearLayout mSeeAllLayout;
private RecyclerView mWifiRecyclerView; private RecyclerView mWifiRecyclerView;
@@ -126,7 +124,6 @@ public class InternetDialog extends SystemUIDialog implements
private Button mDoneButton; private Button mDoneButton;
private Drawable mBackgroundOn; private Drawable mBackgroundOn;
private int mListMaxHeight; private int mListMaxHeight;
private int mLayoutWidth;
private int mDefaultDataSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID; private int mDefaultDataSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
private boolean mCanConfigMobileData; private boolean mCanConfigMobileData;
@@ -181,8 +178,6 @@ public class InternetDialog extends SystemUIDialog implements
}; };
mListMaxHeight = context.getResources().getDimensionPixelSize( mListMaxHeight = context.getResources().getDimensionPixelSize(
R.dimen.internet_dialog_list_max_height); R.dimen.internet_dialog_list_max_height);
mLayoutWidth = context.getResources().getDimensionPixelSize(
R.dimen.internet_dialog_list_max_width);
mUiEventLogger = uiEventLogger; mUiEventLogger = uiEventLogger;
mAdapter = new InternetAdapter(mInternetDialogController); mAdapter = new InternetAdapter(mInternetDialogController);
if (!aboveStatusBar) { if (!aboveStatusBar) {
@@ -221,13 +216,11 @@ public class InternetDialog extends SystemUIDialog implements
mInternetDialogSubTitle = mDialogView.requireViewById(R.id.internet_dialog_subtitle); mInternetDialogSubTitle = mDialogView.requireViewById(R.id.internet_dialog_subtitle);
mDivider = mDialogView.requireViewById(R.id.divider); mDivider = mDialogView.requireViewById(R.id.divider);
mProgressBar = mDialogView.requireViewById(R.id.wifi_searching_progress); mProgressBar = mDialogView.requireViewById(R.id.wifi_searching_progress);
mInternetListLayout = mDialogView.requireViewById(R.id.internet_list); mEthernetLayout = mDialogView.requireViewById(R.id.ethernet_layout);
mMobileNetworkLayout = mDialogView.requireViewById(R.id.mobile_network_layout); mMobileNetworkLayout = mDialogView.requireViewById(R.id.mobile_network_layout);
mMobileNetworkList = mDialogView.requireViewById(R.id.mobile_network_list);
mTurnWifiOnLayout = mDialogView.requireViewById(R.id.turn_on_wifi_layout); mTurnWifiOnLayout = mDialogView.requireViewById(R.id.turn_on_wifi_layout);
mWifiToggleTitleText = mDialogView.requireViewById(R.id.wifi_toggle_title); mWifiToggleTitleText = mDialogView.requireViewById(R.id.wifi_toggle_title);
mConnectedWifListLayout = mDialogView.requireViewById(R.id.wifi_connected_layout); mConnectedWifListLayout = mDialogView.requireViewById(R.id.wifi_connected_layout);
mConnectedWifList = mDialogView.requireViewById(R.id.wifi_connected_list);
mConnectedWifiIcon = mDialogView.requireViewById(R.id.wifi_connected_icon); mConnectedWifiIcon = mDialogView.requireViewById(R.id.wifi_connected_icon);
mConnectedWifiTitleText = mDialogView.requireViewById(R.id.wifi_connected_title); mConnectedWifiTitleText = mDialogView.requireViewById(R.id.wifi_connected_title);
mConnectedWifiSummaryText = mDialogView.requireViewById(R.id.wifi_connected_summary); mConnectedWifiSummaryText = mDialogView.requireViewById(R.id.wifi_connected_summary);
@@ -309,6 +302,7 @@ public class InternetDialog extends SystemUIDialog implements
} else { } else {
mInternetDialogSubTitle.setText(getSubtitleText()); mInternetDialogSubTitle.setText(getSubtitleText());
} }
updateEthernet();
setMobileDataLayout(mInternetDialogController.activeNetworkIsCellular()); setMobileDataLayout(mInternetDialogController.activeNetworkIsCellular());
if (!mCanConfigWifi) { if (!mCanConfigWifi) {
@@ -355,6 +349,12 @@ public class InternetDialog extends SystemUIDialog implements
mDoneButton.setOnClickListener(v -> dismiss()); mDoneButton.setOnClickListener(v -> dismiss());
} }
@MainThread
private void updateEthernet() {
mEthernetLayout.setVisibility(
mInternetDialogController.hasEthernet() ? View.VISIBLE : View.GONE);
}
private void setMobileDataLayout(boolean isCellularNetwork) { private void setMobileDataLayout(boolean isCellularNetwork) {
if (mInternetDialogController.isAirplaneModeEnabled() if (mInternetDialogController.isAirplaneModeEnabled()
|| !mInternetDialogController.hasCarrier()) { || !mInternetDialogController.hasCarrier()) {
@@ -371,38 +371,33 @@ public class InternetDialog extends SystemUIDialog implements
mMobileSummaryText.setVisibility(View.GONE); mMobileSummaryText.setVisibility(View.GONE);
} }
mSignalIcon.setImageDrawable(getSignalStrengthDrawable()); mSignalIcon.setImageDrawable(getSignalStrengthDrawable());
if (mInternetDialogController.isNightMode()) { mMobileTitleText.setTextAppearance(isCellularNetwork
int titleColor = isCellularNetwork ? mContext.getColor( ? R.style.TextAppearance_InternetDialog_Active
R.color.connected_network_primary_color) : Utils.getColorAttrDefaultColor( : R.style.TextAppearance_InternetDialog);
mContext, android.R.attr.textColorPrimary); mMobileSummaryText.setTextAppearance(isCellularNetwork
int summaryColor = isCellularNetwork ? mContext.getColor( ? R.style.TextAppearance_InternetDialog_Secondary_Active
R.color.connected_network_secondary_color) : Utils.getColorAttrDefaultColor( : R.style.TextAppearance_InternetDialog_Secondary);
mContext, android.R.attr.textColorSecondary);
mMobileTitleText.setTextColor(titleColor);
mMobileSummaryText.setTextColor(summaryColor);
}
mMobileNetworkLayout.setBackground(isCellularNetwork ? mBackgroundOn : null); mMobileNetworkLayout.setBackground(isCellularNetwork ? mBackgroundOn : null);
mMobileDataToggle.setVisibility(mCanConfigMobileData ? View.VISIBLE : View.INVISIBLE); mMobileDataToggle.setVisibility(mCanConfigMobileData ? View.VISIBLE : View.INVISIBLE);
} }
} }
@MainThread
private void updateWifiToggle(boolean isWifiEnabled, boolean isDeviceLocked) { private void updateWifiToggle(boolean isWifiEnabled, boolean isDeviceLocked) {
mWiFiToggle.setChecked(isWifiEnabled); mWiFiToggle.setChecked(isWifiEnabled);
if (isDeviceLocked && mInternetDialogController.isNightMode()) { if (isDeviceLocked) {
int titleColor = mConnectedWifiEntry != null ? mContext.getColor( mWifiToggleTitleText.setTextAppearance((mConnectedWifiEntry != null)
R.color.connected_network_primary_color) : Utils.getColorAttrDefaultColor( ? R.style.TextAppearance_InternetDialog_Active
mContext, android.R.attr.textColorPrimary); : R.style.TextAppearance_InternetDialog);
mWifiToggleTitleText.setTextColor(titleColor);
} }
mTurnWifiOnLayout.setBackground( mTurnWifiOnLayout.setBackground(
(isDeviceLocked && mConnectedWifiEntry != null) ? mBackgroundOn : null); (isDeviceLocked && mConnectedWifiEntry != null) ? mBackgroundOn : null);
} }
@MainThread
private void updateConnectedWifi(boolean isWifiEnabled, boolean isDeviceLocked) { private void updateConnectedWifi(boolean isWifiEnabled, boolean isDeviceLocked) {
if (!isWifiEnabled || mConnectedWifiEntry == null || isDeviceLocked) { if (!isWifiEnabled || mConnectedWifiEntry == null || isDeviceLocked) {
mConnectedWifListLayout.setBackground(null);
mConnectedWifListLayout.setVisibility(View.GONE); mConnectedWifListLayout.setVisibility(View.GONE);
return; return;
} }
@@ -411,15 +406,8 @@ public class InternetDialog extends SystemUIDialog implements
mConnectedWifiSummaryText.setText(mConnectedWifiEntry.getSummary(false)); mConnectedWifiSummaryText.setText(mConnectedWifiEntry.getSummary(false));
mConnectedWifiIcon.setImageDrawable( mConnectedWifiIcon.setImageDrawable(
mInternetDialogController.getInternetWifiDrawable(mConnectedWifiEntry)); mInternetDialogController.getInternetWifiDrawable(mConnectedWifiEntry));
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( mWifiSettingsIcon.setColorFilter(
mContext.getColor(R.color.connected_network_primary_color)); mContext.getColor(R.color.connected_network_primary_color));
mConnectedWifListLayout.setBackground(mBackgroundOn);
} }
void onClickConnectedWifi() { void onClickConnectedWifi() {
@@ -528,10 +516,17 @@ public class InternetDialog extends SystemUIDialog implements
} }
@Override @Override
@WorkerThread
public void onCapabilitiesChanged(Network network, NetworkCapabilities networkCapabilities) { public void onCapabilitiesChanged(Network network, NetworkCapabilities networkCapabilities) {
mHandler.post(() -> updateDialog()); mHandler.post(() -> updateDialog());
} }
@Override
@WorkerThread
public void onLost(Network network) {
mHandler.post(() -> updateDialog());
}
@Override @Override
public void onSubscriptionsChanged(int defaultDataSubId) { public void onSubscriptionsChanged(int defaultDataSubId) {
mDefaultDataSubId = defaultDataSubId; mDefaultDataSubId = defaultDataSubId;

57
packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java
View File

@@ -23,7 +23,6 @@ import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.res.Configuration;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
@@ -31,7 +30,6 @@ import android.graphics.drawable.LayerDrawable;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.Network; import android.net.Network;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.NetworkRequest;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.os.Handler; import android.os.Handler;
import android.provider.Settings; import android.provider.Settings;
@@ -49,6 +47,7 @@ import android.util.Log;
import android.view.Gravity; import android.view.Gravity;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.MainThread;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
@@ -133,6 +132,7 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback,
private KeyguardUpdateMonitor mKeyguardUpdateMonitor; private KeyguardUpdateMonitor mKeyguardUpdateMonitor;
private GlobalSettings mGlobalSettings; private GlobalSettings mGlobalSettings;
private int mDefaultDataSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID; private int mDefaultDataSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
private ConnectivityManager.NetworkCallback mConnectivityManagerNetworkCallback;
@VisibleForTesting @VisibleForTesting
protected ActivityStarter mActivityStarter; protected ActivityStarter mActivityStarter;
@@ -146,6 +146,8 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback,
protected boolean mCanConfigWifi; protected boolean mCanConfigWifi;
@VisibleForTesting @VisibleForTesting
protected KeyguardStateController mKeyguardStateController; protected KeyguardStateController mKeyguardStateController;
@VisibleForTesting
protected boolean mHasEthernet = false;
private final KeyguardUpdateMonitorCallback mKeyguardUpdateCallback = private final KeyguardUpdateMonitorCallback mKeyguardUpdateCallback =
new KeyguardUpdateMonitorCallback() { new KeyguardUpdateMonitorCallback() {
@@ -193,6 +195,7 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback,
mAccessPointController = accessPointController; mAccessPointController = accessPointController;
mConfig = MobileMappings.Config.readConfig(mContext); mConfig = MobileMappings.Config.readConfig(mContext);
mWifiIconInjector = new WifiUtils.InternetIconInjector(mContext); mWifiIconInjector = new WifiUtils.InternetIconInjector(mContext);
mConnectivityManagerNetworkCallback = new DataConnectivityListener();
} }
void onStart(@NonNull InternetDialogCallback callback, boolean canConfigWifi) { void onStart(@NonNull InternetDialogCallback callback, boolean canConfigWifi) {
@@ -216,9 +219,7 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback,
mInternetTelephonyCallback = new InternetTelephonyCallback(); mInternetTelephonyCallback = new InternetTelephonyCallback();
mTelephonyManager.registerTelephonyCallback(mExecutor, mInternetTelephonyCallback); mTelephonyManager.registerTelephonyCallback(mExecutor, mInternetTelephonyCallback);
// Listen the connectivity changes // Listen the connectivity changes
mConnectivityManager.registerNetworkCallback(new NetworkRequest.Builder() mConnectivityManager.registerDefaultNetworkCallback(mConnectivityManagerNetworkCallback);
.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
.build(), new DataConnectivityListener(), mHandler);
mCanConfigWifi = canConfigWifi; mCanConfigWifi = canConfigWifi;
scanWifiAccessPoints(); scanWifiAccessPoints();
} }
@@ -233,6 +234,7 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback,
mOnSubscriptionsChangedListener); mOnSubscriptionsChangedListener);
mAccessPointController.removeAccessPointCallback(this); mAccessPointController.removeAccessPointCallback(this);
mKeyguardUpdateMonitor.removeCallback(mKeyguardUpdateCallback); mKeyguardUpdateMonitor.removeCallback(mKeyguardUpdateCallback);
mConnectivityManager.unregisterNetworkCallback(mConnectivityManagerNetworkCallback);
} }
@VisibleForTesting @VisibleForTesting
@@ -351,11 +353,6 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback,
return drawable; return drawable;
} }
boolean isNightMode() {
return (mContext.getResources().getConfiguration().uiMode
& Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;
}
Drawable getSignalStrengthDrawable() { Drawable getSignalStrengthDrawable() {
Drawable drawable = mContext.getDrawable( Drawable drawable = mContext.getDrawable(
R.drawable.ic_signal_strength_zero_bar_no_internet); R.drawable.ic_signal_strength_zero_bar_no_internet);
@@ -800,6 +797,9 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback,
} }
int count = MAX_WIFI_ENTRY_COUNT; int count = MAX_WIFI_ENTRY_COUNT;
if (mHasEthernet) {
count -= 1;
}
if (hasCarrier()) { if (hasCarrier()) {
count -= 1; count -= 1;
} }
@@ -870,21 +870,30 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback,
@Override @Override
@WorkerThread @WorkerThread
public void onCapabilitiesChanged(@NonNull Network network, public void onCapabilitiesChanged(@NonNull Network network,
@NonNull NetworkCapabilities networkCapabilities) { @NonNull NetworkCapabilities capabilities) {
if (mCanConfigWifi) { mHasEthernet = capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET);
for (int transport : networkCapabilities.getTransportTypes()) { if (mCanConfigWifi && (mHasEthernet || capabilities.hasTransport(
if (transport == NetworkCapabilities.TRANSPORT_WIFI) { NetworkCapabilities.TRANSPORT_WIFI))) {
scanWifiAccessPoints(); scanWifiAccessPoints();
break;
}
}
}
final Network activeNetwork = mConnectivityManager.getActiveNetwork();
if (activeNetwork != null && activeNetwork.equals(network)) {
// update UI
mCallback.onCapabilitiesChanged(network, networkCapabilities);
} }
// update UI
mCallback.onCapabilitiesChanged(network, capabilities);
} }
@Override
@WorkerThread
public void onLost(@NonNull Network network) {
mHasEthernet = false;
mCallback.onLost(network);
}
}
/**
* Return {@code true} If the Ethernet exists
*/
@MainThread
public boolean hasEthernet() {
return mHasEthernet;
} }
private final BroadcastReceiver mConnectionStateReceiver = new BroadcastReceiver() { private final BroadcastReceiver mConnectionStateReceiver = new BroadcastReceiver() {
@@ -934,6 +943,8 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback,
void onCapabilitiesChanged(Network network, NetworkCapabilities networkCapabilities); void onCapabilitiesChanged(Network network, NetworkCapabilities networkCapabilities);
void onLost(@NonNull Network network);
void onSubscriptionsChanged(int defaultDataSubId); void onSubscriptionsChanged(int defaultDataSubId);
void onServiceStateChanged(ServiceState serviceState); void onServiceStateChanged(ServiceState serviceState);

41
packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java
View File

@@ -444,6 +444,47 @@ public class InternetDialogControllerTest extends SysuiTestCase {
verify(mInternetDialogCallback).onAccessPointsChanged(mWifiEntries, mConnectedEntry); verify(mInternetDialogCallback).onAccessPointsChanged(mWifiEntries, mConnectedEntry);
} }
@Test
public void onAccessPointsChanged_fourWifiEntries_callbackCutMore() {
reset(mInternetDialogCallback);
mInternetDialogController.setAirplaneModeEnabled(true);
mAccessPoints.clear();
mAccessPoints.add(mWifiEntry1);
mAccessPoints.add(mWifiEntry2);
mAccessPoints.add(mWifiEntry3);
mAccessPoints.add(mWifiEntry4);
mInternetDialogController.onAccessPointsChanged(mAccessPoints);
mWifiEntries.clear();
mWifiEntries.add(mWifiEntry1);
mWifiEntries.add(mWifiEntry2);
mWifiEntries.add(mWifiEntry3);
mWifiEntries.add(mWifiEntry4);
verify(mInternetDialogCallback)
.onAccessPointsChanged(mWifiEntries, null /* connectedEntry */);
// If the Ethernet exists, then Wi-Fi entries will cut last one.
reset(mInternetDialogCallback);
mInternetDialogController.mHasEthernet = true;
mInternetDialogController.onAccessPointsChanged(mAccessPoints);
mWifiEntries.remove(mWifiEntry4);
verify(mInternetDialogCallback)
.onAccessPointsChanged(mWifiEntries, null /* connectedEntry */);
// Turn off airplane mode to has carrier network, then Wi-Fi entries will cut last one.
reset(mInternetDialogCallback);
mInternetDialogController.setAirplaneModeEnabled(false);
mInternetDialogController.onAccessPointsChanged(mAccessPoints);
mWifiEntries.remove(mWifiEntry3);
verify(mInternetDialogCallback)
.onAccessPointsChanged(mWifiEntries, null /* connectedEntry */);
}
private String getResourcesString(String name) { private String getResourcesString(String name) {
return mContext.getResources().getString(getResourcesId(name)); return mContext.getResources().getString(getResourcesId(name));
} }

42
packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java
View File

@@ -67,6 +67,7 @@ public class InternetDialogTest extends SysuiTestCase {
private InternetDialog mInternetDialog; private InternetDialog mInternetDialog;
private View mDialogView; private View mDialogView;
private View mSubTitle; private View mSubTitle;
private LinearLayout mEthernet;
private LinearLayout mMobileDataToggle; private LinearLayout mMobileDataToggle;
private LinearLayout mWifiToggle; private LinearLayout mWifiToggle;
private LinearLayout mConnectedWifi; private LinearLayout mConnectedWifi;
@@ -97,6 +98,7 @@ public class InternetDialogTest extends SysuiTestCase {
mDialogView = mInternetDialog.mDialogView; mDialogView = mInternetDialog.mDialogView;
mSubTitle = mDialogView.requireViewById(R.id.internet_dialog_subtitle); mSubTitle = mDialogView.requireViewById(R.id.internet_dialog_subtitle);
mEthernet = mDialogView.requireViewById(R.id.ethernet_layout);
mMobileDataToggle = mDialogView.requireViewById(R.id.mobile_network_layout); mMobileDataToggle = mDialogView.requireViewById(R.id.mobile_network_layout);
mWifiToggle = mDialogView.requireViewById(R.id.turn_on_wifi_layout); mWifiToggle = mDialogView.requireViewById(R.id.turn_on_wifi_layout);
mConnectedWifi = mDialogView.requireViewById(R.id.wifi_connected_layout); mConnectedWifi = mDialogView.requireViewById(R.id.wifi_connected_layout);
@@ -138,6 +140,46 @@ public class InternetDialogTest extends SysuiTestCase {
assertThat(mSubTitle.getVisibility()).isEqualTo(View.VISIBLE); assertThat(mSubTitle.getVisibility()).isEqualTo(View.VISIBLE);
} }
@Test
public void updateDialog_apmOffAndHasEthernet_showEthernet() {
when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(false);
when(mInternetDialogController.hasEthernet()).thenReturn(true);
mInternetDialog.updateDialog();
assertThat(mEthernet.getVisibility()).isEqualTo(View.VISIBLE);
}
@Test
public void updateDialog_apmOffAndNoEthernet_hideEthernet() {
when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(false);
when(mInternetDialogController.hasEthernet()).thenReturn(false);
mInternetDialog.updateDialog();
assertThat(mEthernet.getVisibility()).isEqualTo(View.GONE);
}
@Test
public void updateDialog_apmOnAndHasEthernet_showEthernet() {
when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(true);
when(mInternetDialogController.hasEthernet()).thenReturn(true);
mInternetDialog.updateDialog();
assertThat(mEthernet.getVisibility()).isEqualTo(View.VISIBLE);
}
@Test
public void updateDialog_apmOnAndNoEthernet_hideEthernet() {
when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(true);
when(mInternetDialogController.hasEthernet()).thenReturn(false);
mInternetDialog.updateDialog();
assertThat(mEthernet.getVisibility()).isEqualTo(View.GONE);
}
@Test @Test
public void updateDialog_withApmOn_mobileDataLayoutGone() { public void updateDialog_withApmOn_mobileDataLayoutGone() {
when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(true); when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(true);