From 8ce423cdd2f83258fc1cff4c6bcb207654faad65 Mon Sep 17 00:00:00 2001 From: Weng Su Date: Tue, 9 Mar 2021 22:36:02 +0800 Subject: [PATCH] [Provider Model] Update Airplane mode message - Show Airplane mode message when Airplane mode is enabled - Show the same message whether Wi-Fi is enabled or disabled - Screenshot: https://screenshot.googleplex.com/9FgqG7WWskRLZxo https://screenshot.googleplex.com/4g4kvnAT6aYN57s Bug: 181858434 Test: manual test make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest Change-Id: I3cb5a8bc7cb4d1e8678eb6d75116effd00ac9432 --- ...l => airplane_mode_message_preference.xml} | 16 +- res/values/dimens.xml | 2 +- res/xml/network_provider_settings.xml | 6 +- .../network/NetworkProviderSettings.java | 52 ++++-- ...odeNetworksLayoutPreferenceController.java | 168 ----------------- .../network/NetworkProviderSettingsTest.java | 41 +++-- ...etworksLayoutPreferenceControllerTest.java | 171 ------------------ 7 files changed, 65 insertions(+), 391 deletions(-) rename res/layout/{view_airplane_mode_networks_button.xml => airplane_mode_message_preference.xml} (61%) delete mode 100644 src/com/android/settings/network/ViewAirplaneModeNetworksLayoutPreferenceController.java delete mode 100644 tests/unit/src/com/android/settings/network/ViewAirplaneModeNetworksLayoutPreferenceControllerTest.java diff --git a/res/layout/view_airplane_mode_networks_button.xml b/res/layout/airplane_mode_message_preference.xml similarity index 61% rename from res/layout/view_airplane_mode_networks_button.xml rename to res/layout/airplane_mode_message_preference.xml index 0599274a169..032161bee17 100644 --- a/res/layout/view_airplane_mode_networks_button.xml +++ b/res/layout/airplane_mode_message_preference.xml @@ -22,7 +22,6 @@ android:orientation="vertical"> - -