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

Merge "[Provider Model] Fix QS internet Panel accessibility issues" into sc-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-24 20:34:11 +00:00
committed by Android (Google) Code Review
parent b0db165d7d b4e3b4c05a
commit 01e6e5780b
3 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,8 +38,7 @@
android:gravity="center_vertical|center_horizontal"
android:layout_width="wrap_content"
android:layout_height="32dp"
android:textColor="?android:attr/textColorPrimary"
android:fontFamily="@*android:string/config_headlineFontFamily"
android:textAppearance="@style/TextAppearance.InternetDialog"
android:textSize="24sp"/>
<TextView
@@ -50,8 +49,7 @@
android:layout_marginTop="4dp"
android:ellipsize="end"
android:maxLines="1"
android:fontFamily="@*android:string/config_headlineFontFamily"
android:textSize="14sp"/>
android:textAppearance="@style/TextAppearance.InternetDialog.Secondary"/>
</LinearLayout>
<LinearLayout
@@ -165,10 +163,11 @@
android:layout_gravity="end|center_vertical">
<Switch
android:id="@+id/mobile_toggle"
android:contentDescription="@string/mobile_data_settings_title"
android:switchMinWidth="@dimen/settingslib_switch_track_width"
android:layout_gravity="center"
android:layout_width="@dimen/settingslib_switch_track_width"
android:layout_height="@dimen/settingslib_switch_track_height"
android:layout_height="match_parent"
android:track="@drawable/settingslib_track_selector"
android:thumb="@drawable/settingslib_thumb_selector"
android:theme="@style/MainSwitch.Settingslib"/>
@@ -180,7 +179,9 @@
android:id="@+id/turn_on_wifi_layout"
style="@style/InternetDialog.Network"
android:layout_height="72dp"
android:gravity="center">
android:gravity="center"
android:clickable="false"
android:focusable="false">
<FrameLayout
android:layout_weight="1"
@@ -204,10 +205,11 @@
android:layout_marginBottom="10dp">
<Switch
android:id="@+id/wifi_toggle"
android:contentDescription="@string/turn_on_wifi"
android:switchMinWidth="@dimen/settingslib_switch_track_width"
android:layout_gravity="center"
android:layout_width="@dimen/settingslib_switch_track_width"
android:layout_height="@dimen/settingslib_switch_track_height"
android:layout_height="match_parent"
android:track="@drawable/settingslib_track_selector"
android:thumb="@drawable/settingslib_thumb_selector"
android:theme="@style/MainSwitch.Settingslib"/>
@@ -319,25 +321,27 @@
android:textAppearance="@style/TextAppearance.InternetDialog"
android:textSize="14sp"/>
</FrameLayout>
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:id="@+id/done_layout"
android:layout_width="67dp"
android:layout_height="48dp"
android:layout_marginBottom="40dp">
android:layout_marginEnd="24dp"
android:layout_marginBottom="40dp"
android:layout_gravity="end|center_vertical"
android:clickable="true"
android:focusable="true">
<Button
style="@*android:style/Widget.DeviceDefault.Button.Borderless.Colored"
android:id="@+id/done"
android:layout_width="67dp"
android:layout_height="36dp"
android:layout_marginEnd="24dp"
android:layout_gravity="end|center_vertical"
android:background="@drawable/internet_dialog_footer_background"
android:textColor="?android:attr/textColorPrimary"
android:text="@string/inline_done_button"
style="@*android:style/Widget.DeviceDefault.Button.Borderless.Colored"
android:layout_width="match_parent"
android:layout_height="36dp"
android:layout_gravity="center"
android:textAppearance="@style/TextAppearance.InternetDialog"
android:textSize="14sp"
android:fontFamily="@*android:string/config_headlineFontFamily"/>
android:background="@drawable/internet_dialog_footer_background"
android:clickable="false"/>
</FrameLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>

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

@@ -1000,7 +1000,7 @@
<style name="TextAppearance.InternetDialog.Secondary">
<item name="android:textSize">14sp</item>
<item name="android:textColor">?android:attr/textColorTertiary</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
<style name="TextAppearance.InternetDialog.Active"/>

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

@@ -45,7 +45,7 @@ import android.view.ViewTreeObserver;
import android.view.Window;
import android.view.WindowInsets;
import android.view.WindowManager;
import android.widget.Button;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
@@ -121,7 +121,7 @@ public class InternetDialog extends SystemUIDialog implements
private TextView mMobileSummaryText;
private Switch mMobileDataToggle;
private Switch mWiFiToggle;
private Button mDoneButton;
private FrameLayout mDoneLayout;
private Drawable mBackgroundOn;
private int mListMaxHeight;
private int mDefaultDataSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
@@ -227,7 +227,7 @@ public class InternetDialog extends SystemUIDialog implements
mWifiSettingsIcon = mDialogView.requireViewById(R.id.wifi_settings_icon);
mWifiRecyclerView = mDialogView.requireViewById(R.id.wifi_list_layout);
mSeeAllLayout = mDialogView.requireViewById(R.id.see_all_layout);
mDoneButton = mDialogView.requireViewById(R.id.done);
mDoneLayout = mDialogView.requireViewById(R.id.done_layout);
mSignalIcon = mDialogView.requireViewById(R.id.signal_icon);
mMobileTitleText = mDialogView.requireViewById(R.id.mobile_title);
mMobileSummaryText = mDialogView.requireViewById(R.id.mobile_summary);
@@ -279,7 +279,7 @@ public class InternetDialog extends SystemUIDialog implements
mConnectedWifListLayout.setOnClickListener(null);
mSeeAllLayout.setOnClickListener(null);
mWiFiToggle.setOnCheckedChangeListener(null);
mDoneButton.setOnClickListener(null);
mDoneLayout.setOnClickListener(null);
mInternetDialogController.onStop();
mInternetDialogFactory.destroyDialog();
}
@@ -347,7 +347,7 @@ public class InternetDialog extends SystemUIDialog implements
buttonView.setChecked(isChecked);
mWifiManager.setWifiEnabled(isChecked);
});
mDoneButton.setOnClickListener(v -> dismiss());
mDoneLayout.setOnClickListener(v -> dismiss());
}
@MainThread