From 6b9407780e5cd45a26905aa2c8b48edc5bbebdf7 Mon Sep 17 00:00:00 2001 From: Weng Su Date: Tue, 12 Apr 2022 04:48:00 +0800 Subject: [PATCH] Restrict Wi-Fi toggle in Internet Panel - Disable Wi-Fi toggle when user is not allowed to change Wi-Fi state. - Show restriction message in Wi-Fi toggle summary. Bug: 203168097 Test: manual test atest -c InternetDialogTest Change-Id: I9e637a1f782997de1486921f5eb0093f59ecb02f --- .../layout/internet_connectivity_dialog.xml | 23 ++++++--- .../qs/tiles/dialog/InternetDialog.java | 11 +++++ .../qs/tiles/dialog/InternetDialogTest.java | 47 +++++++++++++++++++ 3 files changed, 74 insertions(+), 7 deletions(-) diff --git a/packages/SystemUI/res/layout/internet_connectivity_dialog.xml b/packages/SystemUI/res/layout/internet_connectivity_dialog.xml index f72a8dc08c9cb..5b961595fbd36 100644 --- a/packages/SystemUI/res/layout/internet_connectivity_dialog.xml +++ b/packages/SystemUI/res/layout/internet_connectivity_dialog.xml @@ -198,20 +198,29 @@ android:clickable="false" android:focusable="false"> - + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="start|center_vertical" + android:orientation="vertical" + android:clickable="false"> - + +