PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add more Wi-Fi DPP UI features.

Browse Source 
1. Use ConstraintLayout to fix footer buttons at bottom
2. ScrollViews have all other UI components excepts footer buttons
3. Use style/SuwGlifButton for buttons
4. Fix scan fragment crash when rotating screen

Bug: 118794978
Test: manual test
Change-Id: I509b0156c4835c75da75fb7ac4c82f55a0b506a1
This commit is contained in:
Arc Wang
2019-01-07 11:51:42 +08:00
parent 1cb7e12fab
commit 8eda83d071
11 changed files with 189 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.mk
View File

@@ -23,6 +23,7 @@ LOCAL_USE_AAPT2 := true
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_ANDROID_LIBRARIES := \ LOCAL_STATIC_ANDROID_LIBRARIES := \
androidx-constraintlayout_constraintlayout \
androidx.slice_slice-builders \ androidx.slice_slice-builders \
androidx.slice_slice-core \ androidx.slice_slice-core \
androidx.slice_slice-view \ androidx.slice_slice-view \
@@ -40,6 +41,7 @@ LOCAL_JAVA_LIBRARIES := \
ims-common ims-common
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \
androidx-constraintlayout_constraintlayout-solver \
androidx.lifecycle_lifecycle-runtime \ androidx.lifecycle_lifecycle-runtime \
androidx.lifecycle_lifecycle-extensions \ androidx.lifecycle_lifecycle-extensions \
guava \ guava \

51
res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml
View File

@@ -19,29 +19,40 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/root" android:id="@+id/root"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:orientation="vertical">
<include layout="@layout/wifi_dpp_fragment_header"/> <ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.android.settings.wifi.qrcode.QrPreviewLayout <LinearLayout
android:layout_width="@dimen/qrcode_preview_size" android:layout_width="match_parent"
android:layout_height="@dimen/qrcode_preview_size" android:layout_height="match_parent"
android:layout_gravity="center"> android:orientation="vertical"
<TextureView android:gravity="center_horizontal">
android:id="@+id/preview_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"/>
<com.android.settings.wifi.qrcode.QrDecorateView
android:id="@+id/decorate_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"/>
</com.android.settings.wifi.qrcode.QrPreviewLayout>
<TextView android:id="@+id/error_message" <include layout="@layout/wifi_dpp_fragment_header"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content" <com.android.settings.wifi.qrcode.QrPreviewLayout
android:layout_gravity="center"/> android:layout_width="@dimen/qrcode_preview_size"
android:layout_height="@dimen/qrcode_preview_size">
<TextureView
android:id="@+id/preview_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"/>
<com.android.settings.wifi.qrcode.QrDecorateView
android:id="@+id/decorate_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"/>
</com.android.settings.wifi.qrcode.QrPreviewLayout>
<TextView android:id="@+id/error_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
</ScrollView>
</LinearLayout> </LinearLayout>

4
res/layout/wifi_dpp_activity.xml
View File

@@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--> -->
<ScrollView <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/root" android:id="@+id/root"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -27,4 +27,4 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent"/>
</ScrollView> </LinearLayout>

56
res/layout/wifi_dpp_add_device_fragment.xml
View File

@@ -15,31 +15,49 @@
limitations under the License. limitations under the License.
--> -->
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/root" android:id="@+id/root"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:orientation="vertical">
<include layout="@layout/wifi_dpp_fragment_header"/> <ScrollView
<ImageView
android:id="@+id/wifi_ap_picture_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:layout_gravity="center"/>
<TextView <LinearLayout
android:id="@+id/choose_different_network" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical">
<include layout="@layout/wifi_dpp_fragment_header"/>
<ImageView
android:id="@+id/wifi_ap_picture_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/header"/>
<Button
android:id="@+id/choose_different_network"
style="@style/SuwGlifButton.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/wifi_ap_picture_view"
android:layout_marginTop="8dp"
android:text="@string/wifi_dpp_choose_different_network"/>
</LinearLayout>
</ScrollView>
<include
layout="@layout/wifi_dpp_fragment_footer"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" app:layout_constraintBottom_toBottomOf="parent"/>
android:layout_marginTop="8dp"
android:text="@string/wifi_dpp_choose_different_network"/>
<include layout="@layout/wifi_dpp_fragment_footer" </androidx.constraintlayout.widget.ConstraintLayout>
android:gravity="center|bottom"/>
</LinearLayout>

