diff options
| -rw-r--r-- | packages/SystemUI/res/layout/internet_connectivity_dialog.xml | 16 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java | 21 |
2 files changed, 18 insertions, 19 deletions
diff --git a/packages/SystemUI/res/layout/internet_connectivity_dialog.xml b/packages/SystemUI/res/layout/internet_connectivity_dialog.xml index 275e0a52ab45..baf533656822 100644 --- a/packages/SystemUI/res/layout/internet_connectivity_dialog.xml +++ b/packages/SystemUI/res/layout/internet_connectivity_dialog.xml @@ -390,36 +390,34 @@ android:focusable="false"> <FrameLayout - android:id="@+id/apm_layout" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:clickable="true" - android:focusable="true" android:layout_gravity="start|center_vertical" android:orientation="vertical"> <Button + android:id="@+id/apm_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/turn_off_airplane_mode" android:ellipsize="end" style="@style/Widget.Dialog.Button.BorderButton" - android:clickable="false"/> + android:clickable="true" + android:focusable="true"/> </FrameLayout> <FrameLayout - android:id="@+id/done_layout" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:layout_gravity="end|center_vertical" - android:clickable="true" - android:focusable="true"> + android:layout_gravity="end|center_vertical"> <Button + android:id="@+id/done_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/inline_done_button" style="@style/Widget.Dialog.Button" - android:clickable="false"/> + android:clickable="true" + android:focusable="true"/> </FrameLayout> </FrameLayout> </LinearLayout> diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java index 11ecac27e88e..e7982bfb7bcd 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java @@ -41,6 +41,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.Window; import android.view.WindowManager; +import android.widget.Button; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; @@ -126,8 +127,8 @@ public class InternetDialog extends SystemUIDialog implements private Switch mMobileDataToggle; private View mMobileToggleDivider; private Switch mWiFiToggle; - private FrameLayout mDoneLayout; - private FrameLayout mAirplaneModeLayout; + private Button mDoneButton; + private Button mAirplaneModeButton; private Drawable mBackgroundOn; private Drawable mBackgroundOff = null; private int mDefaultDataSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID; @@ -217,8 +218,8 @@ 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); - mDoneLayout = mDialogView.requireViewById(R.id.done_layout); - mAirplaneModeLayout = mDialogView.requireViewById(R.id.apm_layout); + mDoneButton = mDialogView.requireViewById(R.id.done_button); + mAirplaneModeButton = mDialogView.requireViewById(R.id.apm_button); mSignalIcon = mDialogView.requireViewById(R.id.signal_icon); mMobileTitleText = mDialogView.requireViewById(R.id.mobile_title); mMobileSummaryText = mDialogView.requireViewById(R.id.mobile_summary); @@ -240,7 +241,7 @@ public class InternetDialog extends SystemUIDialog implements setOnClickListener(); mTurnWifiOnLayout.setBackground(null); - mAirplaneModeLayout.setVisibility( + mAirplaneModeButton.setVisibility( mInternetDialogController.isAirplaneModeEnabled() ? View.VISIBLE : View.GONE); mWifiRecyclerView.setLayoutManager(new LinearLayoutManager(mContext)); mWifiRecyclerView.setAdapter(mAdapter); @@ -280,8 +281,8 @@ public class InternetDialog extends SystemUIDialog implements mConnectedWifListLayout.setOnClickListener(null); mSeeAllLayout.setOnClickListener(null); mWiFiToggle.setOnCheckedChangeListener(null); - mDoneLayout.setOnClickListener(null); - mAirplaneModeLayout.setOnClickListener(null); + mDoneButton.setOnClickListener(null); + mAirplaneModeButton.setOnClickListener(null); mInternetDialogController.onStop(); mInternetDialogFactory.destroyDialog(); } @@ -307,7 +308,7 @@ public class InternetDialog extends SystemUIDialog implements } mInternetDialogTitle.setText(getDialogTitleText()); mInternetDialogSubTitle.setText(getSubtitleText()); - mAirplaneModeLayout.setVisibility( + mAirplaneModeButton.setVisibility( mInternetDialogController.isAirplaneModeEnabled() ? View.VISIBLE : View.GONE); updateEthernet(); @@ -356,8 +357,8 @@ public class InternetDialog extends SystemUIDialog implements buttonView.setChecked(isChecked); mWifiManager.setWifiEnabled(isChecked); }); - mDoneLayout.setOnClickListener(v -> dismiss()); - mAirplaneModeLayout.setOnClickListener(v -> { + mDoneButton.setOnClickListener(v -> dismiss()); + mAirplaneModeButton.setOnClickListener(v -> { mInternetDialogController.setAirplaneModeDisabled(); }); } |