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

Commit 9dbc0405 authored by Arc Wang's avatar Arc Wang Committed by Android (Google) Code Review
Browse files

Merge "Fine tune UI layout files of WifiDppQrCodeScannerFragment & WifiDppQrCodeGeneratorFragment"

parents f41bbae1 fb0a0818

res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml

+0 −3
Original line number Diff line number Diff line
@@ -43,8 +43,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
@@ -43,6 +43,7 @@ import com.android.settings.R; 
 * {@code WifiDppAddDeviceFragment}

 */

public abstract class WifiDppQrCodeBaseFragment extends InstrumentedFragment {

    private ImageView mHeaderIcon;

    private TextView mTitle;

    private TextView mDescription;
@@ -73,6 +74,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);

        mErrorMessage = view.findViewById(R.id.error_message);
@@ -87,6 +89,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
@@ -51,6 +51,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)) {
@@ -85,7 +86,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);