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

Commit 221b7e0b authored by Arc Wang's avatar Arc Wang
Browse files

Refine Wi-Fi DPP fragments. 

1. WifiDppQrCodeBaseFragment only declairs common UI components between fragments.
2. Initiate UI components in onViewCreated of each View.
3. Remove the only one usage of @NonNull since it should be used consistently
   throughout the class if we want to use it.
4. Use android.R.id for icon/title/summary

Bug: 120645817
Test: atest WifiDppConfiguratorActivityTest
      atest WifiDppEnrolleeActivityTest
      atest WifiDppQrCodeGeneratorFragmentTest
      atest WifiDppQrCodeScannerFragmentTest

Change-Id: I54f99a3072533cec46f0e47753ee0331fecf2ada
parent 1988fb75

res/layout/wifi_dpp_fragment_header.xml

+3 −3
Original line number Diff line number Diff line
@@ -27,13 +27,13 @@ 
    android:paddingEnd="16dp">



    <ImageView

        android:id="@+id/header_icon"

        android:id="@android:id/icon"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:scaleType="fitCenter"/>



    <TextView

        android:id="@+id/title"

        android:id="@android:id/title"

        style="@style/TextAppearance.EntityHeaderTitle"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"
@@ -44,7 +44,7 @@ 
        android:paddingEnd="32dp"/>



    <TextView

        android:id="@+id/description"

        android:id="@android:id/summary"

        style="@style/TextAppearance.EntityHeaderSummary"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

res/layout/wifi_dpp_qrcode_scanner_fragment.xml

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ 
        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:layout_marginTop="8dp"

        android:text="@string/wifi_dpp_could_not_detect_valid_qr_code"

        android:visibility="invisible"

        android:textColor="?android:attr/colorError"/>



</LinearLayout>

src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java

+27 −6
Original line number Diff line number Diff line
@@ -17,6 +17,13 @@ 
package com.android.settings.wifi.dpp;



import android.os.Bundle;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.widget.Button;

import android.widget.ImageView;

import android.widget.ProgressBar;

import android.widget.TextView;



import com.android.internal.logging.nano.MetricsProto;

import com.android.settings.R;
@@ -26,10 +33,11 @@ import com.android.settings.R; 
 * to the Wi-Fi network.

 */