38
res/layout/wifi_dpp_choose_saved_wifi_network_fragment.xml
View File

@@ -15,21 +15,39 @@
limitations under the License. limitations under the License.
--> -->
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/root" android:id="@+id/root"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:orientation="vertical">
<include layout="@layout/wifi_dpp_fragment_header"/> <ScrollView
<ListView android:id="@+id/saved_wifi_network_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="match_parent">
<include layout="@layout/wifi_dpp_fragment_footer" <LinearLayout
android:gravity="center|bottom"/> android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical">
</LinearLayout> <include layout="@layout/wifi_dpp_fragment_header"/>
<ListView android:id="@+id/saved_wifi_network_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/header"/>
</LinearLayout>
</ScrollView>
<include
layout="@layout/wifi_dpp_fragment_footer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

13
res/layout/wifi_dpp_fragment_footer.xml
View File

@@ -18,16 +18,15 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:orientation="horizontal"> style="@style/SuwGlifButtonBar">
<Button <Button
android:id="@+id/button_left" android:id="@+id/button_left"
style="@style/SuwGlifButton.Secondary"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|start" android:layout_gravity="start"/>
android:text="left"
style="?android:attr/borderlessButtonStyle"/>
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
@@ -36,9 +35,9 @@
<Button <Button
android:id="@+id/button_right" android:id="@+id/button_right"
style="@style/SuwGlifButton.Primary"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|end" android:layout_gravity="end"/>
android:text="right"/>
</LinearLayout> </LinearLayout>

27
res/layout/wifi_dpp_qrcode_generator_fragment.xml
View File

@@ -22,14 +22,27 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/wifi_dpp_fragment_header"/> <ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView <LinearLayout
android:id="@+id/qrcode_view" android:layout_width="match_parent"
android:layout_width="@dimen/qrcode_size" android:layout_height="match_parent"
android:layout_height="@dimen/qrcode_size" android:gravity="center_horizontal"
android:src="@android:color/transparent" android:orientation="vertical">
android:layout_gravity="center"/>
<include layout="@layout/wifi_dpp_fragment_header"/>
<ImageView
android:id="@+id/qrcode_view"
android:layout_width="@dimen/qrcode_size"
android:layout_height="@dimen/qrcode_size"
android:src="@android:color/transparent"/>
</LinearLayout>
</ScrollView>
</LinearLayout> </LinearLayout>

60
res/layout/wifi_dpp_qrcode_scanner_fragment.xml
View File

@@ -19,35 +19,45 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/root" android:id="@+id/root"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:orientation="vertical">
<include layout="@layout/wifi_dpp_fragment_header"/> <ScrollView
<com.android.settings.wifi.qrcode.QrPreviewLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<TextureView
android:id="@+id/preview_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
<com.android.settings.wifi.qrcode.QrDecorateView
android:id="@+id/decorate_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
</com.android.settings.wifi.qrcode.QrPreviewLayout>
<TextView <LinearLayout
android:id="@+id/error_message" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="match_parent"
android:layout_height="wrap_content" android:orientation="vertical"
android:layout_gravity="center" android:gravity="center_horizontal">
android:layout_marginTop="8dp"
android:text="@string/wifi_dpp_could_not_detect_valid_qr_code" <include layout="@layout/wifi_dpp_fragment_header"/>
android:visibility="invisible"
android:textColor="?android:attr/colorError"/> <com.android.settings.wifi.qrcode.QrPreviewLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextureView
android:id="@+id/preview_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<com.android.settings.wifi.qrcode.QrDecorateView
android:id="@+id/decorate_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</com.android.settings.wifi.qrcode.QrPreviewLayout>
<TextView
android:id="@+id/error_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/wifi_dpp_could_not_detect_valid_qr_code"
android:visibility="invisible"
android:textColor="?android:attr/colorError"/>
</LinearLayout>
</ScrollView>
</LinearLayout> </LinearLayout>

11
src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
View File

