OSDN Git Service

Add icons of WifiDppAddDeviceFragment.
authorArc Wang <arcwang@google.com>
Tue, 22 Jan 2019 07:23:21 +0000 (15:23 +0800)
committerArc Wang <arcwang@google.com>
Tue, 22 Jan 2019 08:27:23 +0000 (16:27 +0800)
Bug: 118797202
Test: manual test
Change-Id: Ia2ef9db3526f98b1c697a864cec34e1d4dcfc400

res/drawable/ic_check_circle_green.xml [new file with mode: 0644]
res/drawable/ic_devices_other_opaque_black.xml [new file with mode: 0644]
src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java

diff --git a/res/drawable/ic_check_circle_green.xml b/res/drawable/ic_check_circle_green.xml
new file mode 100644 (file)
index 0000000..214d2cf
--- /dev/null
@@ -0,0 +1,28 @@
+<!--
+    Copyright 2019 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="64.0"
+    android:viewportHeight="64.0">
+    <path
+        android:fillColor="#0F9D58"
+        android:pathData="M32,5.3C17.3,5.3 5.3,17.3 5.3,32s12,26.7 26.7,26.7s26.7,-12 26.7,-26.7S46.7,5.3 32,5.3z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M49.4,24.3l-20,20c-1,1 -2.7,1 -3.8,0l0,0l-11.1,-11c-1.1,-1 -1.1,-2.7 0,-3.8s2.7,-1.1 3.8,0l0,0l9.2,9.2l18.1,-18.1c1,-1 2.7,-1 3.8,0C50.4,21.6 50.4,23.3 49.4,24.3L49.4,24.3z"/>
+</vector>
diff --git a/res/drawable/ic_devices_other_opaque_black.xml b/res/drawable/ic_devices_other_opaque_black.xml
new file mode 100644 (file)
index 0000000..1b5af2d
--- /dev/null
@@ -0,0 +1,24 @@
+<!--
+    Copyright 2019 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M3,6h18L21,4L3,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h4v-2L3,18L3,6zM13,12L9,12v1.78c-0.61,0.55 -1,1.33 -1,2.22 0,0.89 0.39,1.67 1,2.22L9,20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22L13,12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1L23,9c0,-0.5 -0.5,-1 -1,-1zM21,18h-4v-8h4v8z"/>
+</vector>
index 9a9a313..9864ea9 100644 (file)
@@ -55,6 +55,7 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {
         @Override
         public void onConfiguratorSuccess(int code) {
             // Update success UI.
+            mHeaderIcon.setImageResource(R.drawable.ic_check_circle_green);
             mTitle.setText(R.string.wifi_dpp_wifi_shared_with_device);
             mSummary.setVisibility(View.INVISIBLE);
             mWifiApPictureView.setImageResource(R.drawable.wifi_dpp_success);
@@ -109,6 +110,8 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
+        mHeaderIcon.setImageResource(R.drawable.ic_devices_other_opaque_black);
+
         final WifiQrCode wifiQrCode = ((WifiDppConfiguratorActivity) getActivity())
                 .getWifiDppQrCode();
         final String information = wifiQrCode.getInformation();