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

Commit fb0a0818 authored by Arc Wang's avatar Arc Wang
Browse files

Fine tune UI layout files of WifiDppQrCodeScannerFragment & 

WifiDppQrCodeGeneratorFragment

    1. Remove footer in landscape QR code scanner fragment
    2. Move header icon from activity layout file to header layout file
    3. Fine tune header layout file
    4. set icons for the 2 fragments

Bug: 118797380
Bug: 118794858
Test: atest WifiDppConfiguratorActivityTest
      atest WifiDppQrCodeScannerFragmentTest
      atest WifiDppQrCodeGeneratorFragmentTest
      atest RunSettingsRoboTests

Change-Id: I7e547d7c29dd947a890e902e61b8244fec399354
parent 57baac2d

res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml

+0 −3
Original line number Diff line number Diff line
@@ -44,8 +44,5 @@ 
        android:layout_height="wrap_content"

        android:layout_gravity="center"/>



    <include layout="@layout/wifi_dpp_fragment_footer"

        android:gravity="center|bottom"/>



</LinearLayout>

res/layout/wifi_dpp_activity.xml

+0 −6
Original line number Diff line number Diff line
@@ -22,12 +22,6 @@ 
    android:layout_height="match_parent"

    android:orientation="vertical">



    <ImageView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:src="@drawable/ic_wifi_signal_4"

        android:layout_gravity="center"/>



    <LinearLayout

        android:id="@+id/fragment_container"

        android:layout_width="match_parent"

res/layout/wifi_dpp_fragment_header.xml

+31 −7
Original line number Diff line number Diff line
@@ -17,18 +17,42 @@ 


<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    style="@style/EntityHeader"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical">

    android:layout_centerHorizontal="true"

    android:gravity="center_horizontal"

    android:orientation="vertical"

    android:paddingStart="16dp"

    android:paddingEnd="16dp">



    <TextView android:id="@+id/title"

        android:layout_width="wrap_content"

    <ImageView

        android:id="@+id/header_icon"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:scaleType="fitCenter"/>



    <TextView

        android:id="@+id/title"

        style="@style/TextAppearance.EntityHeaderTitle"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center"/>

        android:gravity="center_horizontal"

        android:textAlignment="center"

        android:layout_marginTop="8dp"

        android:paddingStart="32dp"

        android:paddingEnd="32dp"/>



    <TextView android:id="@+id/description"

        android:layout_width="wrap_content"

    <TextView

        android:id="@+id/description"

        style="@style/TextAppearance.EntityHeaderSummary"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center"/>

        android:singleLine="false"

        android:gravity="center_horizontal"

        android:textAlignment="center"

        android:layout_marginTop="2dp"

        android:paddingStart="32dp"

        android:paddingEnd="32dp"/>



</LinearLayout>

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

+6 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import com.android.settings.R; 
 * {@code WifiDppAddDeviceFragment}

 */

public abstract class WifiDppQrCodeBaseFragment extends InstrumentedFragment {

    private ImageView mHeaderIcon;

    private TextView mTitle;

    private TextView mDescription;
@@ -89,6 +90,7 @@ public abstract class WifiDppQrCodeBaseFragment extends InstrumentedFragment { 
    }



    private void initView(View view) {

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

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

        mDescription = view.findViewById(R.id.description);
@@ -108,6 +110,10 @@ public abstract class WifiDppQrCodeBaseFragment extends InstrumentedFragment { 
        mButtonRight = view.findViewById(R.id.button_right);

    }



    protected void setHeaderIconImageResource(int resId) {

        mHeaderIcon.setImageResource(resId);

    }



    protected void setTitle(String title) {

        mTitle.setText(title);

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ public class WifiDppQrCodeGeneratorFragment extends WifiDppQrCodeBaseFragment { 
    public void onActivityCreated(Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);



        setHeaderIconImageResource(R.drawable.ic_qrcode_24dp);

        WifiNetworkConfig wifiNetworkConfig = ((WifiNetworkConfig.Retriever) getActivity())

                .getWifiNetworkConfig();

        if (!WifiNetworkConfig.isValidConfig(wifiNetworkConfig)) {
@@ -79,7 +80,7 @@ public class WifiDppQrCodeGeneratorFragment extends WifiDppQrCodeBaseFragment { 
    @Override

    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

        MenuItem item = menu.add(0, Menu.FIRST, 0, R.string.next_label);

        item.setIcon(R.drawable.ic_menu_add);

        item.setIcon(R.drawable.ic_scan_24dp);

        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);



        super.onCreateOptionsMenu(menu, inflater);