Merge "Change the default Controller keys for RoboTests"
diff --git a/res/color/dream_card_color_state_list.xml b/res/color/dream_card_color_state_list.xml
new file mode 100644
index 0000000..31821dd
--- /dev/null
+++ b/res/color/dream_card_color_state_list.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2022 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+ <item android:state_activated="true" android:color="?androidprv:attr/colorSurfaceHighlight"/>
+ <item android:color="?androidprv:attr/colorSurface"/>
+</selector>
\ No newline at end of file
diff --git a/res/layout/dream_picker_layout.xml b/res/layout/dream_picker_layout.xml
new file mode 100644
index 0000000..c5210dd
--- /dev/null
+++ b/res/layout/dream_picker_layout.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2022 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.
+-->
+
+<androidx.constraintlayout.widget.ConstraintLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="@dimen/dream_picker_padding">
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/dream_list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:clipToPadding="true"
+ android:nestedScrollingEnabled="false"/>
+
+ <Button
+ android:id="@+id/preview_button"
+ style="@style/ActionPrimaryButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/dream_preview_button_title"
+ app:layout_constraintTop_toBottomOf="@+id/dream_list"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/res/layout/dream_preference_layout.xml b/res/layout/dream_preference_layout.xml
new file mode 100644
index 0000000..05f88cd
--- /dev/null
+++ b/res/layout/dream_preference_layout.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2022 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.
+-->
+
+<androidx.cardview.widget.CardView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="10dp"
+ style="@style/DreamCardStyle"
+ android:clickable="true">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="8dp"
+ android:minHeight="?android:attr/listPreferredItemHeight">
+
+ <androidx.cardview.widget.CardView
+ android:id="@+id/preview_container"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ app:cardCornerRadius="@dimen/dream_item_corner_radius"
+ app:cardElevation="0dp"
+ app:layout_constraintDimensionRatio="3:2"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent">
+
+ <ImageView
+ android:id="@+id/preview"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scaleType="centerCrop"/>
+
+ </androidx.cardview.widget.CardView>
+
+ <Button
+ android:id="@+id/customize_button"
+ style="@style/ActionPrimaryButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ android:text="@string/customize_button_title"
+ app:layout_constraintTop_toTopOf="@+id/preview_container"
+ app:layout_constraintBottom_toBottomOf="@+id/preview_container"
+ app:layout_constraintStart_toStartOf="@+id/preview_container"
+ app:layout_constraintEnd_toEndOf="@+id/preview_container"/>
+
+ <ImageView
+ android:id="@+id/icon"
+ android:layout_width="18dp"
+ android:layout_height="0dp"
+ android:layout_marginTop="18dp"
+ android:layout_marginStart="10dp"
+ android:layout_marginBottom="10dp"
+ app:layout_constraintDimensionRatio="1:1"
+ app:layout_constraintTop_toBottomOf="@+id/preview_container"
+ app_layout_constraintEnd_toStartOf="@+id/title_text"
+ app:layout_constraintStart_toStartOf="parent"/>
+
+ <TextView
+ android:id="@+id/title_text"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="18dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginBottom="10dp"
+ android:maxLines="1"
+ android:ellipsize="end"
+ android:textAppearance="?android:attr/textAppearanceListItemSmall"
+ app:layout_constraintTop_toBottomOf="@+id/preview_container"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@+id/icon"/>
+
+ <TextView
+ android:id="@+id/summary_text"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:textColor="?android:attr/textColorSecondary"
+ android:maxLines="2"
+ android:layout_marginBottom="8dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginEnd="8dp"
+ app:layout_constraintTop_toBottomOf="@+id/title_text"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"/>
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.cardview.widget.CardView>
diff --git a/res/layout/dream_start_button.xml b/res/layout/dream_start_button.xml
deleted file mode 100644
index 17ba78d..0000000
--- a/res/layout/dream_start_button.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2021 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:orientation="horizontal"
- android:gravity="bottom"
- android:paddingStart="72dp"
- android:paddingEnd="72dp"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <Button
- android:id="@+id/dream_start_now_button"
- style="@style/ActionPrimaryButton"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:text="@string/screensaver_settings_dream_start"/>
-
-</LinearLayout>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0a31c61..c6059d1 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -440,6 +440,13 @@
<dimen name="chartview_trapezoid_margin_start">1dp</dimen>
<dimen name="chartview_trapezoid_margin_bottom">2dp</dimen>
+ <!-- Dimensions for Dream settings cards -->
+ <dimen name="dream_item_min_column_width">230dp</dimen>
+ <dimen name="dream_item_corner_radius">@*android:dimen/config_dialogCornerRadius</dimen>
+ <dimen name="dream_preference_margin_horizontal">4dp</dimen>
+ <dimen name="dream_preference_margin_bottom">8dp</dimen>
+ <dimen name="dream_picker_padding">40dp</dimen>
+
<!-- Sims/Data mobile/Calls/SMS select dialog-->
<dimen name="sims_select_margin_bottom">24dp</dimen>
<dimen name="sims_select_margin_top">8dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5fec077..ec72321 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3144,8 +3144,6 @@
<string name="screensaver_settings_when_to_dream">When to start</string>
<!-- Dream settings screen, action label, current selected screen saver -->
<string name="screensaver_settings_current">Current screen saver</string>
- <!-- Dream settings screen, button label to start dreaming [CHAR LIMIT=30] -->
- <string name="screensaver_settings_dream_start">Start now</string>
<!-- Dream settings screen, button label for settings for a specific screensaver -->
<string name="screensaver_settings_button">Settings</string>
<!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
@@ -5465,6 +5463,8 @@
<string name="accessibility_notification_alarm_vibration_category_title">Notifications and alarms</string>
<!-- Title for the category of preferences to configure device vibrations triggered by user interaction with the device. [CHAR LIMIT=NONE] -->
<string name="accessibility_interactive_haptics_category_title">Interactive haptics</string>
+ <!-- Title for primary switch preference for enabling device vibrations. [CHAR LIMIT=NONE] -->
+ <string name="accessibility_vibration_primary_switch_title">Use vibration & haptics</string>
<!-- Title for preference for configuring alarm vibrations. [CHAR LIMIT=NONE] -->
<string name="accessibility_alarm_vibration_title">Alarm vibration</string>
<!-- Title for preference for configuring media vibrations (e.g. vibrations played together with animations, music, videos, etc). [CHAR LIMIT=NONE] -->
@@ -8255,6 +8255,8 @@
<!-- List of synonyms for hotspot and tethering setting (where you share your wifi with other devices), used to match in settings search [CHAR LIMIT=NONE] -->
<string name="keywords_hotspot_tethering">usb tether, bluetooth tether, wifi hotspot</string>
+ <!-- List of synonyms for device vibration primary setting, used to match in settings search [CHAR LIMIT=NONE] -->
+ <string name="keywords_accessibility_vibration_primary_switch">haptics, vibrate, vibration</string>
<!-- List of synonyms for touch vibration setting (where you get a haptic response for touching things on the screen), used to match in settings search [CHAR LIMIT=NONE] -->
<string name="keywords_touch_vibration">haptics, vibrate, screen, sensitivity</string>
<!-- List of synonyms for ring vibration setting (changes whether your phone vibrates when it rings), used to match in settings search [CHAR LIMIT=NONE] -->
@@ -13075,6 +13077,9 @@
<!-- Title for the button to initiate a heap dump for the system server. [CHAR LIMIT=NONE] -->
<string name="capture_system_heap_dump_title">Capture system heap dump</string>
+ <!-- Title for the button to reboot with MTE enabled. [CHAR LIMIT=NONE] -->
+ <string name="reboot_with_mte_title">Reboot with MTE</string>
+ <string name="reboot_with_mte_message">This wil reboot and allow to experiment with Memory Tagging Extensions (MTE). This may negatively impact system performance and stability. Will be reset on next subsequent reboot.</string>
<!-- Toast that is shown when the user initiates capturing a heap dump for the system server. [CHAR LIMIT=NONE] -->
<string name="capturing_system_heap_dump_message">Capturing system heap dump</string>
<!-- Toast that is shown if there's an error capturing the user initiated heap dump. [CHAR LIMIT=NONE] -->
@@ -13772,4 +13777,8 @@
</string-array>
<!-- TARE dialog button to proceed with a value change [CHAR LIMIT=none] -->
<string name="tare_dialog_confirm_button_title">Confirm</string>
+ <!-- Button to preview the selected screensaver in settings [CHAR LIMIT=40] -->
+ <string name="dream_preview_button_title">Preview screensaver</string>
+ <!-- Button to customize the screensaver [CHAR LIMIT=20] -->
+ <string name="customize_button_title">Customize</string>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7e70144..58f6df4 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -942,4 +942,14 @@
<style name="SimConfirmDialog.ButtonBarStyle" parent="@android:style/Widget.Material.ButtonBar">
<item name="android:paddingEnd">8dp</item>
</style>
+
+ <style name="DreamCardStyle">
+ <item name="android:layout_marginBottom">@dimen/dream_preference_margin_bottom</item>
+ <item name="android:layout_marginStart">@dimen/dream_preference_margin_horizontal</item>
+ <item name="android:layout_marginEnd">@dimen/dream_preference_margin_horizontal</item>
+ <item name="cardBackgroundColor">@color/dream_card_color_state_list</item>
+ <item name="cardCornerRadius">@dimen/dream_item_corner_radius</item>
+ <item name="cardElevation">0dp</item>
+ <item name="rippleColor">?android:attr/colorControlHighlight</item>
+ </style>
</resources>
diff --git a/res/xml/accessibility_vibration_intensity_settings.xml b/res/xml/accessibility_vibration_intensity_settings.xml
index 7982268..7b08fe0 100644
--- a/res/xml/accessibility_vibration_intensity_settings.xml
+++ b/res/xml/accessibility_vibration_intensity_settings.xml
@@ -19,6 +19,12 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/accessibility_vibration_settings_title">
+ <com.android.settingslib.widget.MainSwitchPreference
+ android:key="vibration_main_switch"
+ android:title="@string/accessibility_vibration_primary_switch_title"
+ app:keywords="@string/keywords_accessibility_vibration_primary_switch"
+ app:controller="com.android.settings.accessibility.VibrationMainSwitchPreferenceController"/>
+
<PreferenceCategory
android:key="accessibility_call_vibration_category"
android:title="@string/accessibility_call_vibration_category_title">
diff --git a/res/xml/accessibility_vibration_settings.xml b/res/xml/accessibility_vibration_settings.xml
index af78433..25be499 100644
--- a/res/xml/accessibility_vibration_settings.xml
+++ b/res/xml/accessibility_vibration_settings.xml
@@ -19,6 +19,12 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/accessibility_vibration_settings_title">
+ <com.android.settingslib.widget.MainSwitchPreference
+ android:key="vibration_main_switch"
+ android:title="@string/accessibility_vibration_primary_switch_title"
+ app:keywords="@string/keywords_accessibility_vibration_primary_switch"
+ app:controller="com.android.settings.accessibility.VibrationMainSwitchPreferenceController"/>
+
<PreferenceCategory
android:key="accessibility_call_vibration_category"
android:title="@string/accessibility_call_vibration_category_title">
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 21ee30a..f29930c 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -45,6 +45,10 @@
android:title="@string/capture_system_heap_dump_title" />
<Preference
+ android:key="reboot_with_mte"
+ android:title="@string/reboot_with_mte_title" />
+
+ <Preference
android:key="local_backup_password"
android:title="@string/local_backup_password_title"
android:summary="@string/local_backup_password_summary_none"
diff --git a/res/xml/dream_fragment_overview.xml b/res/xml/dream_fragment_overview.xml
index 42b0334..59da688 100644
--- a/res/xml/dream_fragment_overview.xml
+++ b/res/xml/dream_fragment_overview.xml
@@ -19,23 +19,15 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/screensaver_settings_title">
- <com.android.settings.widget.GearPreference
- android:key="current_screensaver"
- android:title="@string/screensaver_settings_current"
- android:fragment="com.android.settings.dream.CurrentDreamPicker"
- settings:controller="com.android.settings.dream.CurrentDreamPreferenceController" />
+ <com.android.settingslib.widget.LayoutPreference
+ android:key="dream_picker"
+ android:selectable="false"
+ android:layout="@layout/dream_picker_layout"
+ settings:controller="com.android.settings.dream.DreamPickerController"/>
<Preference
android:key="when_to_start"
android:title="@string/screensaver_settings_when_to_dream"
- android:fragment="com.android.settings.dream.WhenToDreamPicker" />
-
- <PreferenceCategory>
- <com.android.settingslib.widget.LayoutPreference
- android:key="dream_start_now_button_container"
- android:layout="@layout/dream_start_button"
- android:selectable="false"
- settings:controller="com.android.settings.dream.StartNowPreferenceController" />
- </PreferenceCategory>
+ android:fragment="com.android.settings.dream.WhenToDreamPicker"/>
</PreferenceScreen>
diff --git a/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceController.java b/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceController.java
index 894d818..e79ad8b 100644
--- a/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceController.java
+++ b/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceController.java
@@ -16,57 +16,12 @@
package com.android.settings.accessibility;
-import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
-import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
-
import android.content.Context;
-import android.media.AudioManager;
-import android.os.VibrationAttributes;
-import android.os.Vibrator;
-import android.provider.Settings;
/** Preference controller for ringtone vibration intensity */
public class RingVibrationIntensityPreferenceController
extends VibrationIntensityPreferenceController {
- /** General configuration for ringtone vibration intensity settings. */
- public static final class RingVibrationPreferenceConfig extends VibrationPreferenceConfig {
- private final AudioManager mAudioManager;
-
- public RingVibrationPreferenceConfig(Context context) {
- super(context, Settings.System.RING_VIBRATION_INTENSITY,
- VibrationAttributes.USAGE_RINGTONE);
- mAudioManager = context.getSystemService(AudioManager.class);
- }
-
- @Override
- public int readIntensity() {
- final int vibrateWhenRinging = Settings.System.getInt(mContentResolver,
- Settings.System.VIBRATE_WHEN_RINGING, ON);
-
- if ((vibrateWhenRinging == OFF)
- && !mAudioManager.isRampingRingerEnabled()) {
- // VIBRATE_WHEN_RINGING is deprecated but should still be applied if the user has
- // turned it off and has not enabled the ramping ringer (old three-state setting).
- return Vibrator.VIBRATION_INTENSITY_OFF;
- }
-
- return super.readIntensity();
- }
-
- @Override
- public boolean updateIntensity(int intensity) {
- final boolean success = super.updateIntensity(intensity);
-
- // VIBRATE_WHEN_RINGING is deprecated but should still reflect the intensity setting.
- // Ramping ringer is independent of the ring intensity and should not be affected.
- Settings.System.putInt(mContentResolver, Settings.System.VIBRATE_WHEN_RINGING,
- (intensity == Vibrator.VIBRATION_INTENSITY_OFF) ? OFF : ON);
-
- return success;
- }
- }
-
public RingVibrationIntensityPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey, new RingVibrationPreferenceConfig(context));
}
diff --git a/src/com/android/settings/accessibility/RingVibrationPreferenceConfig.java b/src/com/android/settings/accessibility/RingVibrationPreferenceConfig.java
new file mode 100644
index 0000000..da446d7
--- /dev/null
+++ b/src/com/android/settings/accessibility/RingVibrationPreferenceConfig.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2022 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.accessibility;
+
+import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
+import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
+
+import android.content.Context;
+import android.media.AudioManager;
+import android.os.VibrationAttributes;
+import android.os.Vibrator;
+import android.provider.Settings;
+
+/** General configuration for ringtone vibration intensity settings. */
+public class RingVibrationPreferenceConfig extends VibrationPreferenceConfig {
+ private final AudioManager mAudioManager;
+
+ public RingVibrationPreferenceConfig(Context context) {
+ super(context, Settings.System.RING_VIBRATION_INTENSITY,
+ VibrationAttributes.USAGE_RINGTONE);
+ mAudioManager = context.getSystemService(AudioManager.class);
+ }
+
+ @Override
+ public int readIntensity() {
+ final int vibrateWhenRinging = Settings.System.getInt(mContentResolver,
+ Settings.System.VIBRATE_WHEN_RINGING, ON);
+
+ if ((vibrateWhenRinging == OFF)
+ && !mAudioManager.isRampingRingerEnabled()) {
+ // VIBRATE_WHEN_RINGING is deprecated but should still be applied if the user has
+ // turned it off and has not enabled the ramping ringer (old three-state setting).
+ return Vibrator.VIBRATION_INTENSITY_OFF;
+ }
+
+ return super.readIntensity();
+ }
+
+ @Override
+ public boolean updateIntensity(int intensity) {
+ final boolean success = super.updateIntensity(intensity);
+
+ // VIBRATE_WHEN_RINGING is deprecated but should still reflect the intensity setting.
+ // Ramping ringer is independent of the ring intensity and should not be affected.
+ Settings.System.putInt(mContentResolver, Settings.System.VIBRATE_WHEN_RINGING,
+ (intensity == Vibrator.VIBRATION_INTENSITY_OFF) ? OFF : ON);
+
+ return success;
+ }
+}
diff --git a/src/com/android/settings/accessibility/RingVibrationTogglePreferenceController.java b/src/com/android/settings/accessibility/RingVibrationTogglePreferenceController.java
index e68b6ce..efad946 100644
--- a/src/com/android/settings/accessibility/RingVibrationTogglePreferenceController.java
+++ b/src/com/android/settings/accessibility/RingVibrationTogglePreferenceController.java
@@ -18,8 +18,6 @@
import android.content.Context;
-import com.android.settings.accessibility.RingVibrationIntensityPreferenceController.RingVibrationPreferenceConfig;
-
/** Preference controller for ringtone vibration with only a toggle for on/off states. */
public class RingVibrationTogglePreferenceController extends VibrationTogglePreferenceController {
diff --git a/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java b/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java
index ef15f06..b3e8168 100644
--- a/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java
+++ b/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.os.Vibrator;
+import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
@@ -70,14 +71,23 @@
super.displayPreference(screen);
final SeekBarPreference preference = screen.findPreference(getPreferenceKey());
mSettingsContentObserver.onDisplayPreference(this, preference);
- // TODO: remove this and replace with a different way to play the haptic preview without
- // relying on the setting being propagated to the service.
+ preference.setEnabled(mPreferenceConfig.isPreferenceEnabled());
+ // TODO: remove setContinuousUpdates and replace with a different way to play the haptic
+ // preview without relying on the setting being propagated to the service.
preference.setContinuousUpdates(true);
preference.setMin(getMin());
preference.setMax(getMax());
}
@Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ if (preference != null) {
+ preference.setEnabled(mPreferenceConfig.isPreferenceEnabled());
+ }
+ }
+
+ @Override
public int getMin() {
return Vibrator.VIBRATION_INTENSITY_OFF;
}
@@ -89,12 +99,19 @@
@Override
public int getSliderPosition() {
+ if (!mPreferenceConfig.isPreferenceEnabled()) {
+ return getMin();
+ }
final int position = mPreferenceConfig.readIntensity();
return Math.min(position, getMax());
}
@Override
public boolean setSliderPosition(int position) {
+ if (!mPreferenceConfig.isPreferenceEnabled()) {
+ // Ignore slider updates when the preference is disabled.
+ return false;
+ }
final int intensity = calculateVibrationIntensity(position);
final boolean success = mPreferenceConfig.updateIntensity(intensity);
diff --git a/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceController.java b/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceController.java
new file mode 100644
index 0000000..726bbc1
--- /dev/null
+++ b/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceController.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2022 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.accessibility;
+
+import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
+import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
+
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.provider.Settings;
+
+import com.android.settings.R;
+import com.android.settings.widget.SettingsMainSwitchPreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+/**
+ * Preference controller for the main switch setting for vibration and haptics screen.
+ *
+ * <p>This preference is controlled by the setting key{@link Settings.System#VIBRATE_ON}, and it
+ * will disable the entire settings screen once the settings is turned OFF. All device haptics will
+ * be disabled by this setting, except the flagged alerts and accessibility touch feedback.
+ */
+public class VibrationMainSwitchPreferenceController extends SettingsMainSwitchPreferenceController
+ implements LifecycleObserver, OnStart, OnStop {
+
+ private final ContentObserver mSettingObserver;
+
+ public VibrationMainSwitchPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ mSettingObserver = new ContentObserver(new Handler(/* async= */ true)) {
+ @Override
+ public void onChange(boolean selfChange, Uri uri) {
+ updateState(mSwitchPreference);
+ }
+ };
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public void onStart() {
+ mContext.getContentResolver().registerContentObserver(
+ Settings.System.getUriFor(VibrationPreferenceConfig.MAIN_SWITCH_SETTING_KEY),
+ /* notifyForDescendants= */ false,
+ mSettingObserver);
+ }
+
+ @Override
+ public void onStop() {
+ mContext.getContentResolver().unregisterContentObserver(mSettingObserver);
+ }
+
+ @Override
+ public boolean isChecked() {
+ return VibrationPreferenceConfig.isMainVibrationSwitchEnabled(
+ mContext.getContentResolver());
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ return Settings.System.putInt(mContext.getContentResolver(),
+ VibrationPreferenceConfig.MAIN_SWITCH_SETTING_KEY,
+ isChecked ? ON : OFF);
+ }
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_accessibility;
+ }
+}
diff --git a/src/com/android/settings/accessibility/VibrationPreferenceConfig.java b/src/com/android/settings/accessibility/VibrationPreferenceConfig.java
index aa59554..1b0b163 100644
--- a/src/com/android/settings/accessibility/VibrationPreferenceConfig.java
+++ b/src/com/android/settings/accessibility/VibrationPreferenceConfig.java
@@ -16,6 +16,8 @@
package com.android.settings.accessibility;
+import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
+
import android.content.ContentResolver;
import android.content.Context;
import android.database.ContentObserver;
@@ -36,12 +38,23 @@
*/
public abstract class VibrationPreferenceConfig {
+ /**
+ * SettingsProvider key for the main "Vibration & haptics" toggle preference, that can disable
+ * all device vibrations.
+ */
+ public static final String MAIN_SWITCH_SETTING_KEY = Settings.System.VIBRATE_ON;
+
protected final ContentResolver mContentResolver;
private final Vibrator mVibrator;
private final String mSettingKey;
private final int mDefaultIntensity;
private final VibrationAttributes mVibrationAttributes;
+ /** Returns true if the user setting for enabling device vibrations is enabled. */
+ public static boolean isMainVibrationSwitchEnabled(ContentResolver contentResolver) {
+ return Settings.System.getInt(contentResolver, MAIN_SWITCH_SETTING_KEY, ON) == ON;
+ }
+
public VibrationPreferenceConfig(Context context, String settingKey, int vibrationUsage) {
mContentResolver = context.getContentResolver();
mVibrator = context.getSystemService(Vibrator.class);
@@ -52,11 +65,16 @@
.build();
}
- /** Return the setting key for this setting preference. */
+ /** Returns the setting key for this setting preference. */
public String getSettingKey() {
return mSettingKey;
}
+ /** Returns true if this setting preference is enabled for user update. */
+ public boolean isPreferenceEnabled() {
+ return isMainVibrationSwitchEnabled(mContentResolver);
+ }
+
/** Returns the default intensity to be displayed when the setting value is not set. */
public int getDefaultIntensity() {
return mDefaultIntensity;
@@ -80,6 +98,9 @@
/** {@link ContentObserver} for a setting described by a {@link VibrationPreferenceConfig}. */
public static final class SettingObserver extends ContentObserver {
+ private static final Uri MAIN_SWITCH_SETTING_URI =
+ Settings.System.getUriFor(MAIN_SWITCH_SETTING_KEY);
+
private final Uri mUri;
private AbstractPreferenceController mPreferenceController;
private Preference mPreference;
@@ -92,7 +113,11 @@
@Override
public void onChange(boolean selfChange, Uri uri) {
- if (mUri.equals(uri) && mPreferenceController != null && mPreference != null) {
+ if (mPreferenceController == null || mPreference == null) {
+ // onDisplayPreference not triggered yet, nothing to update.
+ return;
+ }
+ if (mUri.equals(uri) || MAIN_SWITCH_SETTING_URI.equals(uri)) {
mPreferenceController.updateState(mPreference);
}
}
@@ -103,6 +128,8 @@
*/
public void register(ContentResolver contentResolver) {
contentResolver.registerContentObserver(mUri, /* notifyForDescendants= */ false, this);
+ contentResolver.registerContentObserver(MAIN_SWITCH_SETTING_URI,
+ /* notifyForDescendants= */ false, this);
}
/**
diff --git a/src/com/android/settings/accessibility/VibrationRampingRingerTogglePreferenceController.java b/src/com/android/settings/accessibility/VibrationRampingRingerTogglePreferenceController.java
index 21a5e36..37a0257 100644
--- a/src/com/android/settings/accessibility/VibrationRampingRingerTogglePreferenceController.java
+++ b/src/com/android/settings/accessibility/VibrationRampingRingerTogglePreferenceController.java
@@ -21,7 +21,6 @@
import android.media.AudioManager;
import android.net.Uri;
import android.os.Handler;
-import android.os.VibrationAttributes;
import android.os.Vibrator;
import android.provider.DeviceConfig;
import android.provider.Settings;
@@ -57,8 +56,9 @@
private final DeviceConfigProvider mDeviceConfigProvider;
private final ContentObserver mSettingObserver;
- private final Vibrator mVibrator;
private final AudioManager mAudioManager;
+ private final VibrationPreferenceConfig mRingVibrationPreferenceConfig;
+ private final VibrationPreferenceConfig.SettingObserver mRingSettingObserver;
private Preference mPreference;
@@ -70,8 +70,10 @@
String preferenceKey, DeviceConfigProvider deviceConfigProvider) {
super(context, preferenceKey);
mDeviceConfigProvider = deviceConfigProvider;
- mVibrator = context.getSystemService(Vibrator.class);
mAudioManager = context.getSystemService(AudioManager.class);
+ mRingVibrationPreferenceConfig = new RingVibrationPreferenceConfig(context);
+ mRingSettingObserver = new VibrationPreferenceConfig.SettingObserver(
+ mRingVibrationPreferenceConfig);
mSettingObserver = new ContentObserver(new Handler(/* async= */ true)) {
@Override
public void onChange(boolean selfChange, Uri uri) {
@@ -91,18 +93,16 @@
@Override
public void onStart() {
+ mRingSettingObserver.register(mContext.getContentResolver());
mContext.getContentResolver().registerContentObserver(
Settings.System.getUriFor(Settings.System.APPLY_RAMPING_RINGER),
/* notifyForDescendants= */ false,
mSettingObserver);
- mContext.getContentResolver().registerContentObserver(
- Settings.System.getUriFor(Settings.System.RING_VIBRATION_INTENSITY),
- /* notifyForDescendants= */ false,
- mSettingObserver);
}
@Override
public void onStop() {
+ mRingSettingObserver.unregister(mContext.getContentResolver());
mContext.getContentResolver().unregisterContentObserver(mSettingObserver);
}
@@ -110,6 +110,7 @@
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = screen.findPreference(getPreferenceKey());
+ mRingSettingObserver.onDisplayPreference(this, mPreference);
mPreference.setEnabled(isRingVibrationEnabled());
}
@@ -141,9 +142,8 @@
}
private boolean isRingVibrationEnabled() {
- final int ringIntensity = Settings.System.getInt(mContext.getContentResolver(),
- Settings.System.RING_VIBRATION_INTENSITY,
- mVibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_RINGTONE));
- return ringIntensity != Vibrator.VIBRATION_INTENSITY_OFF;
+ return mRingVibrationPreferenceConfig.isPreferenceEnabled()
+ && (mRingVibrationPreferenceConfig.readIntensity()
+ != Vibrator.VIBRATION_INTENSITY_OFF);
}
}
diff --git a/src/com/android/settings/accessibility/VibrationTogglePreferenceController.java b/src/com/android/settings/accessibility/VibrationTogglePreferenceController.java
index 5278b66..8f158cc 100644
--- a/src/com/android/settings/accessibility/VibrationTogglePreferenceController.java
+++ b/src/com/android/settings/accessibility/VibrationTogglePreferenceController.java
@@ -58,16 +58,29 @@
super.displayPreference(screen);
final Preference preference = screen.findPreference(getPreferenceKey());
mSettingsContentObserver.onDisplayPreference(this, preference);
+ preference.setEnabled(mPreferenceConfig.isPreferenceEnabled());
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ if (preference != null) {
+ preference.setEnabled(mPreferenceConfig.isPreferenceEnabled());
+ }
}
@Override
public boolean isChecked() {
- final int position = mPreferenceConfig.readIntensity();
- return position != Vibrator.VIBRATION_INTENSITY_OFF;
+ return mPreferenceConfig.isPreferenceEnabled()
+ && (mPreferenceConfig.readIntensity() != Vibrator.VIBRATION_INTENSITY_OFF);
}
@Override
public boolean setChecked(boolean isChecked) {
+ if (!mPreferenceConfig.isPreferenceEnabled()) {
+ // Ignore toggle updates when the preference is disabled.
+ return false;
+ }
final int newIntensity = isChecked
? mPreferenceConfig.getDefaultIntensity()
: Vibrator.VIBRATION_INTENSITY_OFF;
diff --git a/src/com/android/settings/applications/appinfo/AppLocaleDetails.java b/src/com/android/settings/applications/appinfo/AppLocaleDetails.java
index 966f02d..7fd43c2 100644
--- a/src/com/android/settings/applications/appinfo/AppLocaleDetails.java
+++ b/src/com/android/settings/applications/appinfo/AppLocaleDetails.java
@@ -237,18 +237,28 @@
mSuggestedLocales.add(appLocale);
}
// 2nd locale in suggested languages group.
- if (simLocale != null && !simLocale.equals(appLocale)) {
+ if (simLocale != null && !compareLocale(simLocale, appLocale)) {
mSuggestedLocales.add(simLocale);
}
// Other locales in suggested languages group.
for (int i = 0; i < currentSystemLocales.size(); i++) {
Locale locale = currentSystemLocales.get(i);
- if (!locale.equals(appLocale) && !locale.equals(simLocale)) {
+ if (!compareLocale(locale, appLocale) && !compareLocale(locale, simLocale)) {
mSuggestedLocales.add(locale);
}
}
}
+ static boolean compareLocale(Locale source, Locale target) {
+ if (source == null && target == null) {
+ return true;
+ } else if (source != null && target != null) {
+ return LocaleList.matchesLanguageAndScript(source, target);
+ } else {
+ return false;
+ }
+ }
+
@VisibleForTesting
void handleSupportedLocales() {
//TODO Waiting for PackageManager api
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
index c807893..2ade4ec 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
@@ -16,6 +16,7 @@
package com.android.settings.bluetooth;
+import android.app.settings.SettingsEnums;
import android.content.Context;
import androidx.preference.PreferenceFragmentCompat;
@@ -70,7 +71,11 @@
mActionButtons
.setButton2Text(R.string.bluetooth_device_context_disconnect)
.setButton2Icon(R.drawable.ic_settings_close)
- .setButton2OnClickListener(view -> mCachedDevice.disconnect());
+ .setButton2OnClickListener(view -> {
+ mMetricsFeatureProvider.action(mContext,
+ SettingsEnums.ACTION_SETTINGS_BLUETOOTH_DISCONNECT);
+ mCachedDevice.disconnect();
+ });
mConnectButtonInitialized = true;
}
} else {
@@ -79,7 +84,11 @@
.setButton2Text(R.string.bluetooth_device_context_connect)
.setButton2Icon(R.drawable.ic_add_24dp)
.setButton2OnClickListener(
- view -> mCachedDevice.connect());
+ view -> {
+ mMetricsFeatureProvider.action(mContext,
+ SettingsEnums.ACTION_SETTINGS_BLUETOOTH_CONNECT);
+ mCachedDevice.connect();
+ });
mConnectButtonInitialized = true;
}
}
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsController.java
index bb48904..5444f68 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsController.java
@@ -22,8 +22,10 @@
import androidx.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -40,6 +42,7 @@
protected final Context mContext;
protected final PreferenceFragmentCompat mFragment;
protected final CachedBluetoothDevice mCachedDevice;
+ protected final MetricsFeatureProvider mMetricsFeatureProvider;
public BluetoothDetailsController(Context context, PreferenceFragmentCompat fragment,
CachedBluetoothDevice device, Lifecycle lifecycle) {
@@ -48,6 +51,7 @@
mFragment = fragment;
mCachedDevice = device;
lifecycle.addObserver(this);
+ mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
}
@Override
diff --git a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
index f5bc279..3bdf91e 100644
--- a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
@@ -15,6 +15,7 @@
*/
package com.android.settings.bluetooth;
+import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.content.Context;
@@ -116,6 +117,8 @@
if (device.isConnected()) {
return device.setActive();
}
+ mMetricsFeatureProvider.action(mPrefContext,
+ SettingsEnums.ACTION_SETTINGS_BLUETOOTH_CONNECT);
device.connect();
return true;
}
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 946e0d7..8f227dc 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -477,6 +477,7 @@
controllers.add(new BugReportPreferenceController(context));
controllers.add(new BugReportHandlerPreferenceController(context));
controllers.add(new SystemServerHeapDumpPreferenceController(context));
+ controllers.add(new RebootWithMtePreferenceController(context, fragment));
controllers.add(new LocalBackupPasswordPreferenceController(context));
controllers.add(new StayAwakePreferenceController(context, lifecycle));
controllers.add(new HdcpCheckingPreferenceController(context));
diff --git a/src/com/android/settings/development/RebootWithMteDialog.java b/src/com/android/settings/development/RebootWithMteDialog.java
new file mode 100644
index 0000000..b6522a9
--- /dev/null
+++ b/src/com/android/settings/development/RebootWithMteDialog.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.app.Dialog;
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.os.PowerManager;
+import android.os.SystemProperties;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
+public class RebootWithMteDialog extends InstrumentedDialogFragment
+ implements DialogInterface.OnClickListener {
+
+ public static final String TAG = "RebootWithMteDlg";
+ private Context mContext;
+
+ public RebootWithMteDialog(Context context) {
+ mContext = context;
+ }
+
+ public static void show(Context context, Fragment host) {
+ FragmentManager manager = host.getActivity().getSupportFragmentManager();
+ if (manager.findFragmentByTag(TAG) == null) {
+ RebootWithMteDialog dialog = new RebootWithMteDialog(context);
+ dialog.setTargetFragment(host, 0 /* requestCode */);
+ dialog.show(manager, TAG);
+ }
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.REBOOT_WITH_MTE;
+ }
+
+ @Override
+ public Dialog onCreateDialog(Bundle savedInstanceState) {
+ return new AlertDialog.Builder(getActivity())
+ .setTitle(R.string.reboot_with_mte_title)
+ .setMessage(R.string.reboot_with_mte_message)
+ .setPositiveButton(android.R.string.ok, this /* onClickListener */)
+ .setNegativeButton(android.R.string.cancel, null /* onClickListener */)
+ .setIcon(android.R.drawable.ic_dialog_alert)
+ .create();
+ }
+
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ PowerManager pm = mContext.getSystemService(PowerManager.class);
+ SystemProperties.set("arm64.memtag.bootctl", "memtag-once");
+ pm.reboot(null);
+ }
+}
diff --git a/src/com/android/settings/development/RebootWithMtePreferenceController.java b/src/com/android/settings/development/RebootWithMtePreferenceController.java
new file mode 100644
index 0000000..6c03853
--- /dev/null
+++ b/src/com/android/settings/development/RebootWithMtePreferenceController.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import androidx.preference.Preference;
+
+import com.android.settings.Utils;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class RebootWithMtePreferenceController extends DeveloperOptionsPreferenceController
+ implements PreferenceControllerMixin {
+
+ private static final String KEY_REBOOT_WITH_MTE = "reboot_with_mte";
+
+ private final DevelopmentSettingsDashboardFragment mFragment;
+
+ public RebootWithMtePreferenceController(
+ Context context, DevelopmentSettingsDashboardFragment fragment) {
+ super(context);
+ mFragment = fragment;
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return android.os.SystemProperties.getBoolean("ro.arm64.memtag.bootctl_supported", false);
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return KEY_REBOOT_WITH_MTE;
+ }
+
+ @Override
+ public boolean handlePreferenceTreeClick(Preference preference) {
+ if (Utils.isMonkeyRunning()) {
+ return false;
+ }
+
+ if (TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+ RebootWithMteDialog.show(mContext, mFragment);
+ return true;
+ }
+ return false;
+ }
+}
diff --git a/src/com/android/settings/dream/CurrentDreamPicker.java b/src/com/android/settings/dream/CurrentDreamPicker.java
deleted file mode 100644
index 3134e79..0000000
--- a/src/com/android/settings/dream/CurrentDreamPicker.java
+++ /dev/null
@@ -1,125 +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.dream;
-
-import android.app.settings.SettingsEnums;
-import android.content.ComponentName;
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-
-import com.android.settings.R;
-import com.android.settings.widget.RadioButtonPickerFragment;
-import com.android.settingslib.dream.DreamBackend;
-import com.android.settingslib.dream.DreamBackend.DreamInfo;
-import com.android.settingslib.widget.CandidateInfo;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-public final class CurrentDreamPicker extends RadioButtonPickerFragment {
-
- private DreamBackend mBackend;
-
- @Override
- public void onAttach(Context context) {
- super.onAttach(context);
-
- mBackend = DreamBackend.getInstance(context);
- }
-
- @Override
- protected int getPreferenceScreenResId() {
- return R.xml.current_dream_settings;
- }
-
- @Override
- public int getMetricsCategory() {
- return SettingsEnums.DREAM;
- }
-
- @Override
- protected boolean setDefaultKey(String key) {
- Map<String, ComponentName> componentNameMap = getDreamComponentsMap();
- if (componentNameMap.get(key) != null) {
- mBackend.setActiveDream(componentNameMap.get(key));
- return true;
- }
- return false;
- }
-
- @Override
- protected String getDefaultKey() {
- return mBackend.getActiveDream().flattenToString();
- }
-
- @Override
- protected List<? extends CandidateInfo> getCandidates() {
- final List<DreamCandidateInfo> candidates;
- candidates = mBackend.getDreamInfos().stream()
- .map(DreamCandidateInfo::new)
- .collect(Collectors.toList());
-
- return candidates;
- }
-
- @Override
- protected void onSelectionPerformed(boolean success) {
- super.onSelectionPerformed(success);
-
- getActivity().finish();
- }
-
- private Map<String, ComponentName> getDreamComponentsMap() {
- Map<String, ComponentName> comps = new HashMap<>();
- mBackend.getDreamInfos()
- .forEach((info) ->
- comps.put(info.componentName.flattenToString(), info.componentName));
-
- return comps;
- }
-
- private static final class DreamCandidateInfo extends CandidateInfo {
- private final CharSequence name;
- private final Drawable icon;
- private final String key;
-
- DreamCandidateInfo(DreamInfo info) {
- super(true);
-
- name = info.caption;
- icon = info.icon;
- key = info.componentName.flattenToString();
- }
-
- @Override
- public CharSequence loadLabel() {
- return name;
- }
-
- @Override
- public Drawable loadIcon() {
- return icon;
- }
-
- @Override
- public String getKey() {
- return key;
- }
- }
-}
diff --git a/src/com/android/settings/dream/CurrentDreamPreferenceController.java b/src/com/android/settings/dream/CurrentDreamPreferenceController.java
deleted file mode 100644
index c267921..0000000
--- a/src/com/android/settings/dream/CurrentDreamPreferenceController.java
+++ /dev/null
@@ -1,93 +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.dream;
-
-import android.content.Context;
-
-import androidx.preference.Preference;
-
-import com.android.settings.Utils;
-import com.android.settings.core.BasePreferenceController;
-import com.android.settings.widget.GearPreference;
-import com.android.settingslib.RestrictedPreference;
-import com.android.settingslib.dream.DreamBackend;
-import com.android.settingslib.dream.DreamBackend.DreamInfo;
-
-import java.util.Optional;
-
-public class CurrentDreamPreferenceController extends BasePreferenceController {
-
- private final DreamBackend mBackend;
-
- public CurrentDreamPreferenceController(Context context, String key) {
- super(context, key);
- mBackend = DreamBackend.getInstance(context);
- }
-
- @Override
- public int getAvailabilityStatus() {
- return mBackend.getDreamInfos().size() > 0 ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
- }
-
- @Override
- public void updateState(Preference preference) {
- super.updateState(preference);
- setGearClickListenerForPreference(preference);
- setActiveDreamIcon(preference);
- }
-
- @Override
- public CharSequence getSummary() {
- return mBackend.getActiveDreamName();
- }
-
- private void setGearClickListenerForPreference(Preference preference) {
- if (!(preference instanceof GearPreference)) {
- return;
- }
-
- final GearPreference gearPreference = (GearPreference) preference;
- final Optional<DreamInfo> info = getActiveDreamInfo();
- if (!info.isPresent() || info.get().settingsComponentName == null) {
- gearPreference.setOnGearClickListener(null);
- return;
- }
- gearPreference.setOnGearClickListener(gearPref -> launchScreenSaverSettings());
- }
-
- private void launchScreenSaverSettings() {
- final Optional<DreamInfo> info = getActiveDreamInfo();
- if (!info.isPresent()) return;
- mBackend.launchSettings(mContext, info.get());
- }
-
- private Optional<DreamInfo> getActiveDreamInfo() {
- return mBackend.getDreamInfos()
- .stream()
- .filter((info) -> info.isActive)
- .findFirst();
- }
-
- private void setActiveDreamIcon(Preference preference) {
- if (!(preference instanceof GearPreference)) {
- return;
- }
- final GearPreference gearPref = (GearPreference) preference;
- gearPref.setIconSize(RestrictedPreference.ICON_SIZE_SMALL);
- gearPref.setIcon(Utils.getSafeIcon(mBackend.getActiveIcon()));
- }
-}
diff --git a/src/com/android/settings/dream/DreamPickerAdapter.java b/src/com/android/settings/dream/DreamPickerAdapter.java
new file mode 100644
index 0000000..50aaee2
--- /dev/null
+++ b/src/com/android/settings/dream/DreamPickerAdapter.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2022 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.dream;
+
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.settings.R;
+import com.android.settingslib.dream.DreamBackend.DreamInfo;
+
+import java.util.List;
+
+/**
+ * RecyclerView adapter which displays list of available dreams for the user to select.
+ */
+class DreamPickerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+ private final List<DreamInfo> mDreamInfoList;
+ private final OnItemClickListener mItemClickListener;
+ private final OnItemClickListener mOnDreamSelected = new OnItemClickListener() {
+ @Override
+ public void onItemClicked(DreamInfo dreamInfo) {
+ if (mItemClickListener != null) {
+ mItemClickListener.onItemClicked(dreamInfo);
+ }
+ mDreamInfoList.forEach(dream -> {
+ if (dream != null) {
+ dream.isActive = false;
+ }
+ });
+ dreamInfo.isActive = true;
+ notifyDataSetChanged();
+ }
+ };
+ private final OnItemClickListener mOnCustomizeListener;
+
+ interface OnItemClickListener {
+ void onItemClicked(DreamInfo dreamInfo);
+ }
+
+ /**
+ * View holder for each Dream service.
+ */
+ private static class DreamViewHolder extends RecyclerView.ViewHolder {
+ private final ImageView mIconView;
+ private final TextView mTitleView;
+ private final TextView mSummaryView;
+ private final ImageView mPreviewView;
+ private final Button mCustomizeButton;
+
+ DreamViewHolder(View view) {
+ super(view);
+ mPreviewView = view.findViewById(R.id.preview);
+ mIconView = view.findViewById(R.id.icon);
+ mTitleView = view.findViewById(R.id.title_text);
+ mSummaryView = view.findViewById(R.id.summary_text);
+ mCustomizeButton = view.findViewById(R.id.customize_button);
+ }
+
+ /**
+ * Bind the dream service view at the given position. Add details on the
+ * dream's icon, name and description.
+ */
+ public void bindView(DreamInfo dreamInfo, OnItemClickListener clickListener,
+ OnItemClickListener customizeListener) {
+ mIconView.setImageDrawable(dreamInfo.icon);
+ mTitleView.setText(dreamInfo.caption);
+ mPreviewView.setImageDrawable(dreamInfo.previewImage);
+ mSummaryView.setText(dreamInfo.description);
+ itemView.setActivated(dreamInfo.isActive);
+ if (dreamInfo.isActive && dreamInfo.settingsComponentName != null) {
+ mCustomizeButton.setVisibility(View.VISIBLE);
+ mCustomizeButton.setOnClickListener(
+ v -> customizeListener.onItemClicked(dreamInfo));
+ } else {
+ mCustomizeButton.setVisibility(View.GONE);
+ }
+
+ itemView.setOnClickListener(v -> clickListener.onItemClicked(dreamInfo));
+ }
+ }
+
+ DreamPickerAdapter(List<DreamInfo> dreamInfos, OnItemClickListener clickListener,
+ OnItemClickListener onCustomizeListener) {
+ mDreamInfoList = dreamInfos;
+ mItemClickListener = clickListener;
+ mOnCustomizeListener = onCustomizeListener;
+ }
+
+ @NonNull
+ @Override
+ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) {
+ View view = LayoutInflater.from(viewGroup.getContext())
+ .inflate(R.layout.dream_preference_layout, viewGroup, false);
+ return new DreamViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
+ ((DreamViewHolder) viewHolder).bindView(mDreamInfoList.get(i), mOnDreamSelected,
+ mOnCustomizeListener);
+ }
+
+ @Override
+ public int getItemCount() {
+ return mDreamInfoList.size();
+ }
+}
diff --git a/src/com/android/settings/dream/DreamPickerController.java b/src/com/android/settings/dream/DreamPickerController.java
new file mode 100644
index 0000000..15cd75c
--- /dev/null
+++ b/src/com/android/settings/dream/DreamPickerController.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2022 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.dream;
+
+import android.content.Context;
+import android.widget.Button;
+
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.dream.DreamPickerAdapter.OnItemClickListener;
+import com.android.settingslib.dream.DreamBackend;
+import com.android.settingslib.widget.LayoutPreference;
+
+import java.util.List;
+
+/**
+ * Controller for the dream picker where the user can select a screensaver.
+ */
+public class DreamPickerController extends BasePreferenceController {
+ public static final String KEY = "dream_picker";
+
+ private final DreamBackend mBackend;
+ private final List<DreamBackend.DreamInfo> mDreamInfos;
+ private Button mPreviewButton;
+ @Nullable
+ private DreamBackend.DreamInfo mActiveDream;
+
+ private final OnItemClickListener mItemClickListener =
+ new OnItemClickListener() {
+ @Override
+ public void onItemClicked(DreamBackend.DreamInfo dreamInfo) {
+ mActiveDream = dreamInfo;
+ mBackend.setActiveDream(
+ mActiveDream == null ? null : mActiveDream.componentName);
+ updatePreviewButtonState();
+ }
+ };
+
+ private final OnItemClickListener mCustomizeListener = new OnItemClickListener() {
+ @Override
+ public void onItemClicked(DreamBackend.DreamInfo dreamInfo) {
+ mBackend.launchSettings(mContext, dreamInfo);
+ }
+ };
+
+ public DreamPickerController(Context context, String preferenceKey) {
+ this(context, preferenceKey, DreamBackend.getInstance(context));
+ }
+
+ public DreamPickerController(Context context, String preferenceKey, DreamBackend backend) {
+ super(context, preferenceKey);
+ mBackend = backend;
+ mDreamInfos = mBackend.getDreamInfos();
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return KEY;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return mDreamInfos.size() > 0 ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+
+ mActiveDream = getActiveDreamInfo();
+
+ final DreamPickerAdapter adapter =
+ new DreamPickerAdapter(mDreamInfos, mItemClickListener, mCustomizeListener);
+
+ final RecyclerView recyclerView =
+ ((LayoutPreference) preference).findViewById(R.id.dream_list);
+ recyclerView.setLayoutManager(new AutoFitGridLayoutManager(mContext));
+ recyclerView.setAdapter(adapter);
+
+ mPreviewButton = ((LayoutPreference) preference).findViewById(R.id.preview_button);
+ mPreviewButton.setOnClickListener(v -> mBackend.preview(mActiveDream));
+ updatePreviewButtonState();
+ }
+
+ private void updatePreviewButtonState() {
+ final boolean hasDream = mActiveDream != null;
+ mPreviewButton.setClickable(hasDream);
+ mPreviewButton.setEnabled(hasDream);
+ }
+
+ @Nullable
+ private DreamBackend.DreamInfo getActiveDreamInfo() {
+ return mDreamInfos
+ .stream()
+ .filter(d -> d.isActive)
+ .findFirst()
+ .orElse(null);
+ }
+
+ /** Grid layout manager that calculates the number of columns for the screen size. */
+ private static final class AutoFitGridLayoutManager extends GridLayoutManager {
+ private final float mColumnWidth;
+
+ AutoFitGridLayoutManager(Context context) {
+ super(context, /* spanCount= */ 1);
+ this.mColumnWidth = context
+ .getResources()
+ .getDimensionPixelSize(R.dimen.dream_item_min_column_width);
+ }
+
+ @Override
+ public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
+ final int totalSpace = getWidth() - getPaddingRight() - getPaddingLeft();
+ final int spanCount = Math.max(1, (int) (totalSpace / mColumnWidth));
+ setSpanCount(spanCount);
+ super.onLayoutChildren(recycler, state);
+ }
+ }
+}
diff --git a/src/com/android/settings/dream/StartNowPreferenceController.java b/src/com/android/settings/dream/StartNowPreferenceController.java
deleted file mode 100644
index f270496..0000000
--- a/src/com/android/settings/dream/StartNowPreferenceController.java
+++ /dev/null
@@ -1,72 +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.dream;
-
-import android.content.Context;
-import android.widget.Button;
-
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.core.BasePreferenceController;
-import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.dream.DreamBackend;
-import com.android.settingslib.widget.LayoutPreference;
-
-/**
- * Controller that used to enable screen saver
- */
-public class StartNowPreferenceController extends BasePreferenceController {
-
- private final DreamBackend mBackend;
- private final MetricsFeatureProvider mMetricsFeatureProvider;
-
- public StartNowPreferenceController(Context context, String preferenceKey) {
- super(context, preferenceKey);
- mBackend = DreamBackend.getInstance(context);
- mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
- }
-
- @Override
- public int getAvailabilityStatus() {
- return AVAILABLE;
- }
-
- @Override
- public void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
-
- final LayoutPreference pref = screen.findPreference(getPreferenceKey());
- final Button startButton = pref.findViewById(R.id.dream_start_now_button);
- startButton.setOnClickListener(v -> {
- mMetricsFeatureProvider.logClickedPreference(pref,
- pref.getExtras().getInt(DashboardFragment.CATEGORY));
- mBackend.startDreaming();
- });
- }
-
- @Override
- public void updateState(Preference preference) {
- super.updateState(preference);
- final Button startButton = ((LayoutPreference) preference)
- .findViewById(R.id.dream_start_now_button);
- startButton.setEnabled(mBackend.getWhenToDreamSetting() != DreamBackend.NEVER);
- }
-}
diff --git a/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java b/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java
index 0d7d531..bcc55e3 100644
--- a/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java
+++ b/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java
@@ -17,7 +17,6 @@
package com.android.settings.localepicker;
import android.app.FragmentTransaction;
-import android.app.ListFragment;
import android.content.Intent;
import android.os.Bundle;
import android.view.MenuItem;
@@ -49,14 +48,6 @@
}
@Override
- protected void onStart() {
- super.onStart();
- final ListFragment listFragment =
- (ListFragment) getFragmentManager().findFragmentById(R.id.content_frame);
- listFragment.getListView().setNestedScrollingEnabled(true);
- }
-
- @Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == android.R.id.home) {
handleBackPressed();
diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index 3e7622c..60b8c6c 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -541,8 +541,6 @@
mDefaultHeaderColorList = mHeaderText.getTextColors();
mLockPatternView = (LockPatternView) view.findViewById(R.id.lockPattern);
mLockPatternView.setOnPatternListener(mChooseNewLockPatternListener);
- mLockPatternView.setTactileFeedbackEnabled(
- mLockPatternUtils.isTactileFeedbackEnabled());
mLockPatternView.setFadePattern(false);
mFooterText = (TextView) view.findViewById(R.id.footerText);
diff --git a/src/com/android/settings/password/ConfirmLockPattern.java b/src/com/android/settings/password/ConfirmLockPattern.java
index ec5efcf..6b9140a 100644
--- a/src/com/android/settings/password/ConfirmLockPattern.java
+++ b/src/com/android/settings/password/ConfirmLockPattern.java
@@ -144,8 +144,6 @@
mHeaderText = mDevicePolicyManager.getOrganizationNameForUser(mUserId);
}
- mLockPatternView.setTactileFeedbackEnabled(
- mLockPatternUtils.isTactileFeedbackEnabled());
mLockPatternView.setInStealthMode(!mLockPatternUtils.isVisiblePatternEnabled(
mEffectiveUserId));
mLockPatternView.setOnPatternListener(mConfirmExistingLockPatternListener);
diff --git a/tests/robotests/src/com/android/settings/MainClearTest.java b/tests/robotests/src/com/android/settings/MainClearTest.java
index e2a7ca9..ec33fad 100644
--- a/tests/robotests/src/com/android/settings/MainClearTest.java
+++ b/tests/robotests/src/com/android/settings/MainClearTest.java
@@ -55,7 +55,6 @@
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
@@ -209,7 +208,6 @@
}
@Test
- @Ignore
public void testShowWipeEuicc_euiccEnabled_unprovisioned() {
prepareEuiccState(
true /* isEuiccEnabled */,
@@ -228,7 +226,6 @@
}
@Test
- @Ignore
public void testShowWipeEuicc_developerMode_unprovisioned() {
prepareEuiccState(
true /* isEuiccEnabled */,
diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/VibrationIntensityPreferenceControllerTest.java
index ba48f66..048bce4 100644
--- a/tests/robotests/src/com/android/settings/accessibility/VibrationIntensityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/VibrationIntensityPreferenceControllerTest.java
@@ -38,11 +38,14 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
+/** Tests for {@link VibrationIntensityPreferenceController}. */
@RunWith(RobolectricTestRunner.class)
public class VibrationIntensityPreferenceControllerTest {
private static final String SETTING_KEY = Settings.System.NOTIFICATION_VIBRATION_INTENSITY;
private static final int VIBRATION_USAGE = VibrationAttributes.USAGE_NOTIFICATION;
+ private static final int OFF = 0;
+ private static final int ON = 1;
/** Basic implementation of preference controller to test generic behavior. */
private static class TestPreferenceController extends VibrationIntensityPreferenceController {
@@ -77,13 +80,34 @@
@Test
public void missingSetting_shouldReturnDefault() {
VibrationIntensityPreferenceController controller = createPreferenceController(3);
- Settings.System.putString(mContext.getContentResolver(), SETTING_KEY, null);
+ Settings.System.putString(mContext.getContentResolver(), SETTING_KEY, /* value= */ null);
controller.updateState(mPreference);
assertThat(mPreference.getProgress())
.isEqualTo(mVibrator.getDefaultVibrationIntensity(VIBRATION_USAGE));
}
@Test
+ public void updateState_mainSwitchUpdates_shouldPreserveSettingBetweenUpdates() {
+ VibrationIntensityPreferenceController controller = createPreferenceController(3);
+ updateSetting(SETTING_KEY, Vibrator.VIBRATION_INTENSITY_LOW);
+
+ updateSetting(VibrationPreferenceConfig.MAIN_SWITCH_SETTING_KEY, ON);
+ controller.updateState(mPreference);
+ assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_LOW);
+ assertThat(mPreference.isEnabled()).isTrue();
+
+ updateSetting(VibrationPreferenceConfig.MAIN_SWITCH_SETTING_KEY, OFF);
+ controller.updateState(mPreference);
+ assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
+ assertThat(mPreference.isEnabled()).isFalse();
+
+ updateSetting(VibrationPreferenceConfig.MAIN_SWITCH_SETTING_KEY, ON);
+ controller.updateState(mPreference);
+ assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_LOW);
+ assertThat(mPreference.isEnabled()).isTrue();
+ }
+
+ @Test
public void updateState_allLevelsSupported_shouldDisplayIntensityInSliderPosition() {
VibrationIntensityPreferenceController controller = createPreferenceController(3);
@@ -147,6 +171,22 @@
}
@Test
+ public void setProgress_mainSwitchDisabled_ignoresUpdates() throws Exception {
+ VibrationIntensityPreferenceController controller = createPreferenceController(3);
+ updateSetting(SETTING_KEY, Vibrator.VIBRATION_INTENSITY_LOW);
+ controller.updateState(mPreference);
+ assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_LOW);
+
+ updateSetting(VibrationPreferenceConfig.MAIN_SWITCH_SETTING_KEY, OFF);
+ controller.updateState(mPreference);
+ assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
+ assertThat(mPreference.isEnabled()).isFalse();
+
+ assertThat(controller.setSliderPosition(Vibrator.VIBRATION_INTENSITY_HIGH)).isFalse();
+ assertThat(readSetting(SETTING_KEY)).isEqualTo(Vibrator.VIBRATION_INTENSITY_LOW);
+ assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
+ }
+ @Test
public void setProgress_allSupportedPositions_updatesIntensitySetting() throws Exception {
VibrationIntensityPreferenceController controller = createPreferenceController(3);
diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceControllerTest.java
new file mode 100644
index 0000000..6f57003
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceControllerTest.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2022 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.accessibility;
+
+import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
+import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.MainSwitchPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link VibrationMainSwitchPreferenceController}. */
+@RunWith(RobolectricTestRunner.class)
+public class VibrationMainSwitchPreferenceControllerTest {
+
+ private static final String PREFERENCE_KEY = "preference_key";
+
+ @Mock private PreferenceScreen mScreen;
+
+ private Lifecycle mLifecycle;
+ private Context mContext;
+ private VibrationMainSwitchPreferenceController mController;
+ private MainSwitchPreference mPreference;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mLifecycle = new Lifecycle(() -> mLifecycle);
+ mContext = ApplicationProvider.getApplicationContext();
+ mController = new VibrationMainSwitchPreferenceController(mContext, PREFERENCE_KEY);
+ mLifecycle.addObserver(mController);
+ mPreference = new MainSwitchPreference(mContext);
+ mPreference.setTitle("Test title");
+ when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+ mController.displayPreference(mScreen);
+ }
+
+ @Test
+ public void verifyConstants() {
+ assertThat(mController.getPreferenceKey()).isEqualTo(PREFERENCE_KEY);
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+ }
+
+ @Test
+ public void updateState_shouldReturnTheSettingState() {
+ updateSetting(Settings.System.VIBRATE_ON, ON);
+ mController.updateState(mPreference);
+ assertThat(mPreference.isChecked()).isTrue();
+
+ updateSetting(Settings.System.VIBRATE_ON, OFF);
+ mController.updateState(mPreference);
+ assertThat(mPreference.isChecked()).isFalse();
+ }
+
+ @Test
+ public void setChecked_updatesSetting() throws Settings.SettingNotFoundException {
+ updateSetting(Settings.System.VIBRATE_ON, OFF);
+ mController.updateState(mPreference);
+ assertThat(mPreference.isChecked()).isFalse();
+
+ mController.setChecked(true);
+ assertThat(readSetting(Settings.System.VIBRATE_ON)).isEqualTo(ON);
+
+ mController.setChecked(false);
+ assertThat(readSetting(Settings.System.VIBRATE_ON)).isEqualTo(OFF);
+ }
+
+ private void updateSetting(String key, int value) {
+ Settings.System.putInt(mContext.getContentResolver(), key, value);
+ }
+
+ private int readSetting(String settingKey) throws Settings.SettingNotFoundException {
+ return Settings.System.getInt(mContext.getContentResolver(), settingKey);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/VibrationTogglePreferenceControllerTest.java
new file mode 100644
index 0000000..cb4a07e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/VibrationTogglePreferenceControllerTest.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 2022 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.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.VibrationAttributes;
+import android.os.Vibrator;
+import android.provider.Settings;
+
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link VibrationTogglePreferenceController}. */
+@RunWith(RobolectricTestRunner.class)
+public class VibrationTogglePreferenceControllerTest {
+
+ private static final String SETTING_KEY = Settings.System.NOTIFICATION_VIBRATION_INTENSITY;
+ private static final int VIBRATION_USAGE = VibrationAttributes.USAGE_NOTIFICATION;
+ private static final int OFF = 0;
+ private static final int ON = 1;
+
+ /** Basic implementation of preference controller to test generic behavior. */
+ private static class TestPreferenceController extends VibrationTogglePreferenceController {
+
+ TestPreferenceController(Context context) {
+ super(context, "preference_key",
+ new VibrationPreferenceConfig(context, SETTING_KEY, VIBRATION_USAGE) {});
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+ }
+
+ @Mock private PreferenceScreen mScreen;
+
+ private Lifecycle mLifecycle;
+ private Context mContext;
+ private Vibrator mVibrator;
+ private SwitchPreference mPreference;
+ private VibrationTogglePreferenceController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mLifecycle = new Lifecycle(() -> mLifecycle);
+ mContext = ApplicationProvider.getApplicationContext();
+ mVibrator = mContext.getSystemService(Vibrator.class);
+ mController = new TestPreferenceController(mContext);
+ mLifecycle.addObserver(mController);
+ mPreference = new SwitchPreference(mContext);
+ mPreference.setTitle("Test title");
+ when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+ mController.displayPreference(mScreen);
+ }
+
+ @Test
+ public void missingSetting_shouldBeCheckedByDefault() {
+ Settings.System.putString(mContext.getContentResolver(), SETTING_KEY, /* value= */ null);
+ mController.updateState(mPreference);
+ assertThat(mPreference.isChecked()).isTrue();
+ }
+
+ @Test
+ public void updateState_mainSwitchUpdates_shouldPreserveSettingBetweenUpdates() {
+ updateSetting(SETTING_KEY, Vibrator.VIBRATION_INTENSITY_LOW);
+
+ updateSetting(VibrationPreferenceConfig.MAIN_SWITCH_SETTING_KEY, ON);
+ mController.updateState(mPreference);
+ assertThat(mPreference.isChecked()).isTrue();
+ assertThat(mPreference.isEnabled()).isTrue();
+
+ updateSetting(VibrationPreferenceConfig.MAIN_SWITCH_SETTING_KEY, OFF);
+ mController.updateState(mPreference);
+ assertThat(mPreference.isChecked()).isFalse();
+ assertThat(mPreference.isEnabled()).isFalse();
+
+ updateSetting(VibrationPreferenceConfig.MAIN_SWITCH_SETTING_KEY, ON);
+ mController.updateState(mPreference);
+ assertThat(mPreference.isChecked()).isTrue();
+ assertThat(mPreference.isEnabled()).isTrue();
+ }
+
+ @Test
+ public void updateState_shouldUpdateToggleState() {
+ updateSetting(SETTING_KEY, Vibrator.VIBRATION_INTENSITY_HIGH);
+ mController.updateState(mPreference);
+ assertThat(mPreference.isChecked()).isTrue();
+
+ updateSetting(SETTING_KEY, Vibrator.VIBRATION_INTENSITY_OFF);
+ mController.updateState(mPreference);
+ assertThat(mPreference.isChecked()).isFalse();
+
+ updateSetting(SETTING_KEY, Vibrator.VIBRATION_INTENSITY_MEDIUM);
+ mController.updateState(mPreference);
+ assertThat(mPreference.isChecked()).isTrue();
+
+ updateSetting(SETTING_KEY, Vibrator.VIBRATION_INTENSITY_OFF);
+ mController.updateState(mPreference);
+ assertThat(mPreference.isChecked()).isFalse();
+
+ updateSetting(SETTING_KEY, Vibrator.VIBRATION_INTENSITY_LOW);
+ mController.updateState(mPreference);
+ assertThat(mPreference.isChecked()).isTrue();
+ }
+
+ @Test
+ public void setProgress_mainSwitchDisabled_ignoresUpdates() throws Exception {
+ updateSetting(SETTING_KEY, Vibrator.VIBRATION_INTENSITY_LOW);
+ mController.updateState(mPreference);
+ assertThat(mPreference.isChecked()).isTrue();
+
+ updateSetting(VibrationPreferenceConfig.MAIN_SWITCH_SETTING_KEY, OFF);
+ mController.updateState(mPreference);
+ assertThat(mPreference.isChecked()).isFalse();
+
+ mController.setChecked(true);
+ assertThat(readSetting(SETTING_KEY)).isEqualTo(Vibrator.VIBRATION_INTENSITY_LOW);
+ assertThat(mPreference.isChecked()).isFalse();
+ assertThat(mPreference.isEnabled()).isFalse();
+
+ }
+ @Test
+ public void setProgress_updatesCheckedState() throws Exception {
+ mController.setChecked(false);
+ assertThat(readSetting(SETTING_KEY)).isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
+
+ mController.setChecked(true);
+ assertThat(readSetting(SETTING_KEY))
+ .isEqualTo(mVibrator.getDefaultVibrationIntensity(VIBRATION_USAGE));
+
+ mController.setChecked(false);
+ assertThat(readSetting(SETTING_KEY)).isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
+ }
+
+ private void updateSetting(String key, int value) {
+ Settings.System.putInt(mContext.getContentResolver(), key, value);
+ }
+
+ private int readSetting(String settingKey) throws Settings.SettingNotFoundException {
+ return Settings.System.getInt(mContext.getContentResolver(), settingKey);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/development/RebootWithMteDialogTest.java b/tests/robotests/src/com/android/settings/development/RebootWithMteDialogTest.java
new file mode 100644
index 0000000..b95c803
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/RebootWithMteDialogTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static junit.framework.Assert.assertEquals;
+
+import android.content.Context;
+import android.os.PowerManager;
+import android.os.SystemProperties;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowPowerManager;
+import org.robolectric.shadows.ShadowSystemProperties;
+
+@RunWith(RobolectricTestRunner.class)
+public class RebootWithMteDialogTest {
+ private Context mContext;
+ private ShadowPowerManager mShadowPowerManager;
+ private RebootWithMteDialog mDialog;
+
+ @Before
+ public void setup() throws Exception {
+ mContext = ApplicationProvider.getApplicationContext();
+ mShadowPowerManager = Shadows.shadowOf(mContext.getSystemService(PowerManager.class));
+ mDialog = new RebootWithMteDialog(mContext);
+ }
+
+ @Test
+ @Config(
+ shadows = {
+ ShadowSystemProperties.class,
+ ShadowPowerManager.class,
+ })
+ public void onClick_shouldSetPropAndReboot() {
+ mDialog.onClick(null, 0);
+ assertEquals(SystemProperties.get("arm64.memtag.bootctl"), "memtag-once");
+ assertEquals(mShadowPowerManager.getTimesRebooted(), 1);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/development/RebootWithMtePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/RebootWithMtePreferenceControllerTest.java
new file mode 100644
index 0000000..ffbf1f1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/RebootWithMtePreferenceControllerTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowSystemProperties;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(
+ shadows = {
+ ShadowSystemProperties.class,
+ })
+public class RebootWithMtePreferenceControllerTest {
+ private Context mContext;
+ private RebootWithMtePreferenceController mController;
+ @Mock private DevelopmentSettingsDashboardFragment mSettings;
+
+ @Before
+ public void setup() throws Exception {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = ApplicationProvider.getApplicationContext();
+ mController = new RebootWithMtePreferenceController(mContext, mSettings);
+ }
+
+ @Test
+ public void onAvailable_falseByDefault() {
+ assertFalse(mController.isAvailable());
+ }
+
+ @Test
+ public void onAvailable_sysPropEnabled() {
+ SystemProperties.set("ro.arm64.memtag.bootctl_supported", "1");
+ assertTrue(mController.isAvailable());
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java
index 4e52fed..2266ed9 100644
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java
@@ -43,7 +43,6 @@
import com.android.settings.R;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -54,7 +53,6 @@
import java.util.Arrays;
@RunWith(RobolectricTestRunner.class)
-@Ignore
public class GraphicsDriverAppPreferenceControllerTest {
private static final int DEFAULT = 0;
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java
index a0fb577..e24b9e5 100644
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java
@@ -40,7 +40,6 @@
import com.android.settings.R;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -49,7 +48,6 @@
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
-@Ignore
public class GraphicsDriverEnableForAllAppsPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarControllerTest.java
index 2c8ce06..838703d 100644
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarControllerTest.java
@@ -32,7 +32,6 @@
import com.android.settings.widget.SwitchWidgetController;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -41,7 +40,6 @@
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
-@Ignore
public class GraphicsDriverGlobalSwitchBarControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java
index 7720a71..9ab67c2 100644
--- a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java
+++ b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java
@@ -30,7 +30,6 @@
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -62,7 +61,6 @@
}
@Test
- @Ignore
public void refresh_devOptionIsDisabled_shouldResetTileValue() {
final ComponentName cn = new ComponentName(
mService.getPackageName(), mService.getClass().getName());
diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java
deleted file mode 100644
index 88d0ff1..0000000
--- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java
+++ /dev/null
@@ -1,92 +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.dream;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.os.UserManager;
-
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.dream.DreamBackend;
-import com.android.settingslib.dream.DreamBackend.DreamInfo;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.Collections;
-
-@RunWith(RobolectricTestRunner.class)
-public class CurrentDreamPickerTest {
-
- private static String COMPONENT_KEY = "mocked_component_name_string";
-
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private DreamBackend mBackend;
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Activity mActivity;
- @Mock
- private UserManager mUserManager;
- private CurrentDreamPicker mPicker;
-
- @Before
- public void setup() {
- MockitoAnnotations.initMocks(this);
- when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
- FakeFeatureFactory.setupForTest();
-
- mPicker = new CurrentDreamPicker();
- mPicker.onAttach(mActivity);
-
- ReflectionHelpers.setField(mPicker, "mBackend", mBackend);
- }
-
- @Test
- public void getDefaultShouldReturnActiveDream() {
- ComponentName mockComponentName = mock(ComponentName.class);
- when(mockComponentName.flattenToString()).thenReturn(COMPONENT_KEY);
- when(mBackend.getActiveDream()).thenReturn(mockComponentName);
-
- assertThat(mPicker.getDefaultKey()).isEqualTo(COMPONENT_KEY);
- }
-
- @Test
- public void setDefaultShouldUpdateActiveDream() {
- DreamInfo mockInfo = mock(DreamInfo.class);
- ComponentName mockName = mock(ComponentName.class);
-
- mockInfo.componentName = mockName;
- when(mockName.flattenToString()).thenReturn(COMPONENT_KEY);
- when(mBackend.getDreamInfos()).thenReturn(Collections.singletonList(mockInfo));
-
- mPicker.setDefaultKey(COMPONENT_KEY);
-
- verify(mBackend).setActiveDream(mockName);
- }
-}
diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java
deleted file mode 100644
index 8a5ee20..0000000
--- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java
+++ /dev/null
@@ -1,111 +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.dream;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.Context;
-
-import com.android.settings.widget.GearPreference;
-import com.android.settingslib.dream.DreamBackend;
-import com.android.settingslib.dream.DreamBackend.DreamInfo;
-
-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.RobolectricTestRunner;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.Collections;
-
-@RunWith(RobolectricTestRunner.class)
-public class CurrentDreamPreferenceControllerTest {
-
- private CurrentDreamPreferenceController mController;
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private DreamBackend mBackend;
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Context mContext;
- @Mock
- private DreamInfo mDreamInfo;
-
- @Before
- public void setup() {
- MockitoAnnotations.initMocks(this);
-
- mController = new CurrentDreamPreferenceController(mContext, "test");
- ReflectionHelpers.setField(mController, "mBackend", mBackend);
- }
-
- @Test
- public void isDisabledIfNoDreamsAvailable() {
- when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(0));
-
- assertThat(mController.isAvailable()).isFalse();
- }
-
- @Test
- public void isEnabledIfDreamsAvailable() {
- when(mBackend.getDreamInfos()).thenReturn(Collections.singletonList(mDreamInfo));
-
- assertThat(mController.isAvailable()).isTrue();
- }
-
- @Test
- public void gearShowsIfActiveDreamInfoHasOptions() {
- mDreamInfo.settingsComponentName = mock(ComponentName.class);
- mDreamInfo.isActive = true;
-
- when(mBackend.getDreamInfos()).thenReturn(Collections.singletonList(mDreamInfo));
-
- GearPreference mockPref = mock(GearPreference.class);
- ArgumentCaptor<GearPreference.OnGearClickListener> captor =
- ArgumentCaptor.forClass(GearPreference.OnGearClickListener.class);
-
- // verify that updateState sets a non-null gear click listener
- mController.updateState(mockPref);
- verify(mockPref).setOnGearClickListener(captor.capture());
- captor.getAllValues().forEach(listener -> assertThat(listener).isNotNull());
- }
-
- @Test
- public void gearHidesIfActiveDreamInfoHasNoOptions() {
- mDreamInfo.settingsComponentName = null;
- mDreamInfo.isActive = true;
-
- when(mBackend.getDreamInfos()).thenReturn(Collections.singletonList(mDreamInfo));
-
- GearPreference mockPref = mock(GearPreference.class);
- ArgumentCaptor<GearPreference.OnGearClickListener> captor =
- ArgumentCaptor.forClass(GearPreference.OnGearClickListener.class);
-
- // setting a null onGearClickListener removes the gear from view
- mController.updateState(mockPref);
- verify(mockPref).setOnGearClickListener(captor.capture());
- captor.getAllValues().forEach(listener -> assertThat(listener).isNull());
- }
-}
diff --git a/tests/robotests/src/com/android/settings/dream/DreamPickerControllerTest.java b/tests/robotests/src/com/android/settings/dream/DreamPickerControllerTest.java
new file mode 100644
index 0000000..1048970
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dream/DreamPickerControllerTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2022 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.dream;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.widget.Button;
+
+import androidx.preference.PreferenceScreen;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settingslib.dream.DreamBackend;
+import com.android.settingslib.dream.DreamBackend.DreamInfo;
+import com.android.settingslib.widget.LayoutPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+@RunWith(RobolectricTestRunner.class)
+public class DreamPickerControllerTest {
+ private DreamPickerController mController;
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private DreamBackend mBackend;
+ private Context mContext;
+ @Mock
+ private PreferenceScreen mScreen;
+ private LayoutPreference mPreference;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mContext = ApplicationProvider.getApplicationContext();
+
+ mPreference = new LayoutPreference(mContext, R.layout.dream_picker_layout);
+ when(mScreen.findPreference(anyString())).thenReturn(mPreference);
+
+ mController = new DreamPickerController(
+ mContext,
+ /* preferenceKey= */ "test",
+ mBackend);
+
+ mController.displayPreference(mScreen);
+ }
+
+ @Test
+ public void isDisabledIfNoDreamsAvailable() {
+ when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(0));
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
+ public void isEnabledIfDreamsAvailable() {
+ when(mBackend.getDreamInfos()).thenReturn(Collections.singletonList(new DreamInfo()));
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void testDreamDisplayedInList() {
+ when(mBackend.getDreamInfos()).thenReturn(Collections.singletonList(new DreamInfo()));
+ mController.updateState(mPreference);
+
+ RecyclerView view = mPreference.findViewById(R.id.dream_list);
+ assertThat(view.getAdapter().getItemCount()).isEqualTo(1);
+ }
+
+ @Test
+ public void testPreviewButton() {
+ final DreamInfo mockDreamInfo = new DreamInfo();
+ mockDreamInfo.componentName = new ComponentName("package", "class");
+ mockDreamInfo.isActive = true;
+
+ when(mBackend.getDreamInfos()).thenReturn(Collections.singletonList(mockDreamInfo));
+ mController.updateState(mPreference);
+
+ Button view = mPreference.findViewById(R.id.preview_button);
+ view.performClick();
+ verify(mBackend).preview(mockDreamInfo);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java
deleted file mode 100644
index 98ba1ce..0000000
--- a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java
+++ /dev/null
@@ -1,87 +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.dream;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.widget.Button;
-
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settingslib.dream.DreamBackend;
-import com.android.settingslib.widget.LayoutPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(RobolectricTestRunner.class)
-public class StartNowPreferenceControllerTest {
-
- private StartNowPreferenceController mController;
- private Context mContext;
-
- @Mock
- private PreferenceScreen mScreen;
- @Mock
- private LayoutPreference mLayoutPref;
- @Mock
- private Button mButton;
- @Mock
- private DreamBackend mBackend;
-
- @Before
- public void setup() {
- MockitoAnnotations.initMocks(this);
-
- mContext = spy(RuntimeEnvironment.application);
- mController = new StartNowPreferenceController(mContext, "key");
- when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mLayoutPref);
- when(mLayoutPref.findViewById(R.id.dream_start_now_button)).thenReturn(mButton);
-
- ReflectionHelpers.setField(mController, "mBackend", mBackend);
- }
-
- @Test
- public void updateState_neverDreaming_buttonShouldDidabled() {
- when(mBackend.getWhenToDreamSetting()).thenReturn(DreamBackend.NEVER);
- mController.displayPreference(mScreen);
-
- mController.updateState(mLayoutPref);
-
- verify(mButton).setEnabled(false);
- }
-
- @Test
- public void updateState_dreamIsAvailable_buttonShouldEnabled() {
- when(mBackend.getWhenToDreamSetting()).thenReturn(DreamBackend.EITHER);
- mController.displayPreference(mScreen);
-
- mController.updateState(mLayoutPref);
-
- verify(mButton).setEnabled(true);
- }
-}
diff --git a/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java b/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java
index b0f14de..f9b1543 100644
--- a/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java
+++ b/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java
@@ -34,7 +34,6 @@
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -82,7 +81,6 @@
}
@Test
- @Ignore
public void testDisallowConfigLocale_unrestrict() {
ReflectionHelpers.setField(mLocaleListEditor, "mIsUiRestricted", true);
mLocaleListEditor.onAttach(mContext);
@@ -91,7 +89,6 @@
}
@Test
- @Ignore
public void testDisallowConfigLocale_restrict() {
ReflectionHelpers.setField(mLocaleListEditor, "mIsUiRestricted", false);
mLocaleListEditor.onAttach(mContext);
diff --git a/tests/robotests/src/com/android/settings/location/LocationSettingsFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationSettingsFooterPreferenceControllerTest.java
index a641324..333929d 100644
--- a/tests/robotests/src/com/android/settings/location/LocationSettingsFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationSettingsFooterPreferenceControllerTest.java
@@ -46,7 +46,6 @@
import com.android.settingslib.widget.FooterPreference;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
@@ -168,7 +167,6 @@
}
@Test
- @Ignore
public void onLocationModeChanged_on_setTitle() {
final List<ResolveInfo> testResolveInfos = new ArrayList<>();
testResolveInfos.add(
diff --git a/tests/robotests/src/com/android/settings/network/WifiConnectionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/WifiConnectionPreferenceControllerTest.java
index 038a292..925b000 100644
--- a/tests/robotests/src/com/android/settings/network/WifiConnectionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/WifiConnectionPreferenceControllerTest.java
@@ -40,6 +40,7 @@
import com.android.wifitrackerlib.WifiPickerTracker;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
@@ -49,6 +50,7 @@
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
+@Ignore
public class WifiConnectionPreferenceControllerTest {
private static final String KEY = "wifi_connection";
diff --git a/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java
index ce2d87b..9b756b0 100644
--- a/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java
@@ -24,6 +24,8 @@
import android.content.Context;
import android.content.pm.PackageManager;
+import android.os.UserHandle;
+import android.os.UserManager;
import androidx.preference.PreferenceScreen;
@@ -32,7 +34,6 @@
import com.android.settings.testutils.shadow.ShadowNfcAdapter;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -47,6 +48,7 @@
@Config(shadows = ShadowNfcAdapter.class)
public class NfcPaymentPreferenceControllerTest {
+ private static final String USER_TEST = "user_test";
private static final String PREF_KEY = PaymentSettingsTest.PAYMENT_KEY;
@Mock
@@ -55,6 +57,12 @@
private PreferenceScreen mScreen;
@Mock
private PackageManager mManager;
+ @Mock
+ private UserManager mUserManager;
+ @Mock
+ private UserHandle mUserHandle;
+ @Mock
+ private Context mContextAsUser;
private Context mContext;
private NfcPaymentPreference mPreference;
@@ -68,6 +76,9 @@
mController = new NfcPaymentPreferenceController(mContext, PREF_KEY);
mPreference = spy(new NfcPaymentPreference(mContext, null));
when(mScreen.findPreference(PREF_KEY)).thenReturn(mPreference);
+ when(mContext.createContextAsUser(UserHandle.CURRENT, 0)).thenReturn(mContextAsUser);
+ when(mContextAsUser.getSystemService(UserManager.class)).thenReturn(mUserManager);
+ when(mUserManager.getUserName()).thenReturn(USER_TEST);
}
@Test
@@ -134,7 +145,6 @@
}
@Test
- @Ignore
public void onPaymentAppsChanged_shouldRefreshSummary() {
mController.setPaymentBackend(mPaymentBackend);
mController.displayPreference(mScreen);
@@ -147,10 +157,12 @@
final PaymentAppInfo appInfo = new PaymentAppInfo();
appInfo.label = "test label";
+ appInfo.userHandle = UserHandle.CURRENT;
when(mPaymentBackend.getDefaultApp()).thenReturn(appInfo);
mController.onPaymentAppsChanged();
- assertThat(mPreference.getSummary()).isEqualTo(appInfo.label);
+ assertThat(mPreference.getSummary())
+ .isEqualTo(appInfo.label + " (" + USER_TEST + ")");
}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/src/com/android/settings/applications/appinfo/AppLocaleDetailsTest.java b/tests/unit/src/com/android/settings/applications/appinfo/AppLocaleDetailsTest.java
index a97656c..e185354 100644
--- a/tests/unit/src/com/android/settings/applications/appinfo/AppLocaleDetailsTest.java
+++ b/tests/unit/src/com/android/settings/applications/appinfo/AppLocaleDetailsTest.java
@@ -152,6 +152,26 @@
assertFalse(helper.getSupportedLocales().isEmpty());
}
+ @Test
+ @UiThreadTest
+ public void handleAllLocalesData_compareLocale() {
+ //Use LocaleList.matchScore() to compare two locales.
+ assertTrue(DummyAppLocaleDetailsHelper.compareLocale(Locale.forLanguageTag("en-US"),
+ Locale.forLanguageTag("en-CA")));
+ assertTrue(DummyAppLocaleDetailsHelper.compareLocale(Locale.forLanguageTag("zh-CN"),
+ Locale.forLanguageTag("zh")));
+ assertTrue(DummyAppLocaleDetailsHelper.compareLocale(Locale.forLanguageTag("zh-CN"),
+ Locale.forLanguageTag("zh-Hans")));
+ assertTrue(DummyAppLocaleDetailsHelper.compareLocale(Locale.forLanguageTag("zh-TW"),
+ Locale.forLanguageTag("zh-Hant")));
+
+ //Use Locale.equals() to compare two locales.
+ assertFalse(Locale.forLanguageTag("en-US").equals(Locale.forLanguageTag("en-CA")));
+ assertFalse(Locale.forLanguageTag("zh-CN").equals(Locale.forLanguageTag("zh")));
+ assertFalse(Locale.forLanguageTag("zh-CN").equals(Locale.forLanguageTag("zh-Hans")));
+ assertFalse(Locale.forLanguageTag("zh-TW").equals(Locale.forLanguageTag("zh-Hant")));
+ }
+
/**
* Sets the initial Locale data
*