@@ -28,7 +28,6 @@ import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R; import com.android.settings.R;
@@ -41,7 +40,7 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {
private static final String TAG = "WifiDppAddDeviceFragment"; private static final String TAG = "WifiDppAddDeviceFragment";
private ImageView mWifiApPictureView; private ImageView mWifiApPictureView;
private TextView mChooseDifferentNetwork; private Button mChooseDifferentNetwork;
private Button mButtonLeft; private Button mButtonLeft;
private Button mButtonRight; private Button mButtonRight;
@@ -109,10 +108,16 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {
wifiNetworkConfig.getSsid())); wifiNetworkConfig.getSsid()));
mWifiApPictureView = view.findViewById(R.id.wifi_ap_picture_view); mWifiApPictureView = view.findViewById(R.id.wifi_ap_picture_view);
mChooseDifferentNetwork = view.findViewById(R.id.choose_different_network); mChooseDifferentNetwork = view.findViewById(R.id.choose_different_network);
mChooseDifferentNetwork.setOnClickListener(v -> getFragmentManager().popBackStack());
mButtonLeft = view.findViewById(R.id.button_left); mButtonLeft = view.findViewById(R.id.button_left);
mButtonLeft.setText(R.string.cancel); mButtonLeft.setText(R.string.cancel);
mButtonLeft.setOnClickListener(v -> getFragmentManager().popBackStack()); mButtonLeft.setOnClickListener(v -> {
getActivity().setResult(Activity.RESULT_CANCELED);
getActivity().finish();
});
mButtonRight = view.findViewById(R.id.button_right); mButtonRight = view.findViewById(R.id.button_right);
mButtonRight.setText(R.string.wifi_dpp_share_wifi); mButtonRight.setText(R.string.wifi_dpp_share_wifi);

19
src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
View File

@@ -64,6 +64,7 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
// Key for Bundle usage // Key for Bundle usage
private static final String KEY_PUBLIC_URI = "key_public_uri"; private static final String KEY_PUBLIC_URI = "key_public_uri";
private static final String KEY_IS_CONFIGURATOR_MODE = "key_is_configurator_mode";
private QrCamera mCamera; private QrCamera mCamera;
private TextureView mTextureView; private TextureView mTextureView;
@@ -71,7 +72,7 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
private TextView mErrorMessage; private TextView mErrorMessage;
/** true if the fragment working for configurator, false enrollee*/ /** true if the fragment working for configurator, false enrollee*/
private final boolean mIsConfiguratorMode; private boolean mIsConfiguratorMode;
/** The SSID of the Wi-Fi network which the user specify to enroll */ /** The SSID of the Wi-Fi network which the user specify to enroll */
private String mSsid; private String mSsid;
@@ -79,6 +80,15 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
/** QR code data scanned by camera */ /** QR code data scanned by camera */
private WifiQrCode mWifiQrCode; private WifiQrCode mWifiQrCode;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (savedInstanceState != null) {
mIsConfiguratorMode = savedInstanceState.getBoolean(KEY_IS_CONFIGURATOR_MODE);
}
}
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
if (mIsConfiguratorMode) { if (mIsConfiguratorMode) {
@@ -368,4 +378,11 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
} }
} }
}; };
@Override
public void onSaveInstanceState(Bundle outState) {
outState.putBoolean(KEY_IS_CONFIGURATOR_MODE, mIsConfiguratorMode);
super.onSaveInstanceState(outState);
}
} }

2
tests/robotests/Android.mk
View File

@@ -25,6 +25,7 @@ LOCAL_RESOURCE_DIR += \
$(SETTINGS_AOSP_PATH)/res $(SETTINGS_AOSP_PATH)/res
LOCAL_STATIC_ANDROID_LIBRARIES := \ LOCAL_STATIC_ANDROID_LIBRARIES := \
androidx-constraintlayout_constraintlayout \
androidx.slice_slice-builders \ androidx.slice_slice-builders \
androidx.slice_slice-core \ androidx.slice_slice-core \
androidx.slice_slice-view \ androidx.slice_slice-view \
@@ -42,6 +43,7 @@ LOCAL_JAVA_LIBRARIES := \
ims-common ims-common
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \
androidx-constraintlayout_constraintlayout-solver \
androidx.lifecycle_lifecycle-runtime \ androidx.lifecycle_lifecycle-runtime \
androidx.lifecycle_lifecycle-extensions \ androidx.lifecycle_lifecycle-extensions \
guava \ guava \