Merge "String change for Permissions Dashboard"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 70dce8f..a94801f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -736,7 +736,7 @@
<activity
android:name=".notification.ZenSuggestionActivity"
android:label="@string/zen_mode_settings_title"
- android:icon="@drawable/ic_do_not_disturb_on_24dp"
+ android:icon="@drawable/ic_suggestion_dnd"
android:theme="@android:style/Theme.NoDisplay">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -796,7 +796,7 @@
<activity android:name=".wallpaper.WallpaperSuggestionActivity"
android:label="@string/wallpaper_settings_title"
- android:icon="@drawable/ic_wallpaper"
+ android:icon="@drawable/ic_suggestion_wallpaper"
android:theme="@android:style/Theme.NoDisplay">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -889,7 +889,7 @@
<activity
android:name="Settings$NightDisplaySuggestionActivity"
android:enabled="@*android:bool/config_nightDisplayAvailable"
- android:icon="@drawable/ic_settings_night_display">
+ android:icon="@drawable/ic_suggestion_night_display">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
@@ -1628,7 +1628,7 @@
</activity>
<activity android:name=".password.ScreenLockSuggestionActivity"
- android:icon="@drawable/ic_settings_security">
+ android:icon="@drawable/ic_suggestion_security">
<intent-filter android:priority="1">
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.suggested.category.DEFAULT" />
@@ -2635,7 +2635,7 @@
<activity android:name=".wifi.calling.WifiCallingSuggestionActivity"
android:label="@string/wifi_calling_settings_title"
- android:icon="@drawable/ic_settings_wireless">
+ android:icon="@drawable/ic_suggestion_wireless">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
diff --git a/res/drawable/ic_suggestion_dnd.xml b/res/drawable/ic_suggestion_dnd.xml
new file mode 100644
index 0000000..816b148
--- /dev/null
+++ b/res/drawable/ic_suggestion_dnd.xml
@@ -0,0 +1,28 @@
+<!--
+ Copyright (C) 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.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10c5.52,0 10,-4.48 10,-10C22,6.48 17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8c4.41,0 8,3.59 8,8C20,16.41 16.41,20 12,20z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M7,11h10v2h-10z"/>
+</vector>
diff --git a/res/drawable/ic_suggestion_night_display.xml b/res/drawable/ic_suggestion_night_display.xml
new file mode 100644
index 0000000..16cb04e
--- /dev/null
+++ b/res/drawable/ic_suggestion_night_display.xml
@@ -0,0 +1,25 @@
+<!--
+ Copyright (C) 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:tint="?android:attr/colorControlNormal"
+ android:viewportHeight="24"
+ android:viewportWidth="24">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M6.28,4.81c0,0.16 0.01,0.32 0.02,0.48c0.38,6.58 5.83,12.03 12.41,12.41c0.16,0.01 0.32,0.02 0.47,0.02c-1.58,1.2 -3.53,1.88 -5.56,1.88c-0.46,0 -0.93,-0.03 -1.4,-0.1c-3.96,-0.58 -7.13,-3.75 -7.71,-7.71C4.13,9.24 4.8,6.75 6.28,4.81M8.27,0.6c-0.08,0 -0.17,0.02 -0.25,0.07c-3.8,2.2 -6.2,6.56 -5.49,11.4c0.7,4.82 4.59,8.7 9.4,9.4c0.57,0.08 1.13,0.12 1.69,0.12c4.15,0 7.78,-2.26 9.72,-5.62c0.2,-0.35 -0.07,-0.76 -0.44,-0.76c-0.05,0 -0.1,0.01 -0.15,0.02c-1.03,0.31 -2.12,0.48 -3.25,0.48c-0.22,0 -0.44,-0.01 -0.67,-0.02C13.23,15.38 8.62,10.77 8.29,5.17C8.21,3.81 8.38,2.49 8.75,1.26C8.86,0.91 8.59,0.6 8.27,0.6L8.27,0.6z"/>
+</vector>
diff --git a/res/drawable/ic_suggestion_security.xml b/res/drawable/ic_suggestion_security.xml
new file mode 100644
index 0000000..e2d3a90
--- /dev/null
+++ b/res/drawable/ic_suggestion_security.xml
@@ -0,0 +1,28 @@
+<!--
+ Copyright (C) 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:viewportHeight="24"
+ android:viewportWidth="24"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M12,15m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M18.5,1C16.01,1 14,3.01 14,5.5V8H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10c0,-1.1 -0.9,-2 -2,-2h-2V5.5C16,4.12 17.12,3 18.5,3C19.88,3 21,4.12 21,5.5V6h2V5.5C23,3.01 20.99,1 18.5,1zM18,10v10H6V10H18z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_suggestion_wallpaper.xml b/res/drawable/ic_suggestion_wallpaper.xml
new file mode 100644
index 0000000..32defce
--- /dev/null
+++ b/res/drawable/ic_suggestion_wallpaper.xml
@@ -0,0 +1,25 @@
+<!--
+ Copyright (C) 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"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M9,12.71l2.14,2.58l3,-3.87L18,16.57H6L9,12.71zM5,5h6V3H5C3.9,3 3,3.9 3,5v6h2V5zM19,19h-6v2h6c1.1,0 2,-0.9 2,-2v-6h-2V19zM5,19v-6H3v6c0,1.1 0.9,2 2,2h6v-2H5zM19,5v6h2V5c0,-1.1 -0.9,-2 -2,-2h-6v2H19zM16,9c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1c-0.55,0 -1,0.45 -1,1S15.45,9 16,9z"/>
+</vector>
diff --git a/res/drawable/ic_suggestion_wireless.xml b/res/drawable/ic_suggestion_wireless.xml
new file mode 100644
index 0000000..74b4cee
--- /dev/null
+++ b/res/drawable/ic_suggestion_wireless.xml
@@ -0,0 +1,25 @@
+<!--
+ Copyright (C) 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="24.0dp"
+ android:height="24.0dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zM9,17l3,3l3,-3C13.35,15.34 10.66,15.34 9,17zM5,13l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2C15.14,9.14 8.87,9.14 5,13z"/>
+</vector>
diff --git a/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml b/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml
index 4eed0f6..0069e93 100644
--- a/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml
+++ b/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml
@@ -46,9 +46,14 @@
android:layout_height="match_parent"/>
</com.android.settings.wifi.qrcode.QrPreviewLayout>
- <TextView android:id="@+id/error_message"
+ <TextView
+ android:id="@+id/error_message"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
+ android:layout_height="wrap_content"
+ android:textAlignment="center"
+ android:layout_marginTop="8dp"
+ android:visibility="invisible"
+ android:textColor="?android:attr/colorError"/>
</LinearLayout>
diff --git a/res/layout/homepage_slice_half_tile.xml b/res/layout/homepage_slice_half_tile.xml
index 46f3cda..fc99561 100644
--- a/res/layout/homepage_slice_half_tile.xml
+++ b/res/layout/homepage_slice_half_tile.xml
@@ -39,8 +39,7 @@
<ImageView
android:id="@android:id/icon"
android:layout_width="@dimen/homepage_card_icon_size"
- android:layout_height="@dimen/homepage_card_icon_size"
- android:tint="?android:attr/colorAccent"/>
+ android:layout_height="@dimen/homepage_card_icon_size"/>
<TextView
android:id="@android:id/title"
diff --git a/res/layout/wifi_dpp_qrcode_scanner_fragment.xml b/res/layout/wifi_dpp_qrcode_scanner_fragment.xml
index c5e416b..9bd066b 100644
--- a/res/layout/wifi_dpp_qrcode_scanner_fragment.xml
+++ b/res/layout/wifi_dpp_qrcode_scanner_fragment.xml
@@ -50,8 +50,8 @@
android:id="@+id/error_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:textAlignment="center"
android:layout_marginTop="8dp"
- android:text="@string/wifi_dpp_could_not_detect_valid_qr_code"
android:visibility="invisible"
android:textColor="?android:attr/colorError"/>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 31b89f1..03e40aa 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1098,6 +1098,17 @@
<item>zen_mode_from_none</item>
</string-array>
+ <!--String arrays for notification swipe direction -->
+ <string-array name="swipe_direction_titles">
+ <item>@string/swipe_direction_rtl</item>
+ <item>@string/swipe_direction_ltr</item>
+ </string-array>
+
+ <string-array name="swipe_direction_values">
+ <item>1</item>
+ <item>0</item>
+ </string-array>
+
<string-array name="wifi_metered_entries">
<item>Detect automatically</item>
<item>Treat as metered</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 05b47ab..1b260f8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -728,7 +728,7 @@
<string name="date_and_time_settings_title_setup_wizard">Set date and time</string>
<!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
<string name="date_and_time_settings_summary">Set date, time, time zone, & formats</string>
- <!-- Date & time setting screen setting check box title if the date and time should be determined automatically [CHAR LIMIT=30] -->
+ <!-- Date & time setting screen setting check box title if the date and time should be determined automatically [CHAR LIMIT=100] -->
<string name="date_time_auto">Use network-provided time</string>
<!-- Date & time setting screen setting option text when Automatic time zone check box is selected (that is, when date and time should be determined automatically)
[CHAR LIMIT=100] -->
@@ -1859,6 +1859,11 @@
<!-- This string asks the user whether or not to allow an app to disable WiFi. [CHAR LIMIT=NONE] -->
<string name="wifi_ask_disable"><xliff:g id="requester" example="FancyApp">%s</xliff:g> wants to turn off Wi-Fi</string>
+ <!-- Debugging developer settings: Enable ART verifier for Debuggable Apps [CHAR LIMIT=40] -->
+ <string name="art_verifier_for_debuggable_title">Verify bytecode of debuggable apps</string>
+ <!-- Debugging developer settings: Enable ART verifier for Debuggable Apps [CHAR LIMIT=NONE] -->
+ <string name="art_verifier_for_debuggable_summary">Allow ART to verify bytecode for debuggable apps</string>
+
<!-- NFC settings -->
<!-- Used in the 1st-level settings screen to turn on NFC -->
<string name="nfc_quick_toggle_title">NFC</string>
@@ -2119,7 +2124,19 @@
<!-- Hint for the user to use another device to scan QR code on screen to join Wi-Fi [CHAR LIMIT=NONE] -->
<string name="wifi_dpp_scan_qr_code_with_another_device">Scan this QR code with another device to join \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d</string>
<!-- Hint for QR code detection [CHAR LIMIT=NONE] -->
- <string name="wifi_dpp_could_not_detect_valid_qr_code">Couldn\u2019t read QR code</string>
+ <string name="wifi_dpp_could_not_detect_valid_qr_code">Couldn\u2019t read QR code. Re-center code and try again</string>
+ <!-- Hint for Wi-Fi DPP handshake failure [CHAR LIMIT=NONE] -->
+ <string name="wifi_dpp_failure_authentication_or_configuration">Try again. If the issue continues, contact the device manufacturer</string>
+ <!-- Hint for Wi-Fi DPP handshake failure [CHAR LIMIT=NONE] -->
+ <string name="wifi_dpp_failure_not_compatible">Something went wrong</string>
+ <!-- Hint for Wi-Fi DPP handshake failure [CHAR LIMIT=NONE] -->
+ <string name="wifi_dpp_failure_timeout">Make sure the device has been plugged in, charged, and turned on</string>
+ <!-- Hint for Wi-Fi DPP handshake failure [CHAR LIMIT=NONE] -->
+ <string name="wifi_dpp_failure_generic">Make sure the device has been plugged in, charged, and turned on. If the issue continues, contact the device manufacturer</string>
+ <!-- Hint for Wi-Fi DPP handshake failure [CHAR LIMIT=NONE] -->
+ <string name="wifi_dpp_failure_not_supported">Adding \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d isn\u2019t supported by this device</string>
+ <!-- Hint for Wi-Fi connection fail [CHAR LIMIT=NONE] -->
+ <string name="wifi_dpp_check_connection_try_again">Check connection and try again</string>
<!-- Title for the fragment choose network [CHAR LIMIT=50] -->
<string name="wifi_dpp_choose_network">Choose network</string>
<!-- Hint for the user to center another device's QR code in the below camera window [CHAR LIMIT=NONE] -->
@@ -7617,6 +7634,15 @@
<!-- Configure Notifications: Title for the notification bubbles option. [CHAR LIMIT=60] -->
<string name="notification_bubbles_title">Allow notification bubbles</string>
+ <!-- Configure notifications: title for swipe direction [CHAR LIMIT=60] -->
+ <string name="swipe_direction_title">Swipe actions</string>
+
+ <!-- Configure notifications: value for swipe direction [CHAR LIMIT=100] -->
+ <string name="swipe_direction_ltr">Swipe right to dismiss, left to show menu</string>
+
+ <!-- Configure notifications: value for swipe direction [CHAR LIMIT=100] -->
+ <string name="swipe_direction_rtl">Swipe left to dismiss, right to show menu</string>
+
<!-- Configure Notifications: Title for the pulse notification light option. [CHAR LIMIT=30] -->
<string name="notification_pulse_title">Blink light</string>
@@ -9171,7 +9197,7 @@
<!-- Title of condition that do not disturb is on [CHAR LIMIT=36] -->
<string name="condition_zen_title">Do Not Disturb is on</string>
- <!-- Summary of condition that do not disturb is on and all exceptions set to off [CHAR LIMIT=36] -->
+ <!-- Summary of condition that do not disturb is on and all exceptions set to off [CHAR LIMIT=38] -->
<string name="condition_zen_summary_phone_muted">Phone muted</string>
<!-- Summary of condition that do not disturb is on and some exceptions are allowed [CHAR LIMIT=36] -->
diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml
index 8df1197..803d12b 100644
--- a/res/xml/configure_notification_settings.xml
+++ b/res/xml/configure_notification_settings.xml
@@ -19,58 +19,71 @@
android:title="@string/configure_notification_settings"
android:key="configure_notification_settings">
- <!-- When device is locked -->
- <com.android.settings.RestrictedListPreference
- android:key="lock_screen_notifications"
- android:title="@string/lock_screen_notifications_title"
- android:summary="@string/summary_placeholder"
- settings:searchable="false"/>
-
<SwitchPreference
android:key="hide_silent_icons"
android:title="@string/hide_silent_icons_title"
android:summary="@string/hide_silent_icons_summary"
settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController" />
- <!-- Notification badging -->
- <SwitchPreference
- android:key="notification_badging"
- android:title="@string/notification_badging_title"
- settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/>
+ <PreferenceCategory
+ android:key="configure_notifications_advanced"
+ android:order="15"
+ settings:initialExpandedChildrenCount="0">
- <!-- Notification bubbles -->
- <SwitchPreference
- android:key="notification_bubbles"
- android:title="@string/notification_bubbles_title"
- settings:controller="com.android.settings.notification.BubbleNotificationPreferenceController"/>
+ <com.android.settings.RestrictedListPreference
+ android:key="swipe"
+ android:title="@string/swipe_direction_title"
+ android:entries="@array/swipe_direction_titles"
+ android:entryValues="@array/swipe_direction_values"
+ settings:controller="com.android.settings.notification.SwipeDirectionPreferenceController"/>
- <!-- Pulse notification light -->
- <SwitchPreference
- android:key="notification_pulse"
- android:title="@string/notification_pulse_title"
- settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>
+ <!-- When device is locked -->
+ <com.android.settings.RestrictedListPreference
+ android:key="lock_screen_notifications"
+ android:title="@string/lock_screen_notifications_title"
+ android:summary="@string/summary_placeholder"
+ settings:searchable="false"/>
- <!-- Default notification ringtone -->
- <com.android.settings.DefaultRingtonePreference
- android:key="notification_default_ringtone"
- android:title="@string/notification_ringtone_title"
- android:dialogTitle="@string/notification_ringtone_title"
- android:summary="@string/summary_placeholder"
- android:ringtoneType="notification"/>
+ <!-- Notification badging -->
+ <SwitchPreference
+ android:key="notification_badging"
+ android:title="@string/notification_badging_title"
+ settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/>
- <Preference
- android:key="gesture_swipe_down_fingerprint_notifications"
- android:title="@string/fingerprint_swipe_for_notifications_title"
- android:fragment="com.android.settings.gestures.SwipeToNotificationSettings"
- settings:controller="com.android.settings.gestures.SwipeToNotificationPreferenceController"/>
+ <!-- Notification bubbles -->
+ <SwitchPreference
+ android:key="notification_bubbles"
+ android:title="@string/notification_bubbles_title"
+ settings:controller="com.android.settings.notification.BubbleNotificationPreferenceController"/>
- <com.android.settingslib.RestrictedPreference
- android:key="zen_mode_notifications"
- android:title="@string/zen_mode_settings_title"
- settings:useAdminDisabledSummary="true"
- android:fragment="com.android.settings.notification.ZenModeSettings"
- settings:controller="com.android.settings.notification.ZenModePreferenceController"
- settings:allowDividerAbove="false"/>
+ <!-- Pulse notification light -->
+ <SwitchPreference
+ android:key="notification_pulse"
+ android:title="@string/notification_pulse_title"
+ settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>
+
+ <!-- Default notification ringtone -->
+ <com.android.settings.DefaultRingtonePreference
+ android:key="notification_default_ringtone"
+ android:title="@string/notification_ringtone_title"
+ android:dialogTitle="@string/notification_ringtone_title"
+ android:summary="@string/summary_placeholder"
+ android:ringtoneType="notification"/>
+
+ <Preference
+ android:key="gesture_swipe_down_fingerprint_notifications"
+ android:title="@string/fingerprint_swipe_for_notifications_title"
+ android:fragment="com.android.settings.gestures.SwipeToNotificationSettings"
+ settings:controller="com.android.settings.gestures.SwipeToNotificationPreferenceController"/>
+
+ <com.android.settingslib.RestrictedPreference
+ android:key="zen_mode_notifications"
+ android:title="@string/zen_mode_settings_title"
+ settings:useAdminDisabledSummary="true"
+ android:fragment="com.android.settings.notification.ZenModeSettings"
+ settings:controller="com.android.settings.notification.ZenModePreferenceController"
+ settings:allowDividerAbove="false"/>
+ </PreferenceCategory>
<!-- Empty category to draw divider -->
<PreferenceCategory
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index d9b592c..032f622 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -175,6 +175,11 @@
android:title="@string/verify_apps_over_usb_title"
android:summary="@string/verify_apps_over_usb_summary" />
+ <SwitchPreference
+ android:key="art_verifier_for_debuggable"
+ android:title="@string/art_verifier_for_debuggable_title"
+ android:summary="@string/art_verifier_for_debuggable_summary" />
+
<ListPreference
android:key="select_logd_size"
android:title="@string/select_logd_size_title"
diff --git a/src/com/android/settings/SmsDefaultDialog.java b/src/com/android/settings/SmsDefaultDialog.java
index c25961d..e856897 100644
--- a/src/com/android/settings/SmsDefaultDialog.java
+++ b/src/com/android/settings/SmsDefaultDialog.java
@@ -67,6 +67,7 @@
protected void onStart() {
super.onStart();
getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+ android.util.EventLog.writeEvent(0x534e4554, "120484087", -1, "");
}
@Override
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 65cfdf6..37643b3 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -89,6 +89,7 @@
import android.widget.TabWidget;
import androidx.annotation.StringRes;
+import androidx.core.graphics.drawable.IconCompat;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
@@ -950,24 +951,30 @@
bitmap = Bitmap.createScaledBitmap(((BitmapDrawable) original).getBitmap(), width,
height, false);
} else {
- bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
- final Canvas canvas = new Canvas(bitmap);
- original.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
- original.draw(canvas);
+ bitmap = createBitmap(original, width, height);
}
return new BitmapDrawable(null, bitmap);
}
/**
- * Converts the {@link Drawable} to a {@link Bitmap}.
+ * Create an Icon pointing to a drawable.
*/
- public static Bitmap drawableToBitmap(Drawable drawable) {
+ public static IconCompat createIconWithDrawable(Drawable drawable) {
+ Bitmap bitmap;
if (drawable instanceof BitmapDrawable) {
- return ((BitmapDrawable)drawable).getBitmap();
+ bitmap = ((BitmapDrawable)drawable).getBitmap();
+ } else {
+ final int width = drawable.getIntrinsicWidth();
+ final int height = drawable.getIntrinsicHeight();
+ bitmap = createBitmap(drawable,
+ width > 0 ? width : 1,
+ height > 0 ? height : 1);
}
+ return IconCompat.createWithBitmap(bitmap);
+ }
- final Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(),
- drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
+ private static Bitmap createBitmap(Drawable drawable, int width, int height) {
+ final Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
final Canvas canvas = new Canvas(bitmap);
drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
drawable.draw(canvas);
diff --git a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
index 24b4dcd..6cd72f7 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
@@ -45,7 +45,8 @@
static final Intent BROWSE_PROBE = new Intent()
.setAction(Intent.ACTION_VIEW)
.addCategory(Intent.CATEGORY_BROWSABLE)
- .setData(Uri.parse("http:"));
+ .setData(Uri.parse("http:"))
+ .addFlags(Intent.FLAG_IGNORE_EPHEMERAL);
public DefaultBrowserPreferenceController(Context context) {
super(context);
@@ -112,11 +113,13 @@
final List<ResolveInfo> candidates = new ArrayList<>();
// Resolve that intent and check that the handleAllWebDataURI boolean is set
final List<ResolveInfo> list = packageManager.queryIntentActivitiesAsUser(
- BROWSE_PROBE, 0 /* flags */, userId);
+ BROWSE_PROBE, PackageManager.MATCH_ALL, userId);
if (list != null) {
final Set<String> addedPackages = new ArraySet<>();
for (ResolveInfo info : list) {
- if (info.activityInfo == null || !info.handleAllWebDataURI) {
+ if (!info.handleAllWebDataURI || info.activityInfo == null
+ || !info.activityInfo.enabled
+ || !info.activityInfo.applicationInfo.enabled) {
continue;
}
final String packageName = info.activityInfo.packageName;
diff --git a/src/com/android/settings/development/ArtVerifierPreferenceController.java b/src/com/android/settings/development/ArtVerifierPreferenceController.java
new file mode 100644
index 0000000..4b2f030
--- /dev/null
+++ b/src/com/android/settings/development/ArtVerifierPreferenceController.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 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.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class ArtVerifierPreferenceController extends DeveloperOptionsPreferenceController
+ implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+ private static final String ART_VERIFIER_FOR_DEBUGGABLE = "art_verifier_for_debuggable";
+
+ @VisibleForTesting
+ static final int SETTING_VALUE_ON = 1;
+ @VisibleForTesting
+ static final int SETTING_VALUE_OFF = 0;
+
+ public ArtVerifierPreferenceController(Context context) {
+ super(context);
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return ART_VERIFIER_FOR_DEBUGGABLE;
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ final boolean isEnabled = (Boolean) newValue;
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.ART_VERIFIER_VERIFY_DEBUGGABLE,
+ isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+ return true;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ final int verifyDebuggable = Settings.Global.getInt(
+ mContext.getContentResolver(),
+ Settings.Global.ART_VERIFIER_VERIFY_DEBUGGABLE, SETTING_VALUE_ON);
+ ((SwitchPreference) mPreference).setChecked(verifyDebuggable != SETTING_VALUE_OFF);
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchDisabled() {
+ super.onDeveloperOptionsSwitchDisabled();
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.ART_VERIFIER_VERIFY_DEBUGGABLE, SETTING_VALUE_ON);
+ ((SwitchPreference) mPreference).setChecked(true);
+ }
+}
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 78520c6..adc23a8 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -424,6 +424,7 @@
controllers.add(new WaitForDebuggerPreferenceController(context));
controllers.add(new EnableGpuDebugLayersPreferenceController(context));
controllers.add(new VerifyAppsOverUsbPreferenceController(context));
+ controllers.add(new ArtVerifierPreferenceController(context));
controllers.add(new LogdSizePreferenceController(context));
controllers.add(new LogPersistPreferenceController(context, fragment, lifecycle));
controllers.add(new CameraLaserSensorPreferenceController(context));
diff --git a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
index 0156ac6..95412a8 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
@@ -214,7 +214,7 @@
.getBtClassDrawableWithDescription(mContext, device);
if (pair.first != null) {
- return IconCompat.createWithBitmap(Utils.drawableToBitmap(pair.first));
+ return Utils.createIconWithDrawable(pair.first);
} else {
return IconCompat.createWithResource(mContext,
com.android.internal.R.drawable.ic_settings_bluetooth);
diff --git a/src/com/android/settings/homepage/contextualcards/slices/NotificationChannelSlice.java b/src/com/android/settings/homepage/contextualcards/slices/NotificationChannelSlice.java
index 692dc0a..c2c2ece 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/NotificationChannelSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/NotificationChannelSlice.java
@@ -30,9 +30,6 @@
import android.content.Intent;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
@@ -243,7 +240,7 @@
return null;
}
- return IconCompat.createWithBitmap(Utils.drawableToBitmap(drawable));
+ return Utils.createIconWithDrawable(drawable);
}
@VisibleForTesting
diff --git a/src/com/android/settings/media/MediaOutputSlice.java b/src/com/android/settings/media/MediaOutputSlice.java
index 5c5eb88..d52b441 100644
--- a/src/com/android/settings/media/MediaOutputSlice.java
+++ b/src/com/android/settings/media/MediaOutputSlice.java
@@ -23,8 +23,6 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.UserHandle;
@@ -87,7 +85,7 @@
final Drawable drawable =
Utils.getBadgedIcon(mIconDrawableFactory, pm, mPackageName, UserHandle.myUserId());
- final IconCompat icon = IconCompat.createWithBitmap(getBitmapFromDrawable(drawable));
+ final IconCompat icon = Utils.createIconWithDrawable(drawable);
@ColorInt final int color = Utils.getColorAccentDefaultColor(mContext);
final SliceAction primarySliceAction = SliceAction.createDeeplink(getPrimaryAction(), icon,
@@ -134,17 +132,6 @@
return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */);
}
- private Bitmap getBitmapFromDrawable(Drawable drawable) {
- final Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(),
- drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
- final Canvas canvas = new Canvas(bitmap);
-
- drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
- drawable.draw(canvas);
-
- return bitmap;
- }
-
private ListBuilder.RowBuilder getMediaDeviceRow(MediaDevice device) {
final String title = device.getName();
final PendingIntent broadcastAction =
diff --git a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
index f678e08..de54879 100644
--- a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
+++ b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
@@ -22,21 +22,21 @@
import android.os.Handler;
import android.os.Looper;
import android.provider.Settings;
+import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
-import com.android.settings.core.TogglePreferenceController;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnStart;
-import com.android.settingslib.core.lifecycle.events.OnStop;
-
/**
* Preference controller for "Mobile data"
*/
@@ -115,8 +115,18 @@
@Override
public boolean isChecked() {
- return mTelephonyManager.isDataEnabled()
- && mSubId == SubscriptionManager.getDefaultDataSubscriptionId();
+ return mTelephonyManager.isDataEnabled();
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ preference.setEnabled(!isOpportunistic());
+ }
+
+ private boolean isOpportunistic() {
+ SubscriptionInfo info = mSubscriptionManager.getActiveSubscriptionInfo(mSubId);
+ return info != null && info.isOpportunistic();
}
public static Uri getObservableUri(int subId) {
diff --git a/src/com/android/settings/notification/SwipeDirectionPreferenceController.java b/src/com/android/settings/notification/SwipeDirectionPreferenceController.java
new file mode 100644
index 0000000..0d122d7
--- /dev/null
+++ b/src/com/android/settings/notification/SwipeDirectionPreferenceController.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 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.
+ */
+
+package com.android.settings.notification;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+
+public class SwipeDirectionPreferenceController extends BasePreferenceController
+ implements Preference.OnPreferenceChangeListener {
+
+ public SwipeDirectionPreferenceController(Context context, String key) {
+ super(context, key);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public void updateState(Preference pref) {
+ ((ListPreference) pref).setValue(String.valueOf(Settings.Secure.getInt(
+ mContext.getContentResolver(),
+ Settings.Secure.NOTIFICATION_DISMISS_RTL,
+ 1)));
+ super.updateState(pref);
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.NOTIFICATION_DISMISS_RTL,
+ Integer.valueOf((String) newValue));
+ refreshSummary(preference);
+ return true;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ int value = Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.NOTIFICATION_DISMISS_RTL, 1);
+ String[] values = mContext.getResources().getStringArray(R.array.swipe_direction_values);
+ String[] titles = mContext.getResources().getStringArray(R.array.swipe_direction_titles);
+ if (values == null) {
+ return null;
+ }
+ for (int i = 0; i < values.length; i++) {
+ int valueAt = Integer.parseInt(values[i]);
+ if (value == valueAt) {
+ return titles[i];
+ }
+ }
+ return null;
+ }
+}
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index 8e72f65..7be441a 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -27,6 +27,9 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.graphics.drawable.Drawable;
+import android.hardware.biometrics.BiometricPrompt;
+import android.os.CancellationSignal;
+import android.os.Looper;
import android.net.ConnectivityManager;
import android.net.ConnectivityManager.NetworkCallback;
import android.net.LinkAddress;
@@ -578,21 +581,43 @@
if (keyguardManager.isKeyguardSecure()) {
// Show authentication screen to confirm credentials (pin, pattern or password) for
// the current user of the device.
+ final String title = mContext.getString(
+ R.string.lockpassword_confirm_your_pattern_header);
final String description = String.format(
mContext.getString(R.string.wifi_sharing_message),
mAccessPoint.getSsidStr());
- final Intent intent = keyguardManager.createConfirmDeviceCredentialIntent(
- mContext.getString(R.string.lockpassword_confirm_your_pattern_header),
- description);
- if (intent != null) {
- mFragment.startActivityForResult(intent,
- WifiNetworkDetailsFragment.REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS);
+
+ final BiometricPrompt.Builder builder = new BiometricPrompt.Builder(mContext)
+ .setTitle(title)
+ .setDescription(description);
+
+ if (keyguardManager.isDeviceSecure()) {
+ builder.setAllowDeviceCredential(true);
}
+
+ final BiometricPrompt bp = builder.build();
+ final Handler handler = new Handler(Looper.getMainLooper());
+ bp.authenticate(new CancellationSignal(),
+ runnable -> handler.post(runnable),
+ mAuthenticationCallback);
} else {
launchWifiDppConfiguratorActivity();
}
}
+ private BiometricPrompt.AuthenticationCallback mAuthenticationCallback =
+ new BiometricPrompt.AuthenticationCallback() {
+ @Override
+ public void onAuthenticationSucceeded(BiometricPrompt.AuthenticationResult result) {
+ launchWifiDppConfiguratorActivity();
+ }
+
+ @Override
+ public void onAuthenticationError(int errorCode, CharSequence errString) {
+ //Do nothing
+ }
+ };
+
/**
* Sign in to the captive portal found on this wifi network associated with this preference.
*/
diff --git a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
index 225ddbc..ab470bf 100644
--- a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
+++ b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
@@ -17,11 +17,9 @@
import static com.android.settings.wifi.WifiSettings.WIFI_DIALOG_ID;
-import android.app.Activity;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import android.content.Intent;
import android.net.ConnectivityManager;
import android.net.wifi.WifiManager;
import android.os.Bundle;
@@ -53,8 +51,6 @@
private static final String TAG = "WifiNetworkDetailsFrg";
- public static final int REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS = 1;
-
private AccessPoint mAccessPoint;
private WifiDetailPreferenceController mWifiDetailPreferenceController;
@@ -146,14 +142,4 @@
return controllers;
}
-
- @Override
- public void onActivityResult(int requestCode, int resultCode, Intent data) {
- super.onActivityResult(requestCode, resultCode, data);
-
- if (requestCode == REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS
- && resultCode == Activity.RESULT_OK) {
- mWifiDetailPreferenceController.launchWifiDppConfiguratorActivity();
- }
- }
}
diff --git a/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java b/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
index 4523def..536924d 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
@@ -20,6 +20,8 @@
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.net.wifi.EasyConnectStatusCallback;
import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.text.TextUtils;
@@ -30,6 +32,8 @@
import android.widget.Button;
import android.widget.ImageView;
+import androidx.lifecycle.ViewModelProviders;
+
import com.android.settings.R;
import java.util.concurrent.Executor;
@@ -46,7 +50,12 @@
private Button mButtonLeft;
private Button mButtonRight;
- private class EasyConnectStatusCallback extends android.net.wifi.EasyConnectStatusCallback {
+ private int mLatestStatusCode = WifiDppUtils.EASY_CONNECT_EVENT_FAILURE_NONE;
+
+ // Key for Bundle usage
+ private static final String KEY_LATEST_ERROR_CODE = "key_latest_error_code";
+
+ private class EasyConnectConfiguratorStatusCallback extends EasyConnectStatusCallback {
@Override
public void onEnrolleeSuccess(int newNetworkId) {
// Do nothing
@@ -54,32 +63,14 @@
@Override
public void onConfiguratorSuccess(int code) {
- // Update success UI.
- setHeaderIconImageResource(R.drawable.ic_devices_check_circle_green);
- mTitle.setText(R.string.wifi_dpp_wifi_shared_with_device);
- mSummary.setVisibility(View.INVISIBLE);
- mWifiApPictureView.setImageResource(R.drawable.wifi_dpp_success);
- mChooseDifferentNetwork.setVisibility(View.INVISIBLE);
- mButtonLeft.setText(R.string.wifi_dpp_add_another_device);
- mButtonLeft.setOnClickListener(v -> getFragmentManager().popBackStack());
- mButtonRight.setText(R.string.done);
- mButtonRight.setOnClickListener(v -> {
- final Activity activity = getActivity();
- activity.setResult(Activity.RESULT_OK);
- activity.finish();
- });
+ showSuccessUi(/* isConfigurationChange */ false);
}
@Override
public void onFailure(int code) {
- Log.d(TAG, "EasyConnectStatusCallback.onFailure " + code);
+ Log.d(TAG, "EasyConnectConfiguratorStatusCallback.onFailure " + code);
- // Update fail UI.
- mTitle.setText(R.string.wifi_dpp_could_not_add_device);
- mSummary.setVisibility(View.INVISIBLE);
- mWifiApPictureView.setImageResource(R.drawable.wifi_dpp_error);
- mChooseDifferentNetwork.setVisibility(View.INVISIBLE);
- mButtonRight.setText(R.string.retry);
+ showErrorUi(code, /* isConfigurationChange */ false);
}
@Override
@@ -88,12 +79,145 @@
}
}
+ private void showSuccessUi(boolean isConfigurationChange) {
+ setHeaderIconImageResource(R.drawable.ic_devices_check_circle_green);
+ mTitle.setText(R.string.wifi_dpp_wifi_shared_with_device);
+ mSummary.setVisibility(View.INVISIBLE);
+ mWifiApPictureView.setImageResource(R.drawable.wifi_dpp_success);
+ mChooseDifferentNetwork.setVisibility(View.INVISIBLE);
+ mButtonLeft.setText(R.string.wifi_dpp_add_another_device);
+ mButtonLeft.setOnClickListener(v -> getFragmentManager().popBackStack());
+ mButtonRight.setText(R.string.done);
+ mButtonRight.setOnClickListener(v -> {
+ final Activity activity = getActivity();
+ activity.setResult(Activity.RESULT_OK);
+ activity.finish();
+ });
+
+ if (!isConfigurationChange) {
+ mLatestStatusCode = WifiDppUtils.EASY_CONNECT_EVENT_SUCCESS;
+ }
+ }
+
+ private void showErrorUi(int code, boolean isConfigurationChange) {
+ switch (code) {
+ case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_INVALID_URI:
+ mSummary.setText(R.string.wifi_dpp_could_not_detect_valid_qr_code);
+ break;
+
+ case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_AUTHENTICATION:
+ mSummary.setText(R.string.wifi_dpp_failure_authentication_or_configuration);
+ break;
+
+ case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_NOT_COMPATIBLE:
+ mSummary.setText(R.string.wifi_dpp_failure_not_compatible);
+ break;
+
+ case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_CONFIGURATION:
+ mSummary.setText(R.string.wifi_dpp_failure_authentication_or_configuration);
+ break;
+
+ case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_BUSY:
+ if (isConfigurationChange) {
+ return;
+ }
+
+ if (code == mLatestStatusCode) {
+ throw(new IllegalStateException("Tried restarting EasyConnectSession but still"
+ + "receiving EASY_CONNECT_EVENT_FAILURE_BUSY"));
+ }
+
+ mLatestStatusCode = code;
+ final WifiManager wifiManager =
+ getContext().getSystemService(WifiManager.class);
+ wifiManager.stopEasyConnectSession();
+ startWifiDppConfiguratorInitiator();
+ return;
+
+ case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_TIMEOUT:
+ mSummary.setText(R.string.wifi_dpp_failure_timeout);
+ break;
+
+ case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_GENERIC:
+ mSummary.setText(R.string.wifi_dpp_failure_generic);
+ break;
+
+ case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_NOT_SUPPORTED:
+ mSummary.setText(getString(R.string.wifi_dpp_failure_not_supported, getSsid()));
+ break;
+
+ case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_INVALID_NETWORK:
+ throw(new IllegalStateException("Wi-Fi DPP configurator used a non-PSK/non-SAE"
+ + "network to handshake"));
+
+ default:
+ throw(new IllegalStateException("Unexpected Wi-Fi DPP error"));
+ }
+
+ mTitle.setText(R.string.wifi_dpp_could_not_add_device);
+ mWifiApPictureView.setImageResource(R.drawable.wifi_dpp_error);
+ mChooseDifferentNetwork.setVisibility(View.INVISIBLE);
+ if (hasRetryButton(code)) {
+ mButtonRight.setText(R.string.retry);
+ } else {
+ mButtonRight.setText(R.string.done);
+ mButtonRight.setOnClickListener(v -> getActivity().finish());
+ mButtonLeft.setVisibility(View.INVISIBLE);
+ }
+
+ if (!isConfigurationChange) {
+ mLatestStatusCode = code;
+ }
+
+ mButtonRight.setVisibility(isGoingInitiator() ? View.INVISIBLE : View.VISIBLE);
+ }
+
+ private boolean hasRetryButton(int code) {
+ switch (code) {
+ case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_INVALID_URI:
+ case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_NOT_COMPATIBLE:
+ return false;
+
+ default:
+ break;
+ }
+
+ return true;
+ }
+
@Override
public int getMetricsCategory() {
return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR;
}
@Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ if (savedInstanceState != null) {
+ mLatestStatusCode = savedInstanceState.getInt(KEY_LATEST_ERROR_CODE);
+ }
+
+ final WifiDppInitiatorViewModel model =
+ ViewModelProviders.of(this).get(WifiDppInitiatorViewModel.class);
+
+ model.getStatusCode().observe(this, statusCode -> {
+ // After configuration change, observe callback will be triggered,
+ // do nothing for this case if a handshake does not end
+ if (model.isGoingInitiator()) {
+ return;
+ }
+
+ int code = statusCode.intValue();
+ if (code == WifiDppUtils.EASY_CONNECT_EVENT_SUCCESS) {
+ new EasyConnectConfiguratorStatusCallback().onConfiguratorSuccess(code);
+ } else {
+ new EasyConnectConfiguratorStatusCallback().onFailure(code);
+ }
+ });
+ }
+
+ @Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
@@ -125,14 +249,7 @@
mTitle.setText(information);
}
- final WifiNetworkConfig wifiNetworkConfig = ((WifiDppConfiguratorActivity) getActivity())
- .getWifiNetworkConfig();
- if (!WifiNetworkConfig.isValidConfig(wifiNetworkConfig)) {
- throw new IllegalStateException("Invalid Wi-Fi network for configuring");
- }
- mSummary.setText(getString(R.string.wifi_dpp_add_device_to_wifi,
- wifiNetworkConfig.getSsid()));
-
+ mSummary.setText(getString(R.string.wifi_dpp_add_device_to_wifi, getSsid()));
mWifiApPictureView = view.findViewById(R.id.wifi_ap_picture_view);
mChooseDifferentNetwork = view.findViewById(R.id.choose_different_network);
@@ -146,19 +263,48 @@
mButtonRight = view.findViewById(R.id.button_right);
mButtonRight.setText(R.string.wifi_dpp_share_wifi);
- mButtonRight.setOnClickListener(v -> startWifiDppInitiator());
+ mButtonRight.setOnClickListener(v -> {
+ mButtonRight.setVisibility(View.INVISIBLE);
+ startWifiDppConfiguratorInitiator();
+ });
+
+ if (savedInstanceState != null) {
+ if (mLatestStatusCode == WifiDppUtils.EASY_CONNECT_EVENT_SUCCESS) {
+ showSuccessUi(/* isConfigurationChange */ true);
+ } else if (mLatestStatusCode == WifiDppUtils.EASY_CONNECT_EVENT_FAILURE_NONE) {
+ mButtonRight.setVisibility(isGoingInitiator() ? View.INVISIBLE : View.VISIBLE);
+ } else {
+ showErrorUi(mLatestStatusCode, /* isConfigurationChange */ true);
+ }
+ }
}
- private void startWifiDppInitiator() {
+ @Override
+ public void onSaveInstanceState(Bundle outState) {
+ outState.putInt(KEY_LATEST_ERROR_CODE, mLatestStatusCode);
+
+ super.onSaveInstanceState(outState);
+ }
+
+ private String getSsid() {
+ final WifiNetworkConfig wifiNetworkConfig = ((WifiDppConfiguratorActivity) getActivity())
+ .getWifiNetworkConfig();
+ if (!WifiNetworkConfig.isValidConfig(wifiNetworkConfig)) {
+ throw new IllegalStateException("Invalid Wi-Fi network for configuring");
+ }
+ return wifiNetworkConfig.getSsid();
+ }
+
+ private void startWifiDppConfiguratorInitiator() {
final WifiQrCode wifiQrCode = ((WifiDppConfiguratorActivity) getActivity())
.getWifiDppQrCode();
final String qrCode = wifiQrCode.getQrCode();
final int networkId =
((WifiDppConfiguratorActivity) getActivity()).getWifiNetworkConfig().getNetworkId();
- final WifiManager wifiManager = getContext().getSystemService(WifiManager.class);
- wifiManager.startEasyConnectAsConfiguratorInitiator(qrCode, networkId,
- WifiManager.EASY_CONNECT_NETWORK_ROLE_STA, getContext().getMainExecutor(),
- new EasyConnectStatusCallback());
+ final WifiDppInitiatorViewModel model =
+ ViewModelProviders.of(this).get(WifiDppInitiatorViewModel.class);
+
+ model.startEasyConnectAsConfiguratorInitiator(qrCode, networkId);
}
// Container Activity must implement this interface
@@ -180,4 +326,12 @@
super.onDetach();
}
+
+ // Check is Easy Connect handshaking or not
+ private boolean isGoingInitiator() {
+ final WifiDppInitiatorViewModel model =
+ ViewModelProviders.of(this).get(WifiDppInitiatorViewModel.class);
+
+ return model.isGoingInitiator();
+ }
}
diff --git a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
index 65be11c..1770a02 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
@@ -57,7 +57,6 @@
WifiNetworkConfig.Retriever,
WifiDppQrCodeGeneratorFragment.OnQrCodeGeneratorFragmentAddButtonClickedListener,
WifiDppQrCodeScannerFragment.OnScanWifiDppSuccessListener,
- WifiDppQrCodeScannerFragment.OnScanZxingWifiFormatSuccessListener,
WifiDppAddDeviceFragment.OnClickChooseDifferentNetworkListener,
WifiNetworkListFragment.OnChooseNetworkListener {
@@ -102,7 +101,7 @@
if (savedInstanceState != null) {
String qrCode = savedInstanceState.getString(KEY_QR_CODE);
- mWifiDppQrCode = getValidWifiDppQrCodeOrNull(qrCode);
+ mWifiDppQrCode = WifiQrCode.getValidWifiDppQrCodeOrNull(qrCode);
String security = savedInstanceState.getString(KEY_WIFI_SECURITY);
String ssid = savedInstanceState.getString(KEY_WIFI_SSID);
@@ -148,7 +147,7 @@
case Settings.ACTION_PROCESS_WIFI_EASY_CONNECT_QR_CODE:
String qrCode = intent.getStringExtra(Settings.EXTRA_QR_CODE);
mIsTest = intent.getBooleanExtra(WifiDppUtils.EXTRA_TEST, false);
- mWifiDppQrCode = getValidWifiDppQrCodeOrNull(qrCode);
+ mWifiDppQrCode = WifiQrCode.getValidWifiDppQrCodeOrNull(qrCode);
final boolean isDppSupported = WifiDppUtils.isWifiDppEnabled(this);
if (!isDppSupported) {
Log.d(TAG, "Device doesn't support Wifi DPP");
@@ -285,21 +284,6 @@
fragmentTransaction.commit();
}
- private WifiQrCode getValidWifiDppQrCodeOrNull(String qrCode) {
- WifiQrCode wifiQrCode;
- try {
- wifiQrCode = new WifiQrCode(qrCode);
- } catch(IllegalArgumentException e) {
- return null;
- }
-
- if (WifiQrCode.SCHEME_DPP.equals(wifiQrCode.getScheme())) {
- return wifiQrCode;
- }
-
- return null;
- }
-
@Override
public WifiNetworkConfig getWifiNetworkConfig() {
return mWifiNetworkConfig;
@@ -359,11 +343,6 @@
}
@Override
- public void onScanZxingWifiFormatSuccess(WifiNetworkConfig wifiNetworkConfig) {
- // Do nothing, it's impossible to be a configurator without a Wi-Fi DPP QR code
- }
-
- @Override
public void onClickChooseDifferentNetwork() {
showChooseSavedWifiNetworkFragment(/* addToBackStack */ true);
}
diff --git a/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java b/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java
index 143f87f..392b27d 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java
@@ -17,14 +17,10 @@
package com.android.settings.wifi.dpp;
import android.app.ActionBar;
-import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
import android.os.Bundle;
-import android.provider.Settings;
import android.util.Log;
import androidx.fragment.app.Fragment;
@@ -34,9 +30,6 @@
import com.android.settings.R;
import com.android.settings.core.InstrumentedActivity;
-import java.util.List;
-import java.util.concurrent.Executor;
-
/**
* To provision "this" device with specified Wi-Fi network.
*
@@ -44,9 +37,7 @@
* Wi-Fi network to be provisioned in {@code WifiDppUtils.EXTRA_WIFI_SSID}.
*/
public class WifiDppEnrolleeActivity extends InstrumentedActivity implements
- WifiManager.ActionListener,
- WifiDppQrCodeScannerFragment.OnScanWifiDppSuccessListener,
- WifiDppQrCodeScannerFragment.OnScanZxingWifiFormatSuccessListener {
+ WifiDppQrCodeScannerFragment.OnScanWifiDppSuccessListener {
private static final String TAG = "WifiDppEnrolleeActivity";
public static final String ACTION_ENROLLEE_QR_CODE_SCANNER =
@@ -54,40 +45,6 @@
private FragmentManager mFragmentManager;
- private class EasyConnectStatusCallback extends android.net.wifi.EasyConnectStatusCallback {
- @Override
- public void onEnrolleeSuccess(int newNetworkId) {
- // Connect to the new network.
- final WifiManager wifiManager = getSystemService(WifiManager.class);
- final List<WifiConfiguration> wifiConfigs =
- wifiManager.getPrivilegedConfiguredNetworks();
- for (WifiConfiguration wifiConfig : wifiConfigs) {
- if (wifiConfig.networkId == newNetworkId) {
- wifiManager.connect(wifiConfig, WifiDppEnrolleeActivity.this);
- return;
- }
- }
- Log.e(TAG, "Invalid networkId " + newNetworkId);
- WifiDppEnrolleeActivity.this.onFailure(WifiManager.ERROR_AUTHENTICATING);
- }
-
- @Override
- public void onConfiguratorSuccess(int code) {
- // Do nothing
- }
-
- @Override
- public void onFailure(int code) {
- //TODO(b/122429170): Show DPP enrollee error state UI
- Log.d(TAG, "EasyConnectStatusCallback.onFailure " + code);
- }
-
- @Override
- public void onProgress(int code) {
- // Do nothing
- }
- }
-
@Override
public int getMetricsCategory() {
return SettingsEnums.SETTINGS_WIFI_DPP_ENROLLEE;
@@ -158,30 +115,6 @@
@Override
public void onScanWifiDppSuccess(WifiQrCode wifiQrCode) {
- final WifiManager wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
- wifiManager.startEasyConnectAsEnrolleeInitiator(wifiQrCode.getQrCode(), getMainExecutor(),
- new EasyConnectStatusCallback());
- }
-
- @Override
- public void onScanZxingWifiFormatSuccess(WifiNetworkConfig wifiNetworkConfig) {
- wifiNetworkConfig.connect(/* context */ this, /* listener */ this);
- }
-
- @Override
- public void onSuccess() {
- startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS));
- setResult(Activity.RESULT_OK);
- finish();
- }
-
- @Override
- public void onFailure(int reason) {
- Log.d(TAG, "Wi-Fi connect onFailure reason - " + reason);
-
- final Fragment fragment = mFragmentManager.findFragmentById(R.id.fragment_container);
- if (fragment instanceof WifiDppQrCodeScannerFragment) {
- ((WifiDppQrCodeScannerFragment)fragment).showErrorMessage(true);
- }
+ // Do nothing
}
}
diff --git a/src/com/android/settings/wifi/dpp/WifiDppInitiatorViewModel.java b/src/com/android/settings/wifi/dpp/WifiDppInitiatorViewModel.java
new file mode 100644
index 0000000..24e5ebe
--- /dev/null
+++ b/src/com/android/settings/wifi/dpp/WifiDppInitiatorViewModel.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 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.
+ */
+
+package com.android.settings.wifi.dpp;
+
+import android.app.Application;
+import android.net.wifi.EasyConnectStatusCallback;
+import android.net.wifi.WifiManager;
+
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.AndroidViewModel;
+
+public class WifiDppInitiatorViewModel extends AndroidViewModel {
+ private MutableLiveData<Integer> mEnrolleeSuccessNetworkId;
+ private MutableLiveData<Integer> mStatusCode;
+ private boolean mIsGoingInitiator;
+
+ public WifiDppInitiatorViewModel(Application application) {
+ super(application);
+ }
+
+ public MutableLiveData<Integer> getEnrolleeSuccessNetworkId() {
+ if (mEnrolleeSuccessNetworkId == null) {
+ mEnrolleeSuccessNetworkId = new MutableLiveData<>();
+ }
+
+ return mEnrolleeSuccessNetworkId;
+ }
+
+ public MutableLiveData<Integer> getStatusCode() {
+ if (mStatusCode == null) {
+ mStatusCode = new MutableLiveData<>();
+ }
+
+ return mStatusCode;
+ }
+
+ public boolean isGoingInitiator() {
+ return mIsGoingInitiator;
+ }
+
+ public void startEasyConnectAsConfiguratorInitiator(String qrCode, int networkId) {
+ mIsGoingInitiator = true;
+ final WifiManager wifiManager = getApplication().getSystemService(WifiManager.class);
+
+ wifiManager.startEasyConnectAsConfiguratorInitiator(qrCode, networkId,
+ WifiManager.EASY_CONNECT_NETWORK_ROLE_STA, getApplication().getMainExecutor(),
+ new EasyConnectDelegateCallback());
+ }
+
+ public void startEasyConnectAsEnrolleeInitiator(String qrCode) {
+ mIsGoingInitiator = true;
+ final WifiManager wifiManager = getApplication().getSystemService(WifiManager.class);
+
+ wifiManager.startEasyConnectAsEnrolleeInitiator(qrCode, getApplication().getMainExecutor(),
+ new EasyConnectDelegateCallback());
+ }
+
+ private class EasyConnectDelegateCallback extends EasyConnectStatusCallback {
+ @Override
+ public void onEnrolleeSuccess(int newNetworkId) {
+ mIsGoingInitiator = false;
+ mEnrolleeSuccessNetworkId.setValue(newNetworkId);
+ }
+
+ @Override
+ public void onConfiguratorSuccess(int code) {
+ mIsGoingInitiator = false;
+ mStatusCode.setValue(WifiDppUtils.EASY_CONNECT_EVENT_SUCCESS);
+ }
+
+ @Override
+ public void onFailure(int code) {
+ mIsGoingInitiator = false;
+ mStatusCode.setValue(code);
+ }
+
+ @Override
+ public void onProgress(int code) {
+ // Do nothing
+ }
+ }
+}
diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
index 9524fee..c88313b 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
@@ -17,15 +17,23 @@
package com.android.settings.wifi.dpp;
import android.app.ActionBar;
+import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.content.Intent;
import android.graphics.Matrix;
import android.graphics.Rect;
import android.graphics.SurfaceTexture;
+import android.net.wifi.EasyConnectStatusCallback;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
+import android.provider.Settings;
import android.text.TextUtils;
+import android.util.Log;
import android.util.Size;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -36,13 +44,18 @@
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.lifecycle.ViewModelProviders;
+
import com.android.settings.R;
import com.android.settings.wifi.qrcode.QrCamera;
import com.android.settings.wifi.qrcode.QrDecorateView;
+import java.util.List;
+
public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment implements
SurfaceTextureListener,
- QrCamera.ScannerCallback {
+ QrCamera.ScannerCallback,
+ WifiManager.ActionListener {
private static final String TAG = "WifiDppQrCodeScannerFragment";
/** Message sent to hide error message */
@@ -57,12 +70,12 @@
/** Message sent to manipulate ZXing Wi-Fi QR code */
private static final int MESSAGE_SCAN_ZXING_WIFI_FORMAT_SUCCESS = 4;
- private static final long SHOW_ERROR_MESSAGE_INTERVAL = 2000;
+ private static final long SHOW_ERROR_MESSAGE_INTERVAL = 10000;
private static final long SHOW_SUCCESS_SQUARE_INTERVAL = 1000;
// Key for Bundle usage
- private static final String KEY_PUBLIC_URI = "key_public_uri";
private static final String KEY_IS_CONFIGURATOR_MODE = "key_is_configurator_mode";
+ private static final String KEY_LATEST_ERROR_CODE = "key_latest_error_code";
private QrCamera mCamera;
private TextureView mTextureView;
@@ -78,13 +91,41 @@
/** QR code data scanned by camera */
private WifiQrCode mWifiQrCode;
+ private int mLatestStatusCode = WifiDppUtils.EASY_CONNECT_EVENT_FAILURE_NONE;
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (savedInstanceState != null) {
mIsConfiguratorMode = savedInstanceState.getBoolean(KEY_IS_CONFIGURATOR_MODE);
+ mLatestStatusCode = savedInstanceState.getInt(KEY_LATEST_ERROR_CODE);
}
+
+ final WifiDppInitiatorViewModel model =
+ ViewModelProviders.of(this).get(WifiDppInitiatorViewModel.class);
+
+ model.getEnrolleeSuccessNetworkId().observe(this, networkId -> {
+ // After configuration change, observe callback will be triggered,
+ // do nothing for this case if a handshake does not end
+ if (model.isGoingInitiator()) {
+ return;
+ }
+
+ new EasyConnectEnrolleeStatusCallback().onEnrolleeSuccess(networkId.intValue());
+ });
+
+ model.getStatusCode().observe(this, statusCode -> {
+ // After configuration change, observe callback will be triggered,
+ // do nothing for this case if a handshake does not end
+ if (model.isGoingInitiator()) {
+ return;
+ }
+
+ int code = statusCode.intValue();
+ Log.d(TAG, "Easy connect enrollee callback onFailure " + code);
+ new EasyConnectEnrolleeStatusCallback().onFailure(code);
+ });
}
@Override
@@ -102,12 +143,6 @@
}
OnScanWifiDppSuccessListener mScanWifiDppSuccessListener;
- // Container Activity must implement this interface
- public interface OnScanZxingWifiFormatSuccessListener {
- public void onScanZxingWifiFormatSuccess(WifiNetworkConfig wifiNetworkConfig);
- }
- OnScanZxingWifiFormatSuccessListener mScanZxingWifiFormatSuccessListener;
-
/**
* Configurator container activity of the fragment should create instance with this constructor.
*/
@@ -144,13 +179,11 @@
super.onAttach(context);
mScanWifiDppSuccessListener = (OnScanWifiDppSuccessListener) context;
- mScanZxingWifiFormatSuccessListener = (OnScanZxingWifiFormatSuccessListener) context;
}
@Override
public void onDetach() {
mScanWifiDppSuccessListener = null;
- mScanZxingWifiFormatSuccessListener = null;
super.onDetach();
}
@@ -289,7 +322,9 @@
}
private void handleWifiDpp() {
- destroyCamera();
+ if (mCamera != null) {
+ mCamera.stop();
+ }
mDecorateView.setFocused(true);
Message message = mHandler.obtainMessage(MESSAGE_SCAN_WIFI_DPP_SUCCESS);
@@ -299,7 +334,9 @@
}
private void handleZxingWifiFormat() {
- destroyCamera();
+ if (mCamera != null) {
+ mCamera.stop();
+ }
mDecorateView.setFocused(true);
Message message = mHandler.obtainMessage(MESSAGE_SCAN_ZXING_WIFI_FORMAT_SUCCESS);
@@ -317,7 +354,14 @@
// Check if the camera has already created.
if (mCamera == null) {
mCamera = new QrCamera(getContext(), this);
- mCamera.start(surface);
+
+ if (isGoingInitiator()) {
+ if (mDecorateView != null) {
+ mDecorateView.setFocused(true);
+ }
+ } else {
+ mCamera.start(surface);
+ }
}
}
@@ -328,14 +372,13 @@
}
}
- public void showErrorMessage(boolean show) {
- mErrorMessage.setVisibility(show ? View.VISIBLE : View.INVISIBLE);
+ public void showErrorMessage(String message) {
+ mErrorMessage.setVisibility(View.VISIBLE);
+ mErrorMessage.setText(message);
- if (show) {
- mHandler.removeMessages(MESSAGE_HIDE_ERROR_MESSAGE);
- mHandler.sendEmptyMessageDelayed(MESSAGE_HIDE_ERROR_MESSAGE,
- SHOW_ERROR_MESSAGE_INTERVAL);
- }
+ mHandler.removeMessages(MESSAGE_HIDE_ERROR_MESSAGE);
+ mHandler.sendEmptyMessageDelayed(MESSAGE_HIDE_ERROR_MESSAGE,
+ SHOW_ERROR_MESSAGE_INTERVAL);
}
private final Handler mHandler = new Handler() {
@@ -343,26 +386,32 @@
public void handleMessage(Message msg) {
switch (msg.what) {
case MESSAGE_HIDE_ERROR_MESSAGE:
- showErrorMessage(false);
+ mErrorMessage.setVisibility(View.INVISIBLE);
break;
case MESSAGE_SHOW_ERROR_MESSAGE:
- showErrorMessage(true);
+ showErrorMessage(getString(R.string.wifi_dpp_could_not_detect_valid_qr_code));
break;
case MESSAGE_SCAN_WIFI_DPP_SUCCESS:
+ mErrorMessage.setVisibility(View.INVISIBLE);
+
if (mScanWifiDppSuccessListener == null) {
return;
}
mScanWifiDppSuccessListener.onScanWifiDppSuccess((WifiQrCode)msg.obj);
+
+ if (!mIsConfiguratorMode) {
+ startWifiDppEnrolleeInitiator((WifiQrCode)msg.obj);
+ }
break;
case MESSAGE_SCAN_ZXING_WIFI_FORMAT_SUCCESS:
- if (mScanZxingWifiFormatSuccessListener == null) {
- return;
- }
- mScanZxingWifiFormatSuccessListener.onScanZxingWifiFormatSuccess(
- (WifiNetworkConfig)msg.obj);
+ mErrorMessage.setVisibility(View.INVISIBLE);
+
+ final WifiNetworkConfig wifiNetworkConfig = (WifiNetworkConfig)msg.obj;
+ wifiNetworkConfig.connect(getContext(),
+ /* listener */ WifiDppQrCodeScannerFragment.this);
break;
default:
@@ -374,7 +423,149 @@
@Override
public void onSaveInstanceState(Bundle outState) {
outState.putBoolean(KEY_IS_CONFIGURATOR_MODE, mIsConfiguratorMode);
+ outState.putInt(KEY_LATEST_ERROR_CODE, mLatestStatusCode);
super.onSaveInstanceState(outState);
}
+
+ private class EasyConnectEnrolleeStatusCallback extends EasyConnectStatusCallback {
+ @Override
+ public void onEnrolleeSuccess(int newNetworkId) {
+
+ // Connect to the new network.
+ final WifiManager wifiManager = getContext().getSystemService(WifiManager.class);
+ final List<WifiConfiguration> wifiConfigs =
+ wifiManager.getPrivilegedConfiguredNetworks();
+ for (WifiConfiguration wifiConfig : wifiConfigs) {
+ if (wifiConfig.networkId == newNetworkId) {
+ mLatestStatusCode = WifiDppUtils.EASY_CONNECT_EVENT_SUCCESS;
+ wifiManager.connect(wifiConfig, WifiDppQrCodeScannerFragment.this);
+ return;
+ }
+ }
+
+ Log.e(TAG, "Invalid networkId " + newNetworkId);
+ mLatestStatusCode = EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_GENERIC;
+ showErrorMessage(getString(R.string.wifi_dpp_check_connection_try_again));
+ restartCamera();
+ }
+
+ @Override
+ public void onConfiguratorSuccess(int code) {
+ // Do nothing
+ }
+
+ @Override
+ public void onFailure(int code) {
+ Log.d(TAG, "EasyConnectEnrolleeStatusCallback.onFailure " + code);
+
+ switch (code) {
+ case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_INVALID_URI:
+ showErrorMessage(getString(R.string.wifi_dpp_could_not_detect_valid_qr_code));
+ break;
+
+ case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_AUTHENTICATION:
+ showErrorMessage(
+ getString(R.string.wifi_dpp_failure_authentication_or_configuration));
+ break;
+
+ case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_NOT_COMPATIBLE:
+ showErrorMessage(getString(R.string.wifi_dpp_failure_not_compatible));
+ break;
+
+ case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_CONFIGURATION:
+ showErrorMessage(
+ getString(R.string.wifi_dpp_failure_authentication_or_configuration));
+ break;
+
+ case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_BUSY:
+ if (code == mLatestStatusCode) {
+ throw(new IllegalStateException("stopEasyConnectSession and try again for"
+ + "EASY_CONNECT_EVENT_FAILURE_BUSY but still failed"));
+ }
+
+ mLatestStatusCode = code;
+ final WifiManager wifiManager =
+ getContext().getSystemService(WifiManager.class);
+ wifiManager.stopEasyConnectSession();
+ startWifiDppEnrolleeInitiator(mWifiQrCode);
+ return;
+
+ case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_TIMEOUT:
+ showErrorMessage(getString(R.string.wifi_dpp_failure_timeout));
+ break;
+
+ case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_GENERIC:
+ showErrorMessage(getString(R.string.wifi_dpp_failure_generic));
+ break;
+
+ case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_NOT_SUPPORTED:
+ throw(new IllegalStateException("EASY_CONNECT_EVENT_FAILURE_NOT_SUPPORTED" +
+ " should be a configurator only error"));
+
+ case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_INVALID_NETWORK:
+ throw(new IllegalStateException("EASY_CONNECT_EVENT_FAILURE_INVALID_NETWORK" +
+ " should be a configurator only error"));
+
+ default:
+ throw(new IllegalStateException("Unexpected Wi-Fi DPP error"));
+ }
+
+ mLatestStatusCode = code;
+ restartCamera();
+ }
+
+ @Override
+ public void onProgress(int code) {
+ // Do nothing
+ }
+ }
+
+ private void startWifiDppEnrolleeInitiator(WifiQrCode wifiQrCode) {
+ final WifiDppInitiatorViewModel model =
+ ViewModelProviders.of(this).get(WifiDppInitiatorViewModel.class);
+
+ model.startEasyConnectAsEnrolleeInitiator(wifiQrCode.getQrCode());
+ }
+
+ @Override
+ public void onSuccess() {
+ startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS));
+ final Activity hostActivity = getActivity();
+ hostActivity.setResult(Activity.RESULT_OK);
+ hostActivity.finish();
+ }
+
+ @Override
+ public void onFailure(int reason) {
+ Log.d(TAG, "Wi-Fi connect onFailure reason - " + reason);
+
+ showErrorMessage(getString(R.string.wifi_dpp_check_connection_try_again));
+ restartCamera();
+ }
+
+ // Check is Easy Connect handshaking or not
+ private boolean isGoingInitiator() {
+ final WifiDppInitiatorViewModel model =
+ ViewModelProviders.of(this).get(WifiDppInitiatorViewModel.class);
+
+ return model.isGoingInitiator();
+ }
+
+ /**
+ * To resume camera decoding task after handshake fail or Wi-Fi connection fail.
+ */
+ private void restartCamera() {
+ if (mCamera == null) {
+ Log.d(TAG, "mCamera is not available for restarting camera");
+ return;
+ }
+
+ final SurfaceTexture surfaceTexture = mTextureView.getSurfaceTexture();
+ if (surfaceTexture == null) {
+ throw new IllegalStateException("SurfaceTexture is not ready for restarting camera");
+ }
+
+ mCamera.start(surfaceTexture);
+ }
}
diff --git a/src/com/android/settings/wifi/dpp/WifiDppUtils.java b/src/com/android/settings/wifi/dpp/WifiDppUtils.java
index 8b333e2..24cd1d7 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppUtils.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppUtils.java
@@ -75,6 +75,16 @@
public static final String EXTRA_TEST = "test";
/**
+ * Default status code for Easy Connect
+ */
+ public static final int EASY_CONNECT_EVENT_FAILURE_NONE = 0;
+
+ /**
+ * Success status code for Easy Connect.
+ */
+ public static final int EASY_CONNECT_EVENT_SUCCESS = 1;
+
+ /**
* Returns whether the device support WiFi DPP.
*/
public static boolean isWifiDppEnabled(Context context) {
diff --git a/src/com/android/settings/wifi/dpp/WifiQrCode.java b/src/com/android/settings/wifi/dpp/WifiQrCode.java
index a08fb44..10971cf 100644
--- a/src/com/android/settings/wifi/dpp/WifiQrCode.java
+++ b/src/com/android/settings/wifi/dpp/WifiQrCode.java
@@ -228,4 +228,19 @@
return new WifiNetworkConfig(mWifiNetworkConfig);
}
+
+ public static WifiQrCode getValidWifiDppQrCodeOrNull(String qrCode) {
+ WifiQrCode wifiQrCode;
+ try {
+ wifiQrCode = new WifiQrCode(qrCode);
+ } catch(IllegalArgumentException e) {
+ return null;
+ }
+
+ if (SCHEME_DPP.equals(wifiQrCode.getScheme())) {
+ return wifiQrCode;
+ }
+
+ return null;
+ }
}
diff --git a/src/com/android/settings/wifi/slice/ContextualWifiSlice.java b/src/com/android/settings/wifi/slice/ContextualWifiSlice.java
index 7a6d1fa..5761ae5 100644
--- a/src/com/android/settings/wifi/slice/ContextualWifiSlice.java
+++ b/src/com/android/settings/wifi/slice/ContextualWifiSlice.java
@@ -90,7 +90,7 @@
}
d.setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN));
- return IconCompat.createWithBitmap(Utils.drawableToBitmap(d));
+ return Utils.createIconWithDrawable(d);
}
@Override
diff --git a/tests/robotests/src/com/android/settings/UtilsTest.java b/tests/robotests/src/com/android/settings/UtilsTest.java
index c10e0d6..37186ca 100644
--- a/tests/robotests/src/com/android/settings/UtilsTest.java
+++ b/tests/robotests/src/com/android/settings/UtilsTest.java
@@ -34,6 +34,11 @@
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.VectorDrawable;
import android.net.ConnectivityManager;
import android.net.LinkAddress;
import android.net.LinkProperties;
@@ -48,6 +53,8 @@
import android.widget.EditText;
import android.widget.TextView;
+import androidx.core.graphics.drawable.IconCompat;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -96,7 +103,7 @@
}
@Test
- public void testGetWifiIpAddresses_succeeds() throws Exception {
+ public void getWifiIpAddresses_succeeds() throws Exception {
when(wifiManager.getCurrentNetwork()).thenReturn(network);
LinkAddress address = new LinkAddress(InetAddress.getByName("127.0.0.1"), 0);
LinkProperties lp = new LinkProperties();
@@ -107,7 +114,7 @@
}
@Test
- public void testGetWifiIpAddresses_nullLinkProperties() {
+ public void getWifiIpAddresses_nullLinkProperties() {
when(wifiManager.getCurrentNetwork()).thenReturn(network);
// Explicitly set the return value to null for readability sake.
when(connectivityManager.getLinkProperties(network)).thenReturn(null);
@@ -116,7 +123,7 @@
}
@Test
- public void testGetWifiIpAddresses_nullNetwork() {
+ public void getWifiIpAddresses_nullNetwork() {
// Explicitly set the return value to null for readability sake.
when(wifiManager.getCurrentNetwork()).thenReturn(null);
@@ -124,7 +131,7 @@
}
@Test
- public void testInitializeVolumeDoesntBreakOnNullVolume() {
+ public void initializeVolumeDoesntBreakOnNullVolume() {
VolumeInfo info = new VolumeInfo("id", 0, new DiskInfo("id", 0), "");
StorageManager storageManager = mock(StorageManager.class, RETURNS_DEEP_STUBS);
when(storageManager.findVolumeById(anyString())).thenReturn(info);
@@ -133,13 +140,13 @@
}
@Test
- public void testGetInstallationStatus_notInstalled_shouldReturnUninstalled() {
+ public void getInstallationStatus_notInstalled_shouldReturnUninstalled() {
assertThat(Utils.getInstallationStatus(new ApplicationInfo()))
.isEqualTo(R.string.not_installed);
}
@Test
- public void testGetInstallationStatus_enabled_shouldReturnInstalled() {
+ public void getInstallationStatus_enabled_shouldReturnInstalled() {
final ApplicationInfo info = new ApplicationInfo();
info.flags = ApplicationInfo.FLAG_INSTALLED;
info.enabled = true;
@@ -148,7 +155,7 @@
}
@Test
- public void testGetInstallationStatus_disabled_shouldReturnDisabled() {
+ public void getInstallationStatus_disabled_shouldReturnDisabled() {
final ApplicationInfo info = new ApplicationInfo();
info.flags = ApplicationInfo.FLAG_INSTALLED;
info.enabled = false;
@@ -157,7 +164,7 @@
}
@Test
- public void testIsProfileOrDeviceOwner_deviceOwnerApp_returnTrue() {
+ public void isProfileOrDeviceOwner_deviceOwnerApp_returnTrue() {
when(mDevicePolicyManager.isDeviceOwnerAppOnAnyUser(PACKAGE_NAME)).thenReturn(true);
assertThat(Utils.isProfileOrDeviceOwner(mUserManager, mDevicePolicyManager, PACKAGE_NAME))
@@ -165,7 +172,7 @@
}
@Test
- public void testIsProfileOrDeviceOwner_profileOwnerApp_returnTrue() {
+ public void isProfileOrDeviceOwner_profileOwnerApp_returnTrue() {
final List<UserInfo> userInfos = new ArrayList<>();
userInfos.add(new UserInfo());
@@ -178,7 +185,7 @@
}
@Test
- public void testSetEditTextCursorPosition_shouldGetExpectedEditTextLenght() {
+ public void setEditTextCursorPosition_shouldGetExpectedEditTextLenght() {
final EditText editText = new EditText(mContext);
final CharSequence text = "test";
editText.setText(text, TextView.BufferType.EDITABLE);
@@ -189,7 +196,36 @@
}
@Test
- public void testGetBadgedIcon_usePackageNameAndUserId()
+ public void createIconWithDrawable_BitmapDrawable() {
+ final Bitmap bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
+ final BitmapDrawable drawable = new BitmapDrawable(mContext.getResources(), bitmap);
+
+ final IconCompat icon = Utils.createIconWithDrawable(drawable);
+
+ assertThat(icon.getBitmap()).isNotNull();
+ }
+
+ @Test
+ public void createIconWithDrawable_ColorDrawable() {
+ final ColorDrawable drawable = new ColorDrawable(Color.BLACK);
+
+ final IconCompat icon = Utils.createIconWithDrawable(drawable);
+
+ assertThat(icon.getBitmap()).isNotNull();
+ }
+
+ @Test
+ public void createIconWithDrawable_VectorDrawable() {
+ final VectorDrawable drawable = VectorDrawable.create(mContext.getResources(),
+ R.drawable.ic_settings_accent);
+
+ final IconCompat icon = Utils.createIconWithDrawable(drawable);
+
+ assertThat(icon.getBitmap()).isNotNull();
+ }
+
+ @Test
+ public void getBadgedIcon_usePackageNameAndUserId()
throws PackageManager.NameNotFoundException {
doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfoAsUser(
PACKAGE_NAME, PackageManager.GET_META_DATA, USER_ID);
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
index 03b3867..1aa9f9d 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
@@ -181,11 +181,11 @@
}
@Test
- public void getCandidates_shouldQueryActivityWithFlagsEquals0() {
+ public void getCandidates_shouldQueryActivityWithMatchAll() {
DefaultBrowserPreferenceController.getCandidates(mPackageManager, 0 /* userId */);
verify(mPackageManager).queryIntentActivitiesAsUser(
- any(Intent.class), eq(0) /* flags */, eq(0) /* userId */);
+ any(Intent.class), eq(PackageManager.MATCH_ALL), eq(0) /* userId */);
}
@Test
@@ -221,6 +221,7 @@
info.handleAllWebDataURI = true;
info.activityInfo = new ActivityInfo();
info.activityInfo.packageName = packageName;
+ info.activityInfo.applicationInfo = createApplicationInfo(packageName);
return info;
}
diff --git a/tests/robotests/src/com/android/settings/development/ArtVerifierPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ArtVerifierPreferenceControllerTest.java
new file mode 100644
index 0000000..e5dade4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/ArtVerifierPreferenceControllerTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 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.
+ */
+
+package com.android.settings.development;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class ArtVerifierPreferenceControllerTest {
+
+ @Mock
+ private SwitchPreference mPreference;
+ @Mock
+ private PreferenceScreen mPreferenceScreen;
+
+ private Context mContext;
+ private ArtVerifierPreferenceController mController;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mController = new ArtVerifierPreferenceController(mContext);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
+ mController.displayPreference(mPreferenceScreen);
+ }
+
+ @Test
+ public void onPreferenceChanged_settingEnabled_turnOnArtVerifier() {
+ mController.onPreferenceChange(mPreference, true /* new value */);
+
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.ART_VERIFIER_VERIFY_DEBUGGABLE, -1 /* default */);
+
+ assertThat(mode).isEqualTo(ArtVerifierPreferenceController.SETTING_VALUE_ON);
+ }
+
+ @Test
+ public void onPreferenceChanged_settingDisabled_turnOffArtVerifier() {
+ mController.onPreferenceChange(mPreference, false /* new value */);
+
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.ART_VERIFIER_VERIFY_DEBUGGABLE, -1 /* default */);
+
+ assertThat(mode).isEqualTo(ArtVerifierPreferenceController.SETTING_VALUE_OFF);
+ }
+
+ @Test
+ public void updateState_settingEnabled_preferenceShouldBeChecked() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.ART_VERIFIER_VERIFY_DEBUGGABLE,
+ ArtVerifierPreferenceController.SETTING_VALUE_ON);
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(true);
+ }
+
+ @Test
+ public void updateState_settingDisabled_preferenceShouldBeChecked() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.ART_VERIFIER_VERIFY_DEBUGGABLE,
+ ArtVerifierPreferenceController.SETTING_VALUE_OFF);
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(false);
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+ mController.onDeveloperOptionsSwitchDisabled();
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.ART_VERIFIER_VERIFY_DEBUGGABLE, -1 /* default */);
+
+ assertThat(mode).isEqualTo(ArtVerifierPreferenceController.SETTING_VALUE_ON);
+ verify(mPreference).setEnabled(false);
+ verify(mPreference).setChecked(true);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
index 4c242c1..1b7b4b4 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
@@ -149,4 +149,23 @@
verify(mTelephonyManager).setDataEnabled(true);
}
+
+ @Test
+ public void isChecked_returnUserDataEnabled() {
+ mController.init(mFragmentManager, SUB_ID);
+ assertThat(mController.isChecked()).isFalse();
+
+ doReturn(true).when(mTelephonyManager).isDataEnabled();
+ assertThat(mController.isChecked()).isTrue();
+ }
+
+ @Test
+ public void updateState_opportunistic_disabled() {
+ doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
+ mController.init(mFragmentManager, SUB_ID);
+ doReturn(true).when(mSubscriptionInfo).isOpportunistic();
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/notification/SwipeDirectionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/SwipeDirectionPreferenceControllerTest.java
new file mode 100644
index 0000000..32ba592
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/SwipeDirectionPreferenceControllerTest.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 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.
+ */
+
+package com.android.settings.notification;
+
+import static android.provider.Settings.Secure.NOTIFICATION_DISMISS_RTL;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
+@RunWith(RobolectricTestRunner.class)
+public class SwipeDirectionPreferenceControllerTest {
+
+ private Context mContext;
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private PreferenceScreen mScreen;
+
+ private SwipeDirectionPreferenceController mController;
+ private ListPreference mPreference;
+
+ private static final String KEY = "swipe";
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mController = new SwipeDirectionPreferenceController(mContext, KEY);
+ mPreference = new ListPreference(RuntimeEnvironment.application);
+ mPreference.setKey(mController.getPreferenceKey());
+ when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
+ }
+
+ @Test
+ public void display_shouldDisplay() {
+ assertThat(mPreference.isVisible()).isTrue();
+ }
+
+ @Test
+ public void updateState_SettingIsOn() {
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ NOTIFICATION_DISMISS_RTL,
+ 1);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.getValue()).isEqualTo("1");
+ }
+
+ @Test
+ public void updateState_SettingIsOff() {
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ NOTIFICATION_DISMISS_RTL,
+ 0);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.getValue()).isEqualTo("0");
+ }
+
+ @Test
+ public void onPreferenceChange_LTR() {
+ Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_DISMISS_RTL, 1);
+
+ mController.onPreferenceChange(mPreference, "0");
+
+ assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+ NOTIFICATION_DISMISS_RTL, 1)).isEqualTo(0);
+
+ assertThat(mPreference.getSummary()).isEqualTo(
+ mContext.getResources().getStringArray(R.array.swipe_direction_titles)[1]);
+ }
+
+ @Test
+ public void onPreferenceChange_On() {
+ Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_DISMISS_RTL, 0);
+
+ mController.onPreferenceChange(mPreference, "1");
+
+ assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+ NOTIFICATION_DISMISS_RTL, 0)).isEqualTo(1);
+
+ assertThat(mPreference.getSummary()).isEqualTo(
+ mContext.getResources().getStringArray(R.array.swipe_direction_titles)[0]);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/qrcode/QrCameraTest.java b/tests/robotests/src/com/android/settings/wifi/qrcode/QrCameraTest.java
index a57fefc..bd2ce1e 100644
--- a/tests/robotests/src/com/android/settings/wifi/qrcode/QrCameraTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/qrcode/QrCameraTest.java
@@ -22,14 +22,11 @@
import android.content.Context;
import android.graphics.Bitmap;
-import android.graphics.Color;
import android.graphics.Matrix;
import android.graphics.Rect;
import android.graphics.SurfaceTexture;
import android.util.Size;
-import com.android.settings.R;
-
import com.google.zxing.BinaryBitmap;
import com.google.zxing.LuminanceSource;
import com.google.zxing.RGBLuminanceSource;
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java
index 76df764..a425177 100644
--- a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java
+++ b/tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java
@@ -110,14 +110,6 @@
}
@Test
- public void testActivity_shouldImplementsOnScanZxingWifiFormatSuccessCallback() {
- WifiDppConfiguratorActivity activity = mActivityRule.getActivity();
-
- assertThat(activity instanceof WifiDppQrCodeScannerFragment
- .OnScanZxingWifiFormatSuccessListener).isEqualTo(true);
- }
-
- @Test
public void testActivity_shouldImplementsOnClickChooseDifferentNetworkCallback() {
WifiDppConfiguratorActivity activity = mActivityRule.getActivity();
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivityTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivityTest.java
index 283da13..aef4767 100644
--- a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivityTest.java
+++ b/tests/unit/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivityTest.java
@@ -38,12 +38,4 @@
assertThat(activity instanceof WifiDppQrCodeScannerFragment
.OnScanWifiDppSuccessListener).isEqualTo(true);
}
-
- @Test
- public void testActivity_shouldImplementsOnScanZxingWifiFormatSuccessCallback() {
- WifiDppEnrolleeActivity activity = mActivityRule.getActivity();
-
- assertThat(activity instanceof WifiDppQrCodeScannerFragment
- .OnScanZxingWifiFormatSuccessListener).isEqualTo(true);
- }
}