From fb0a0818487de7300bd107b57ca93cd09cb93434 Mon Sep 17 00:00:00 2001 From: Arc Wang Date: Thu, 13 Dec 2018 11:45:08 +0800 Subject: [PATCH] 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 --- .../wifi_dpp_qrcode_scanner_fragment.xml | 3 -- res/layout/wifi_dpp_activity.xml | 6 --- res/layout/wifi_dpp_fragment_header.xml | 40 +++++++++++++++---- .../wifi/dpp/WifiDppQrCodeBaseFragment.java | 6 +++ .../dpp/WifiDppQrCodeGeneratorFragment.java | 3 +- .../dpp/WifiDppQrCodeScannerFragment.java | 2 + 6 files changed, 42 insertions(+), 18 deletions(-) diff --git a/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml b/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml index 0c938f82ede..e2df31c183b 100644 --- a/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml +++ b/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml @@ -44,8 +44,5 @@ android:layout_height="wrap_content" android:layout_gravity="center"/> - - diff --git a/res/layout/wifi_dpp_activity.xml b/res/layout/wifi_dpp_activity.xml index a833dcc757c..cb82f661c13 100644 --- a/res/layout/wifi_dpp_activity.xml +++ b/res/layout/wifi_dpp_activity.xml @@ -22,12 +22,6 @@ android:layout_height="match_parent" android:orientation="vertical"> - - + android:layout_centerHorizontal="true" + android:gravity="center_horizontal" + android:orientation="vertical" + android:paddingStart="16dp" + android:paddingEnd="16dp"> - + - + android:gravity="center_horizontal" + android:textAlignment="center" + android:layout_marginTop="8dp" + android:paddingStart="32dp" + android:paddingEnd="32dp"/> + + diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java index cddd55cdd40..5257178644f 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java +++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java @@ -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); } diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java index b064253f315..6358e066d8d 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java +++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java @@ -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); diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java index 5689c56ddad..a555d5f39d3 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java +++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java @@ -76,6 +76,8 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); + setHeaderIconImageResource(R.drawable.ic_scan_24dp); + if (mConfiguratorMode) { setTitle(getString(R.string.wifi_dpp_add_device_to_network));