Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6dbbb855 authored by Betty Chang's avatar Betty Chang Committed by Android (Google) Code Review
Browse files

Merge "To re-adjust the layout to pass the test in switch access and talkback" into sc-v2-dev

parents 3a91691e 2a7bb514

packages/SystemUI/res/layout/internet_connectivity_dialog.xml

+7 −9
Original line number Diff line number Diff line
@@ -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>

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

+11 −10
Original line number Diff line number Diff line
@@ -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();
@@ -355,8 +356,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();

        });

    }