public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {

    @Override

    protected int getLayout() {

        return R.layout.wifi_dpp_add_device_fragment;

    }

    private ProgressBar mProgressBar;

    private ImageView mWifiApPictureView;

    private TextView mChooseDifferentNetwork;

    private Button mButtonLeft;

    private Button mButtonRight;



    @Override

    public int getMetricsCategory() {
@@ -37,7 +45,20 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment { 
    }



    @Override

    public void onActivityCreated (Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);

    public final View onCreateView(LayoutInflater inflater, ViewGroup container,

            Bundle savedInstanceState) {

        return inflater.inflate(R.layout.wifi_dpp_add_device_fragment, container,

                /* attachToRoot */ false);

    }



    @Override

    public void onViewCreated(View view, Bundle savedInstanceState) {

        super.onViewCreated(view, savedInstanceState);



        mProgressBar = view.findViewById(R.id.progress_bar);

        mWifiApPictureView = view.findViewById(R.id.wifi_ap_picture_view);

        mChooseDifferentNetwork = view.findViewById(R.id.choose_different_network);

        mButtonLeft = view.findViewById(R.id.button_left);

        mButtonRight = view.findViewById(R.id.button_right);

    }

}

src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragment.java

+21 −6
Original line number Diff line number Diff line
@@ -17,6 +17,11 @@ 
package com.android.settings.wifi.dpp;



import android.os.Bundle;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.widget.Button;

import android.widget.ListView;



import com.android.internal.logging.nano.MetricsProto;

import com.android.settings.R;
@@ -26,10 +31,9 @@ import com.android.settings.R; 
 * {@code WifiDppConfiguratorActivity} to start with this fragment to choose a saved Wi-Fi network.

 */

public class WifiDppChooseSavedWifiNetworkFragment extends WifiDppQrCodeBaseFragment {

    @Override

    protected int getLayout() {

        return R.layout.wifi_dpp_choose_saved_wifi_network_fragment;

    }

    private ListView mSavedWifiNetworkList;

    private Button mButtonLeft;

    private Button mButtonRight;



    @Override

    public int getMetricsCategory() {
@@ -37,7 +41,18 @@ public class WifiDppChooseSavedWifiNetworkFragment extends WifiDppQrCodeBaseFrag 
    }



    @Override

    public void onActivityCreated (Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);

    public final View onCreateView(LayoutInflater inflater, ViewGroup container,

            Bundle savedInstanceState) {

        return inflater.inflate(R.layout.wifi_dpp_choose_saved_wifi_network_fragment, container,

                /* attachToRoot */ false);

    }



    @Override

    public void onViewCreated(View view, Bundle savedInstanceState) {

        super.onViewCreated(view, savedInstanceState);



        mSavedWifiNetworkList = view.findViewById(R.id.saved_wifi_network_list);

        mButtonLeft = view.findViewById(R.id.button_left);

        mButtonRight = view.findViewById(R.id.button_right);

    }

}

src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java

+9 −137
Original line number Diff line number Diff line
@@ -17,25 +17,16 @@ 
package com.android.settings.wifi.dpp;



import android.os.Bundle;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.widget.Button;

import android.widget.ImageView;

import android.widget.ListView;

import android.widget.ProgressBar;

import android.widget.TextView;



import com.android.settings.core.InstrumentedFragment;

import com.android.settings.R;



/**

 * TODO: b/120645817 should refine code to only initiate UI component in each child fragment.

 */



/**

 * There are below 4 fragments for Wi-Fi DPP UI flow, to reduce redundant code of UI components,

 * this parent fragment instantiates all UI components and provides setting APIs for them.

 * this parent fragment instantiates common UI components

 *

 * {@code WifiDppQrCodeScannerFragment}

 * {@code WifiDppQrCodeGeneratorFragment}
@@ -43,135 +34,16 @@ import com.android.settings.R; 
 * {@code WifiDppAddDeviceFragment}

 */

public abstract class WifiDppQrCodeBaseFragment extends InstrumentedFragment {

    private ImageView mHeaderIcon;

    private TextView mTitle;

    private TextView mDescription;



    private TextView mErrorMessage;         //optional, for WifiDppQrCodeScannerFragment

    private ListView mSavedWifiNetworkList; //optional, for WifiDppChooseSavedWifiNetworkFragment

    private ProgressBar mProgressBar;       //optional, for WifiDppAddDeviceFragment

    private ImageView mWifiApPictureView;   //optional, for WifiDppAddDeviceFragment

    private TextView mChooseDifferentNetwork;//optional, for WifiDppAddDeviceFragment



    private Button mButtonLeft;             //optional, for WifiDppChooseSavedWifiNetworkFragment,

                                            //              WifiDppAddDeviceFragment

    private Button mButtonRight;            //optional, for WifiDppChooseSavedWifiNetworkFragment,

                                            //              WifiDppAddDeviceFragment



    abstract protected int getLayout();



    @Override

    public final void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

    }

    protected ImageView mHeaderIcon;

    protected TextView mTitle;

    protected TextView mSummary;



    @Override

    public final View onCreateView(LayoutInflater inflater, ViewGroup container,

            Bundle savedInstanceState) {

        View view = inflater.inflate(getLayout(), container, false);

        initView(view);

        return view;

    }



    private void initView(View view) {

        mHeaderIcon = view.findViewById(R.id.header_icon);

        mTitle = view.findViewById(R.id.title);

        mDescription = view.findViewById(R.id.description);

        mErrorMessage = view.findViewById(R.id.error_message);



        mSavedWifiNetworkList = view.findViewById(R.id.saved_wifi_network_list);



        mProgressBar = view.findViewById(R.id.progress_bar);

        mWifiApPictureView = view.findViewById(R.id.wifi_ap_picture_view);

        mChooseDifferentNetwork = view.findViewById(R.id.choose_different_network);



        mButtonLeft = view.findViewById(R.id.button_left);

        mButtonRight = view.findViewById(R.id.button_right);

    }



    protected void setHeaderIconImageResource(int resId) {

        mHeaderIcon.setImageResource(resId);

    }



    protected void setTitle(String title) {

        mTitle.setText(title);

    }



    protected void setDescription(String description) {

        mDescription.setText(description);

    }

    public void onViewCreated(View view, Bundle savedInstanceState) {

        super.onViewCreated(view, savedInstanceState);



    /** optional, for WifiDppQrCodeScannerFragment */

    protected void showErrorMessage(boolean show) {

        if (mErrorMessage != null) {

            mErrorMessage.setVisibility(show ? View.VISIBLE : View.INVISIBLE);

        }

    }



    /** optional, for WifiDppQrCodeScannerFragment */

    protected void setErrorMessage(String errorMessage) {

        if (mErrorMessage != null) {

            mErrorMessage.setText(errorMessage);

        }

    }



    /**

     * optional, for WifiDppChooseSavedWifiNetworkFragment,

     *               WifiDppAddDeviceFragment

     */

    protected void setLeftButtonText(String text) {

        if (mButtonLeft != null) {

            mButtonLeft.setText(text);

        }

    }



    /**

     * optional, for WifiDppChooseSavedWifiNetworkFragment,

     *               WifiDppAddDeviceFragment

     */

    protected void setRightButtonText(String text) {

        if (mButtonRight != null) {

            mButtonRight.setText(text);

        }

    }



    /**

     * optional, for WifiDppChooseSavedWifiNetworkFragment,

     *               WifiDppAddDeviceFragment

     */

    protected void hideLeftButton() {

        if (mButtonLeft != null) {

            mButtonLeft.setVisibility(View.INVISIBLE);

        }

    }



    /**

     * optional, for WifiDppChooseSavedWifiNetworkFragment,

     *               WifiDppAddDeviceFragment

     */

    protected void hideRightButton() {

        if (mButtonRight != null) {

            mButtonRight.setVisibility(View.INVISIBLE);

        }

    }



    /**

     * optional, for WifiDppChooseSavedWifiNetworkFragment,

     *               WifiDppAddDeviceFragment

     */

    protected void setLeftButtonOnClickListener(View.OnClickListener listener) {

        if (mButtonLeft != null) {

            mButtonLeft.setOnClickListener(listener);

        }

    }



    /**

     * optional, for WifiDppChooseSavedWifiNetworkFragment,

     *               WifiDppAddDeviceFragment

     */

    protected void setRightButtonOnClickListener(View.OnClickListener listener) {

        if (mButtonRight != null) {

            mButtonRight.setOnClickListener(listener);

        }

        mHeaderIcon = view.findViewById(android.R.id.icon);

        mTitle = view.findViewById(android.R.id.title);

        mSummary = view.findViewById(android.R.id.summary);

    }

}