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

Merge "[Provider Model] Under the APM on, should set the sub-title to keep the same height and avoid the jumpy" into sc-v2-dev

Browse Source
This commit is contained in:
Zoey Chen
2021-12-09 14:02:01 +00:00
committed by Android (Google) Code Review
parent 02507e9c35 fd251b1390
commit 2b439cd4a3
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@
android:ellipsize="end"
android:gravity="center_vertical|center_horizontal"
android:layout_width="wrap_content"
android:layout_height="32dp"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.InternetDialog"
android:textSize="24sp"/>
@@ -45,7 +45,7 @@
android:id="@+id/internet_dialog_subtitle"
android:gravity="center_vertical|center_horizontal"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:ellipsize="end"
android:maxLines="1"
@@ -150,6 +150,7 @@
android:gravity="start|center_vertical">
<TextView
android:id="@+id/mobile_title"
android:maxLines="1"
style="@style/InternetDialog.NetworkTitle"/>
<TextView
android:id="@+id/mobile_summary"

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

@@ -316,15 +316,11 @@ public class InternetDialogController implements AccessPointController.AccessPoi
}
CharSequence getSubtitleText(boolean isProgressBarVisible) {
if (isAirplaneModeEnabled()) {
return null;
}
if (mCanConfigWifi && !mWifiManager.isWifiEnabled()) {
// When the airplane mode is off and Wi-Fi is disabled.
// When Wi-Fi is disabled.
// Sub-Title: Wi-Fi is off
if (DEBUG) {
Log.d(TAG, "Airplane mode off + Wi-Fi off.");
Log.d(TAG, "Wi-Fi off.");
}
return mContext.getText(SUBTITLE_TEXT_WIFI_IS_OFF);
}

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

@@ -235,10 +235,18 @@ public class InternetDialogControllerTest extends SysuiTestCase {
}
@Test
public void getSubtitleText_withAirplaneModeOn_returnNull() {
public void getSubtitleText_withApmOnAndWifiOff_returnWifiIsOff() {
fakeAirplaneModeEnabled(true);
when(mWifiManager.isWifiEnabled()).thenReturn(false);
assertThat(mInternetDialogController.getSubtitleText(false)).isNull();
assertThat(mInternetDialogController.getSubtitleText(false))
.isEqualTo(getResourcesString("wifi_is_off"));
// if the Wi-Fi disallow config, then don't return Wi-Fi related string.
mInternetDialogController.mCanConfigWifi = false;
assertThat(mInternetDialogController.getSubtitleText(false))
.isNotEqualTo(getResourcesString("wifi_is_off"));
}
@Test