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

Commit efbe5ec9 authored by Salvador Martinez's avatar Salvador Martinez Committed by Android (Google) Code Review
Browse files

Merge "Fixed talkback feedback for wifi menu" into nyc-mr1-dev

parents d76a3ed9 7c59e7ab

res/layout/wifi_dialog.xml

+3 −0
Original line number Diff line number Diff line
@@ -287,11 +287,14 @@ 
                android:layout_height="wrap_content"

                style="@style/wifi_item"

                android:paddingBottom="4dp"

                android:importantForAccessibility="yes"

                android:contentDescription="@string/wifi_advanced_toggle_description_collapsed"

                android:visibility="gone">

            <CheckBox android:id="@+id/wifi_advanced_togglebox"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    style="@style/wifi_advanced_toggle"

                    android:importantForAccessibility="noHideDescendants"

                    android:text="@string/wifi_show_advanced" />

        </LinearLayout>

src/com/android/settings/wifi/WifiConfigController.java

+16 −8
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import android.widget.CheckBox; 
import android.widget.CompoundButton;

import android.widget.CompoundButton.OnCheckedChangeListener;

import android.widget.EditText;

import android.widget.LinearLayout;

import android.widget.Spinner;

import android.widget.TextView;
@@ -262,13 +263,13 @@ public class WifiConfigController implements TextWatcher, 
                showSecurityFields();

                showIpConfigFields();

                showProxyFields();

                final CheckBox advancedTogglebox =

                        (CheckBox) mView.findViewById(R.id.wifi_advanced_togglebox);

                mView.findViewById(R.id.wifi_advanced_toggle).setVisibility(View.VISIBLE);

                ((CheckBox) mView.findViewById(R.id.wifi_advanced_togglebox))

                        .setOnCheckedChangeListener(this);

                if (showAdvancedFields) {

                    ((CheckBox) mView.findViewById(R.id.wifi_advanced_togglebox)).setChecked(true);

                    mView.findViewById(R.id.wifi_advanced_fields).setVisibility(View.VISIBLE);

                }

                advancedTogglebox.setOnCheckedChangeListener(this);

                advancedTogglebox.setChecked(showAdvancedFields);

                mView.findViewById(R.id.wifi_advanced_fields)

                        .setVisibility(showAdvancedFields ? View.VISIBLE : View.GONE);

            }



            if (mMode == WifiConfigUiBase.MODE_MODIFY) {
@@ -1210,11 +1211,18 @@ public class WifiConfigController implements TextWatcher, 
                ((EditText) mPasswordView).setSelection(pos);

            }

        } else if (view.getId() == R.id.wifi_advanced_togglebox) {

            final View advancedToggle = mView.findViewById(R.id.wifi_advanced_toggle);

            final int toggleVisibility;

            final int stringID;

            if (isChecked) {

                mView.findViewById(R.id.wifi_advanced_fields).setVisibility(View.VISIBLE);

                toggleVisibility = View.VISIBLE;

                stringID = R.string.wifi_advanced_toggle_description_expanded;

            } else {

                mView.findViewById(R.id.wifi_advanced_fields).setVisibility(View.GONE);

                toggleVisibility = View.GONE;

                stringID = R.string.wifi_advanced_toggle_description_collapsed;

            }

            mView.findViewById(R.id.wifi_advanced_fields).setVisibility(toggleVisibility);

            advancedToggle.setContentDescription(mContext.getString(stringID));

        }

    }