Merge "Convert auto-brightness switch to a full screen UI." into pi-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b892dee..14fe92b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -700,6 +700,7 @@
</activity>
<activity android:name=".inputmethod.UserDictionaryAddWordActivity"
+ android:visibleToInstantApps="true"
android:label="@string/user_dict_settings_title"
android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"
android:windowSoftInputMode="stateVisible"
@@ -742,6 +743,10 @@
android:exported="true"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
+ <intent-filter android:priority="1">
+ <action android:name="android.settings.ZEN_MODE_BLOCKED_EFFECTS_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.notification.ZenModeBlockedEffectsSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -749,6 +754,20 @@
</activity>
<activity
+ android:name=".notification.ZenOnboardingActivity"
+ android:label="@string/zen_onboarding_dnd_visual_disturbances_header"
+ android:icon="@drawable/ic_settings_notifications"
+ android:theme="@style/Theme.Settings.NoActionBar"
+ android:exported="true"
+ android:taskAffinity="com.android.settings"
+ android:parentActivityName="Settings">
+ <intent-filter android:priority="1">
+ <action android:name="android.settings.ZEN_MODE_ONBOARDING" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
+
+ <activity
android:name="Settings$ZenModeBehaviorSettingsActivity"
android:label="@string/zen_mode_behavior_settings_title"
android:icon="@drawable/ic_settings_notifications"
@@ -771,7 +790,7 @@
android:icon="@drawable/ic_settings_notifications"
android:exported="true"
android:taskAffinity="com.android.settings"
- android:parentActivityName="Settings">
+ android:parentActivityName="Settings$ZenModeSettingsActivity">
<intent-filter android:priority="1">
<action android:name="android.settings.ZEN_MODE_AUTOMATION_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
@@ -834,7 +853,7 @@
android:name="Settings$ZenModeScheduleRuleSettingsActivity"
android:exported="true"
android:taskAffinity="com.android.settings"
- android:parentActivityName="Settings">
+ android:parentActivityName="Settings$ZenModeAutomationSettingsActivity">
<intent-filter android:priority="1">
<action android:name="android.settings.ZEN_MODE_SCHEDULE_RULE_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
@@ -853,7 +872,7 @@
android:name="Settings$ZenModeEventRuleSettingsActivity"
android:exported="true"
android:taskAffinity="com.android.settings"
- android:parentActivityName="Settings">
+ android:parentActivityName="Settings$ZenModeAutomationSettingsActivity">
<intent-filter android:priority="1">
<action android:name="android.settings.ZEN_MODE_EVENT_RULE_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
@@ -1842,43 +1861,39 @@
<!-- Exported for SystemUI to launch into -->
<activity android:name=".deviceinfo.StorageWizardInit"
- android:theme="@style/SetupWizardStorageStyle"
+ android:theme="@style/GlifTheme.Light"
android:taskAffinity="com.android.settings.storage_wizard"
android:exported="true"
android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
- <activity android:name=".deviceinfo.StorageWizardFormatConfirm"
- android:theme="@style/SetupWizardStorageStyle"
- android:taskAffinity="com.android.settings.storage_wizard"
- android:exported="false" />
<activity android:name=".deviceinfo.StorageWizardFormatProgress"
- android:theme="@style/SetupWizardStorageStyle"
+ android:theme="@style/GlifTheme.Light"
android:taskAffinity="com.android.settings.storage_wizard"
android:exported="false" />
- <activity android:name=".deviceinfo.StorageWizardMigrate"
- android:theme="@style/SetupWizardStorageStyle"
+ <activity android:name=".deviceinfo.StorageWizardFormatSlow"
+ android:theme="@style/GlifTheme.Light"
android:taskAffinity="com.android.settings.storage_wizard"
android:exported="false" />
<activity android:name=".deviceinfo.StorageWizardMigrateConfirm"
- android:theme="@style/SetupWizardStorageStyle"
+ android:theme="@style/GlifTheme.Light"
android:taskAffinity="com.android.settings.storage_wizard"
android:exported="false" />
<activity android:name=".deviceinfo.StorageWizardMigrateProgress"
- android:theme="@style/SetupWizardStorageStyle"
+ android:theme="@style/GlifTheme.Light"
android:taskAffinity="com.android.settings.storage_wizard"
android:exported="true"
android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
<activity android:name=".deviceinfo.StorageWizardReady"
- android:theme="@style/SetupWizardStorageStyle"
+ android:theme="@style/GlifTheme.Light"
android:taskAffinity="com.android.settings.storage_wizard"
android:exported="true"
android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
<activity android:name=".deviceinfo.StorageWizardMoveConfirm"
- android:theme="@style/SetupWizardStorageStyle"
+ android:theme="@style/GlifTheme.Light"
android:taskAffinity="com.android.settings.storage_wizard"
android:exported="false" />
<activity android:name=".deviceinfo.StorageWizardMoveProgress"
- android:theme="@style/SetupWizardStorageStyle"
+ android:theme="@style/GlifTheme.Light"
android:taskAffinity="com.android.settings.storage_wizard"
android:exported="true"
android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
diff --git a/res/drawable-nodpi/gesture_prevent_ringing b/res/drawable-nodpi/gesture_prevent_ringing
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/drawable-nodpi/gesture_prevent_ringing
diff --git a/res/drawable/ic_apps_alt.xml b/res/drawable/ic_apps_alt.xml
new file mode 100644
index 0000000..6902a96
--- /dev/null
+++ b/res/drawable/ic_apps_alt.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M4,8h4L8,4L4,4v4zM10,20h4v-4h-4v4zM4,20h4v-4L4,16v4zM4,14h4v-4L4,10v4zM10,14h4v-4h-4v4zM16,4v4h4L20,4h-4zM10,8h4L14,4h-4v4zM16,14h4v-4h-4v4zM16,20h4v-4h-4v4z"
+ android:fillColor="#000000"/>
+</vector>
diff --git a/res/drawable/ic_battery_charging_full.xml b/res/drawable/ic_battery_charging_full.xml
new file mode 100644
index 0000000..c2a614e
--- /dev/null
+++ b/res/drawable/ic_battery_charging_full.xml
@@ -0,0 +1,24 @@
+<!--
+ Copyright (C) 2018 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">
+ <path
+ android:pathData="M15.67,4H14V2h-4v2H8.33C7.6,4 7,4.6 7,5.33v15.33C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33V5.33C17,4.6 16.4,4 15.67,4zM11,20v-5.5H9L13,7v5.5h2L11,20z"
+ android:fillColor="#000000"/>
+</vector>
diff --git a/res/drawable/ic_sd_card.xml b/res/drawable/ic_sd_card.xml
new file mode 100644
index 0000000..ff88779
--- /dev/null
+++ b/res/drawable/ic_sd_card.xml
@@ -0,0 +1,24 @@
+<!--
+ Copyright (C) 2018 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">
+ <path
+ android:pathData="M18,2h-8L4.02,8 4,20c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM12,8h-2L10,4h2v4zM15,8h-2L13,4h2v4zM18,8h-2L16,4h2v4z"
+ android:fillColor="#000000"/>
+</vector>
diff --git a/res/drawable/ic_storage_wizard_external.xml b/res/drawable/ic_storage_wizard_external.xml
new file mode 100644
index 0000000..c11334d
--- /dev/null
+++ b/res/drawable/ic_storage_wizard_external.xml
@@ -0,0 +1,89 @@
+<!--
+ Copyright (C) 2018 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="144dp"
+ android:height="144dp"
+ android:viewportWidth="144.0"
+ android:viewportHeight="144.0">
+ <path
+ android:pathData="M20.98,105C19.88,105 19,104.12 19,103.03L19,44.97C19,43.88 19.88,43 20.98,43L49.02,43C50.12,43 51,43.88 51,44.97L51,103.03C51,104.12 50.12,105 49.02,105L20.98,105Z"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:fillColor="#FFFFFF"
+ android:strokeWidth="1"/>
+ <path
+ android:pathData="M20.98,106C19.33,106 18,104.68 18,103.03L18,44.97C18,43.32 19.33,42 20.98,42L49.02,42C50.67,42 52,43.32 52,44.97L52,103.03C52,104.68 50.67,106 49.02,106L20.98,106Z"
+ android:fillType="nonZero"
+ android:strokeColor="#DADCE0"
+ android:fillColor="#00000000"
+ android:strokeWidth="2"/>
+ <path
+ android:pathData="M20.98,104L49.02,104C49.57,104 50,103.57 50,103.03L50,44.97C50,44.43 49.57,44 49.02,44L20.98,44C20.43,44 20,44.43 20,44.97L20,103.03C20,103.57 20.43,104 20.98,104Z"
+ android:fillType="nonZero"
+ android:strokeColor="#F1F3F4"
+ android:fillColor="#00000000"
+ android:strokeWidth="2"/>
+ <path
+ android:pathData="M79,97L159,97A1,1 0,0 1,160 98L160,106A1,1 0,0 1,159 107L79,107A1,1 0,0 1,78 106L78,98A1,1 0,0 1,79 97z"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:fillColor="#F1F3F4"
+ android:strokeWidth="1"/>
+ <path
+ android:pathData="M80,98L158,98A1,1 0,0 1,159 99L159,105A1,1 0,0 1,158 106L80,106A1,1 0,0 1,79 105L79,99A1,1 0,0 1,80 98z"
+ android:fillType="evenOdd"
+ android:strokeColor="#DADCE0"
+ android:fillColor="#00000000"
+ android:strokeWidth="2"/>
+ <path
+ android:pathData="M95,37L173,37C174.1,37 175,37.9 175,39L175,97C175,98.1 174.1,99 173,99L93,99L93,39C93,37.9 93.9,37 95,37Z"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:fillColor="#F1F3F4"
+ android:strokeWidth="1"/>
+ <path
+ android:pathData="M94,98L173,98C173.55,98 174,97.55 174,97L174,39C174,38.45 173.55,38 173,38L95,38C94.45,38 94,38.45 94,39L94,98Z"
+ android:fillType="evenOdd"
+ android:strokeColor="#DADCE0"
+ android:fillColor="#00000000"
+ android:strokeWidth="2"/>
+ <path
+ android:pathData="M100,43L180,43A1,1 0,0 1,181 44L181,92A1,1 0,0 1,180 93L100,93A1,1 0,0 1,99 92L99,44A1,1 0,0 1,100 43z"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:fillColor="#FFFFFF"
+ android:strokeWidth="1"/>
+ <path
+ android:pathData="M76.63,54L71.13,54L67.01,58.2L67,66.6C67,67.37 67.62,68 68.38,68L76.63,68C77.38,68 78,67.37 78,66.6L78,55.4C78,54.63 77.38,54 76.63,54ZM72.5,58.2L71.13,58.2L71.13,55.4L72.5,55.4L72.5,58.2ZM74.56,58.2L73.19,58.2L73.19,55.4L74.56,55.4L74.56,58.2ZM76.63,58.2L75.25,58.2L75.25,55.4L76.63,55.4L76.63,58.2Z"
+ android:strokeColor="#00000000"
+ android:fillType="nonZero"
+ android:fillAlpha="0.87"
+ android:fillColor="?android:attr/colorAccent"
+ android:strokeWidth="1"/>
+ <path
+ android:pathData="M66.99,82L63,86L66.99,90L66.99,87L74,87L74,85L66.99,85L66.99,82ZM81,80L77.01,76L77.01,79L70,79L70,81L77.01,81L77.01,84L81,80Z"
+ android:strokeColor="#00000000"
+ android:fillType="nonZero"
+ android:fillAlpha="0.87"
+ android:fillColor="?android:attr/colorAccent"
+ android:strokeWidth="1"/>
+ <path
+ android:pathData="M72,72m-71.04,0a71.04,71.04 0,1 1,142.08 0a71.04,71.04 0,1 1,-142.08 0"
+ android:fillType="evenOdd"
+ android:strokeColor="#DADCE0"
+ android:fillColor="#00000000"
+ android:strokeWidth="1.92"/>
+</vector>
diff --git a/res/drawable/ic_storage_wizard_internal.xml b/res/drawable/ic_storage_wizard_internal.xml
new file mode 100644
index 0000000..f6c660b
--- /dev/null
+++ b/res/drawable/ic_storage_wizard_internal.xml
@@ -0,0 +1,75 @@
+<!--
+ Copyright (C) 2018 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="82dp"
+ android:height="150dp"
+ android:viewportWidth="82.0"
+ android:viewportHeight="150.0">
+ <path
+ android:pathData="M42,62L45,62L45,64L42,64L42,67L40,67L40,64L37,64L37,62L40,62L40,59L42,59L42,62Z"
+ android:fillAlpha="0.87"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorAccent"
+ android:strokeWidth="1"
+ android:strokeAlpha="0.87"/>
+ <path
+ android:pathData="M58.63,56L53.13,56L49.01,60.2L49,68.6C49,69.37 49.62,70 50.38,70L58.63,70C59.38,70 60,69.37 60,68.6L60,57.4C60,56.63 59.38,56 58.63,56ZM54.5,60.2L53.13,60.2L53.13,57.4L54.5,57.4L54.5,60.2ZM56.56,60.2L55.19,60.2L55.19,57.4L56.56,57.4L56.56,60.2ZM58.63,60.2L57.25,60.2L57.25,57.4L58.63,57.4L58.63,60.2Z"
+ android:fillAlpha="0.87"
+ android:strokeColor="#00000000"
+ android:fillType="nonZero"
+ android:fillColor="?android:attr/colorAccent"
+ android:strokeWidth="1"
+ android:strokeAlpha="0.87"/>
+ <path
+ android:pathData="M16,77L64,77A4,4 0,0 1,68 81L68,81A4,4 0,0 1,64 85L16,85A4,4 0,0 1,12 81L12,81A4,4 0,0 1,16 77z"
+ android:fillAlpha="0.87"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorAccent"
+ android:strokeWidth="1"
+ android:strokeAlpha="0.87"/>
+ <path
+ android:pathData="M9,77h31v8h-31z"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:fillColor="#DADCE0"
+ android:strokeWidth="1"/>
+ <path
+ android:pathData="M6,144L74,144L74,6L6,6L6,144ZM4.95,150C2.21,150 0,147.88 0,145.24L0,4.76C0,2.12 2.21,0 4.95,0L75.05,0C77.79,0 80,2.12 80,4.76L80,145.24C80,147.88 77.79,150 75.05,150L4.95,150Z"
+ android:strokeColor="#00000000"
+ android:fillType="nonZero"
+ android:fillColor="#F1F3F4"
+ android:strokeWidth="1"/>
+ <path
+ android:pathData="M4.95,148L75.05,148C76.7,148 78,146.75 78,145.24L78,4.76C78,3.25 76.7,2 75.05,2L4.95,2C3.3,2 2,3.25 2,4.76L2,145.24C2,146.75 3.3,148 4.95,148ZM4.95,150C2.21,150 0,147.88 0,145.24L0,4.76C0,2.12 2.21,0 4.95,0L75.05,0C77.79,0 80,2.12 80,4.76L80,145.24C80,147.88 77.79,150 75.05,150L4.95,150Z"
+ android:strokeColor="#00000000"
+ android:fillType="nonZero"
+ android:fillColor="#DADCE0"
+ android:strokeWidth="1"/>
+ <path
+ android:pathData="M80,58L80,58C81.1,58 82,58.9 82,60L82,76C82,77.1 81.1,78 80,78L80,58Z"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:fillColor="#DADCE0"
+ android:strokeWidth="1"/>
+ <path
+ android:pathData="M80,32L80,32C81.1,32 82,32.9 82,34L82,40C82,41.1 81.1,42 80,42L80,32Z"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:fillColor="#DADCE0"
+ android:strokeWidth="1"/>
+</vector>
diff --git a/res/drawable/ic_swap_horiz.xml b/res/drawable/ic_swap_horiz.xml
new file mode 100644
index 0000000..a38833b
--- /dev/null
+++ b/res/drawable/ic_swap_horiz.xml
@@ -0,0 +1,24 @@
+<!--
+ Copyright (C) 2018 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">
+ <path
+ android:pathData="M6.99,11L3,15l3.99,4v-3H14v-2H6.99v-3zM21,9l-3.99,-4v3H10v2h7.01v3L21,9z"
+ android:fillColor="#000000"/>
+</vector>
diff --git a/res/layout/preference_app.xml b/res/layout/preference_app.xml
index 2e134de..6605041 100644
--- a/res/layout/preference_app.xml
+++ b/res/layout/preference_app.xml
@@ -95,8 +95,8 @@
android:id="@android:id/widget_frame"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:gravity="end|center_vertical"
- android:paddingStart="16dp"
+ android:gravity="center"
+ android:minWidth="64dp"
android:orientation="vertical" />
</LinearLayout>
diff --git a/res/layout/storage_wizard_checklist.xml b/res/layout/storage_wizard_checklist.xml
new file mode 100644
index 0000000..6f21bb8
--- /dev/null
+++ b/res/layout/storage_wizard_checklist.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/suw_description_margin_top"
+ android:textColor="?android:attr/textColorPrimary"
+ android:text="@string/storage_wizard_migrate_v2_checklist" />
+ <TextView
+ android:id="@+id/storage_wizard_migrate_v2_checklist_media"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/suw_description_margin_top"
+ android:layout_marginBottom="@dimen/suw_description_margin_bottom"
+ android:textColor="?android:attr/textColorPrimary"
+ android:text="@string/storage_wizard_migrate_v2_checklist_media"
+ android:drawableStart="@drawable/ic_sd_card"
+ android:drawableTint="?android:attr/textColorSecondary"
+ android:drawablePadding="@dimen/suw_description_margin_bottom" />
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/suw_description_margin_bottom"
+ android:textColor="?android:attr/textColorPrimary"
+ android:text="@string/storage_wizard_migrate_v2_checklist_apps"
+ android:drawableStart="@drawable/ic_apps_alt"
+ android:drawableTint="?android:attr/textColorSecondary"
+ android:drawablePadding="@dimen/suw_description_margin_bottom" />
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/suw_description_margin_bottom"
+ android:textColor="?android:attr/textColorPrimary"
+ android:text="@string/storage_wizard_migrate_v2_checklist_battery"
+ android:drawableStart="@drawable/ic_battery_charging_full"
+ android:drawableTint="?android:attr/textColorSecondary"
+ android:drawablePadding="@dimen/suw_description_margin_bottom" />
+</LinearLayout>
diff --git a/res/layout/storage_wizard_footer.xml b/res/layout/storage_wizard_footer.xml
index f8384dc..0ff40aa 100644
--- a/res/layout/storage_wizard_footer.xml
+++ b/res/layout/storage_wizard_footer.xml
@@ -20,6 +20,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
+ <Button
+ android:id="@+id/storage_back_button"
+ style="@style/SuwGlifButton.Secondary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:onClick="onNavigateBack"
+ android:visibility="gone"
+ android:text="@string/suw_back_button_label" />
+
<Space
android:layout_width="0dp"
android:layout_height="0dp"
@@ -30,6 +39,8 @@
style="@style/SuwGlifButton.Primary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:onClick="onNavigateNext"
+ android:visibility="gone"
android:text="@string/suw_next_button_label" />
</LinearLayout>
diff --git a/res/layout/storage_wizard_generic.xml b/res/layout/storage_wizard_generic.xml
index b6aab28..fe4c052 100644
--- a/res/layout/storage_wizard_generic.xml
+++ b/res/layout/storage_wizard_generic.xml
@@ -34,18 +34,13 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_margin_top"
android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
- android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorPrimary" />
- <TextView
- android:id="@+id/storage_wizard_second_body"
- android:visibility="gone"
+ <FrameLayout
+ android:id="@+id/storage_wizard_aux"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/suw_description_margin_top"
- android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
- android:textAppearance="@android:style/TextAppearance.Material.Body1"
- android:textColor="?android:attr/textColorPrimary" />
+ android:visibility="gone" />
</LinearLayout>
diff --git a/res/layout/storage_wizard_init.xml b/res/layout/storage_wizard_init.xml
index 5fc298e..4905de6 100644
--- a/res/layout/storage_wizard_init.xml
+++ b/res/layout/storage_wizard_init.xml
@@ -28,41 +28,111 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <RadioButton
- android:id="@+id/storage_wizard_init_external_title"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_margin_top"
- android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
- android:textAppearance="@android:style/TextAppearance.Material.Subhead"
- android:textColor="?android:attr/textColorPrimary"
- android:text="@string/storage_wizard_init_external_title" />
- <TextView
- android:id="@+id/storage_wizard_init_external_summary"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
- android:textAppearance="@android:style/TextAppearance.Material.Body1"
- android:textColor="?android:attr/textColorSecondary"
- android:text="@string/storage_wizard_init_external_summary" />
+ android:orientation="horizontal"
+ android:gravity="center_vertical">
+ <ImageView
+ android:layout_width="144dp"
+ android:layout_height="144dp"
+ android:scaleType="centerInside"
+ android:src="@drawable/ic_storage_wizard_internal" />
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginStart="@dimen/suw_glif_margin_sides"
+ android:orientation="vertical">
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/suw_description_margin_bottom"
+ android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+ android:text="@string/storage_wizard_init_v2_internal_title" />
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/suw_description_margin_bottom"
+ android:textColor="?android:attr/textColorSecondary"
+ android:text="@string/storage_wizard_init_v2_internal_summary" />
+ <Button
+ android:id="@+id/storage_wizard_init_internal"
+ style="@style/SuwGlifButton.Primary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/storage_wizard_init_v2_internal_action"
+ android:onClick="onNavigateInternal" />
+ </LinearLayout>
+ </LinearLayout>
- <RadioButton
- android:id="@+id/storage_wizard_init_internal_title"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_margin_top"
- android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
- android:textAppearance="@android:style/TextAppearance.Material.Subhead"
- android:textColor="?android:attr/textColorPrimary"
- android:text="@string/storage_wizard_init_internal_title" />
- <TextView
- android:id="@+id/storage_wizard_init_internal_summary"
+ android:orientation="horizontal"
+ android:gravity="center_vertical">
+ <View
+ android:layout_width="0dp"
+ android:layout_height="1dp"
+ android:layout_weight="1"
+ android:background="@android:color/black"
+ android:backgroundTint="?android:attr/textColorTertiary" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginEnd="8dp"
+ android:text="@string/storage_wizard_init_v2_or"
+ android:textColor="?android:attr/textColorTertiary"
+ android:textAllCaps="true" />
+ <View
+ android:layout_width="0dp"
+ android:layout_height="1dp"
+ android:layout_weight="1"
+ android:background="@android:color/black"
+ android:backgroundTint="?android:attr/textColorTertiary" />
+ </LinearLayout>
+
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
- android:textAppearance="@android:style/TextAppearance.Material.Body1"
- android:textColor="?android:attr/textColorSecondary"
- android:text="@string/storage_wizard_init_internal_summary" />
+ android:layout_marginTop="@dimen/suw_description_margin_top"
+ android:orientation="horizontal"
+ android:gravity="center_vertical">
+ <ImageView
+ android:layout_width="144dp"
+ android:layout_height="144dp"
+ android:scaleType="centerInside"
+ android:src="@drawable/ic_storage_wizard_external" />
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginStart="@dimen/suw_glif_margin_sides"
+ android:orientation="vertical">
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/suw_description_margin_bottom"
+ android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+ android:text="@string/storage_wizard_init_v2_external_title" />
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/suw_description_margin_bottom"
+ android:textColor="?android:attr/textColorSecondary"
+ android:text="@string/storage_wizard_init_v2_external_summary" />
+ <Button
+ android:id="@+id/storage_wizard_init_external"
+ style="@style/SuwGlifButton.Primary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/storage_wizard_init_v2_external_action"
+ android:onClick="onNavigateExternal" />
+ </LinearLayout>
+ </LinearLayout>
</LinearLayout>
diff --git a/res/layout/storage_wizard_migrate.xml b/res/layout/storage_wizard_migrate.xml
deleted file mode 100644
index a1c1168..0000000
--- a/res/layout/storage_wizard_migrate.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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.
--->
-
-<com.android.setupwizardlib.GlifLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:id="@+id/setup_wizard_layout"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- app:suwFooter="@layout/storage_wizard_footer">
-
- <LinearLayout
- style="@style/SuwContentFrame"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/storage_wizard_body"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/suw_description_margin_top"
- android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
- android:textAppearance="@android:style/TextAppearance.Material.Body1"
- android:textColor="?android:attr/textColorPrimary" />
-
- <RadioButton
- android:id="@+id/storage_wizard_migrate_now"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/suw_description_margin_top"
- android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
- android:textAppearance="@android:style/TextAppearance.Material.Subhead"
- android:textColor="?android:attr/textColorPrimary"
- android:text="@string/storage_wizard_migrate_now" />
- <RadioButton
- android:id="@+id/storage_wizard_migrate_later"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
- android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
- android:textAppearance="@android:style/TextAppearance.Material.Subhead"
- android:textColor="?android:attr/textColorPrimary"
- android:text="@string/storage_wizard_migrate_later" />
-
- </LinearLayout>
-
-</com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/storage_wizard_progress.xml b/res/layout/storage_wizard_progress.xml
index dbeaf66..0b38475 100644
--- a/res/layout/storage_wizard_progress.xml
+++ b/res/layout/storage_wizard_progress.xml
@@ -40,7 +40,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
- android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary" />
<TextView
@@ -49,8 +48,14 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_margin_top"
android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
- android:textAppearance="@android:style/TextAppearance.Material.Body1"
- android:textColor="?android:attr/textColorPrimary" />
+ android:textColor="?android:attr/textColorPrimary"
+ android:visibility="gone" />
+
+ <FrameLayout
+ android:id="@+id/storage_wizard_aux"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:visibility="gone" />
</LinearLayout>
diff --git a/res/layout/storage_wizard_ready.xml b/res/layout/storage_wizard_ready.xml
index 043b89f..a9e4ddf 100644
--- a/res/layout/storage_wizard_ready.xml
+++ b/res/layout/storage_wizard_ready.xml
@@ -34,7 +34,6 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_margin_top"
android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
- android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorPrimary" />
</LinearLayout>
diff --git a/res/layout/zen_onboarding.xml b/res/layout/zen_onboarding.xml
new file mode 100644
index 0000000..05b38f2
--- /dev/null
+++ b/res/layout/zen_onboarding.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2018 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.
+-->
+<RelativeLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="20dp">
+
+ <ImageView
+ android:id="@+id/header_icon"
+ android:layout_width="32dp"
+ android:layout_height="32dp"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
+ android:src="@drawable/ic_zen"
+ android:tint="?android:attr/colorAccent"/>
+
+ <TextView
+ android:id="@+id/header"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/header_icon"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="12dp"
+ android:text="@string/zen_onboarding_dnd_visual_disturbances_header"
+ android:textAppearance="@android:style/TextAppearance.Material.Headline" />
+
+ <TextView
+ android:id="@+id/feature_description"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/header"
+ android:layout_centerHorizontal="true"
+ android:textAlignment="center"
+ android:layout_marginTop="14dp"
+ android:textAppearance="?android:attr/textAppearanceListItem"
+ android:text="@string/zen_onboarding_dnd_visual_disturbances_description" />
+
+ <LinearLayout
+ android:id="@+id/screen_off"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/feature_description"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="35dp"
+ android:orientation="horizontal">
+
+ <CheckBox
+ android:id="@+id/screen_off_option"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingHorizontal="8dp"
+ android:onClick="logClick" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/screen_off_title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/zen_onboarding_screen_off_title"
+ android:textAppearance="?android:attr/textAppearanceListItem" />
+
+ <TextView
+ android:id="@+id/screen_off_summary"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/zen_onboarding_screen_off_summary" />
+ </LinearLayout>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/screen_on"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/screen_off"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="10dp"
+ android:orientation="horizontal">
+
+ <CheckBox
+ android:id="@+id/screen_on_option"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingHorizontal="8dp"
+ android:onClick="logClick" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/screen_on_title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/zen_onboarding_screen_off_title"
+ android:textAppearance="?android:attr/textAppearanceListItem" />
+
+ <TextView
+ android:id="@+id/screen_on_summary"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/zen_onboarding_screen_on_summary" />
+ </LinearLayout>
+
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/further_customize"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/screen_on"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="20dp"
+ android:textAppearance="?android:attr/textAppearanceListItem"
+ android:text="@string/zen_onboarding_more_options" />
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/further_customize"
+ android:layout_marginTop="35dp"
+ android:id="@+id/buttons">
+
+ <TextView
+ android:id="@+id/settings"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
+ android:layout_weight="1"
+ android:layout_centerInParent="true"
+ android:text="@string/zen_onboarding_settings"
+ android:textAppearance="?android:attr/textAppearanceListItem"
+ android:textColor="?android:attr/colorControlActivated"
+ android:onClick="launchSettings" />
+
+ <Button
+ android:id="@+id/ok"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_weight="1"
+ android:layout_centerInParent="true"
+ android:text="@string/zen_onboarding_ok"
+ style="@style/ActionPrimaryButton"
+ android:onClick="save" />
+ </RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/raw/gesture_prevent_ringing.mp4 b/res/raw/gesture_prevent_ringing.mp4
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/gesture_prevent_ringing.mp4
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b92fb92..43d5563 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1592,7 +1592,7 @@
<!-- Bluetooth settings: The sub heading for devices which have already been paired with this device. [CHAR LIMIT=40] -->
<string name="bluetooth_preference_paired_devices">Paired devices</string>
<!-- Bluetooth settings: The sub heading for available devices during and after scanning. [CHAR LIMIT=40] -->
- <string name="bluetooth_preference_found_media_devices">Available media devices</string>
+ <string name="bluetooth_preference_found_media_devices">Available devices</string>
<!-- Bluetooth settings: The message displayed if no Bluetooth devices were found. [CHAR LIMIT=40] -->
<string name="bluetooth_preference_no_found_devices">No devices available</string>
<!-- Bluetooth settings. Context menu item for a device. Action will connect to all profiles on the device. -->
@@ -2162,6 +2162,8 @@
<string name="wifi_hotspot_tethering_on_subtext" product="default">Sharing this phone\u2019s internet connection via hotspot</string>
<!-- Summary text when hotspot is on for local-only -->
<string name="wifi_hotspot_on_local_only_subtext">App is sharing content. To share internet connection, turn hotspot off, then on</string>
+ <!-- Summary text when no password is set [CHAR LIMIT=60] -->
+ <string name="wifi_hotspot_no_password_subtext">No password set</string>
<!-- Wifi hotspot settings -->
<!-- Label for Wifi hotspot name. -->
@@ -5922,10 +5924,6 @@
<string name="really_remove_account_message" product="device">Removing this account will delete all of its messages, contacts, and other data from the device!</string>
<!-- This is shown if the autheticator for a given account fails to remove it. [CHAR LIMIT=NONE] -->
<string name="remove_account_failed">This change isn\'t allowed by your admin</string>
- <!-- What to show in messaging that refers to this provider, e.g. AccountSyncSettings -->
- <string name="provider_label">Push subscriptions</string>
- <!-- Formatter in AccountSyncSettings for each application we wish to synchronize, e.g. "Sync Calendar" -->
- <string name="sync_item_title"><xliff:g id="authority" example="Calendar">%s</xliff:g></string>
<!-- Title of dialog shown when you can't manually sync an item because it's disabled -->
<string name="cant_sync_dialog_title">Can\u2019t manually sync</string>
<!-- Messaage shown in dialog when you can't manually sync -->
@@ -7325,6 +7323,16 @@
<item quantity="other"><xliff:g id="on_count" example="3">%d</xliff:g> rules can turn on automatically</item>
</plurals>
+ <string name="zen_onboarding_ok">Ok</string>
+ <string name="zen_onboarding_settings">Settings</string>
+ <string name="zen_onboarding_more_options">You can further customize this in Settings.</string>
+ <string name="zen_onboarding_screen_on_title">Block when the screen is on</string>
+ <string name="zen_onboarding_screen_off_title">Block when the screen is off</string>
+ <string name="zen_onboarding_dnd_visual_disturbances_description">Do Not Disturb can do more than block unwanted sounds - it can block visuals too. This may be helpful if you\'re trying to sleep, focus, or limit time spent on your phone.</string>
+ <string name="zen_onboarding_dnd_visual_disturbances_header">Block sounds and visuals</string>
+ <string name="zen_onboarding_screen_off_summary">Don\'t turn on the screen or show notifications in the ambient display</string>
+ <string name="zen_onboarding_screen_on_summary">Don\'t show notifications at all, except for basic phone activity and status</string>
+
<!-- Work Sounds: Work sound settings section header. [CHAR LIMIT=50] -->
<string name="sound_work_settings">Work profile sounds</string>
@@ -7515,9 +7523,9 @@
<string name="default_notification_assistant">Notification assistant</string>
<!-- app summary of notification app list screen [CHAR LIMIT=100] -->
- <string name="notifications_sent_daily">~<xliff:g id="number">%1$s</xliff:g> sent daily</string>
+ <string name="notifications_sent_daily">~<xliff:g id="number">%1$s</xliff:g> per day</string>
<!-- app summary of notification app list screen [CHAR LIMIT=100] -->
- <string name="notifications_sent_weekly">~<xliff:g id="number">%1$s</xliff:g> sent weekly</string>
+ <string name="notifications_sent_weekly">~<xliff:g id="number">%1$s</xliff:g> per week</string>
<!-- app summary of notification app list screen [CHAR LIMIT=100] -->
<string name="notifications_sent_never">Never</string>
@@ -9835,6 +9843,9 @@
<!-- Title for media output settings -->
<string name="media_output_title">Play media to</string>
+ <!-- Summary for media output default settings. (this device) [CHAR LIMIT=30] -->
+ <string name="media_output_default_summary">This device</string>
+
<!-- Summary for media output settings. (phone) -->
<string name="media_output_summary" product="default">Phone</string>
@@ -9866,6 +9877,8 @@
<string name="gesture_prevent_ringing_screen_title">Prevent ringing</string>
<!-- Title for prevent ringing setting -->
<string name="gesture_prevent_ringing_title">Press Power & Volume Up together</string>
+ <!-- Title for prevent ringing setting -->
+ <string name="gesture_prevent_ringing_sound_title">Shortcut to prevent ringing</string>
<!-- Option for prevent ringing setting -->
<string name="prevent_ringing_option_vibrate">Vibrate</string>
<!-- Option for prevent ringing setting -->
@@ -9873,11 +9886,11 @@
<!-- Option for prevent ringing setting -->
<string name="prevent_ringing_option_none">Do nothing</string>
<!-- Summary for prevent ringing setting -->
- <string name="prevent_ringing_option_vibrate_summary">Vibrate all calls and notifications</string>
+ <string name="prevent_ringing_option_vibrate_summary">On (vibrate)</string>
<!-- Summary for prevent ringing setting -->
- <string name="prevent_ringing_option_mute_summary">Mute all calls and notifications</string>
+ <string name="prevent_ringing_option_mute_summary">On (mute)</string>
<!-- Summary for prevent ringing setting -->
- <string name="prevent_ringing_option_none_summary">Do nothing</string>
+ <string name="prevent_ringing_option_none_summary">Off</string>
<!-- Title for detail page of wifi network [CHAR LIMIT=30] -->
<string name="pref_title_network_details">Network details</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c6500c4..23ec207 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -374,9 +374,6 @@
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
- <style name="SetupWizardStorageStyle" parent="@style/SuwThemeGlif.Light">
- </style>
-
<style name="PreviewPagerPageIndicator">
<item name="dotGap">8dp</item>
<item name="pageIndicatorColor">?android:attr/colorControlNormal</item>
diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml
index 0eaa2a6..aec933a 100644
--- a/res/xml/gestures.xml
+++ b/res/xml/gestures.xml
@@ -60,6 +60,7 @@
<Preference
android:key="gesture_prevent_ringing_summary"
android:title="@string/gesture_prevent_ringing_screen_title"
- android:fragment="com.android.settings.gestures.PreventRingingGestureSettings" />
+ android:fragment="com.android.settings.gestures.PreventRingingGestureSettings"
+ settings:controller="com.android.settings.gestures.PreventRingingPreferenceController" />
</PreferenceScreen>
diff --git a/res/xml/prevent_ringing_gesture_settings.xml b/res/xml/prevent_ringing_gesture_settings.xml
index 10732fc..08146e4 100644
--- a/res/xml/prevent_ringing_gesture_settings.xml
+++ b/res/xml/prevent_ringing_gesture_settings.xml
@@ -21,15 +21,17 @@
android:key="gesture_prevent_ringing_screen"
android:title="@string/gesture_prevent_ringing_screen_title">
- <!-- TODO: Add video preference when it exists -->
<com.android.settings.widget.VideoPreference
- android:key="gesture_prevent_ringing_video" />
+ android:key="gesture_prevent_ringing_video"
+ app:animation="@raw/gesture_prevent_ringing"
+ app:preview="@drawable/gesture_prevent_ringing" />
<ListPreference
android:key="gesture_prevent_ringing"
android:title="@string/gesture_prevent_ringing_title"
android:entries="@array/gesture_prevent_ringing_entries"
android:entryValues="@array/gesture_prevent_ringing_values"
+ app:controller="com.android.settings.gestures.PreventRingingPreferenceController"
app:keywords="@string/keywords_gesture" />
</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index 7fd3709..9772fa2 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -20,7 +20,7 @@
android:title="@string/sound_settings"
android:key="sound_settings"
settings:keywords="@string/keywords_sounds"
- settings:initialExpandedChildrenCount="7">
+ settings:initialExpandedChildrenCount="8">
<!-- Media volume -->
<com.android.settings.notification.VolumeSeekBarPreference
@@ -70,6 +70,14 @@
settings:allowDividerAbove="true"
android:order="-120"/>
+ <Preference
+ android:key="gesture_prevent_ringing_sound"
+ android:title="@string/gesture_prevent_ringing_sound_title"
+ settings:allowDividerAbove="true"
+ android:order="-110"
+ android:fragment="com.android.settings.gestures.PreventRingingGestureSettings"
+ settings:controller="com.android.settings.gestures.PreventRingingPreferenceController" />
+
<!-- Phone ringtone -->
<com.android.settings.DefaultRingtonePreference
android:key="ringtone"
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index d83694d..6b60e87 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -194,25 +194,24 @@
} else {
item.setup(account, authority, packageName, uid);
}
+ final PackageManager packageManager = getPackageManager();
item.setPersistent(false);
- final ProviderInfo providerInfo = getPackageManager().resolveContentProviderAsUser(
+ final ProviderInfo providerInfo = packageManager.resolveContentProviderAsUser(
authority, 0, mUserHandle.getIdentifier());
if (providerInfo == null) {
return;
}
- CharSequence providerLabel = providerInfo.loadLabel(getPackageManager());
+ final CharSequence providerLabel = providerInfo.loadLabel(packageManager);
if (TextUtils.isEmpty(providerLabel)) {
Log.e(TAG, "Provider needs a label for authority '" + authority + "'");
return;
}
- String title = getString(R.string.sync_item_title, providerLabel);
- item.setTitle(title);
+ item.setTitle(providerLabel);
item.setKey(authority);
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-
MenuItem syncNow = menu.add(0, MENU_SYNC_NOW_ID, 0,
getString(R.string.sync_menu_sync_now))
.setIcon(R.drawable.ic_menu_refresh_holo_dark);
diff --git a/src/com/android/settings/accounts/SyncStateSwitchPreference.java b/src/com/android/settings/accounts/SyncStateSwitchPreference.java
index 058fedd..456edba 100644
--- a/src/com/android/settings/accounts/SyncStateSwitchPreference.java
+++ b/src/com/android/settings/accounts/SyncStateSwitchPreference.java
@@ -21,6 +21,7 @@
import android.content.Context;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceViewHolder;
+import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
@@ -64,6 +65,7 @@
mAuthority = authority;
mPackageName = packageName;
mUid = uid;
+ setVisible(!TextUtils.isEmpty(mAuthority));
notifyChanged();
}
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java b/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java
index 319a09c..4a63e64 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java
@@ -16,6 +16,11 @@
package com.android.settings.deviceinfo;
+import static android.os.storage.DiskInfo.EXTRA_DISK_ID;
+
+import static com.android.settings.deviceinfo.StorageWizardBase.EXTRA_FORMAT_FORGET_UUID;
+import static com.android.settings.deviceinfo.StorageWizardBase.EXTRA_FORMAT_PRIVATE;
+
import android.content.Intent;
import android.os.Bundle;
import android.os.storage.DiskInfo;
@@ -30,8 +35,8 @@
import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.R;
+import com.android.settings.core.InstrumentedPreferenceFragment;
public class PrivateVolumeFormat extends InstrumentedPreferenceFragment {
private VolumeInfo mVolume;
@@ -65,9 +70,9 @@
@Override
public void onClick(View v) {
final Intent intent = new Intent(getActivity(), StorageWizardFormatProgress.class);
- intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
- intent.putExtra(StorageWizardFormatConfirm.EXTRA_FORMAT_PRIVATE, false);
- intent.putExtra(StorageWizardFormatConfirm.EXTRA_FORGET_UUID, mVolume.getFsUuid());
+ intent.putExtra(EXTRA_DISK_ID, mDisk.getId());
+ intent.putExtra(EXTRA_FORMAT_PRIVATE, false);
+ intent.putExtra(EXTRA_FORMAT_FORGET_UUID, mVolume.getFsUuid());
startActivity(intent);
getActivity().finish();
}
diff --git a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
index c6337ce..85b7904 100644
--- a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
@@ -18,7 +18,6 @@
import android.app.ActivityManager;
import android.content.Context;
-import android.content.Intent;
import android.content.res.Resources;
import android.net.Uri;
import android.os.Bundle;
@@ -223,19 +222,12 @@
@Override
public boolean onPreferenceTreeClick(Preference pref) {
- final Context context = getActivity();
if (pref == mMount) {
- new MountTask(context, mVolume).execute();
+ new MountTask(getActivity(), mVolume).execute();
} else if (pref == mFormatPublic) {
- final Intent intent = new Intent(context, StorageWizardFormatConfirm.class);
- intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
- intent.putExtra(StorageWizardFormatConfirm.EXTRA_FORMAT_PRIVATE, false);
- startActivity(intent);
+ StorageWizardFormatConfirm.showPublic(getActivity(), mDisk.getId());
} else if (pref == mFormatPrivate) {
- final Intent intent = new Intent(context, StorageWizardFormatConfirm.class);
- intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
- intent.putExtra(StorageWizardFormatConfirm.EXTRA_FORMAT_PRIVATE, true);
- startActivity(intent);
+ StorageWizardFormatConfirm.showPrivate(getActivity(), mDisk.getId());
}
return super.onPreferenceTreeClick(pref);
diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java
index 5b48666..4787ac5 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardBase.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java
@@ -16,12 +16,14 @@
package com.android.settings.deviceinfo;
+import static android.os.storage.DiskInfo.EXTRA_DISK_ID;
+import static android.os.storage.VolumeInfo.EXTRA_VOLUME_ID;
+
import static com.android.settings.deviceinfo.StorageSettings.TAG;
import android.annotation.LayoutRes;
import android.app.Activity;
-import android.content.Context;
-import android.content.res.TypedArray;
+import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.SystemClock;
@@ -31,12 +33,15 @@
import android.os.storage.VolumeInfo;
import android.text.TextUtils;
import android.util.Log;
+import android.view.LayoutInflater;
import android.view.View;
import android.widget.Button;
+import android.widget.FrameLayout;
import android.widget.ProgressBar;
import android.widget.TextView;
import com.android.settings.R;
+import com.android.settingslib.Utils;
import com.android.setupwizardlib.GlifLayout;
import java.text.NumberFormat;
@@ -44,11 +49,17 @@
import java.util.Objects;
public abstract class StorageWizardBase extends Activity {
+ protected static final String EXTRA_FORMAT_FORGET_UUID = "format_forget_uuid";
+ protected static final String EXTRA_FORMAT_PRIVATE = "format_private";
+ protected static final String EXTRA_FORMAT_SLOW = "format_slow";
+ protected static final String EXTRA_MIGRATE_SKIP = "migrate_skip";
+
protected StorageManager mStorage;
protected VolumeInfo mVolume;
protected DiskInfo mDisk;
+ private Button mBack;
private Button mNext;
@Override
@@ -57,12 +68,12 @@
mStorage = getSystemService(StorageManager.class);
- final String volumeId = getIntent().getStringExtra(VolumeInfo.EXTRA_VOLUME_ID);
+ final String volumeId = getIntent().getStringExtra(EXTRA_VOLUME_ID);
if (!TextUtils.isEmpty(volumeId)) {
mVolume = mStorage.findVolumeById(volumeId);
}
- final String diskId = getIntent().getStringExtra(DiskInfo.EXTRA_DISK_ID);
+ final String diskId = getIntent().getStringExtra(EXTRA_DISK_ID);
if (!TextUtils.isEmpty(diskId)) {
mDisk = mStorage.findDiskById(diskId);
} else if (mVolume != null) {
@@ -78,13 +89,10 @@
public void setContentView(@LayoutRes int layoutResID) {
super.setContentView(layoutResID);
- mNext = (Button) findViewById(R.id.storage_next_button);
- mNext.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- onNavigateNext();
- }
- });
+ mBack = requireViewById(R.id.storage_back_button);
+ mNext = requireViewById(R.id.storage_next_button);
+
+ setIcon(com.android.internal.R.drawable.ic_sd_card_48dp);
}
@Override
@@ -93,62 +101,109 @@
super.onDestroy();
}
+ protected Button getBackButton() {
+ return mBack;
+ }
+
protected Button getNextButton() {
return mNext;
}
protected GlifLayout getGlifLayout() {
- return (GlifLayout) findViewById(R.id.setup_wizard_layout);
+ return requireViewById(R.id.setup_wizard_layout);
}
protected ProgressBar getProgressBar() {
- return (ProgressBar) findViewById(R.id.storage_wizard_progress);
+ return requireViewById(R.id.storage_wizard_progress);
}
protected void setCurrentProgress(int progress) {
getProgressBar().setProgress(progress);
- ((TextView) findViewById(R.id.storage_wizard_progress_summary)).setText(
+ ((TextView) requireViewById(R.id.storage_wizard_progress_summary)).setText(
NumberFormat.getPercentInstance().format((double) progress / 100));
}
- protected void setHeaderText(int resId, String... args) {
+ protected void setHeaderText(int resId, CharSequence... args) {
final CharSequence headerText = TextUtils.expandTemplate(getText(resId), args);
getGlifLayout().setHeaderText(headerText);
setTitle(headerText);
}
- protected void setBodyText(int resId, String... args) {
- ((TextView) findViewById(R.id.storage_wizard_body)).setText(
- TextUtils.expandTemplate(getText(resId), args));
+ protected void setBodyText(int resId, CharSequence... args) {
+ final TextView body = requireViewById(R.id.storage_wizard_body);
+ body.setText(TextUtils.expandTemplate(getText(resId), args));
+ body.setVisibility(View.VISIBLE);
}
- protected void setSecondaryBodyText(int resId, String... args) {
- final TextView secondBody = ((TextView) findViewById(R.id.storage_wizard_second_body));
- secondBody.setText(TextUtils.expandTemplate(getText(resId), args));
- secondBody.setVisibility(View.VISIBLE);
+ protected void setAuxChecklist() {
+ final FrameLayout aux = requireViewById(R.id.storage_wizard_aux);
+ aux.addView(LayoutInflater.from(aux.getContext())
+ .inflate(R.layout.storage_wizard_checklist, aux, false));
+ aux.setVisibility(View.VISIBLE);
+
+ // Customize string based on disk
+ ((TextView) aux.requireViewById(R.id.storage_wizard_migrate_v2_checklist_media))
+ .setText(TextUtils.expandTemplate(
+ getText(R.string.storage_wizard_migrate_v2_checklist_media),
+ mDisk.getShortDescription()));
}
- protected static final int ILLUSTRATION_SETUP = 0;
- protected static final int ILLUSTRATION_INTERNAL = 1;
- protected static final int ILLUSTRATION_PORTABLE = 2;
+ protected void setBackButtonText(int resId, CharSequence... args) {
+ mBack.setText(TextUtils.expandTemplate(getText(resId), args));
+ mBack.setVisibility(View.VISIBLE);
+ }
- protected void setIllustrationType(int type) {
- // TODO: map type to updated icons once provided by UX
- TypedArray array = obtainStyledAttributes(new int[] {android.R.attr.colorAccent});
- Drawable icon = getDrawable(com.android.internal.R.drawable.ic_sd_card_48dp).mutate();
- icon.setTint(array.getColor(0, 0));
- array.recycle();
- getGlifLayout().setIcon(icon);
+ protected void setNextButtonText(int resId, CharSequence... args) {
+ mNext.setText(TextUtils.expandTemplate(getText(resId), args));
+ mNext.setVisibility(View.VISIBLE);
+ }
+
+ protected void setIcon(int resId) {
+ final GlifLayout layout = getGlifLayout();
+ final Drawable icon = getDrawable(resId).mutate();
+ icon.setTint(Utils.getColorAccent(layout.getContext()));
+ layout.setIcon(icon);
}
protected void setKeepScreenOn(boolean keepScreenOn) {
getGlifLayout().setKeepScreenOn(keepScreenOn);
}
- public void onNavigateNext() {
+ public void onNavigateBack(View view) {
throw new UnsupportedOperationException();
}
+ public void onNavigateNext(View view) {
+ throw new UnsupportedOperationException();
+ }
+
+ private void copyStringExtra(Intent from, Intent to, String key) {
+ if (from.hasExtra(key) && !to.hasExtra(key)) {
+ to.putExtra(key, from.getStringExtra(key));
+ }
+ }
+
+ private void copyBooleanExtra(Intent from, Intent to, String key) {
+ if (from.hasExtra(key) && !to.hasExtra(key)) {
+ to.putExtra(key, from.getBooleanExtra(key, false));
+ }
+ }
+
+ @Override
+ public void startActivity(Intent intent) {
+ final Intent from = getIntent();
+ final Intent to = intent;
+
+ copyStringExtra(from, to, EXTRA_DISK_ID);
+ copyStringExtra(from, to, EXTRA_VOLUME_ID);
+ copyStringExtra(from, to, EXTRA_FORMAT_FORGET_UUID);
+ copyBooleanExtra(from, to, EXTRA_FORMAT_PRIVATE);
+ copyBooleanExtra(from, to, EXTRA_FORMAT_SLOW);
+ copyBooleanExtra(from, to, EXTRA_MIGRATE_SKIP);
+
+ super.startActivity(intent);
+ }
+
protected VolumeInfo findFirstVolume(int type) {
return findFirstVolume(type, 1);
}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java
index a9a4db2..7173f08 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java
@@ -16,52 +16,91 @@
package com.android.settings.deviceinfo;
+import static android.os.storage.DiskInfo.EXTRA_DISK_ID;
+
+import static com.android.settings.deviceinfo.StorageWizardBase.EXTRA_FORMAT_FORGET_UUID;
+import static com.android.settings.deviceinfo.StorageWizardBase.EXTRA_FORMAT_PRIVATE;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.storage.DiskInfo;
+import android.os.storage.StorageManager;
+import android.text.TextUtils;
+import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-public class StorageWizardFormatConfirm extends StorageWizardBase {
- public static final String EXTRA_FORMAT_PRIVATE = "format_private";
- public static final String EXTRA_FORGET_UUID = "forget_uuid";
+public class StorageWizardFormatConfirm extends InstrumentedDialogFragment {
+ private static final String TAG_FORMAT_WARNING = "format_warning";
- private boolean mFormatPrivate;
+ public static void showPublic(Activity activity, String diskId) {
+ show(activity, diskId, null, false);
+ }
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- if (mDisk == null) {
- finish();
- return;
- }
- setContentView(R.layout.storage_wizard_generic);
+ public static void showPublic(Activity activity, String diskId, String forgetUuid) {
+ show(activity, diskId, forgetUuid, false);
+ }
- mFormatPrivate = getIntent().getBooleanExtra(EXTRA_FORMAT_PRIVATE, false);
- setIllustrationType(
- mFormatPrivate ? ILLUSTRATION_INTERNAL : ILLUSTRATION_PORTABLE);
+ public static void showPrivate(Activity activity, String diskId) {
+ show(activity, diskId, null, true);
+ }
- if (mFormatPrivate) {
- setHeaderText(R.string.storage_wizard_format_confirm_title);
- setBodyText(R.string.storage_wizard_format_confirm_body,
- mDisk.getDescription());
- } else {
- setHeaderText(R.string.storage_wizard_format_confirm_public_title);
- setBodyText(R.string.storage_wizard_format_confirm_public_body,
- mDisk.getDescription());
- }
+ private static void show(Activity activity, String diskId, String formatForgetUuid,
+ boolean formatPrivate) {
+ final Bundle args = new Bundle();
+ args.putString(EXTRA_DISK_ID, diskId);
+ args.putString(EXTRA_FORMAT_FORGET_UUID, formatForgetUuid);
+ args.putBoolean(EXTRA_FORMAT_PRIVATE, formatPrivate);
- getNextButton().setText(R.string.storage_wizard_format_confirm_next);
- getNextButton().setBackgroundTintList(getColorStateList(R.color.storage_wizard_button_red));
+ final StorageWizardFormatConfirm fragment = new StorageWizardFormatConfirm();
+ fragment.setArguments(args);
+ fragment.showAllowingStateLoss(activity.getFragmentManager(), TAG_FORMAT_WARNING);
}
@Override
- public void onNavigateNext() {
- final Intent intent = new Intent(this, StorageWizardFormatProgress.class);
- intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
- intent.putExtra(EXTRA_FORMAT_PRIVATE, mFormatPrivate);
- intent.putExtra(EXTRA_FORGET_UUID, getIntent().getStringExtra(EXTRA_FORGET_UUID));
- startActivity(intent);
- finishAffinity();
+ public int getMetricsCategory() {
+ return MetricsProto.MetricsEvent.DIALOG_VOLUME_FORMAT;
+ }
+
+ @Override
+ public Dialog onCreateDialog(Bundle savedInstanceState) {
+ final Context context = getContext();
+
+ final Bundle args = getArguments();
+ final String diskId = args.getString(EXTRA_DISK_ID);
+ final String formatForgetUuid = args.getString(EXTRA_FORMAT_FORGET_UUID);
+ final boolean formatPrivate = args.getBoolean(EXTRA_FORMAT_PRIVATE, false);
+
+ final DiskInfo disk = context.getSystemService(StorageManager.class)
+ .findDiskById(diskId);
+
+ final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+ builder.setTitle(TextUtils.expandTemplate(
+ getText(R.string.storage_wizard_format_confirm_v2_title),
+ disk.getShortDescription()));
+ builder.setMessage(TextUtils.expandTemplate(
+ getText(R.string.storage_wizard_format_confirm_v2_body),
+ disk.getDescription(),
+ disk.getShortDescription(),
+ disk.getShortDescription()));
+
+ builder.setNegativeButton(android.R.string.cancel, null);
+ builder.setPositiveButton(
+ TextUtils.expandTemplate(getText(R.string.storage_wizard_format_confirm_v2_action),
+ disk.getShortDescription()),
+ (dialog, which) -> {
+ final Intent intent = new Intent(context, StorageWizardFormatProgress.class);
+ intent.putExtra(EXTRA_DISK_ID, diskId);
+ intent.putExtra(EXTRA_FORMAT_FORGET_UUID, formatForgetUuid);
+ intent.putExtra(EXTRA_FORMAT_PRIVATE, formatPrivate);
+ context.startActivity(intent);
+ });
+
+ return builder.create();
}
}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
index 3dfc74b..8e3f8ef 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
@@ -20,34 +20,26 @@
import static com.android.settings.deviceinfo.StorageSettings.TAG;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.IPackageMoveObserver;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.IVoldTaskListener;
import android.os.PersistableBundle;
-import android.os.storage.DiskInfo;
+import android.os.SystemProperties;
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
-import android.text.TextUtils;
import android.util.Log;
-import android.view.View;
import android.widget.Toast;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
public class StorageWizardFormatProgress extends StorageWizardBase {
- private static final String TAG_SLOW_WARNING = "slow_warning";
+ private static final String PROP_DEBUG_STORAGE_SLOW = "sys.debug.storage_slow";
private boolean mFormatPrivate;
@@ -63,16 +55,11 @@
setContentView(R.layout.storage_wizard_progress);
setKeepScreenOn(true);
- mFormatPrivate = getIntent().getBooleanExtra(
- StorageWizardFormatConfirm.EXTRA_FORMAT_PRIVATE, false);
- setIllustrationType(
- mFormatPrivate ? ILLUSTRATION_INTERNAL : ILLUSTRATION_PORTABLE);
+ mFormatPrivate = getIntent().getBooleanExtra(EXTRA_FORMAT_PRIVATE, false);
- setHeaderText(R.string.storage_wizard_format_progress_title, mDisk.getDescription());
+ setHeaderText(R.string.storage_wizard_format_progress_title, mDisk.getShortDescription());
setBodyText(R.string.storage_wizard_format_progress_body, mDisk.getDescription());
- getNextButton().setVisibility(View.GONE);
-
mTask = (PartitionTask) getLastNonConfigurationInstance();
if (mTask == null) {
mTask = new PartitionTask();
@@ -198,93 +185,29 @@
// changes.
Log.d(TAG, "New volume took " + mPrivateBench + "ms to run benchmark");
- if (mPrivateBench > 2000) {
- final SlowWarningFragment dialog = new SlowWarningFragment();
- dialog.showAllowingStateLoss(activity.getFragmentManager(), TAG_SLOW_WARNING);
+ if (mPrivateBench > 2000
+ || SystemProperties.getBoolean(PROP_DEBUG_STORAGE_SLOW, false)) {
+ mActivity.onFormatFinishedSlow();
} else {
- activity.onFormatFinished();
+ mActivity.onFormatFinished();
}
} else {
- activity.onFormatFinished();
+ mActivity.onFormatFinished();
}
}
}
- public static class SlowWarningFragment extends InstrumentedDialogFragment {
-
- @Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.DIALOG_VOLUME_SLOW_WARNING;
- }
-
- @Override
- public Dialog onCreateDialog(Bundle savedInstanceState) {
- final Context context = getActivity();
-
- final AlertDialog.Builder builder = new AlertDialog.Builder(context);
-
- final StorageWizardFormatProgress target =
- (StorageWizardFormatProgress) getActivity();
- final String descrip = target.getDiskDescription();
- final String genericDescip = target.getGenericDiskDescription();
- builder.setMessage(TextUtils.expandTemplate(getText(R.string.storage_wizard_slow_body),
- descrip, genericDescip));
-
- builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- final StorageWizardFormatProgress target =
- (StorageWizardFormatProgress) getActivity();
- target.onFormatFinished();
- }
- });
-
- return builder.create();
- }
+ public void onFormatFinished() {
+ final Intent intent = new Intent(this, StorageWizardFormatSlow.class);
+ intent.putExtra(EXTRA_FORMAT_SLOW, false);
+ startActivity(intent);
+ finishAffinity();
}
- private String getDiskDescription() {
- return mDisk.getDescription();
- }
-
- private String getGenericDiskDescription() {
- // TODO: move this directly to DiskInfo
- if (mDisk.isSd()) {
- return getString(com.android.internal.R.string.storage_sd_card);
- } else if (mDisk.isUsb()) {
- return getString(com.android.internal.R.string.storage_usb_drive);
- } else {
- return null;
- }
- }
-
- private void onFormatFinished() {
- final String forgetUuid = getIntent().getStringExtra(
- StorageWizardFormatConfirm.EXTRA_FORGET_UUID);
- if (!TextUtils.isEmpty(forgetUuid)) {
- mStorage.forgetVolume(forgetUuid);
- }
-
- final boolean offerMigrate;
- if (mFormatPrivate) {
- // Offer to migrate only if storage is currently internal
- final VolumeInfo privateVol = getPackageManager()
- .getPrimaryStorageCurrentVolume();
- offerMigrate = (privateVol != null
- && VolumeInfo.ID_PRIVATE_INTERNAL.equals(privateVol.getId()));
- } else {
- offerMigrate = false;
- }
-
- if (offerMigrate) {
- final Intent intent = new Intent(this, StorageWizardMigrate.class);
- intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
- startActivity(intent);
- } else {
- final Intent intent = new Intent(this, StorageWizardReady.class);
- intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
- startActivity(intent);
- }
+ public void onFormatFinishedSlow() {
+ final Intent intent = new Intent(this, StorageWizardFormatSlow.class);
+ intent.putExtra(EXTRA_FORMAT_SLOW, true);
+ startActivity(intent);
finishAffinity();
}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatSlow.java b/src/com/android/settings/deviceinfo/StorageWizardFormatSlow.java
new file mode 100644
index 0000000..9c80ff6
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageWizardFormatSlow.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2018 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.deviceinfo;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.storage.DiskInfo;
+import android.os.storage.VolumeInfo;
+import android.text.TextUtils;
+import android.view.View;
+
+import com.android.settings.R;
+
+public class StorageWizardFormatSlow extends StorageWizardBase {
+ private boolean mFormatPrivate;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ if (mDisk == null) {
+ finish();
+ return;
+ }
+ setContentView(R.layout.storage_wizard_generic);
+
+ mFormatPrivate = getIntent().getBooleanExtra(EXTRA_FORMAT_PRIVATE, false);
+
+ setHeaderText(R.string.storage_wizard_slow_v2_title, mDisk.getShortDescription());
+ setBodyText(R.string.storage_wizard_slow_v2_body, mDisk.getDescription(),
+ mDisk.getShortDescription(), mDisk.getShortDescription(),
+ mDisk.getShortDescription());
+
+ setBackButtonText(R.string.storage_wizard_slow_v2_start_over);
+ setNextButtonText(R.string.storage_wizard_slow_v2_continue);
+
+ // If benchmark wasn't actually slow, skip this warning
+ if (!getIntent().getBooleanExtra(EXTRA_FORMAT_SLOW, false)) {
+ onNavigateNext(null);
+ }
+ }
+
+ @Override
+ public void onNavigateBack(View view) {
+ final Intent intent = new Intent(this, StorageWizardInit.class);
+ startActivity(intent);
+ finishAffinity();
+ }
+
+ @Override
+ public void onNavigateNext(View view) {
+ final String forgetUuid = getIntent().getStringExtra(EXTRA_FORMAT_FORGET_UUID);
+ if (!TextUtils.isEmpty(forgetUuid)) {
+ mStorage.forgetVolume(forgetUuid);
+ }
+
+ final boolean offerMigrate;
+ if (mFormatPrivate) {
+ // Offer to migrate only if storage is currently internal
+ final VolumeInfo privateVol = getPackageManager()
+ .getPrimaryStorageCurrentVolume();
+ offerMigrate = (privateVol != null
+ && VolumeInfo.ID_PRIVATE_INTERNAL.equals(privateVol.getId()));
+ } else {
+ offerMigrate = false;
+ }
+
+ if (offerMigrate) {
+ final Intent intent = new Intent(this, StorageWizardMigrateConfirm.class);
+ intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+ startActivity(intent);
+ } else {
+ final Intent intent = new Intent(this, StorageWizardReady.class);
+ intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+ startActivity(intent);
+ }
+ finishAffinity();
+ }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardInit.java b/src/com/android/settings/deviceinfo/StorageWizardInit.java
index 05c7b15..2233cf9 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardInit.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardInit.java
@@ -16,29 +16,20 @@
package com.android.settings.deviceinfo;
-import static com.android.settings.deviceinfo.StorageSettings.TAG;
-
import android.app.ActivityManager;
import android.content.Intent;
-import android.os.AsyncTask;
import android.os.Bundle;
-import android.os.Environment;
import android.os.UserManager;
import android.os.storage.DiskInfo;
import android.os.storage.VolumeInfo;
-import android.util.DebugUtils;
-import android.util.Log;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.RadioButton;
+import android.view.View;
+import android.widget.Button;
import com.android.settings.R;
-import java.io.File;
-
public class StorageWizardInit extends StorageWizardBase {
- private RadioButton mRadioExternal;
- private RadioButton mRadioInternal;
+ private Button mExternal;
+ private Button mInternal;
private boolean mIsPermittedToAdopt;
@@ -54,107 +45,46 @@
mIsPermittedToAdopt = UserManager.get(this).isAdminUser()
&& !ActivityManager.isUserAMonkey();
- setIllustrationType(ILLUSTRATION_SETUP);
- setHeaderText(R.string.storage_wizard_init_title, mDisk.getDescription());
+ setHeaderText(R.string.storage_wizard_init_v2_title, mDisk.getShortDescription());
- mRadioExternal = (RadioButton) findViewById(R.id.storage_wizard_init_external_title);
- mRadioInternal = (RadioButton) findViewById(R.id.storage_wizard_init_internal_title);
+ mExternal = requireViewById(R.id.storage_wizard_init_external);
+ mInternal = requireViewById(R.id.storage_wizard_init_internal);
- mRadioExternal.setOnCheckedChangeListener(mRadioListener);
- mRadioInternal.setOnCheckedChangeListener(mRadioListener);
-
- findViewById(R.id.storage_wizard_init_external_summary).setPadding(
- mRadioExternal.getCompoundPaddingLeft(), 0,
- mRadioExternal.getCompoundPaddingRight(), 0);
- findViewById(R.id.storage_wizard_init_internal_summary).setPadding(
- mRadioExternal.getCompoundPaddingLeft(), 0,
- mRadioExternal.getCompoundPaddingRight(), 0);
-
- getNextButton().setEnabled(false);
+ setBackButtonText(R.string.storage_wizard_init_v2_later);
if (!mDisk.isAdoptable()) {
// If not adoptable, we only have one choice
- mRadioExternal.setChecked(true);
- onNavigateNext();
+ onNavigateExternal(null);
finish();
} else if (!mIsPermittedToAdopt) {
// TODO: Show a message about why this is disabled for guest and
// that only an admin user can adopt an sd card.
- mRadioInternal.setEnabled(false);
- } else if (mVolume != null && mVolume.getType() == VolumeInfo.TYPE_PUBLIC
- && mVolume.isMountedReadable()) {
- // Device is mounted, so classify contents to possibly pick a
- // recommended default operation.
- new ClassifyTask().execute(mVolume.getPath());
+ mInternal.setEnabled(false);
}
}
- private final OnCheckedChangeListener mRadioListener = new OnCheckedChangeListener() {
- @Override
- public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
- if (isChecked) {
- if (buttonView == mRadioExternal) {
- mRadioInternal.setChecked(false);
- setIllustrationType(ILLUSTRATION_PORTABLE);
- } else if (buttonView == mRadioInternal) {
- mRadioExternal.setChecked(false);
- setIllustrationType(ILLUSTRATION_INTERNAL);
- }
- getNextButton().setEnabled(true);
- }
- }
- };
-
@Override
- public void onNavigateNext() {
- if (mRadioExternal.isChecked()) {
- if (mVolume != null && mVolume.getType() == VolumeInfo.TYPE_PUBLIC
- && mVolume.getState() != VolumeInfo.STATE_UNMOUNTABLE) {
- // Remember that user made decision
- mStorage.setVolumeInited(mVolume.getFsUuid(), true);
+ public void onNavigateBack(View view) {
+ finish();
+ }
- final Intent intent = new Intent(this, StorageWizardReady.class);
- intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
- startActivity(intent);
+ public void onNavigateExternal(View view) {
+ if (mVolume != null && mVolume.getType() == VolumeInfo.TYPE_PUBLIC
+ && mVolume.getState() != VolumeInfo.STATE_UNMOUNTABLE) {
+ // Remember that user made decision
+ mStorage.setVolumeInited(mVolume.getFsUuid(), true);
- } else {
- // Gotta format to get there
- final Intent intent = new Intent(this, StorageWizardFormatConfirm.class);
- intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
- intent.putExtra(StorageWizardFormatConfirm.EXTRA_FORMAT_PRIVATE, false);
- startActivity(intent);
- }
-
- } else if (mRadioInternal.isChecked()) {
- final Intent intent = new Intent(this, StorageWizardFormatConfirm.class);
+ final Intent intent = new Intent(this, StorageWizardReady.class);
intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
- intent.putExtra(StorageWizardFormatConfirm.EXTRA_FORMAT_PRIVATE, true);
startActivity(intent);
+
+ } else {
+ // Gotta format to get there
+ StorageWizardFormatConfirm.showPublic(this, mDisk.getId());
}
}
- /**
- * Task that classifies the contents of a mounted storage device, and sets a
- * recommended default operation based on result.
- */
- public class ClassifyTask extends AsyncTask<File, Void, Integer> {
- @Override
- protected Integer doInBackground(File... params) {
- int classes = Environment.classifyExternalStorageDirectory(params[0]);
- Log.v(TAG, "Classified " + params[0] + " as "
- + DebugUtils.flagsToString(Environment.class, "HAS_", classes));
- return classes;
- }
-
- @Override
- protected void onPostExecute(Integer classes) {
- if (classes == 0) {
- // Empty is strong signal for adopt
- mRadioInternal.setChecked(true);
- } else if ((classes & (Environment.HAS_PICTURES | Environment.HAS_DCIM)) != 0) {
- // Photos is strong signal for portable
- mRadioExternal.setChecked(true);
- }
- }
+ public void onNavigateInternal(View view) {
+ StorageWizardFormatConfirm.showPrivate(this, mDisk.getId());
}
}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrate.java b/src/com/android/settings/deviceinfo/StorageWizardMigrate.java
deleted file mode 100644
index 148282f..0000000
--- a/src/com/android/settings/deviceinfo/StorageWizardMigrate.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2015 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.deviceinfo;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.storage.DiskInfo;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.RadioButton;
-
-import com.android.settings.R;
-
-public class StorageWizardMigrate extends StorageWizardBase {
- private MigrateEstimateTask mEstimate;
-
- private RadioButton mRadioNow;
- private RadioButton mRadioLater;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- if (mDisk == null) {
- finish();
- return;
- }
- setContentView(R.layout.storage_wizard_migrate);
-
- setIllustrationType(ILLUSTRATION_INTERNAL);
- setHeaderText(R.string.storage_wizard_migrate_title, mDisk.getDescription());
- setBodyText(R.string.memory_calculating_size);
-
- mRadioNow = (RadioButton) findViewById(R.id.storage_wizard_migrate_now);
- mRadioLater = (RadioButton) findViewById(R.id.storage_wizard_migrate_later);
-
- mRadioNow.setOnCheckedChangeListener(mRadioListener);
- mRadioLater.setOnCheckedChangeListener(mRadioListener);
-
- getNextButton().setEnabled(false);
-
- mEstimate = new MigrateEstimateTask(this) {
- @Override
- public void onPostExecute(String size, String time) {
- setBodyText(R.string.storage_wizard_migrate_body,
- mDisk.getDescription(), time, size);
- }
- };
-
- mEstimate.copyFrom(getIntent());
- mEstimate.execute();
- }
-
- private final OnCheckedChangeListener mRadioListener = new OnCheckedChangeListener() {
- @Override
- public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
- if (isChecked) {
- if (buttonView == mRadioNow) {
- mRadioLater.setChecked(false);
- } else if (buttonView == mRadioLater) {
- mRadioNow.setChecked(false);
- }
- getNextButton().setEnabled(true);
- }
- }
- };
-
- @Override
- public void onNavigateNext() {
- if (mRadioNow.isChecked()) {
- final Intent intent = new Intent(this, StorageWizardMigrateConfirm.class);
- intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
- mEstimate.copyTo(intent);
- startActivity(intent);
- } else if (mRadioLater.isChecked()) {
- final Intent intent = new Intent(this, StorageWizardReady.class);
- intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
- startActivity(intent);
- }
- }
-}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
index 8c8b90e..755f093 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
@@ -28,6 +28,7 @@
import android.os.storage.VolumeInfo;
import android.text.TextUtils;
import android.util.Log;
+import android.view.View;
import android.widget.Toast;
import com.android.settings.R;
@@ -57,30 +58,35 @@
return;
}
- final String sourceDescrip = mStorage.getBestVolumeDescription(sourceVol);
- final String targetDescrip = mStorage.getBestVolumeDescription(mVolume);
-
- setIllustrationType(ILLUSTRATION_INTERNAL);
- setHeaderText(R.string.storage_wizard_migrate_confirm_title, targetDescrip);
+ setIcon(R.drawable.ic_swap_horiz);
+ setHeaderText(R.string.storage_wizard_migrate_v2_title, mDisk.getShortDescription());
setBodyText(R.string.memory_calculating_size);
- setSecondaryBodyText(R.string.storage_wizard_migrate_details, targetDescrip);
+ setAuxChecklist();
mEstimate = new MigrateEstimateTask(this) {
@Override
public void onPostExecute(String size, String time) {
- setBodyText(R.string.storage_wizard_migrate_confirm_body, time, size,
- sourceDescrip);
+ setBodyText(R.string.storage_wizard_migrate_v2_body,
+ mDisk.getDescription(), size, time);
}
};
mEstimate.copyFrom(getIntent());
mEstimate.execute();
- getNextButton().setText(R.string.storage_wizard_migrate_confirm_next);
+ setBackButtonText(R.string.storage_wizard_migrate_v2_later);
+ setNextButtonText(R.string.storage_wizard_migrate_v2_now);
}
@Override
- public void onNavigateNext() {
+ public void onNavigateBack(View view) {
+ final Intent intent = new Intent(this, StorageWizardReady.class);
+ intent.putExtra(EXTRA_MIGRATE_SKIP, true);
+ startActivity(intent);
+ }
+
+ @Override
+ public void onNavigateNext(View view) {
// Ensure that all users are unlocked so that we can move their data
if (StorageManager.isFileEncryptedNativeOrEmulated()) {
for (UserInfo user : getSystemService(UserManager.class).getUsers()) {
@@ -134,7 +140,7 @@
if (resultCode == RESULT_OK) {
// Credentials confirmed, so storage should be unlocked; let's
// go look for the next locked user.
- onNavigateNext();
+ onNavigateNext(null);
} else {
// User wasn't able to confirm credentials, so we're okay
// landing back at the wizard page again, where they read
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java
index ade3bfa..60f3cb5 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java
@@ -16,6 +16,10 @@
package com.android.settings.deviceinfo;
+import static android.content.pm.PackageManager.EXTRA_MOVE_ID;
+
+import static com.android.settings.deviceinfo.StorageSettings.TAG;
+
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
@@ -24,14 +28,10 @@
import android.os.Handler;
import android.os.storage.DiskInfo;
import android.util.Log;
-import android.view.View;
import android.widget.Toast;
import com.android.settings.R;
-import static android.content.pm.PackageManager.EXTRA_MOVE_ID;
-import static com.android.settings.deviceinfo.StorageSettings.TAG;
-
public class StorageWizardMigrateProgress extends StorageWizardBase {
private static final String ACTION_FINISH_WIZARD = "com.android.systemui.action.FINISH_WIZARD";
@@ -48,12 +48,9 @@
mMoveId = getIntent().getIntExtra(EXTRA_MOVE_ID, -1);
- final String descrip = mStorage.getBestVolumeDescription(mVolume);
- setIllustrationType(ILLUSTRATION_INTERNAL);
- setHeaderText(R.string.storage_wizard_migrate_progress_title, descrip);
- setBodyText(R.string.storage_wizard_migrate_details, descrip);
-
- getNextButton().setVisibility(View.GONE);
+ setIcon(R.drawable.ic_swap_horiz);
+ setHeaderText(R.string.storage_wizard_migrate_progress_v2_title);
+ setAuxChecklist();
// Register for updates and push through current status
getPackageManager().registerMoveCallback(mCallback, new Handler());
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
index e82612c..10b78af 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
@@ -32,6 +32,7 @@
import android.os.storage.StorageManager;
import android.text.TextUtils;
import android.util.Log;
+import android.view.View;
import com.android.internal.util.Preconditions;
import com.android.settings.R;
@@ -67,15 +68,15 @@
final String appName = getPackageManager().getApplicationLabel(mApp).toString();
final String volumeName = mStorage.getBestVolumeDescription(mVolume);
- setIllustrationType(ILLUSTRATION_INTERNAL);
+ setIcon(R.drawable.ic_swap_horiz);
setHeaderText(R.string.storage_wizard_move_confirm_title, appName);
setBodyText(R.string.storage_wizard_move_confirm_body, appName, volumeName);
- getNextButton().setText(R.string.move_app);
+ setNextButtonText(R.string.move_app);
}
@Override
- public void onNavigateNext() {
+ public void onNavigateNext(View view) {
// Ensure that all users are unlocked so that we can move their data
if (StorageManager.isFileEncryptedNativeOrEmulated()) {
for (UserInfo user : getSystemService(UserManager.class).getUsers()) {
@@ -108,7 +109,7 @@
if (resultCode == RESULT_OK) {
// Credentials confirmed, so storage should be unlocked; let's
// go look for the next locked user.
- onNavigateNext();
+ onNavigateNext(null);
} else {
// User wasn't able to confirm credentials, so we're okay
// landing back at the wizard page again, where they read
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java b/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java
index 69247f6..1f393c5 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java
@@ -46,12 +46,10 @@
final String appName = getIntent().getStringExtra(EXTRA_TITLE);
final String volumeName = mStorage.getBestVolumeDescription(mVolume);
- setIllustrationType(ILLUSTRATION_INTERNAL);
+ setIcon(R.drawable.ic_swap_horiz);
setHeaderText(R.string.storage_wizard_move_progress_title, appName);
setBodyText(R.string.storage_wizard_move_progress_body, volumeName, appName);
- getNextButton().setVisibility(View.GONE);
-
// Register for updates and push through current status
getPackageManager().registerMoveCallback(mCallback, new Handler());
mCallback.onStatusChanged(mMoveId, getPackageManager().getMoveStatus(mMoveId), -1);
diff --git a/src/com/android/settings/deviceinfo/StorageWizardReady.java b/src/com/android/settings/deviceinfo/StorageWizardReady.java
index ac5cf44..55f4ba1 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardReady.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardReady.java
@@ -18,10 +18,12 @@
import android.os.Bundle;
import android.os.storage.VolumeInfo;
+import android.view.View;
import com.android.settings.R;
public class StorageWizardReady extends StorageWizardBase {
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -31,27 +33,23 @@
}
setContentView(R.layout.storage_wizard_generic);
- setHeaderText(R.string.storage_wizard_ready_title, mDisk.getDescription());
+ setHeaderText(R.string.storage_wizard_ready_title, mDisk.getShortDescription());
- // TODO: handle mixed partition cases instead of just guessing based on
- // first volume type we encounter
- final VolumeInfo publicVol = findFirstVolume(VolumeInfo.TYPE_PUBLIC);
final VolumeInfo privateVol = findFirstVolume(VolumeInfo.TYPE_PRIVATE);
- if (publicVol != null) {
- setIllustrationType(ILLUSTRATION_PORTABLE);
- setBodyText(R.string.storage_wizard_ready_external_body,
- mDisk.getDescription());
- } else if (privateVol != null) {
- setIllustrationType(ILLUSTRATION_INTERNAL);
- setBodyText(R.string.storage_wizard_ready_internal_body,
+ final boolean migrateSkip = getIntent().getBooleanExtra(EXTRA_MIGRATE_SKIP, false);
+ if (privateVol != null && !migrateSkip) {
+ setBodyText(R.string.storage_wizard_ready_v2_internal_body,
+ mDisk.getDescription(), mDisk.getShortDescription());
+ } else {
+ setBodyText(R.string.storage_wizard_ready_v2_external_body,
mDisk.getDescription());
}
- getNextButton().setText(R.string.done);
+ setNextButtonText(R.string.done);
}
@Override
- public void onNavigateNext() {
+ public void onNavigateNext(View view) {
finishAffinity();
}
}
diff --git a/src/com/android/settings/display/ColorModePreferenceController.java b/src/com/android/settings/display/ColorModePreferenceController.java
index 7fa9782..31f5393 100644
--- a/src/com/android/settings/display/ColorModePreferenceController.java
+++ b/src/com/android/settings/display/ColorModePreferenceController.java
@@ -41,7 +41,9 @@
@Override
public int getAvailabilityStatus() {
- return mConfigWrapper.isScreenWideColorGamut() ? AVAILABLE : DISABLED_FOR_USER;
+ return mConfigWrapper.isScreenWideColorGamut()
+ && !getColorDisplayController().getAccessibilityTransformActivated() ?
+ AVAILABLE : DISABLED_FOR_USER;
}
@Override
diff --git a/src/com/android/settings/display/ColorModePreferenceFragment.java b/src/com/android/settings/display/ColorModePreferenceFragment.java
index 6e4bd1f..9f947e9 100644
--- a/src/com/android/settings/display/ColorModePreferenceFragment.java
+++ b/src/com/android/settings/display/ColorModePreferenceFragment.java
@@ -16,7 +16,6 @@
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.support.annotation.VisibleForTesting;
-import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.internal.app.ColorDisplayController;
@@ -25,7 +24,6 @@
import com.android.settings.applications.LayoutPreference;
import com.android.settings.R;
import com.android.settings.widget.RadioButtonPickerFragment;
-import com.android.settings.widget.RadioButtonPreference;
import com.android.settingslib.widget.CandidateInfo;
import java.util.Arrays;
@@ -41,9 +39,6 @@
static final String KEY_COLOR_MODE_BOOSTED = "color_mode_boosted";
@VisibleForTesting
static final String KEY_COLOR_MODE_SATURATED = "color_mode_saturated";
- // TODO have a real key for "automatic" rather than just re-using "saturated"
- @VisibleForTesting
- static final String KEY_COLOR_MODE_AUTOMATIC = "color_mode_saturated";
private ColorDisplayController mController;
@@ -84,25 +79,22 @@
@Override
protected List<? extends CandidateInfo> getCandidates() {
Context c = getContext();
- final boolean enabled = !mController.getAccessibilityTransformActivated();
return Arrays.asList(
new ColorModeCandidateInfo(c.getText(R.string.color_mode_option_natural),
- KEY_COLOR_MODE_NATURAL, enabled),
+ KEY_COLOR_MODE_NATURAL, true /* enabled */),
new ColorModeCandidateInfo(c.getText(R.string.color_mode_option_boosted),
- KEY_COLOR_MODE_BOOSTED, enabled),
+ KEY_COLOR_MODE_BOOSTED, true /* enabled */),
new ColorModeCandidateInfo(c.getText(R.string.color_mode_option_saturated),
- KEY_COLOR_MODE_SATURATED, enabled),
- new ColorModeCandidateInfo(c.getText(R.string.color_mode_option_automatic),
- KEY_COLOR_MODE_AUTOMATIC, enabled)
+ KEY_COLOR_MODE_SATURATED, true /* enabled */)
);
}
@Override
protected String getDefaultKey() {
- if (mController.getColorMode() == ColorDisplayController.COLOR_MODE_SATURATED) {
+ final int colorMode = mController.getColorMode();
+ if (colorMode == ColorDisplayController.COLOR_MODE_SATURATED) {
return KEY_COLOR_MODE_SATURATED;
- }
- if (mController.getColorMode() == ColorDisplayController.COLOR_MODE_BOOSTED) {
+ } else if (colorMode == ColorDisplayController.COLOR_MODE_BOOSTED) {
return KEY_COLOR_MODE_BOOSTED;
}
return KEY_COLOR_MODE_NATURAL;
@@ -158,16 +150,10 @@
@Override
public void onAccessibilityTransformChanged(boolean state) {
- // Disable controls when a11y transforms are enabled, and vice versa
- final PreferenceScreen screen = getPreferenceScreen();
- if (screen != null) {
- final int count = screen.getPreferenceCount();
- for (int i = 0; i < count; i++) {
- final Preference pref = screen.getPreference(i);
- if (pref instanceof RadioButtonPreference) {
- pref.setEnabled(!state);
- }
- }
+ // Color modes are no not configurable when Accessibility transforms are enabled. Close
+ // this fragment in that case.
+ if (state) {
+ getActivity().onBackPressed();
}
}
}
diff --git a/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java
index fce8a65..7fdf829 100644
--- a/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java
@@ -72,8 +72,8 @@
mAppInfos = BatteryTipUtils.getRestrictedAppsList(mAppOpsManager, mUserManager);
final int num = mAppInfos.size();
- // Enable the preference if some apps already been restricted, otherwise disable it
- preference.setEnabled(num > 0);
+ // Don't show it if no app been restricted
+ preference.setVisible(num > 0);
preference.setSummary(
mContext.getResources().getQuantityString(R.plurals.restricted_app_summary, num,
num));
diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
index 7720dcc..8928efd 100644
--- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
+++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
@@ -175,7 +175,7 @@
metricsFeatureProvider.action(context,
MetricsProto.MetricsEvent.ACTION_ANOMALY_TRIGGERED,
packageName,
- Pair.create(MetricsProto.MetricsEvent.FIELD_CONTEXT,
+ Pair.create(MetricsProto.MetricsEvent.FIELD_ANOMALY_TYPE,
anomalyInfo.anomalyType));
}
}
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java
index 17284a0..5520bf3 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java
@@ -47,6 +47,10 @@
private static final String KEY_DATA_HISTORY_RETAIN_DAY = "data_history_retain_day";
private static final String KEY_EXCESSIVE_BG_DRAIN_PERCENTAGE = "excessive_bg_drain_percentage";
+ private static final String KEY_TEST_BATTERY_SAVER_TIP = "test_battery_saver_tip";
+ private static final String KEY_TEST_HIGH_USAGE_TIP = "test_high_usage_tip";
+ private static final String KEY_TEST_SMART_BATTERY_TIP = "test_smart_battery_tip";
+
/**
* {@code true} if general battery tip is enabled
*
@@ -164,6 +168,30 @@
*/
public final int excessiveBgDrainPercentage;
+ /**
+ * {@code true} if we want to test battery saver tip.
+ *
+ * @see Settings.Global#BATTERY_TIP_CONSTANTS
+ * @see #KEY_TEST_BATTERY_SAVER_TIP
+ */
+ public final boolean testBatterySaverTip;
+
+ /**
+ * {@code true} if we want to test high usage tip.
+ *
+ * @see Settings.Global#BATTERY_TIP_CONSTANTS
+ * @see #KEY_TEST_HIGH_USAGE_TIP
+ */
+ public final boolean testHighUsageTip;
+
+ /**
+ * {@code true} if we want to test smart battery tip.
+ *
+ * @see Settings.Global#BATTERY_TIP_CONSTANTS
+ * @see #KEY_TEST_SMART_BATTERY_TIP
+ */
+ public final boolean testSmartBatteryTip;
+
private final KeyValueListParser mParser;
public BatteryTipPolicy(Context context) {
@@ -197,6 +225,10 @@
lowBatteryHour = mParser.getInt(KEY_LOW_BATTERY_HOUR, 16);
dataHistoryRetainDay = mParser.getInt(KEY_DATA_HISTORY_RETAIN_DAY, 30);
excessiveBgDrainPercentage = mParser.getInt(KEY_EXCESSIVE_BG_DRAIN_PERCENTAGE, 10);
+
+ testBatterySaverTip = mParser.getBoolean(KEY_TEST_BATTERY_SAVER_TIP, false);
+ testHighUsageTip = mParser.getBoolean(KEY_TEST_HIGH_USAGE_TIP, false);
+ testSmartBatteryTip = mParser.getBoolean(KEY_TEST_SMART_BATTERY_TIP, false);
}
}
diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetector.java
index a10c8f1..9b6b9b5 100644
--- a/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetector.java
+++ b/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetector.java
@@ -53,7 +53,7 @@
batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) == 0;
final boolean powerSaveModeOn = mPowerManager.isPowerSaveMode();
final boolean earlyWarning = mPowerUsageFeatureProvider.getEarlyWarningSignal(mContext,
- EarlyWarningDetector.class.getName());
+ EarlyWarningDetector.class.getName()) || mPolicy.testBatterySaverTip;
final int state = powerSaveModeOn
? BatteryTip.StateType.HANDLED
diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java
index 1b6e2f0..8435c52 100644
--- a/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java
+++ b/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java
@@ -34,6 +34,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.concurrent.TimeUnit;
/**
* Detector whether to show summary tip. This detector should be executed as the last
@@ -65,7 +66,7 @@
final long screenUsageTimeMs = mBatteryUtils.calculateScreenUsageTime(mBatteryStatsHelper);
if (mPolicy.highUsageEnabled) {
parseBatteryData();
- if (mDataParser.isDeviceHeavilyUsed()) {
+ if (mDataParser.isDeviceHeavilyUsed() || mPolicy.testHighUsageTip) {
final List<BatterySipper> batterySippers = mBatteryStatsHelper.getUsageList();
for (int i = 0, size = batterySippers.size(); i < size; i++) {
final BatterySipper batterySipper = batterySippers.get(i);
@@ -84,6 +85,14 @@
}
}
+ // When in test mode, add an app if necessary
+ if (mPolicy.testHighUsageTip && mHighUsageAppList.isEmpty()) {
+ mHighUsageAppList.add(new AppInfo.Builder()
+ .setPackageName("com.android.settings")
+ .setScreenOnTimeMs(TimeUnit.HOURS.toMillis(3))
+ .build());
+ }
+
Collections.sort(mHighUsageAppList, Collections.reverseOrder());
mHighUsageAppList = mHighUsageAppList.subList(0,
Math.min(mPolicy.highUsageAppCount, mHighUsageAppList.size()));
diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetector.java
index bff324d..ecd595e 100644
--- a/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetector.java
+++ b/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetector.java
@@ -38,10 +38,10 @@
@Override
public BatteryTip detect() {
// Show it if there is no other tips shown
- final boolean smartBatteryOn = Settings.Global.getInt(mContentResolver,
- Settings.Global.APP_STANDBY_ENABLED, 1) != 0;
+ final boolean smartBatteryOff = Settings.Global.getInt(mContentResolver,
+ Settings.Global.APP_STANDBY_ENABLED, 1) == 0 || mPolicy.testSmartBatteryTip;
final int state =
- smartBatteryOn ? BatteryTip.StateType.INVISIBLE : BatteryTip.StateType.NEW;
+ smartBatteryOff ? BatteryTip.StateType.NEW : BatteryTip.StateType.INVISIBLE;
return new SmartBatteryTip(state);
}
}
diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java
index f6fe82c..439819c 100644
--- a/src/com/android/settings/gestures/GestureSettings.java
+++ b/src/com/android/settings/gestures/GestureSettings.java
@@ -64,19 +64,6 @@
}
@Override
- protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
- return buildPreferenceControllers(context, getLifecycle());
- }
-
- static List<AbstractPreferenceController> buildPreferenceControllers(
- @NonNull Context context, @Nullable Lifecycle lifecycle) {
- final List<AbstractPreferenceController> controllers = new ArrayList<>();
- controllers.add(new PreventRingingPreferenceController(
- context, lifecycle, UserHandle.myUserId(), KEY_PREVENT_RINGING));
- return controllers;
- }
-
- @Override
public void onAttach(Context context) {
super.onAttach(context);
use(AssistGestureSettingsPreferenceController.class).setAssistOnly(false);
@@ -102,12 +89,6 @@
}
@Override
- public List<AbstractPreferenceController> createPreferenceControllers(
- Context context) {
- return buildPreferenceControllers(context, null);
- }
-
- @Override
public List<String> getNonIndexableKeys(Context context) {
List<String> keys = super.getNonIndexableKeys(context);
// Duplicates in summary and details pages.
@@ -117,6 +98,7 @@
keys.add(KEY_DOUBLE_TWIST);
keys.add(KEY_DOUBLE_TAP_SCREEN);
keys.add(KEY_PICK_UP);
+ keys.add(KEY_PREVENT_RINGING);
return keys;
}
diff --git a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
index e4e24d8..1eb188a 100644
--- a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
+++ b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
@@ -27,6 +27,7 @@
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
+import java.util.ArrayList;
import java.util.List;
public class GesturesSettingPreferenceController extends BasePreferenceController {
@@ -63,8 +64,7 @@
@NonNull Context context) {
final AmbientDisplayConfiguration ambientDisplayConfiguration =
new AmbientDisplayConfiguration(context);
- final List<AbstractPreferenceController> controllers =
- GestureSettings.buildPreferenceControllers(context, null);
+ final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new AssistGestureSettingsPreferenceController(context, FAKE_PREF_KEY)
.setAssistOnly(false));
@@ -75,6 +75,7 @@
.setConfig(ambientDisplayConfiguration));
controllers.add(new DoubleTapScreenPreferenceController(context, FAKE_PREF_KEY)
.setConfig(ambientDisplayConfiguration));
+ controllers.add(new PreventRingingPreferenceController(context, FAKE_PREF_KEY));
return controllers;
}
diff --git a/src/com/android/settings/gestures/PreventRingingGestureSettings.java b/src/com/android/settings/gestures/PreventRingingGestureSettings.java
index 9897b48..09570df 100644
--- a/src/com/android/settings/gestures/PreventRingingGestureSettings.java
+++ b/src/com/android/settings/gestures/PreventRingingGestureSettings.java
@@ -61,19 +61,6 @@
return 0;
}
- @Override
- protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
- return buildPreferenceControllers(context, getLifecycle());
- }
-
- private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
- Lifecycle lifecycle) {
- final List<AbstractPreferenceController> controllers = new ArrayList<>();
- controllers.add(new PreventRingingPreferenceController(context, lifecycle,
- UserHandle.myUserId(), KEY_PREVENT_RINGING));
- return controllers;
- }
-
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
@@ -83,12 +70,6 @@
sir.xmlResId = R.xml.prevent_ringing_gesture_settings;
return Arrays.asList(sir);
}
-
- @Override
- public List<AbstractPreferenceController> createPreferenceControllers(
- Context context) {
- return buildPreferenceControllers(context, null /* lifecycle */);
- }
};
}
diff --git a/src/com/android/settings/gestures/PreventRingingPreferenceController.java b/src/com/android/settings/gestures/PreventRingingPreferenceController.java
index 3255c92..493755f 100644
--- a/src/com/android/settings/gestures/PreventRingingPreferenceController.java
+++ b/src/com/android/settings/gestures/PreventRingingPreferenceController.java
@@ -21,7 +21,6 @@
import static android.provider.Settings.Secure.VOLUME_HUSH_OFF;
import static android.provider.Settings.Secure.VOLUME_HUSH_VIBRATE;
-import android.annotation.UserIdInt;
import android.content.Context;
import android.os.Bundle;
import android.provider.Settings;
@@ -31,22 +30,20 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.widget.VideoPreference;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnCreate;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
-public class PreventRingingPreferenceController extends AbstractPreferenceController
+public class PreventRingingPreferenceController extends BasePreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
LifecycleObserver, OnResume, OnPause, OnCreate, OnSaveInstanceState {
private static final String PREF_KEY_VIDEO = "gesture_prevent_ringing_video";
- private final String mPrefKey;
@VisibleForTesting
static final String KEY_VIDEO_PAUSED = "key_video_paused";
@@ -56,17 +53,15 @@
private final String SECURE_KEY = VOLUME_HUSH_GESTURE;
- @UserIdInt
- private final int mUserId;
+ public PreventRingingPreferenceController(Context context, String key) {
+ super(context, key);
+ }
- public PreventRingingPreferenceController(Context context, Lifecycle lifecycle,
- @UserIdInt int userId, String key) {
- super(context);
- if (lifecycle != null) {
- lifecycle.addObserver(this);
- }
- mUserId = userId;
- mPrefKey = key;
+ @Override
+ public int getAvailabilityStatus() {
+ return mContext.getResources().getBoolean(
+ com.android.internal.R.bool.config_volumeHushGestureEnabled)
+ ? AVAILABLE : DISABLED_UNSUPPORTED;
}
@Override
@@ -144,22 +139,11 @@
}
}
- @Override
- public boolean isAvailable() {
- return mContext.getResources()
- .getBoolean(com.android.internal.R.bool.config_volumeHushGestureEnabled);
- }
-
protected String getVideoPrefKey() {
return PREF_KEY_VIDEO;
}
@Override
- public String getPreferenceKey() {
- return mPrefKey;
- }
-
- @Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
int value = Integer.parseInt((String) newValue);
Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY, value);
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index d334b92..c028298 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -167,9 +167,9 @@
getPreferenceScreen().addPreference(groupCategory);
mDynamicPreferences.add(groupCategory);
if (group.getId() == null) {
- groupCategory.setTitle(mChannelGroupList.size() > 1
- ? R.string.notification_channels_other
- : R.string.notification_channels);
+ if (mChannelGroupList.size() > 1) {
+ groupCategory.setTitle(R.string.notification_channels_other);
+ }
groupCategory.setKey(KEY_GENERAL_CATEGORY);
} else {
groupCategory.setTitle(group.getName());
diff --git a/src/com/android/settings/notification/BadgePreferenceController.java b/src/com/android/settings/notification/BadgePreferenceController.java
index 8f0376c..e768ad1 100644
--- a/src/com/android/settings/notification/BadgePreferenceController.java
+++ b/src/com/android/settings/notification/BadgePreferenceController.java
@@ -57,7 +57,7 @@
return false;
}
if (mChannel != null) {
- if (NotificationChannel.DEFAULT_CHANNEL_ID.equals(mChannel.getId())) {
+ if (isDefaultChannel()) {
return true;
} else {
return mAppRow.showBadge;
diff --git a/src/com/android/settings/notification/BlockPreferenceController.java b/src/com/android/settings/notification/BlockPreferenceController.java
index 9ea29fe..7c6201e 100644
--- a/src/com/android/settings/notification/BlockPreferenceController.java
+++ b/src/com/android/settings/notification/BlockPreferenceController.java
@@ -98,8 +98,7 @@
// it was blocked and we are unblocking it.
if (blocked || originalImportance == IMPORTANCE_NONE) {
final int importance = blocked ? IMPORTANCE_NONE
- : DEFAULT_CHANNEL_ID.equals(mChannel.getId())
- ? IMPORTANCE_UNSPECIFIED : IMPORTANCE_DEFAULT;
+ : isDefaultChannel() ? IMPORTANCE_UNSPECIFIED : IMPORTANCE_DEFAULT;
mChannel.setImportance(importance);
saveChannel();
}
diff --git a/src/com/android/settings/notification/HeaderPreferenceController.java b/src/com/android/settings/notification/HeaderPreferenceController.java
index ff687e8..d5e289b 100644
--- a/src/com/android/settings/notification/HeaderPreferenceController.java
+++ b/src/com/android/settings/notification/HeaderPreferenceController.java
@@ -31,6 +31,8 @@
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.widget.EntityHeaderController;
+import java.util.Objects;
+
public class HeaderPreferenceController extends NotificationPreferenceController
implements PreferenceControllerMixin {
@@ -72,7 +74,7 @@
}
CharSequence getLabel() {
- return mChannel != null ? mChannel.getName()
+ return (mChannel != null && !isDefaultChannel()) ? mChannel.getName()
: mChannelGroup != null
? mChannelGroup.getName()
: mAppRow.label;
@@ -80,7 +82,7 @@
@Override
public CharSequence getSummary() {
- if (mChannel != null) {
+ if (mChannel != null && !isDefaultChannel()) {
if (mChannelGroup != null
&& !TextUtils.isEmpty(mChannelGroup.getName())) {
final SpannableStringBuilder summary = new SpannableStringBuilder();
diff --git a/src/com/android/settings/notification/ImportancePreferenceController.java b/src/com/android/settings/notification/ImportancePreferenceController.java
index f95c34a..60b2ebe 100644
--- a/src/com/android/settings/notification/ImportancePreferenceController.java
+++ b/src/com/android/settings/notification/ImportancePreferenceController.java
@@ -58,7 +58,7 @@
if (mChannel == null) {
return false;
}
- return !NotificationChannel.DEFAULT_CHANNEL_ID.equals(mChannel.getId());
+ return !isDefaultChannel();
}
@Override
diff --git a/src/com/android/settings/notification/LightsPreferenceController.java b/src/com/android/settings/notification/LightsPreferenceController.java
index 230c3e2..9d5a6c5 100644
--- a/src/com/android/settings/notification/LightsPreferenceController.java
+++ b/src/com/android/settings/notification/LightsPreferenceController.java
@@ -50,8 +50,9 @@
if (mChannel == null) {
return false;
}
- return checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT) && canPulseLight()
- && !NotificationChannel.DEFAULT_CHANNEL_ID.equals(mChannel.getId());
+ return checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT)
+ && canPulseLight()
+ && !isDefaultChannel();
}
public void updateState(Preference preference) {
diff --git a/src/com/android/settings/notification/NotificationPreferenceController.java b/src/com/android/settings/notification/NotificationPreferenceController.java
index c0bb705..1a65351 100644
--- a/src/com/android/settings/notification/NotificationPreferenceController.java
+++ b/src/com/android/settings/notification/NotificationPreferenceController.java
@@ -184,4 +184,11 @@
protected boolean hasValidGroup() {
return mChannelGroup != null;
}
+
+ protected final boolean isDefaultChannel() {
+ if (mChannel == null) {
+ return false;
+ }
+ return Objects.equals(NotificationChannel.DEFAULT_CHANNEL_ID, mChannel.getId());
+ }
}
diff --git a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
index 3867640..4079099 100644
--- a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
+++ b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
@@ -37,14 +37,13 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.applications.AppInfoBase;
-import com.android.settings.applications.InstalledAppCounter;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.SubSettingLauncher;
+import com.android.settingslib.TwoTargetPreference;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.utils.StringUtil;
-import com.android.settingslib.wrapper.PackageManagerWrapper;
import java.util.ArrayList;
import java.util.Arrays;
@@ -211,6 +210,7 @@
pref.setKey(pkgName);
pref.setTitle(appEntry.label);
pref.setIcon(mIconDrawableFactory.getBadgedIcon(appEntry.info));
+ pref.setIconSize(TwoTargetPreference.ICON_SIZE_SMALL);
pref.setSummary(StringUtil.formatRelativeTime(mContext,
System.currentTimeMillis() - app.getLastNotified(), true));
pref.setOrder(i);
diff --git a/src/com/android/settings/notification/SoundPreferenceController.java b/src/com/android/settings/notification/SoundPreferenceController.java
index e4414b6..4ae6ebe 100644
--- a/src/com/android/settings/notification/SoundPreferenceController.java
+++ b/src/com/android/settings/notification/SoundPreferenceController.java
@@ -59,8 +59,7 @@
if (mChannel == null) {
return false;
}
- return checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT)
- && !NotificationChannel.DEFAULT_CHANNEL_ID.equals(mChannel.getId());
+ return checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT) && !isDefaultChannel();
}
@Override
diff --git a/src/com/android/settings/notification/VibrationPreferenceController.java b/src/com/android/settings/notification/VibrationPreferenceController.java
index f9b786d..9df8e04 100644
--- a/src/com/android/settings/notification/VibrationPreferenceController.java
+++ b/src/com/android/settings/notification/VibrationPreferenceController.java
@@ -47,7 +47,7 @@
return false;
}
return checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT)
- && !NotificationChannel.DEFAULT_CHANNEL_ID.equals(mChannel.getId())
+ && !isDefaultChannel()
&& mVibrator != null
&& mVibrator.hasVibrator();
}
diff --git a/src/com/android/settings/notification/ZenOnboardingActivity.java b/src/com/android/settings/notification/ZenOnboardingActivity.java
new file mode 100644
index 0000000..b38bad6
--- /dev/null
+++ b/src/com/android/settings/notification/ZenOnboardingActivity.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2018 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.app.Activity;
+import android.app.NotificationManager;
+import android.content.Intent;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.view.View;
+import android.widget.CheckBox;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+
+public class ZenOnboardingActivity extends Activity {
+
+ private NotificationManager mNm;
+ private MetricsLogger mMetrics;
+ CheckBox mScreenOn;
+ CheckBox mScreenOff;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setNotificationManager(getSystemService(NotificationManager.class));
+ setMetricsLogger(new MetricsLogger());
+
+ setupUI();
+ }
+
+ @VisibleForTesting
+ protected void setupUI() {
+ setContentView(R.layout.zen_onboarding);
+ mScreenOn = findViewById(R.id.screen_on_option);
+ mScreenOff = findViewById(R.id.screen_off_option);
+ mScreenOn.setChecked(true);
+ mScreenOff.setChecked(true);
+
+ mMetrics.visible(MetricsEvent.SETTINGS_ZEN_ONBOARDING);
+ }
+
+ @VisibleForTesting
+ protected void setNotificationManager(NotificationManager nm) {
+ mNm = nm;
+ }
+
+ @VisibleForTesting
+ protected void setMetricsLogger(MetricsLogger ml) {
+ mMetrics = ml;
+ }
+
+ public void logClick(View view) {
+ CheckBox checkbox = (CheckBox) view;
+ switch (checkbox.getId()) {
+ case R.id.screen_on_option:
+ mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_SCREEN_ON, checkbox.isChecked());
+ break;
+ case R.id.screen_off_option:
+ mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_SCREEN_OFF,
+ checkbox.isChecked());
+ break;
+ }
+ }
+
+ public void launchSettings(View button) {
+ mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_SETTINGS);
+ Intent settings = new Intent(Settings.ZEN_MODE_BLOCKED_EFFECTS_SETTINGS);
+ settings.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+ startActivity(settings);
+ }
+
+ public void save(View button) {
+ mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_OK);
+ NotificationManager.Policy policy = mNm.getNotificationPolicy();
+ int currentEffects = policy.suppressedVisualEffects;
+
+ currentEffects = NotificationManager.Policy.toggleScreenOnEffectsSuppressed(
+ currentEffects, mScreenOn != null && mScreenOn.isChecked());
+ currentEffects = NotificationManager.Policy.toggleScreenOffEffectsSuppressed(
+ currentEffects, mScreenOff != null && mScreenOff.isChecked());
+
+ NotificationManager.Policy newPolicy = new NotificationManager.Policy(
+ policy.priorityCategories, policy.priorityCallSenders,
+ policy.priorityMessageSenders, currentEffects);
+ mNm.setNotificationPolicy(newPolicy);
+
+ finishAndRemoveTask();
+ }
+}
diff --git a/src/com/android/settings/slices/SliceBroadcastReceiver.java b/src/com/android/settings/slices/SliceBroadcastReceiver.java
index 2d6f83e..80b7519 100644
--- a/src/com/android/settings/slices/SliceBroadcastReceiver.java
+++ b/src/com/android/settings/slices/SliceBroadcastReceiver.java
@@ -40,8 +40,6 @@
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
-import androidx.slice.core.SliceHints;
-
/**
* Responds to actions performed on slices and notifies slices of updates in state changes.
*/
@@ -64,7 +62,7 @@
handleToggleAction(context, key, isPlatformDefined);
break;
case ACTION_SLIDER_CHANGED:
- int newPosition = intent.getIntExtra(SliceHints.EXTRA_RANGE_VALUE, -1);
+ int newPosition = intent.getIntExtra(Slice.EXTRA_RANGE_VALUE, -1);
handleSliderAction(context, key, newPosition);
break;
case ACTION_WIFI_CHANGED:
diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java
index c54d138..05f0974 100644
--- a/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -17,6 +17,8 @@
package com.android.settings.slices;
import static androidx.slice.builders.ListBuilder.ICON_IMAGE;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
@@ -47,7 +49,9 @@
import com.android.settingslib.core.AbstractPreferenceController;
import android.support.v4.graphics.drawable.IconCompat;
+
import androidx.slice.Slice;
+import androidx.slice.SliceMetadata;
import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.SliceAction;
@@ -75,7 +79,8 @@
// action name).
FeatureFactory.getFactory(context).getMetricsFeatureProvider()
.action(context, MetricsEvent.ACTION_SETTINGS_SLICE_REQUESTED, sliceNamePair);
- if (!controller.isAvailable()) {
+
+ if (controller.getAvailabilityStatus() != AVAILABLE) {
return buildUnavailableSlice(context, sliceData, controller);
}
@@ -145,6 +150,60 @@
sliceData.getKey());
}
+ /**
+ * @return {@link PendingIntent} for a non-primary {@link SliceAction}.
+ */
+ public static PendingIntent getActionIntent(Context context, String action, SliceData data) {
+ Intent intent = new Intent(action);
+ intent.setClass(context, SliceBroadcastReceiver.class);
+ intent.putExtra(EXTRA_SLICE_KEY, data.getKey());
+ intent.putExtra(EXTRA_SLICE_PLATFORM_DEFINED, data.isPlatformDefined());
+ return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,
+ PendingIntent.FLAG_CANCEL_CURRENT);
+ }
+
+ /**
+ * @return {@link PendingIntent} for the primary {@link SliceAction}.
+ */
+ public static PendingIntent getContentIntent(Context context, SliceData sliceData) {
+ Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(context,
+ sliceData.getFragmentClassName(), sliceData.getKey(), sliceData.getScreenTitle(),
+ 0 /* TODO */);
+ intent.setClassName("com.android.settings", SubSettings.class.getName());
+ return PendingIntent.getActivity(context, 0 /* requestCode */, intent, 0 /* flags */);
+ }
+
+ /**
+ * @return {@link PendingIntent} to the Settings home page.
+ */
+ public static PendingIntent getSettingsIntent(Context context) {
+ final PackageManager manager = context.getPackageManager();
+ final Intent intent = manager.getLaunchIntentForPackage(context.getPackageName());
+ return PendingIntent.getActivity(context, 0 /* requestCode */, intent, 0 /* flags */);
+ }
+
+ /**
+ * @return the summary text for a {@link Slice} built for {@param sliceData}.
+ */
+ public static CharSequence getSubtitleText(Context context,
+ AbstractPreferenceController controller, SliceData sliceData) {
+ CharSequence summaryText;
+ if (controller != null) {
+ summaryText = controller.getSummary();
+
+ if (isValidSummary(context, summaryText)) {
+ return summaryText;
+ }
+ }
+
+ summaryText = sliceData.getSummary();
+ if (isValidSummary(context, summaryText)) {
+ return summaryText;
+ }
+
+ return "";
+ }
+
public static Uri getUri(String path, boolean isPlatformSlice) {
final String authority = isPlatformSlice
? SettingsSlicesContract.AUTHORITY
@@ -227,49 +286,6 @@
return getActionIntent(context, SettingsSliceProvider.ACTION_SLIDER_CHANGED, sliceData);
}
- private static PendingIntent getActionIntent(Context context, String action, SliceData data) {
- Intent intent = new Intent(action);
- intent.setClass(context, SliceBroadcastReceiver.class);
- intent.putExtra(EXTRA_SLICE_KEY, data.getKey());
- intent.putExtra(EXTRA_SLICE_PLATFORM_DEFINED, data.isPlatformDefined());
- return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,
- PendingIntent.FLAG_CANCEL_CURRENT);
- }
-
- private static PendingIntent getContentIntent(Context context, SliceData sliceData) {
- Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(context,
- sliceData.getFragmentClassName(), sliceData.getKey(), sliceData.getScreenTitle(),
- 0 /* TODO */);
- intent.setClassName("com.android.settings", SubSettings.class.getName());
- return PendingIntent.getActivity(context, 0 /* requestCode */, intent, 0 /* flags */);
- }
-
- private static PendingIntent getSettingsIntent(Context context) {
- final PackageManager manager = context.getPackageManager();
- final Intent intent = manager.getLaunchIntentForPackage(context.getPackageName());
- return PendingIntent.getActivity(context, 0 /* requestCode */, intent, 0 /* flags */);
- }
-
- @VisibleForTesting
- static CharSequence getSubtitleText(Context context, AbstractPreferenceController controller,
- SliceData sliceData) {
- CharSequence summaryText;
- if (controller != null) {
- summaryText = controller.getSummary();
-
- if (isValidSummary(context, summaryText)) {
- return summaryText;
- }
- }
-
- summaryText = sliceData.getSummary();
- if (isValidSummary(context, summaryText)) {
- return summaryText;
- }
-
- return "";
- }
-
private static boolean isValidSummary(Context context, CharSequence summary) {
if (summary == null || TextUtils.isEmpty(summary.toString().trim())) {
return false;
diff --git a/src/com/android/settings/widget/ValidatedEditTextPreference.java b/src/com/android/settings/widget/ValidatedEditTextPreference.java
index 580eb58..a5bab1c 100644
--- a/src/com/android/settings/widget/ValidatedEditTextPreference.java
+++ b/src/com/android/settings/widget/ValidatedEditTextPreference.java
@@ -86,9 +86,14 @@
super.onBindViewHolder(holder);
final TextView textView = (TextView) holder.findViewById(android.R.id.summary);
- if (textView != null && mIsSummaryPassword) {
+ if (textView == null) {
+ return;
+ }
+ if (mIsSummaryPassword) {
textView.setInputType(
InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+ } else {
+ textView.setInputType(InputType.TYPE_CLASS_TEXT);
}
}
diff --git a/src/com/android/settings/wifi/WifiUtils.java b/src/com/android/settings/wifi/WifiUtils.java
index 0477280..3e797d7 100644
--- a/src/com/android/settings/wifi/WifiUtils.java
+++ b/src/com/android/settings/wifi/WifiUtils.java
@@ -50,10 +50,11 @@
return ssid.length() < SSID_ASCII_MIN_LENGTH;
}
- public static boolean isPasswordValid(String password) {
+ public static boolean isHotspotPasswordValid(String password) {
if (TextUtils.isEmpty(password)) {
- return false;
+ return true;
}
+
final int length = password.length();
return length >= PASSWORD_MIN_LENGTH && length <= PASSWORD_MAX_LENGTH;
}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
index 0e973ae..8eab9f4 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
@@ -20,11 +20,15 @@
import android.net.wifi.WifiConfiguration;
import android.support.v7.preference.EditTextPreference;
import android.support.v7.preference.Preference;
+import android.text.TextUtils;
import android.util.Log;
+import com.android.settings.R;
import com.android.settings.widget.ValidatedEditTextPreference;
import com.android.settings.wifi.WifiUtils;
+import java.util.UUID;
+
public class WifiTetherPasswordPreferenceController extends WifiTetherBasePreferenceController
implements ValidatedEditTextPreference.Validator {
@@ -49,6 +53,8 @@
if (config != null) {
mPassword = config.preSharedKey;
Log.d(TAG, "Updating password in Preference, " + mPassword);
+ } else {
+ mPassword = generateRandomPassword();
}
((ValidatedEditTextPreference) mPreference).setValidator(this);
((ValidatedEditTextPreference) mPreference).setIsSummaryPassword(true);
@@ -67,13 +73,35 @@
return mPassword;
}
+ public int getSecuritySettingForPassword() {
+ // We should return NONE when no password is set
+ if (TextUtils.isEmpty(mPassword)) {
+ return WifiConfiguration.KeyMgmt.NONE;
+ }
+ // Only other currently supported type is WPA2 so we'll try that
+ return WifiConfiguration.KeyMgmt.WPA2_PSK;
+ }
+
@Override
public boolean isTextValid(String value) {
- return WifiUtils.isPasswordValid(value);
+ return WifiUtils.isHotspotPasswordValid(value);
+ }
+
+ private static String generateRandomPassword() {
+ String randomUUID = UUID.randomUUID().toString();
+ //first 12 chars from xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx
+ return randomUUID.substring(0, 8) + randomUUID.substring(9, 13);
}
private void updatePasswordDisplay(EditTextPreference preference) {
- preference.setText(mPassword);
- preference.setSummary(mPassword);
+ ValidatedEditTextPreference pref = (ValidatedEditTextPreference) preference;
+ pref.setText(mPassword);
+ if (!TextUtils.isEmpty(mPassword)) {
+ pref.setIsSummaryPassword(true);
+ pref.setSummary(mPassword);
+ } else {
+ pref.setIsSummaryPassword(false);
+ pref.setSummary(R.string.wifi_hotspot_no_password_subtext);
+ }
}
}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
index 996c73c..de6243c 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
@@ -161,8 +161,8 @@
config.SSID = mSSIDPreferenceController.getSSID();
config.preSharedKey = mPasswordPreferenceController.getPassword();
- ensureWifiConfigHasPassword(config);
- config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA2_PSK);
+ config.allowedKeyManagement.set(
+ mPasswordPreferenceController.getSecuritySettingForPassword());
config.allowedAuthAlgorithms.set(WifiConfiguration.AuthAlgorithm.OPEN);
config.apBand = mApBandPreferenceController.getBandIndex();
return config;
@@ -183,15 +183,6 @@
}
@VisibleForTesting
- static void ensureWifiConfigHasPassword(WifiConfiguration config) {
- if (TextUtils.isEmpty(config.preSharedKey)) {
- String randomUUID = UUID.randomUUID().toString();
- //first 12 chars from xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx
- config.preSharedKey = randomUUID.substring(0, 8) + randomUUID.substring(9, 13);
- }
- }
-
- @VisibleForTesting
class TetherChangeReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context content, Intent intent) {
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
index bdad9e6..ab08fdb 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
@@ -102,7 +102,7 @@
void startTether() {
mSwitchBar.setEnabled(false);
- mConnectivityManager.startTethering(TETHERING_WIFI, true /* showProvisioningUi */,
+ mConnectivityManager.startTethering(TETHERING_WIFI, false /* showProvisioningUi */,
mOnStartTetheringCallback, new Handler(Looper.getMainLooper()));
}
diff --git a/tests/robotests/src/com/android/settings/accounts/SyncStateSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/SyncStateSwitchPreferenceTest.java
new file mode 100644
index 0000000..0d45418
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accounts/SyncStateSwitchPreferenceTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2018 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.accounts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.accounts.Account;
+import android.content.Context;
+import android.os.UserHandle;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class SyncStateSwitchPreferenceTest {
+
+ private Context mContext;
+ private SyncStateSwitchPreference mPreference;
+
+ @Before
+ public void setup() {
+ mContext = RuntimeEnvironment.application;
+ }
+
+ @Test
+ public void setup_validAuthority_shouldBeVisible() {
+ mPreference = new SyncStateSwitchPreference(mContext, null /* attrs */);
+
+ mPreference.setup(new Account("name", "type"), "authority", mContext.getPackageName(),
+ UserHandle.USER_CURRENT);
+
+ assertThat(mPreference.isVisible()).isTrue();
+ }
+
+ @Test
+ public void setup_emptyAuthority_shouldBeInvisible() {
+ mPreference = new SyncStateSwitchPreference(mContext, null /* attrs */);
+
+ mPreference.setup(new Account("name", "type"), null /* authority */,
+ mContext.getPackageName(), UserHandle.USER_CURRENT);
+
+ assertThat(mPreference.isVisible()).isFalse();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java
index 541aeae..00d02a3 100644
--- a/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java
@@ -39,11 +39,11 @@
private static final long MILLIS_IN_ONE_HOUR = 60 * 60 * 1000;
private static final long MILLIS_IN_ONE_DAY = 24 * MILLIS_IN_ONE_HOUR;
+ private static final long TIMESTAMP_NOW = Integer.MAX_VALUE;
private NetworkStatsHistory mNetworkStatsHistory;
private Context mContext;
private ChartDataUsagePreference mPreference;
- private long mNow;
@Before
public void setUp() {
@@ -51,7 +51,6 @@
mContext = RuntimeEnvironment.application;
mPreference = new ChartDataUsagePreference(mContext, null);
- mNow = System.currentTimeMillis();
mNetworkStatsHistory = spy(new NetworkStatsHistory(MILLIS_IN_ONE_HOUR, 10));
addTestNetworkEntries();
mPreference.setNetworkStats(mNetworkStatsHistory);
@@ -59,8 +58,8 @@
@Test
public void calcPoints_notStartOfData_shouldAddDataPointsOnly() {
- final long start = mNow - 20 * MILLIS_IN_ONE_DAY;
- final long end = mNow - 5 * MILLIS_IN_ONE_DAY;
+ final long start = TIMESTAMP_NOW - 20 * MILLIS_IN_ONE_DAY;
+ final long end = TIMESTAMP_NOW - 5 * MILLIS_IN_ONE_DAY;
mPreference.setVisibleRange(start, end);
when(mNetworkStatsHistory.getIndexAfter(start)).thenReturn(2);
when(mNetworkStatsHistory.getIndexAfter(end)).thenReturn(7);
@@ -78,8 +77,8 @@
@Test
public void calcPoints_startOfData_shouldIndicateStartOfData() {
- final long start = mNow - 20 * MILLIS_IN_ONE_DAY;
- final long end = mNow - 5 * MILLIS_IN_ONE_DAY;
+ final long start = TIMESTAMP_NOW - 20 * MILLIS_IN_ONE_DAY;
+ final long end = TIMESTAMP_NOW - 5 * MILLIS_IN_ONE_DAY;
mPreference.setVisibleRange(start, end);
when(mNetworkStatsHistory.getIndexAfter(start)).thenReturn(0);
when(mNetworkStatsHistory.getIndexAfter(end)).thenReturn(5);
@@ -104,10 +103,10 @@
mNetworkStatsHistory.setValues(3, createEntry(1521655200000L, 83849690L, 3558238L));
mNetworkStatsHistory.setValues(4, createEntry(1521658800000L, 1883657L, 353330L));
mNetworkStatsHistory.setValues(5, createEntry(1521662400000L, 705259L, 279065L));
- mNetworkStatsHistory.setValues(5, createEntry(1521666000000L, 216169L, 155302L));
- mNetworkStatsHistory.setValues(5, createEntry(1521669600000L, 6069175L, 427581L));
- mNetworkStatsHistory.setValues(5, createEntry(1521673200000L, 120389L, 110807L));
- mNetworkStatsHistory.setValues(5, createEntry(1521676800000L, 29947L, 73257L));
+ mNetworkStatsHistory.setValues(6, createEntry(1521666000000L, 216169L, 155302L));
+ mNetworkStatsHistory.setValues(7, createEntry(1521669600000L, 6069175L, 427581L));
+ mNetworkStatsHistory.setValues(8, createEntry(1521673200000L, 120389L, 110807L));
+ mNetworkStatsHistory.setValues(9, createEntry(1521676800000L, 29947L, 73257L));
}
/**
diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
index 6df0c04..4264daa 100644
--- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
@@ -16,7 +16,6 @@
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
@@ -25,6 +24,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.Activity;
import android.os.Bundle;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
@@ -34,7 +34,6 @@
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.widget.RadioButtonPreference;
import com.android.settingslib.widget.CandidateInfo;
import org.junit.Before;
@@ -46,7 +45,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -58,13 +56,13 @@
private ColorDisplayController mController;
@Mock
- private PreferenceScreen mScreen;
+ private Activity mActivity;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
- mFragment = spy(new ColorModePreferenceFragmentTestable(mScreen));
+ mFragment = spy(new ColorModePreferenceFragment());
ReflectionHelpers.setField(mFragment, "mController", mController);
}
@@ -79,15 +77,13 @@
when(mFragment.getContext()).thenReturn(RuntimeEnvironment.application);
List<? extends CandidateInfo> candidates = mFragment.getCandidates();
- assertThat(candidates.size()).isEqualTo(4);
+ assertThat(candidates.size()).isEqualTo(3);
assertThat(candidates.get(0).getKey())
.isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL);
assertThat(candidates.get(1).getKey())
.isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED);
assertThat(candidates.get(2).getKey())
.isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED);
- assertThat(candidates.get(3).getKey())
- .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_AUTOMATIC);
}
@Test
@@ -161,50 +157,8 @@
@Test
public void onAccessibilityTransformChanged_toggles() {
- final int radioPrefsCount = 3;
- List<RadioButtonPreference> radioPrefs = new ArrayList<>();
- for (int i = 0; i < radioPrefsCount; i++) {
- radioPrefs.add(mock(RadioButtonPreference.class));
- }
-
- when(mScreen.getPreferenceCount()).thenReturn(radioPrefs.size());
- when(mScreen.getPreference(anyInt())).thenAnswer(invocation -> {
- final Object[] args = invocation.getArguments();
- return radioPrefs.get((int) args[0]);
- });
-
+ when(mFragment.getActivity()).thenReturn(mActivity);
mFragment.onAccessibilityTransformChanged(true /* state */);
- for (int i = 0; i < radioPrefsCount; i++) {
- verify(radioPrefs.get(i)).setEnabled(false);
- }
-
- mFragment.onAccessibilityTransformChanged(false /* state */);
- for (int i = 0; i < radioPrefsCount; i++) {
- verify(radioPrefs.get(i)).setEnabled(true);
- }
- }
-
- private static class ColorModePreferenceFragmentTestable
- extends ColorModePreferenceFragment {
-
- private final PreferenceScreen mPreferenceScreen;
-
- private ColorModePreferenceFragmentTestable(PreferenceScreen screen) {
- mPreferenceScreen = screen;
- }
-
- /**
- * A method to return a mock PreferenceScreen.
- * A real ColorModePreferenceFragment calls super.getPreferenceScreen() to get its
- * PreferenceScreen handle, which internally dereferenced a PreferenceManager. But in this
- * test scenario, the PreferenceManager object is uninitialized, so we need to supply the
- * PreferenceScreen directly.
- *
- * @return a mock PreferenceScreen
- */
- @Override
- public PreferenceScreen getPreferenceScreen() {
- return mPreferenceScreen;
- }
+ verify(mActivity).onBackPressed();
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
index 6a97fe1..7d26755 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
@@ -125,7 +125,7 @@
}
@Test
- public void testUpdateState_twoRestrictedAppsForPrimaryUser_showCorrectSummary() {
+ public void testUpdateState_twoRestrictedAppsForPrimaryUser_visibleAndShowCorrectSummary() {
mPackageOpsList.add(mRestrictedPackageOps);
mPackageOpsList.add(mRestrictedPackageOps);
mPackageOpsList.add(mAllowedPackageOps);
@@ -135,6 +135,7 @@
mRestrictAppPreferenceController.updateState(mPreference);
assertThat(mPreference.getSummary()).isEqualTo("Limiting battery usage for 2 apps");
+ assertThat(mPreference.isVisible()).isTrue();
}
@Test
@@ -155,13 +156,13 @@
}
@Test
- public void testUpdateState_zeroRestrictApp_disabled() {
+ public void testUpdateState_zeroRestrictApp_inVisible() {
mPackageOpsList.add(mAllowedPackageOps);
doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any());
mRestrictAppPreferenceController.updateState(mPreference);
- assertThat(mPreference.isEnabled()).isFalse();
+ assertThat(mPreference.isVisible()).isFalse();
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
index 55a8f4e..49567f6 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
@@ -192,7 +192,7 @@
verify(mFeatureFactory.metricsFeatureProvider).action(mContext,
MetricsProto.MetricsEvent.ACTION_ANOMALY_TRIGGERED,
SYSTEM_PACKAGE,
- Pair.create(MetricsProto.MetricsEvent.FIELD_CONTEXT, ANOMALY_TYPE));
+ Pair.create(MetricsProto.MetricsEvent.FIELD_ANOMALY_TYPE, ANOMALY_TYPE));
}
@@ -217,7 +217,7 @@
verify(mFeatureFactory.metricsFeatureProvider).action(mContext,
MetricsProto.MetricsEvent.ACTION_ANOMALY_TRIGGERED,
SYSTEM_PACKAGE,
- Pair.create(MetricsProto.MetricsEvent.FIELD_CONTEXT, ANOMALY_TYPE));
+ Pair.create(MetricsProto.MetricsEvent.FIELD_ANOMALY_TYPE, ANOMALY_TYPE));
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java
index c52b73e..654b247 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java
@@ -45,7 +45,10 @@
+ ",low_battery_enabled=false"
+ ",low_battery_hour=10"
+ ",data_history_retain_day=24"
- + ",excessive_bg_drain_percentage=25";
+ + ",excessive_bg_drain_percentage=25"
+ + ",test_battery_saver_tip=true"
+ + ",test_high_usage_tip=false"
+ + ",test_smart_battery_tip=true";
private Context mContext;
@Before
@@ -74,6 +77,9 @@
assertThat(batteryTipPolicy.lowBatteryHour).isEqualTo(10);
assertThat(batteryTipPolicy.dataHistoryRetainDay).isEqualTo(24);
assertThat(batteryTipPolicy.excessiveBgDrainPercentage).isEqualTo(25);
+ assertThat(batteryTipPolicy.testBatterySaverTip).isTrue();
+ assertThat(batteryTipPolicy.testHighUsageTip).isFalse();
+ assertThat(batteryTipPolicy.testSmartBatteryTip).isTrue();
}
@Test
@@ -97,5 +103,8 @@
assertThat(batteryTipPolicy.lowBatteryHour).isEqualTo(16);
assertThat(batteryTipPolicy.dataHistoryRetainDay).isEqualTo(30);
assertThat(batteryTipPolicy.excessiveBgDrainPercentage).isEqualTo(10);
+ assertThat(batteryTipPolicy.testBatterySaverTip).isFalse();
+ assertThat(batteryTipPolicy.testHighUsageTip).isFalse();
+ assertThat(batteryTipPolicy.testSmartBatteryTip).isFalse();
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java
index 21ef8a3..c4c3d02 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java
@@ -75,6 +75,16 @@
}
@Test
+ public void testDetect_testFeatureOn_tipNew() {
+ doReturn(false).when(mFakeFeatureFactory.powerUsageFeatureProvider)
+ .getEarlyWarningSignal(any(), any());
+ ReflectionHelpers.setField(mPolicy, "testBatterySaverTip", true);
+
+ assertThat(mEarlyWarningDetector.detect().getState())
+ .isEqualTo(BatteryTip.StateType.NEW);
+ }
+
+ @Test
public void testDetect_batterySaverOn_tipHandled() {
doReturn(true).when(mPowerManager).isPowerSaveMode();
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java
index d983dfc..2a2420d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java
@@ -34,6 +34,7 @@
import com.android.settings.fuelgauge.batterytip.AppInfo;
import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
import com.android.settings.fuelgauge.batterytip.HighUsageDataParser;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -109,6 +110,14 @@
}
@Test
+ public void testDetect_testFeatureOn_tipNew() {
+ doReturn(false).when(mDataParser).isDeviceHeavilyUsed();
+ ReflectionHelpers.setField(mPolicy, "testHighUsageTip", true);
+
+ assertThat(mHighUsageDetector.detect().getState()).isEqualTo(BatteryTip.StateType.NEW);
+ }
+
+ @Test
public void testDetect_containsHighUsageApp_tipVisible() {
doReturn(true).when(mDataParser).isDeviceHeavilyUsed();
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java
index 9134319..ad08a22 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java
@@ -24,6 +24,7 @@
import android.provider.Settings;
import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -31,6 +32,7 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
public class SmartBatteryDetectorTest {
@@ -38,6 +40,7 @@
private Context mContext;
private ContentResolver mContentResolver;
private SmartBatteryDetector mSmartBatteryDetector;
+ private BatteryTipPolicy mPolicy;
@Before
public void setUp() {
@@ -45,8 +48,15 @@
mContext = RuntimeEnvironment.application;
mContentResolver = mContext.getContentResolver();
- final BatteryTipPolicy policy = spy(new BatteryTipPolicy(mContext));
- mSmartBatteryDetector = new SmartBatteryDetector(policy, mContentResolver);
+ mPolicy = spy(new BatteryTipPolicy(mContext));
+ mSmartBatteryDetector = new SmartBatteryDetector(mPolicy, mContentResolver);
+ }
+
+ @Test
+ public void testDetect_testFeatureOn_tipNew() {
+ ReflectionHelpers.setField(mPolicy, "testSmartBatteryTip", true);
+
+ assertThat(mSmartBatteryDetector.detect().getState()).isEqualTo(BatteryTip.StateType.NEW);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java
index d92e0e0..b687b46 100644
--- a/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java
@@ -68,8 +68,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mController = new PreventRingingPreferenceController(
- mContext, null, 0, KEY_PICK_UP);
+ mController = new PreventRingingPreferenceController(mContext, KEY_PICK_UP);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java
index 29773d2..9a76647 100644
--- a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java
@@ -109,6 +109,11 @@
NotificationChannel channel = new NotificationChannel("cid", "cname", IMPORTANCE_NONE);
mController.onResume(appRow, channel, group, null);
assertEquals(channel.getName(), mController.getLabel());
+
+ NotificationChannel defaultChannel = new NotificationChannel(
+ NotificationChannel.DEFAULT_CHANNEL_ID, "", IMPORTANCE_NONE);
+ mController.onResume(appRow, defaultChannel, null, null);
+ assertEquals(appRow.label, mController.getLabel());
}
@Test
@@ -130,5 +135,10 @@
mController.onResume(appRow, channel, null, null);
assertFalse(mController.getSummary().toString().contains(group.getName()));
assertTrue(mController.getSummary().toString().contains(appRow.label));
+
+ NotificationChannel defaultChannel = new NotificationChannel(
+ NotificationChannel.DEFAULT_CHANNEL_ID, "", IMPORTANCE_NONE);
+ mController.onResume(appRow, defaultChannel, null, null);
+ assertEquals("", mController.getSummary());
}
}
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
index 3ead72a..4fe384e 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
@@ -294,6 +294,30 @@
assertTrue(mController.isChannelGroupBlockable());
}
+ @Test
+ public void testIsDefaultChannel_noChannel() {
+ mController.onResume(mock(NotificationBackend.AppRow.class), null, null, null);
+
+ assertFalse(mController.isDefaultChannel());
+ }
+
+ @Test
+ public void testIsDefaultChannel_nonDefaultChannel() {
+ NotificationChannel channel = mock(NotificationChannel.class);
+ mController.onResume(mock(NotificationBackend.AppRow.class), channel, null, null);
+
+ assertFalse(mController.isDefaultChannel());
+ }
+
+ @Test
+ public void testIsDefaultChannel() {
+ NotificationChannel channel = mock(NotificationChannel.class);
+ when(channel.getId()).thenReturn(NotificationChannel.DEFAULT_CHANNEL_ID);
+ mController.onResume(mock(NotificationBackend.AppRow.class), channel, null, null);
+
+ assertTrue(mController.isDefaultChannel());
+ }
+
private final class TestPreferenceController extends NotificationPreferenceController {
private TestPreferenceController(Context context, NotificationBackend backend) {
diff --git a/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java b/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java
new file mode 100644
index 0000000..3fd2239
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright (C) 2018 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.app.NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS;
+import static android.app.NotificationManager.Policy.PRIORITY_SENDERS_ANY;
+import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT;
+import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_BADGE;
+import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_FULL_SCREEN_INTENT;
+import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_LIGHTS;
+import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_NOTIFICATION_LIST;
+import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK;
+import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF;
+import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON;
+import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationManager;
+import android.app.NotificationManager.Policy;
+import android.content.Context;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class ZenOnboardingActivityTest {
+
+ @Mock
+ MetricsLogger mMetricsLogger;
+ @Mock
+ NotificationManager mNm;
+
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private Context mContext;
+
+ ZenOnboardingActivity mActivity;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mActivity = Robolectric.buildActivity(ZenOnboardingActivity.class)
+ .create()
+ .get();
+ mActivity.setNotificationManager(mNm);
+ mActivity.setMetricsLogger(mMetricsLogger);
+
+ mActivity.setupUI();
+ }
+
+ @Test
+ public void loadUiRecordsEvent() {
+ verify(mMetricsLogger).visible(MetricsEvent.SETTINGS_ZEN_ONBOARDING);
+ }
+
+ @Test
+ public void toggleCheckBoxRecordsEvents_screenOn() {
+ mActivity.findViewById(R.id.screen_on_option).performClick();
+
+ verify(mMetricsLogger).action(MetricsEvent.ACTION_ZEN_ONBOARDING_SCREEN_ON, false);
+
+ mActivity.findViewById(R.id.screen_on_option).performClick();
+
+ verify(mMetricsLogger).action(MetricsEvent.ACTION_ZEN_ONBOARDING_SCREEN_ON, true);
+ }
+
+ @Test
+ public void toggleCheckBoxRecordsEvents_screenOff() {
+ mActivity.findViewById(R.id.screen_off_option).performClick();
+
+ verify(mMetricsLogger).action(MetricsEvent.ACTION_ZEN_ONBOARDING_SCREEN_OFF, false);
+
+ mActivity.findViewById(R.id.screen_off_option).performClick();
+
+ verify(mMetricsLogger).action(MetricsEvent.ACTION_ZEN_ONBOARDING_SCREEN_OFF, true);
+ }
+
+ @Test
+ public void save_screenOn() {
+ Policy policy = new Policy(
+ PRIORITY_CATEGORY_ALARMS, 0, 0,
+ SUPPRESSED_EFFECT_SCREEN_ON
+ | SUPPRESSED_EFFECT_SCREEN_OFF
+ | SUPPRESSED_EFFECT_FULL_SCREEN_INTENT
+ | SUPPRESSED_EFFECT_LIGHTS
+ | SUPPRESSED_EFFECT_PEEK
+ | SUPPRESSED_EFFECT_STATUS_BAR
+ | SUPPRESSED_EFFECT_BADGE
+ | SUPPRESSED_EFFECT_AMBIENT
+ | SUPPRESSED_EFFECT_NOTIFICATION_LIST);
+ when(mNm.getNotificationPolicy()).thenReturn(policy);
+
+ mActivity.findViewById(R.id.screen_off_option).performClick();
+
+ mActivity.save(null);
+
+ verify(mMetricsLogger).action(MetricsEvent.ACTION_ZEN_ONBOARDING_OK);
+
+ ArgumentCaptor<Policy> captor = ArgumentCaptor.forClass(Policy.class);
+ verify(mNm).setNotificationPolicy(captor.capture());
+
+ Policy actual = captor.getValue();
+ assertThat(actual.priorityCategories).isEqualTo(PRIORITY_CATEGORY_ALARMS);
+ assertThat(actual.suppressedVisualEffects).isEqualTo(
+ SUPPRESSED_EFFECT_SCREEN_ON | SUPPRESSED_EFFECT_NOTIFICATION_LIST
+ | SUPPRESSED_EFFECT_BADGE | SUPPRESSED_EFFECT_STATUS_BAR
+ | SUPPRESSED_EFFECT_PEEK);
+ }
+
+ @Test
+ public void save_screenOff() {
+ Policy policy = new Policy(
+ PRIORITY_CATEGORY_ALARMS, PRIORITY_SENDERS_ANY, 0,
+ SUPPRESSED_EFFECT_SCREEN_ON
+ | SUPPRESSED_EFFECT_SCREEN_OFF
+ | SUPPRESSED_EFFECT_FULL_SCREEN_INTENT
+ | SUPPRESSED_EFFECT_LIGHTS
+ | SUPPRESSED_EFFECT_PEEK
+ | SUPPRESSED_EFFECT_STATUS_BAR
+ | SUPPRESSED_EFFECT_BADGE
+ | SUPPRESSED_EFFECT_AMBIENT
+ | SUPPRESSED_EFFECT_NOTIFICATION_LIST);
+ when(mNm.getNotificationPolicy()).thenReturn(policy);
+
+ mActivity.findViewById(R.id.screen_on_option).performClick();
+
+ mActivity.save(null);
+
+ verify(mMetricsLogger).action(MetricsEvent.ACTION_ZEN_ONBOARDING_OK);
+
+ ArgumentCaptor<Policy> captor = ArgumentCaptor.forClass(Policy.class);
+ verify(mNm).setNotificationPolicy(captor.capture());
+
+ Policy actual = captor.getValue();
+ assertThat(actual.priorityCallSenders).isEqualTo(PRIORITY_SENDERS_ANY);
+ assertThat(actual.suppressedVisualEffects).isEqualTo(
+ SUPPRESSED_EFFECT_SCREEN_OFF | SUPPRESSED_EFFECT_FULL_SCREEN_INTENT
+ | SUPPRESSED_EFFECT_LIGHTS | SUPPRESSED_EFFECT_AMBIENT);
+ }
+
+ @Test
+ public void save_none() {
+ Policy policy = new Policy(0, 0, 0,
+ SUPPRESSED_EFFECT_SCREEN_ON
+ | SUPPRESSED_EFFECT_SCREEN_OFF
+ | SUPPRESSED_EFFECT_FULL_SCREEN_INTENT
+ | SUPPRESSED_EFFECT_LIGHTS
+ | SUPPRESSED_EFFECT_PEEK
+ | SUPPRESSED_EFFECT_STATUS_BAR
+ | SUPPRESSED_EFFECT_BADGE
+ | SUPPRESSED_EFFECT_AMBIENT
+ | SUPPRESSED_EFFECT_NOTIFICATION_LIST);
+ when(mNm.getNotificationPolicy()).thenReturn(policy);
+
+ mActivity.findViewById(R.id.screen_on_option).performClick();
+ mActivity.findViewById(R.id.screen_off_option).performClick();
+
+ mActivity.save(null);
+
+ verify(mMetricsLogger).action(MetricsEvent.ACTION_ZEN_ONBOARDING_OK);
+
+ ArgumentCaptor<Policy> captor = ArgumentCaptor.forClass(Policy.class);
+ verify(mNm).setNotificationPolicy(captor.capture());
+
+ Policy actual = captor.getValue();
+ assertThat(actual.suppressedVisualEffects).isEqualTo(0);
+ }
+
+ @Test
+ public void save_all() {
+ Policy policy = new Policy(0, 0, 0, 0);
+ when(mNm.getNotificationPolicy()).thenReturn(policy);
+
+ mActivity.save(null);
+
+ verify(mMetricsLogger).action(MetricsEvent.ACTION_ZEN_ONBOARDING_OK);
+
+ ArgumentCaptor<Policy> captor = ArgumentCaptor.forClass(Policy.class);
+ verify(mNm).setNotificationPolicy(captor.capture());
+
+ Policy actual = captor.getValue();
+ assertThat(actual.suppressedVisualEffects).isEqualTo(
+ SUPPRESSED_EFFECT_SCREEN_ON
+ | SUPPRESSED_EFFECT_SCREEN_OFF
+ | SUPPRESSED_EFFECT_FULL_SCREEN_INTENT
+ | SUPPRESSED_EFFECT_LIGHTS
+ | SUPPRESSED_EFFECT_PEEK
+ | SUPPRESSED_EFFECT_STATUS_BAR
+ | SUPPRESSED_EFFECT_BADGE
+ | SUPPRESSED_EFFECT_AMBIENT
+ | SUPPRESSED_EFFECT_NOTIFICATION_LIST);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
index fdd77e8..0cdb2f4 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
@@ -21,6 +21,7 @@
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
+import android.app.slice.Slice;
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
@@ -44,8 +45,6 @@
import org.mockito.ArgumentCaptor;
import org.robolectric.RuntimeEnvironment;
-import androidx.slice.core.SliceHints;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class SliceBroadcastReceiverTest {
@@ -129,7 +128,7 @@
fakeSliderController.setSliderPosition(oldPosition);
// Build action
Intent intent = new Intent(SettingsSliceProvider.ACTION_SLIDER_CHANGED);
- intent.putExtra(SliceHints.EXTRA_RANGE_VALUE, position);
+ intent.putExtra(Slice.EXTRA_RANGE_VALUE, position);
intent.putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key);
assertThat(fakeSliderController.getSliderPosition()).isEqualTo(oldPosition);
@@ -163,7 +162,7 @@
// Build action
Intent intent = new Intent(SettingsSliceProvider.ACTION_SLIDER_CHANGED);
- intent.putExtra(SliceHints.EXTRA_RANGE_VALUE, position);
+ intent.putExtra(Slice.EXTRA_RANGE_VALUE, position);
intent.putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key);
// Trigger the exception.
@@ -174,7 +173,7 @@
public void sliderOnReceive_noKey_throwsException() {
// Build action
final Intent intent = new Intent(SettingsSliceProvider.ACTION_SLIDER_CHANGED)
- .putExtra(SliceHints.EXTRA_RANGE_VALUE, 0);
+ .putExtra(Slice.EXTRA_RANGE_VALUE, 0);
// Trigger the exception.
mReceiver.onReceive(mContext, intent);
diff --git a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
index 1f3f40f..58ee969 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
@@ -17,6 +17,8 @@
package com.android.settings.slices;
import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -24,6 +26,7 @@
import android.content.ContentResolver;
import android.content.Context;
+import android.content.res.Resources;
import android.net.Uri;
import android.provider.Settings;
import android.provider.SettingsSlicesContract;
@@ -36,6 +39,7 @@
import com.android.settings.testutils.FakeSliderController;
import com.android.settings.testutils.FakeToggleController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SliceTester;
import org.junit.Before;
import org.junit.Test;
@@ -44,6 +48,8 @@
import org.robolectric.RuntimeEnvironment;
import androidx.slice.Slice;
+import androidx.slice.SliceProvider;
+import androidx.slice.widget.SliceLiveData;
@RunWith(SettingsRobolectricTestRunner.class)
public class SliceBuilderUtilsTest {
@@ -55,8 +61,9 @@
private final String FRAGMENT_NAME = "fragment name";
private final int ICON = 1234; // I declare a thumb war
private final Uri URI = Uri.parse("content://com.android.settings.slices/test");
- private final Class PREF_CONTROLLER = FakeToggleController.class;
- private final Class PREF_CONTROLLER2 = FakeContextOnlyPreferenceController.class;
+ private final Class TOGGLE_CONTROLLER = FakeToggleController.class;
+ private final Class SLIDER_CONTROLLER = FakeSliderController.class;
+ private final Class CONTEXT_CONTROLLER = FakeContextOnlyPreferenceController.class;
private final String INTENT_PATH = SettingsSlicesContract.PATH_SETTING_INTENT + "/" + KEY;
private final String ACTION_PATH = SettingsSlicesContract.PATH_SETTING_ACTION + "/" + KEY;
@@ -67,23 +74,50 @@
@Before
public void setUp() {
- mContext = RuntimeEnvironment.application;
+ mContext = spy(RuntimeEnvironment.application);
mFeatureFactory = FakeFeatureFactory.setupForTest();
mLoggingArgumentCatpor = ArgumentCaptor.forClass(Pair.class);
+
+ // Prevent crash in SliceMetadata.
+ Resources resources = spy(mContext.getResources());
+ doReturn(60).when(resources).getDimensionPixelSize(anyInt());
+ doReturn(resources).when(mContext).getResources();
+
+ // Set-up specs for SliceMetadata.
+ SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
}
@Test
- public void testBuildSlice_returnsMatchingSlice() {
- Slice slice = SliceBuilderUtils.buildSlice(mContext, getDummyData());
+ public void buildIntentSlice_returnsMatchingSlice() {
+ final SliceData sliceData = getDummyData(CONTEXT_CONTROLLER, SliceData.SliceType.INTENT);
+ final Slice slice = SliceBuilderUtils.buildSlice(mContext, sliceData);
- assertThat(slice).isNotNull(); // TODO improve test for Slice content
+ SliceTester.testSettingsIntentSlice(mContext, slice, sliceData);
}
@Test
- public void testSliderSlice_returnsSeekBarSlice() {
- final SliceData data = getDummyData(FakeSliderController.class);
+ public void buildToggleSlice_returnsMatchingSlice() {
+ final SliceData dummyData = getDummyData(TOGGLE_CONTROLLER, SliceData.SliceType.SWITCH);
+
+ final Slice slice = SliceBuilderUtils.buildSlice(mContext, dummyData);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(eq(mContext), eq(MetricsEvent.ACTION_SETTINGS_SLICE_REQUESTED),
+ mLoggingArgumentCatpor.capture());
+ final Pair<Integer, Object> capturedLoggingPair = mLoggingArgumentCatpor.getValue();
+
+ assertThat(capturedLoggingPair.first)
+ .isEqualTo(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME);
+ assertThat(capturedLoggingPair.second)
+ .isEqualTo(dummyData.getKey());
+ SliceTester.testSettingsToggleSlice(mContext, slice, dummyData);
+ }
+
+ @Test
+ public void buildSliderSlice_returnsMatchingSlice() {
+ final SliceData data = getDummyData(SLIDER_CONTROLLER, SliceData.SliceType.SLIDER);
+
+
final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
-
verify(mFeatureFactory.metricsFeatureProvider)
.action(eq(mContext), eq(MetricsEvent.ACTION_SETTINGS_SLICE_REQUESTED),
mLoggingArgumentCatpor.capture());
@@ -93,7 +127,7 @@
.isEqualTo(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME);
assertThat(capturedLoggingPair.second)
.isEqualTo(data.getKey());
- assertThat(slice).isNotNull();
+ SliceTester.testSettingsSliderSlice(mContext, slice, data);
}
@Test
@@ -159,7 +193,8 @@
@Test
public void testGetPreferenceController_contextOnly_buildsMatchingController() {
final BasePreferenceController controller =
- SliceBuilderUtils.getPreferenceController(mContext, getDummyData(PREF_CONTROLLER2));
+ SliceBuilderUtils.getPreferenceController(mContext,
+ getDummyData(CONTEXT_CONTROLLER, 0));
assertThat(controller).isInstanceOf(FakeContextOnlyPreferenceController.class);
}
@@ -176,7 +211,7 @@
@Test
public void testDynamicSummary_returnsFragmentSummary() {
- final SliceData data = getDummyData((String) null);
+ final SliceData data = getDummyData(null);
final FakePreferenceController controller = spy(
new FakePreferenceController(mContext, KEY));
final String controllerSummary = "new_Summary";
@@ -189,7 +224,7 @@
@Test
public void testDynamicSummary_returnsSliceEmptyString() {
- final SliceData data = getDummyData((String) null);
+ final SliceData data = getDummyData(null);
final FakePreferenceController controller = new FakePreferenceController(mContext, KEY);
final CharSequence summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
@@ -285,31 +320,34 @@
@Test
public void testUnsupportedSlice_validTitleSummary() {
- final SliceData data = getDummyData(FakeUnavailablePreferenceController.class.getName());
+ final SliceData data = getDummyData(FakeUnavailablePreferenceController.class,
+ SliceData.SliceType.SWITCH);
Settings.System.putInt(mContext.getContentResolver(),
FakeUnavailablePreferenceController.AVAILABILITY_KEY,
BasePreferenceController.DISABLED_UNSUPPORTED);
final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
- assertThat(slice).isNotNull();
+ SliceTester.testSettingsUnavailableSlice(mContext, slice, data);
}
@Test
public void testDisabledForUserSlice_validTitleSummary() {
- final SliceData data = getDummyData(FakeUnavailablePreferenceController.class.getName());
+ final SliceData data = getDummyData(FakeUnavailablePreferenceController.class,
+ SliceData.SliceType.SWITCH);
Settings.System.putInt(mContext.getContentResolver(),
FakeUnavailablePreferenceController.AVAILABILITY_KEY,
BasePreferenceController.DISABLED_FOR_USER);
final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
- assertThat(slice).isNotNull();
+ SliceTester.testSettingsUnavailableSlice(mContext, slice, data);
}
@Test
- public void testDisabledDependententSettingSlice_validTitleSummary() {
- final SliceData data = getDummyData(FakeUnavailablePreferenceController.class.getName());
+ public void testDisabledDependentSettingSlice_validTitleSummary() {
+ final SliceData data = getDummyData(FakeUnavailablePreferenceController.class,
+ SliceData.SliceType.INTENT);
Settings.System.putInt(mContext.getContentResolver(),
FakeUnavailablePreferenceController.AVAILABILITY_KEY,
BasePreferenceController.DISABLED_DEPENDENT_SETTING);
@@ -325,12 +363,13 @@
.isEqualTo(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME);
assertThat(capturedLoggingPair.second)
.isEqualTo(data.getKey());
- assertThat(slice).isNotNull();
+ SliceTester.testSettingsUnavailableSlice(mContext, slice, data);
}
@Test
public void testUnavailableUnknownSlice_validTitleSummary() {
- final SliceData data = getDummyData(FakeUnavailablePreferenceController.class.getName());
+ final SliceData data = getDummyData(FakeUnavailablePreferenceController.class,
+ SliceData.SliceType.SWITCH);
Settings.System.putInt(mContext.getContentResolver(),
FakeUnavailablePreferenceController.AVAILABILITY_KEY,
BasePreferenceController.UNAVAILABLE_UNKNOWN);
@@ -347,22 +386,22 @@
.isEqualTo(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME);
assertThat(capturedLoggingPair.second)
.isEqualTo(data.getKey());
- assertThat(slice).isNotNull();
+ SliceTester.testSettingsUnavailableSlice(mContext, slice, data);
}
private SliceData getDummyData() {
- return getDummyData(PREF_CONTROLLER, SUMMARY);
+ return getDummyData(TOGGLE_CONTROLLER, SUMMARY, SliceData.SliceType.SWITCH);
}
private SliceData getDummyData(String summary) {
- return getDummyData(PREF_CONTROLLER, summary);
+ return getDummyData(TOGGLE_CONTROLLER, summary, SliceData.SliceType.SWITCH);
}
- private SliceData getDummyData(Class prefController) {
- return getDummyData(prefController, SUMMARY);
+ private SliceData getDummyData(Class prefController, int sliceType) {
+ return getDummyData(prefController, SUMMARY, sliceType);
}
- private SliceData getDummyData(Class prefController, String summary) {
+ private SliceData getDummyData(Class prefController, String summary, int sliceType) {
return new SliceData.Builder()
.setKey(KEY)
.setTitle(TITLE)
@@ -372,6 +411,7 @@
.setFragmentName(FRAGMENT_NAME)
.setUri(URI)
.setPreferenceControllerClassName(prefController.getName())
+ .setSliceType(sliceType)
.build();
}
}
diff --git a/tests/robotests/src/com/android/settings/testutils/SliceTester.java b/tests/robotests/src/com/android/settings/testutils/SliceTester.java
new file mode 100644
index 0000000..ef62d77
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/SliceTester.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2018 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.testutils;
+
+import static android.app.slice.Slice.HINT_TITLE;
+import static android.app.slice.SliceItem.FORMAT_TEXT;
+
+import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
+import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
+import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
+import static com.android.settings.core.BasePreferenceController.UNAVAILABLE_UNKNOWN;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.PendingIntent;
+import android.content.Context;
+
+import java.util.List;
+
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceMetadata;
+import androidx.slice.core.SliceAction;
+import androidx.slice.core.SliceQuery;
+
+import android.support.v4.graphics.drawable.IconCompat;
+
+import com.android.settings.slices.SettingsSliceProvider;
+import com.android.settings.slices.SliceBuilderUtils;
+import com.android.settings.slices.SliceData;
+
+/**
+ * Testing utility class to verify the contents of the different Settings Slices.
+ *
+ * TODO (77712944) check Summary, range (metadata.getRange()), toggle icons.
+ */
+public class SliceTester {
+
+ /**
+ * Test the contents of an intent based slice, including:
+ * - No toggles
+ * - Correct intent
+ * - Correct title
+ */
+ public static void testSettingsIntentSlice(Context context, Slice slice, SliceData sliceData) {
+ final SliceMetadata metadata = SliceMetadata.from(context, slice);
+
+ final List<SliceAction> toggles = metadata.getToggles();
+ assertThat(toggles).isEmpty();
+
+ final PendingIntent primaryPendingIntent = metadata.getPrimaryAction().getAction();
+ assertThat(primaryPendingIntent).isEqualTo(
+ SliceBuilderUtils.getContentIntent(context, sliceData));
+
+ final List<SliceItem> sliceItems = slice.getItems();
+ assertTitle(sliceItems, sliceData.getTitle());
+ }
+
+ /**
+ * Test the contents of an toggle based slice, including:
+ * - Contains one toggle
+ * - Correct toggle intent
+ * - Correct content intent
+ * - Correct title
+ */
+ public static void testSettingsToggleSlice(Context context, Slice slice, SliceData sliceData) {
+ final SliceMetadata metadata = SliceMetadata.from(context, slice);
+
+ final List<SliceAction> toggles = metadata.getToggles();
+ assertThat(toggles).hasSize(1);
+
+ final SliceAction mainToggleAction = toggles.get(0);
+
+ final IconCompat expectedToggleIcon = IconCompat.createWithResource(context,
+ sliceData.getIconResource());
+ assertThat(mainToggleAction.getIcon()).isNull();
+
+ // Check intent in Toggle Action
+ final PendingIntent togglePendingIntent = mainToggleAction.getAction();
+ assertThat(togglePendingIntent).isEqualTo(SliceBuilderUtils.getActionIntent(context,
+ SettingsSliceProvider.ACTION_TOGGLE_CHANGED, sliceData));
+
+ // Check primary intent
+ final PendingIntent primaryPendingIntent = metadata.getPrimaryAction().getAction();
+ assertThat(primaryPendingIntent).isEqualTo(
+ SliceBuilderUtils.getContentIntent(context, sliceData));
+
+ final List<SliceItem> sliceItems = slice.getItems();
+ assertTitle(sliceItems, sliceData.getTitle());
+ }
+
+ /**
+ * Test the contents of an slider based slice, including:
+ * - No intent
+ * - Correct title
+ */
+ public static void testSettingsSliderSlice(Context context, Slice slice, SliceData sliceData) {
+ final SliceMetadata metadata = SliceMetadata.from(context, slice);
+
+ final IconCompat expectedToggleIcon = IconCompat.createWithResource(context,
+ sliceData.getIconResource());
+
+ // Check primary intent
+ final SliceAction primaryAction = metadata.getPrimaryAction();
+ assertThat(primaryAction).isNull();
+
+ final List<SliceItem> sliceItems = slice.getItems();
+ assertTitle(sliceItems, sliceData.getTitle());
+ }
+
+ /**
+ * Test the contents of an unavailable slice, including:
+ * - No toggles
+ * - Correct title
+ * - Correct intent
+ */
+ public static void testSettingsUnavailableSlice(Context context, Slice slice,
+ SliceData sliceData) {
+ final SliceMetadata metadata = SliceMetadata.from(context, slice);
+
+ final List<SliceAction> toggles = metadata.getToggles();
+ assertThat(toggles).isEmpty();
+
+ final PendingIntent primaryPendingIntent = metadata.getPrimaryAction().getAction();
+ final int availabilityStatus = SliceBuilderUtils.getPreferenceController(context,
+ sliceData).getAvailabilityStatus();
+ switch (availabilityStatus) {
+ case DISABLED_UNSUPPORTED:
+ case UNAVAILABLE_UNKNOWN:
+ assertThat(primaryPendingIntent).isEqualTo(
+ SliceBuilderUtils.getSettingsIntent(context));
+ break;
+ case DISABLED_FOR_USER:
+ case DISABLED_DEPENDENT_SETTING:
+ assertThat(primaryPendingIntent).isEqualTo(
+ SliceBuilderUtils.getContentIntent(context, sliceData));
+ break;
+ }
+
+ final List<SliceItem> sliceItems = slice.getItems();
+ assertTitle(sliceItems, sliceData.getTitle());
+ }
+
+ private static void assertTitle(List<SliceItem> sliceItems, String title) {
+ boolean hasTitle = false;
+ for (SliceItem item : sliceItems) {
+ List<SliceItem> titles = SliceQuery.findAll(item, FORMAT_TEXT, HINT_TITLE,
+ null /* non-hints */);
+ if (titles != null & titles.size() == 1) {
+ assertThat(titles.get(0).getText()).isEqualTo(title);
+ hasTitle = true;
+ }
+ }
+ assertThat(hasTitle).isTrue();
+ }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java
index 197fd40..198517a 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java
@@ -39,9 +39,10 @@
public void testPassword() {
final String longPassword = "123456789012345678901234567890"
+ "1234567890123456789012345678901234567890";
- assertThat(WifiUtils.isPasswordValid("123")).isFalse();
- assertThat(WifiUtils.isPasswordValid("12345678")).isTrue();
- assertThat(WifiUtils.isPasswordValid("1234567890")).isTrue();
- assertThat(WifiUtils.isPasswordValid(longPassword)).isFalse();
+ assertThat(WifiUtils.isHotspotPasswordValid("123")).isFalse();
+ assertThat(WifiUtils.isHotspotPasswordValid("12345678")).isTrue();
+ assertThat(WifiUtils.isHotspotPasswordValid("1234567890")).isTrue();
+ assertThat(WifiUtils.isHotspotPasswordValid(longPassword)).isFalse();
+ assertThat(WifiUtils.isHotspotPasswordValid("")).isTrue();
}
}
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
index 58f31b1..60faa2e 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
@@ -113,4 +113,36 @@
assertThat(mController.getPassword()).isEqualTo(config.preSharedKey);
assertThat(mPreference.getSummary()).isEqualTo(config.preSharedKey);
}
+
+ @Test
+ public void getSecuritySettingForPassword_returnCorrectType() {
+ // valid wpa2 password
+ mController.displayPreference(mScreen);
+ assertThat(mController.getSecuritySettingForPassword())
+ .isEqualTo(WifiConfiguration.KeyMgmt.WPA2_PSK);
+
+ // password which is empty returns NONE
+ mConfig = new WifiConfiguration();
+ mConfig.SSID = "test_1234";
+ mConfig.preSharedKey = "";
+ when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
+ when(mWifiManager.getWifiApConfiguration()).thenReturn(mConfig);
+ mController = new WifiTetherPasswordPreferenceController(mContext, mListener);
+
+ mController.displayPreference(mScreen);
+ assertThat(mController.getSecuritySettingForPassword())
+ .isEqualTo(WifiConfiguration.KeyMgmt.NONE);
+
+ // default for unsupported types is wpa2
+ mConfig = new WifiConfiguration();
+ mConfig.SSID = "test_1234";
+ mConfig.preSharedKey = "short";
+ when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
+ when(mWifiManager.getWifiApConfiguration()).thenReturn(mConfig);
+ mController = new WifiTetherPasswordPreferenceController(mContext, mListener);
+
+ mController.displayPreference(mScreen);
+ assertThat(mController.getSecuritySettingForPassword())
+ .isEqualTo(WifiConfiguration.KeyMgmt.WPA2_PSK);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
deleted file mode 100644
index 8c84575..0000000
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2017 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.tether;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.net.wifi.WifiConfiguration;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public class WifiTetherSettingsTest {
-
- @Test
- public void ensureWifiConfigHasPassword_shouldGeneratePassword() {
- WifiConfiguration config = new WifiConfiguration();
- WifiTetherSettings.ensureWifiConfigHasPassword(config);
-
- assertThat(config.preSharedKey).isNotEmpty();
- }
-}
diff --git a/tests/uitests/Android.mk b/tests/uitests/Android.mk
index 6f03b3f..89f9133 100644
--- a/tests/uitests/Android.mk
+++ b/tests/uitests/Android.mk
@@ -17,6 +17,7 @@
LOCAL_PACKAGE_NAME := SettingsUITests
LOCAL_PRIVATE_PLATFORM_APIS := true
+LOCAL_CERTIFICATE := platform
LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_MODULE_TAGS := tests
diff --git a/tests/uitests/AndroidManifest.xml b/tests/uitests/AndroidManifest.xml
index 06d74c6..91e15b8 100644
--- a/tests/uitests/AndroidManifest.xml
+++ b/tests/uitests/AndroidManifest.xml
@@ -15,7 +15,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.settings.ui">
+ package="com.android.settings.ui"
+ android:sharedUserId="android.uid.systemui">
<application>
<uses-library android:name="android.test.runner" />
@@ -26,6 +27,7 @@
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.READ_LOGS" />
+ <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
<instrumentation
android:name="android.support.test.runner.AndroidJUnitRunner"
diff --git a/tests/uitests/src/com/android/settings/ui/StorageWizardTest.java b/tests/uitests/src/com/android/settings/ui/StorageWizardTest.java
new file mode 100644
index 0000000..4b923f5
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/StorageWizardTest.java
@@ -0,0 +1,191 @@
+/*
+ * Copyright (C) 2018 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.ui;
+
+import android.content.Intent;
+import android.os.SystemClock;
+import android.os.storage.DiskInfo;
+import android.os.storage.VolumeInfo;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.BySelector;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.UiObjectNotFoundException;
+import android.support.test.uiautomator.Until;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+import java.util.regex.Pattern;
+
+/**
+ * Verify storage wizard flows. Temporarily enables a virtual disk which enables
+ * testing on all devices, regardless of physical SD card support.
+ */
+@RunWith(AndroidJUnit4.class)
+public class StorageWizardTest {
+ private static final String ANDROID_PACKAGE = "android";
+ private static final String PACKAGE = "com.android.settings";
+ private static final int TIMEOUT = 5000;
+ private static final int TIMEOUT_LONG = 30000;
+
+ private UiDevice mDevice;
+
+ private String mDisk;
+ private String mVolume;
+
+ @Before
+ public void setUp() throws Exception {
+ mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+ mDevice.executeShellCommand("setprop sys.debug.storage_slow 1");
+ mDevice.executeShellCommand("sm set-virtual-disk true");
+
+ mDisk = getAdoptableDisk();
+ mDevice.executeShellCommand("sm partition " + mDisk + " public");
+ mVolume = getPublicVolume();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ // Go back to home for next test.
+ mDevice.pressBack();
+ mDevice.pressBack();
+ mDevice.pressHome();
+ mDevice.waitForIdle(TIMEOUT);
+
+ mDevice.executeShellCommand("setprop sys.debug.storage_slow 0");
+ mDevice.executeShellCommand("sm set-virtual-disk false");
+ mDevice.executeShellCommand("sm forget all");
+ }
+
+ /**
+ * Test flow for adopting a storage device as internal/adopted.
+ */
+ @Test
+ public void testInternal() throws Exception {
+ InstrumentationRegistry.getContext().startActivity(buildInitIntent());
+
+ // Activity: pick option to use as internal
+ waitFor(By.res(PACKAGE, "suw_layout_title").text(containsIgnoringCase("How will you use")));
+ waitFor(By.res(PACKAGE, "storage_wizard_init_internal")).click();
+
+ // Dialog: acknowledge that we're formatting the card
+ waitFor(By.res(ANDROID_PACKAGE, "alertTitle").textContains("Format"));
+ waitFor(By.clickable(true).text(containsIgnoringCase("Format"))).click();
+
+ // Activity: ack storage device is slow
+ waitForLong(By.res(PACKAGE, "suw_layout_title").textContains("Slow"));
+ waitFor(By.res(PACKAGE, "storage_next_button")).click();
+
+ // Activity: choose to move content
+ waitForLong(By.res(PACKAGE, "suw_layout_title").textContains("Move content"));
+ waitFor(By.res(PACKAGE, "storage_next_button")).click();
+
+ // Activity: yay, we're done!
+ waitForLong(By.res(PACKAGE, "suw_layout_title").textContains("ready to use"));
+ waitFor(By.res(PACKAGE, "storage_next_button")).click();
+ }
+
+ /**
+ * Test flow for adopting a storage device as external/portable.
+ */
+ @Test
+ public void testExternal() throws Exception {
+ InstrumentationRegistry.getContext().startActivity(buildInitIntent());
+
+ // Activity: pick option to use as external
+ waitFor(By.res(PACKAGE, "suw_layout_title").textContains("How will you use"));
+ waitFor(By.res(PACKAGE, "storage_wizard_init_external")).click();
+
+ // Activity: yay, we're done!
+ waitFor(By.res(PACKAGE, "suw_layout_title").textContains("ready to use"));
+ waitFor(By.res(PACKAGE, "storage_next_button")).click();
+ }
+
+ private UiObject2 waitFor(BySelector selector) throws UiObjectNotFoundException {
+ return waitFor(selector, TIMEOUT);
+ }
+
+ private UiObject2 waitForLong(BySelector selector) throws UiObjectNotFoundException {
+ return waitFor(selector, TIMEOUT_LONG);
+ }
+
+ private UiObject2 waitFor(BySelector selector, long timeout) throws UiObjectNotFoundException {
+ final UiObject2 item = mDevice.wait(Until.findObject(selector), timeout);
+ if (item != null) {
+ return item;
+ } else {
+ throw new UiObjectNotFoundException(selector.toString());
+ }
+ }
+
+ /**
+ * Shamelessly borrowed from AdoptableHostTest in CTS.
+ */
+ private String getAdoptableDisk() throws IOException {
+ // In the case where we run multiple test we cleanup the state of the device. This
+ // results in the execution of sm forget all which causes the MountService to "reset"
+ // all its knowledge about available drives. This can cause the adoptable drive to
+ // become temporarily unavailable.
+ int attempt = 0;
+ String disks = mDevice.executeShellCommand("sm list-disks adoptable");
+ while ((disks == null || disks.isEmpty()) && attempt++ < 15) {
+ SystemClock.sleep(1000);
+ disks = mDevice.executeShellCommand("sm list-disks adoptable");
+ }
+
+ if (disks == null || disks.isEmpty()) {
+ throw new AssertionError("Devices that claim to support adoptable storage must have "
+ + "adoptable media inserted during CTS to verify correct behavior");
+ }
+ return disks.split("\n")[0].trim();
+ }
+
+ private String getPublicVolume() throws IOException {
+ int attempt = 0;
+ String volumes = mDevice.executeShellCommand("sm list-volumes public");
+ while ((volumes == null || volumes.isEmpty() || !volumes.contains("mounted"))
+ && attempt++ < 15) {
+ SystemClock.sleep(1000);
+ volumes = mDevice.executeShellCommand("sm list-volumes public");
+ }
+
+ if (volumes == null || volumes.isEmpty()) {
+ throw new AssertionError("Devices that claim to support adoptable storage must have "
+ + "adoptable media inserted during CTS to verify correct behavior");
+ }
+ return volumes.split("[\n ]")[0].trim();
+ }
+
+ private Intent buildInitIntent() {
+ final Intent intent = new Intent().setClassName(PACKAGE,
+ PACKAGE + ".deviceinfo.StorageWizardInit");
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk);
+ intent.putExtra(VolumeInfo.EXTRA_VOLUME_ID, mVolume);
+ return intent;
+ }
+
+ private Pattern containsIgnoringCase(String text) {
+ return Pattern.compile("(?i)^.*" + text + ".*$");
+ }
+}