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

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

Browse Source
This commit is contained in:
Betty Chang
2021-12-16 03:16:10 +00:00
committed by Android (Google) Code Review
parent 3a91691eb6 2a7bb51441
commit 6dbbb8557f
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,36 +390,34 @@
android:focusable="false"> android:focusable="false">
<FrameLayout <FrameLayout
android:id="@+id/apm_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="true"
android:focusable="true"
android:layout_gravity="start|center_vertical" android:layout_gravity="start|center_vertical"
android:orientation="vertical"> android:orientation="vertical">
<Button <Button
android:id="@+id/apm_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/turn_off_airplane_mode" android:text="@string/turn_off_airplane_mode"
android:ellipsize="end" android:ellipsize="end"
style="@style/Widget.Dialog.Button.BorderButton" style="@style/Widget.Dialog.Button.BorderButton"
android:clickable="false"/> android:clickable="true"
android:focusable="true"/>
</FrameLayout> </FrameLayout>
<FrameLayout <FrameLayout
android:id="@+id/done_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_gravity="end|center_vertical" android:layout_gravity="end|center_vertical">
android:clickable="true"
android:focusable="true">
<Button <Button
android:id="@+id/done_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/inline_done_button" android:text="@string/inline_done_button"
style="@style/Widget.Dialog.Button" style="@style/Widget.Dialog.Button"
android:clickable="false"/> android:clickable="true"
android:focusable="true"/>
</FrameLayout> </FrameLayout>
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>

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

@@ -41,6 +41,7 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.Button;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
@@ -126,8 +127,8 @@ public class InternetDialog extends SystemUIDialog implements
private Switch mMobileDataToggle; private Switch mMobileDataToggle;
private View mMobileToggleDivider; private View mMobileToggleDivider;
private Switch mWiFiToggle; private Switch mWiFiToggle;
private FrameLayout mDoneLayout; private Button mDoneButton;
private FrameLayout mAirplaneModeLayout; private Button mAirplaneModeButton;
private Drawable mBackgroundOn; private Drawable mBackgroundOn;
private Drawable mBackgroundOff = null; private Drawable mBackgroundOff = null;
private int mDefaultDataSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID; 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); mWifiSettingsIcon = mDialogView.requireViewById(R.id.wifi_settings_icon);
mWifiRecyclerView = mDialogView.requireViewById(R.id.wifi_list_layout); mWifiRecyclerView = mDialogView.requireViewById(R.id.wifi_list_layout);
mSeeAllLayout = mDialogView.requireViewById(R.id.see_all_layout); mSeeAllLayout = mDialogView.requireViewById(R.id.see_all_layout);
mDoneLayout = mDialogView.requireViewById(R.id.done_layout); mDoneButton = mDialogView.requireViewById(R.id.done_button);
mAirplaneModeLayout = mDialogView.requireViewById(R.id.apm_layout); mAirplaneModeButton = mDialogView.requireViewById(R.id.apm_button);
mSignalIcon = mDialogView.requireViewById(R.id.signal_icon); mSignalIcon = mDialogView.requireViewById(R.id.signal_icon);
mMobileTitleText = mDialogView.requireViewById(R.id.mobile_title); mMobileTitleText = mDialogView.requireViewById(R.id.mobile_title);
mMobileSummaryText = mDialogView.requireViewById(R.id.mobile_summary); mMobileSummaryText = mDialogView.requireViewById(R.id.mobile_summary);
@@ -240,7 +241,7 @@ public class InternetDialog extends SystemUIDialog implements
setOnClickListener(); setOnClickListener();
mTurnWifiOnLayout.setBackground(null); mTurnWifiOnLayout.setBackground(null);
mAirplaneModeLayout.setVisibility( mAirplaneModeButton.setVisibility(
mInternetDialogController.isAirplaneModeEnabled() ? View.VISIBLE : View.GONE); mInternetDialogController.isAirplaneModeEnabled() ? View.VISIBLE : View.GONE);
mWifiRecyclerView.setLayoutManager(new LinearLayoutManager(mContext)); mWifiRecyclerView.setLayoutManager(new LinearLayoutManager(mContext));
mWifiRecyclerView.setAdapter(mAdapter); mWifiRecyclerView.setAdapter(mAdapter);
@@ -280,8 +281,8 @@ public class InternetDialog extends SystemUIDialog implements
mConnectedWifListLayout.setOnClickListener(null); mConnectedWifListLayout.setOnClickListener(null);
mSeeAllLayout.setOnClickListener(null); mSeeAllLayout.setOnClickListener(null);
mWiFiToggle.setOnCheckedChangeListener(null); mWiFiToggle.setOnCheckedChangeListener(null);
mDoneLayout.setOnClickListener(null); mDoneButton.setOnClickListener(null);
mAirplaneModeLayout.setOnClickListener(null); mAirplaneModeButton.setOnClickListener(null);
mInternetDialogController.onStop(); mInternetDialogController.onStop();
mInternetDialogFactory.destroyDialog(); mInternetDialogFactory.destroyDialog();
} }
@@ -307,7 +308,7 @@ public class InternetDialog extends SystemUIDialog implements
} }
mInternetDialogTitle.setText(getDialogTitleText()); mInternetDialogTitle.setText(getDialogTitleText());
mInternetDialogSubTitle.setText(getSubtitleText()); mInternetDialogSubTitle.setText(getSubtitleText());
mAirplaneModeLayout.setVisibility( mAirplaneModeButton.setVisibility(
mInternetDialogController.isAirplaneModeEnabled() ? View.VISIBLE : View.GONE); mInternetDialogController.isAirplaneModeEnabled() ? View.VISIBLE : View.GONE);
updateEthernet(); updateEthernet();
@@ -355,8 +356,8 @@ public class InternetDialog extends SystemUIDialog implements
buttonView.setChecked(isChecked); buttonView.setChecked(isChecked);
mWifiManager.setWifiEnabled(isChecked); mWifiManager.setWifiEnabled(isChecked);
}); });
mDoneLayout.setOnClickListener(v -> dismiss()); mDoneButton.setOnClickListener(v -> dismiss());
mAirplaneModeLayout.setOnClickListener(v -> { mAirplaneModeButton.setOnClickListener(v -> {
mInternetDialogController.setAirplaneModeDisabled(); mInternetDialogController.setAirplaneModeDisabled();
}); });
} }