Use inline radio buttons for Prevent Ringing
Test: atest PreventRingingGesturePreferenceControllerTest Fixes: 79867902 Change-Id: I3c9f949e038bba98e5be972adc01f35f5513432a
This commit is contained in:
@@ -10064,7 +10064,7 @@
|
|||||||
<!-- Title for prevent ringing gesture screen -->
|
<!-- Title for prevent ringing gesture screen -->
|
||||||
<string name="gesture_prevent_ringing_screen_title">Prevent ringing</string>
|
<string name="gesture_prevent_ringing_screen_title">Prevent ringing</string>
|
||||||
<!-- Title for prevent ringing setting -->
|
<!-- Title for prevent ringing setting -->
|
||||||
<string name="gesture_prevent_ringing_title">Press Power & Volume Up together</string>
|
<string name="gesture_prevent_ringing_title">Press Power & Volume Up together to</string>
|
||||||
<!-- Title for prevent ringing setting -->
|
<!-- Title for prevent ringing setting -->
|
||||||
<string name="gesture_prevent_ringing_sound_title">Shortcut to prevent ringing</string>
|
<string name="gesture_prevent_ringing_sound_title">Shortcut to prevent ringing</string>
|
||||||
<!-- Option for prevent ringing setting -->
|
<!-- Option for prevent ringing setting -->
|
||||||
|
@@ -26,13 +26,8 @@
|
|||||||
app:animation="@raw/gesture_prevent_ringing"
|
app:animation="@raw/gesture_prevent_ringing"
|
||||||
app:preview="@drawable/gesture_prevent_ringing" />
|
app:preview="@drawable/gesture_prevent_ringing" />
|
||||||
|
|
||||||
<ListPreference
|
<PreferenceCategory
|
||||||
android:key="gesture_prevent_ringing"
|
android:key="gesture_prevent_ringing_category"
|
||||||
android:title="@string/gesture_prevent_ringing_title"
|
android:title="@string/gesture_prevent_ringing_title">
|
||||||
android:entries="@array/gesture_prevent_ringing_entries"
|
</PreferenceCategory>
|
||||||
android:entryValues="@array/gesture_prevent_ringing_values"
|
|
||||||
app:controller="com.android.settings.gestures.PreventRingingPreferenceController"
|
|
||||||
app:keywords="@string/keywords_gesture"
|
|
||||||
app:allowDividerAbove="true" />
|
|
||||||
|
|
||||||
</PreferenceScreen>
|
</PreferenceScreen>
|
@@ -20,8 +20,6 @@ import android.content.ContentResolver;
|
|||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.provider.Settings;
|
import android.provider.Settings;
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
|
|
||||||
import com.android.internal.hardware.AmbientDisplayConfiguration;
|
import com.android.internal.hardware.AmbientDisplayConfiguration;
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.core.BasePreferenceController;
|
import com.android.settings.core.BasePreferenceController;
|
||||||
@@ -31,6 +29,8 @@ import com.android.settingslib.core.AbstractPreferenceController;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
|
||||||
public class GesturesSettingPreferenceController extends BasePreferenceController {
|
public class GesturesSettingPreferenceController extends BasePreferenceController {
|
||||||
private final AssistGestureFeatureProvider mFeatureProvider;
|
private final AssistGestureFeatureProvider mFeatureProvider;
|
||||||
private List<AbstractPreferenceController> mGestureControllers;
|
private List<AbstractPreferenceController> mGestureControllers;
|
||||||
@@ -76,7 +76,7 @@ public class GesturesSettingPreferenceController extends BasePreferenceControlle
|
|||||||
.setConfig(ambientDisplayConfiguration));
|
.setConfig(ambientDisplayConfiguration));
|
||||||
controllers.add(new DoubleTapScreenPreferenceController(context, FAKE_PREF_KEY)
|
controllers.add(new DoubleTapScreenPreferenceController(context, FAKE_PREF_KEY)
|
||||||
.setConfig(ambientDisplayConfiguration));
|
.setConfig(ambientDisplayConfiguration));
|
||||||
controllers.add(new PreventRingingPreferenceController(context, FAKE_PREF_KEY));
|
controllers.add(new PreventRingingParentPreferenceController(context, FAKE_PREF_KEY));
|
||||||
return controllers;
|
return controllers;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -0,0 +1,222 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.gestures;
|
||||||
|
|
||||||
|
import android.content.ContentResolver;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.database.ContentObserver;
|
||||||
|
import android.net.Uri;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.os.Handler;
|
||||||
|
import android.provider.Settings;
|
||||||
|
|
||||||
|
import com.android.internal.annotations.VisibleForTesting;
|
||||||
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.core.PreferenceControllerMixin;
|
||||||
|
import com.android.settings.widget.RadioButtonPreference;
|
||||||
|
import com.android.settings.widget.VideoPreference;
|
||||||
|
import com.android.settingslib.core.AbstractPreferenceController;
|
||||||
|
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||||
|
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
||||||
|
import com.android.settingslib.core.lifecycle.events.OnCreate;
|
||||||
|
import com.android.settingslib.core.lifecycle.events.OnPause;
|
||||||
|
import com.android.settingslib.core.lifecycle.events.OnResume;
|
||||||
|
import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
|
||||||
|
|
||||||
|
import androidx.preference.Preference;
|
||||||
|
import androidx.preference.PreferenceCategory;
|
||||||
|
import androidx.preference.PreferenceScreen;
|
||||||
|
|
||||||
|
public class PreventRingingGesturePreferenceController extends AbstractPreferenceController
|
||||||
|
implements RadioButtonPreference.OnClickListener, LifecycleObserver, OnSaveInstanceState,
|
||||||
|
OnResume, OnPause, OnCreate, PreferenceControllerMixin {
|
||||||
|
|
||||||
|
@VisibleForTesting static final String KEY_VIBRATE = "prevent_ringing_option_vibrate";
|
||||||
|
@VisibleForTesting static final String KEY_NONE = "prevent_ringing_option_none";
|
||||||
|
@VisibleForTesting static final String KEY_MUTE = "prevent_ringing_option_mute";
|
||||||
|
|
||||||
|
private final String KEY_VIDEO_PAUSED = "key_video_paused";
|
||||||
|
private final String PREF_KEY_VIDEO = "gesture_prevent_ringing_video";
|
||||||
|
private final String KEY = "gesture_prevent_ringing_category";
|
||||||
|
private final Context mContext;
|
||||||
|
|
||||||
|
private VideoPreference mVideoPreference;
|
||||||
|
private boolean mVideoPaused;
|
||||||
|
|
||||||
|
private PreferenceCategory mPreferenceCategory;
|
||||||
|
@VisibleForTesting RadioButtonPreference mVibratePref;
|
||||||
|
@VisibleForTesting RadioButtonPreference mNonePref;
|
||||||
|
@VisibleForTesting RadioButtonPreference mMutePref;
|
||||||
|
|
||||||
|
private SettingObserver mSettingObserver;
|
||||||
|
|
||||||
|
public PreventRingingGesturePreferenceController(Context context, Lifecycle lifecycle) {
|
||||||
|
super(context);
|
||||||
|
mContext = context;
|
||||||
|
|
||||||
|
if (lifecycle != null) {
|
||||||
|
lifecycle.addObserver(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void displayPreference(PreferenceScreen screen) {
|
||||||
|
super.displayPreference(screen);
|
||||||
|
if (isAvailable()) {
|
||||||
|
mPreferenceCategory = (PreferenceCategory) screen.findPreference(getPreferenceKey());
|
||||||
|
mVibratePref = makeRadioPreference(KEY_VIBRATE, R.string.prevent_ringing_option_vibrate);
|
||||||
|
mMutePref = makeRadioPreference(KEY_MUTE, R.string.prevent_ringing_option_mute);
|
||||||
|
mNonePref = makeRadioPreference(KEY_NONE, R.string.prevent_ringing_option_none);
|
||||||
|
|
||||||
|
if (mPreferenceCategory != null) {
|
||||||
|
mSettingObserver = new SettingObserver(mPreferenceCategory);
|
||||||
|
}
|
||||||
|
|
||||||
|
mVideoPreference = (VideoPreference) screen.findPreference(getVideoPrefKey());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isAvailable() {
|
||||||
|
return mContext.getResources().getBoolean(
|
||||||
|
com.android.internal.R.bool.config_volumeHushGestureEnabled);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getPreferenceKey() {
|
||||||
|
return KEY;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getVideoPrefKey() {
|
||||||
|
return PREF_KEY_VIDEO;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onSaveInstanceState(Bundle outState) {
|
||||||
|
outState.putBoolean(KEY_VIDEO_PAUSED, mVideoPaused);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onRadioButtonClicked(RadioButtonPreference preference) {
|
||||||
|
int preventRingingSetting = keyToSetting(preference.getKey());
|
||||||
|
if (preventRingingSetting != Settings.Secure.getInt(mContext.getContentResolver(),
|
||||||
|
Settings.Secure.VOLUME_HUSH_GESTURE, Settings.Secure.VOLUME_HUSH_VIBRATE)) {
|
||||||
|
Settings.Secure.putInt(mContext.getContentResolver(),
|
||||||
|
Settings.Secure.VOLUME_HUSH_GESTURE, preventRingingSetting);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateState(Preference preference) {
|
||||||
|
int preventRingingSetting = Settings.Secure.getInt(mContext.getContentResolver(),
|
||||||
|
Settings.Secure.VOLUME_HUSH_GESTURE, Settings.Secure.VOLUME_HUSH_VIBRATE);
|
||||||
|
|
||||||
|
final boolean isVibrate = preventRingingSetting == Settings.Secure.VOLUME_HUSH_VIBRATE;
|
||||||
|
final boolean isMute = preventRingingSetting == Settings.Secure.VOLUME_HUSH_MUTE;
|
||||||
|
final boolean isOff = preventRingingSetting == Settings.Secure.VOLUME_HUSH_OFF
|
||||||
|
|| (!isVibrate && !isMute);
|
||||||
|
if (mVibratePref != null && mVibratePref.isChecked() != isVibrate) {
|
||||||
|
mVibratePref.setChecked(isVibrate);
|
||||||
|
}
|
||||||
|
if (mMutePref != null && mMutePref.isChecked() != isMute) {
|
||||||
|
mMutePref.setChecked(isMute);
|
||||||
|
}
|
||||||
|
if (mNonePref != null && mNonePref.isChecked() != isOff) {
|
||||||
|
mNonePref.setChecked(isOff);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
if (savedInstanceState != null) {
|
||||||
|
mVideoPaused = savedInstanceState.getBoolean(KEY_VIDEO_PAUSED, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onResume() {
|
||||||
|
if (mSettingObserver != null) {
|
||||||
|
mSettingObserver.register(mContext.getContentResolver());
|
||||||
|
mSettingObserver.onChange(false, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mVideoPreference != null) {
|
||||||
|
mVideoPreference.onViewVisible(mVideoPaused);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onPause() {
|
||||||
|
if (mSettingObserver != null) {
|
||||||
|
mSettingObserver.unregister(mContext.getContentResolver());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mVideoPreference != null) {
|
||||||
|
mVideoPaused = mVideoPreference.isVideoPaused();
|
||||||
|
mVideoPreference.onViewInvisible();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private int keyToSetting(String key) {
|
||||||
|
switch (key) {
|
||||||
|
case KEY_NONE:
|
||||||
|
return Settings.Secure.VOLUME_HUSH_OFF;
|
||||||
|
case KEY_MUTE:
|
||||||
|
return Settings.Secure.VOLUME_HUSH_MUTE;
|
||||||
|
case KEY_VIBRATE:
|
||||||
|
default:
|
||||||
|
return Settings.Secure.VOLUME_HUSH_VIBRATE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private RadioButtonPreference makeRadioPreference(String key, int titleId) {
|
||||||
|
RadioButtonPreference pref = new RadioButtonPreference(mPreferenceCategory.getContext());
|
||||||
|
pref.setKey(key);
|
||||||
|
pref.setTitle(titleId);
|
||||||
|
pref.setOnClickListener(this);
|
||||||
|
mPreferenceCategory.addPreference(pref);
|
||||||
|
return pref;
|
||||||
|
}
|
||||||
|
|
||||||
|
private class SettingObserver extends ContentObserver {
|
||||||
|
private final Uri VOLUME_HUSH_GESTURE = Settings.Secure.getUriFor(
|
||||||
|
Settings.Secure.VOLUME_HUSH_GESTURE);
|
||||||
|
|
||||||
|
private final Preference mPreference;
|
||||||
|
|
||||||
|
public SettingObserver(Preference preference) {
|
||||||
|
super(new Handler());
|
||||||
|
mPreference = preference;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void register(ContentResolver cr) {
|
||||||
|
cr.registerContentObserver(VOLUME_HUSH_GESTURE, false, this);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void unregister(ContentResolver cr) {
|
||||||
|
cr.unregisterContentObserver(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onChange(boolean selfChange, Uri uri) {
|
||||||
|
super.onChange(selfChange, uri);
|
||||||
|
if (uri == null || VOLUME_HUSH_GESTURE.equals(uri)) {
|
||||||
|
updateState(mPreference);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -23,8 +23,11 @@ import com.android.internal.logging.nano.MetricsProto;
|
|||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.dashboard.DashboardFragment;
|
import com.android.settings.dashboard.DashboardFragment;
|
||||||
import com.android.settings.search.BaseSearchIndexProvider;
|
import com.android.settings.search.BaseSearchIndexProvider;
|
||||||
|
import com.android.settingslib.core.AbstractPreferenceController;
|
||||||
|
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||||
import com.android.settingslib.search.SearchIndexable;
|
import com.android.settingslib.search.SearchIndexable;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -39,6 +42,18 @@ public class PreventRingingGestureSettings extends DashboardFragment {
|
|||||||
super.onAttach(context);
|
super.onAttach(context);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||||
|
return buildPreferenceControllers(context, getSettingsLifecycle());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
|
||||||
|
Lifecycle lifecycle) {
|
||||||
|
List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||||
|
controllers.add(new PreventRingingGesturePreferenceController(context, lifecycle));
|
||||||
|
return controllers;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getMetricsCategory() {
|
public int getMetricsCategory() {
|
||||||
return MetricsProto.MetricsEvent.SETTINGS_PREVENT_RINGING;
|
return MetricsProto.MetricsEvent.SETTINGS_PREVENT_RINGING;
|
||||||
@@ -68,6 +83,12 @@ public class PreventRingingGestureSettings extends DashboardFragment {
|
|||||||
sir.xmlResId = R.xml.prevent_ringing_gesture_settings;
|
sir.xmlResId = R.xml.prevent_ringing_gesture_settings;
|
||||||
return Arrays.asList(sir);
|
return Arrays.asList(sir);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<AbstractPreferenceController> createPreferenceControllers(
|
||||||
|
Context context) {
|
||||||
|
return buildPreferenceControllers(context, null);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -1,132 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2018 The Android Open Source Project
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.android.settings.gestures;
|
|
||||||
|
|
||||||
import static android.provider.Settings.Secure.VOLUME_HUSH_MUTE;
|
|
||||||
import static android.provider.Settings.Secure.VOLUME_HUSH_OFF;
|
|
||||||
import static android.provider.Settings.Secure.VOLUME_HUSH_VIBRATE;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.provider.Settings;
|
|
||||||
|
|
||||||
import androidx.annotation.VisibleForTesting;
|
|
||||||
import androidx.preference.ListPreference;
|
|
||||||
import androidx.preference.Preference;
|
|
||||||
import androidx.preference.PreferenceScreen;
|
|
||||||
|
|
||||||
import com.android.settings.widget.VideoPreference;
|
|
||||||
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
|
||||||
import com.android.settingslib.core.lifecycle.events.OnCreate;
|
|
||||||
import com.android.settingslib.core.lifecycle.events.OnPause;
|
|
||||||
import com.android.settingslib.core.lifecycle.events.OnResume;
|
|
||||||
import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
|
|
||||||
|
|
||||||
public class PreventRingingPreferenceController extends PreventRingingParentPreferenceController
|
|
||||||
implements Preference.OnPreferenceChangeListener,
|
|
||||||
LifecycleObserver, OnResume, OnPause, OnCreate, OnSaveInstanceState {
|
|
||||||
|
|
||||||
private static final String PREF_KEY_VIDEO = "gesture_prevent_ringing_video";
|
|
||||||
@VisibleForTesting
|
|
||||||
static final String KEY_VIDEO_PAUSED = "key_video_paused";
|
|
||||||
|
|
||||||
private VideoPreference mVideoPreference;
|
|
||||||
@VisibleForTesting
|
|
||||||
boolean mVideoPaused;
|
|
||||||
|
|
||||||
public PreventRingingPreferenceController(Context context, String key) {
|
|
||||||
super(context, key);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getAvailabilityStatus() {
|
|
||||||
final int status = super.getAvailabilityStatus();
|
|
||||||
if (status == AVAILABLE_UNSEARCHABLE) {
|
|
||||||
return AVAILABLE;
|
|
||||||
}
|
|
||||||
return status;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void displayPreference(PreferenceScreen screen) {
|
|
||||||
super.displayPreference(screen);
|
|
||||||
if (isAvailable()) {
|
|
||||||
mVideoPreference = (VideoPreference) screen.findPreference(getVideoPrefKey());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void updateState(Preference preference) {
|
|
||||||
super.updateState(preference);
|
|
||||||
if (preference != null) {
|
|
||||||
if (preference instanceof ListPreference) {
|
|
||||||
ListPreference pref = (ListPreference) preference;
|
|
||||||
int value = Settings.Secure.getInt(
|
|
||||||
mContext.getContentResolver(), SECURE_KEY, VOLUME_HUSH_VIBRATE);
|
|
||||||
switch (value) {
|
|
||||||
case VOLUME_HUSH_VIBRATE:
|
|
||||||
pref.setValue(String.valueOf(value));
|
|
||||||
break;
|
|
||||||
case VOLUME_HUSH_MUTE:
|
|
||||||
pref.setValue(String.valueOf(value));
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
pref.setValue(String.valueOf(VOLUME_HUSH_OFF));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
|
||||||
if (savedInstanceState != null) {
|
|
||||||
mVideoPaused = savedInstanceState.getBoolean(KEY_VIDEO_PAUSED, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onSaveInstanceState(Bundle outState) {
|
|
||||||
outState.putBoolean(KEY_VIDEO_PAUSED, mVideoPaused);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onPause() {
|
|
||||||
if (mVideoPreference != null) {
|
|
||||||
mVideoPaused = mVideoPreference.isVideoPaused();
|
|
||||||
mVideoPreference.onViewInvisible();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResume() {
|
|
||||||
if (mVideoPreference != null) {
|
|
||||||
mVideoPreference.onViewVisible(mVideoPaused);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected String getVideoPrefKey() {
|
|
||||||
return PREF_KEY_VIDEO;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
|
||||||
int value = Integer.parseInt((String) newValue);
|
|
||||||
Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY, value);
|
|
||||||
preference.setSummary(getSummary());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
@@ -0,0 +1,152 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.gestures;
|
||||||
|
|
||||||
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
|
import static org.mockito.Mockito.mock;
|
||||||
|
import static org.mockito.Mockito.spy;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
import static org.mockito.MockitoAnnotations.initMocks;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.res.Resources;
|
||||||
|
import android.preference.PreferenceCategory;
|
||||||
|
import android.provider.Settings;
|
||||||
|
|
||||||
|
import androidx.preference.PreferenceScreen;
|
||||||
|
|
||||||
|
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||||
|
import com.android.settings.widget.RadioButtonPreference;
|
||||||
|
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.Answers;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.robolectric.RuntimeEnvironment;
|
||||||
|
|
||||||
|
@RunWith(SettingsRobolectricTestRunner.class)
|
||||||
|
public class PreventRingingGesturePreferenceControllerTest {
|
||||||
|
|
||||||
|
private Context mContext;
|
||||||
|
private Resources mResources;
|
||||||
|
private PreventRingingGesturePreferenceController mController;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
mContext = spy(RuntimeEnvironment.application);
|
||||||
|
mResources = mock(Resources.class);
|
||||||
|
when(mContext.getResources()).thenReturn(mResources);
|
||||||
|
when(mResources.getBoolean(com.android.internal.R.bool.config_volumeHushGestureEnabled))
|
||||||
|
.thenReturn(true);
|
||||||
|
mController = new PreventRingingGesturePreferenceController(mContext, null);
|
||||||
|
mController.mVibratePref = new RadioButtonPreference(mContext);
|
||||||
|
mController.mNonePref = new RadioButtonPreference(mContext);
|
||||||
|
mController.mMutePref = new RadioButtonPreference(mContext);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testIsAvailable_configIsTrue_shouldReturnTrue() {
|
||||||
|
when(mResources.getBoolean(
|
||||||
|
com.android.internal.R.bool.config_volumeHushGestureEnabled)).thenReturn(true);
|
||||||
|
|
||||||
|
assertThat(mController.isAvailable()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testIsAvailable_configIsFalse_shouldReturnFalse() {
|
||||||
|
when(mResources.getBoolean(
|
||||||
|
com.android.internal.R.bool.config_volumeHushGestureEnabled)).thenReturn(false);
|
||||||
|
|
||||||
|
assertThat(mController.isAvailable()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testUpdateState_mute() {
|
||||||
|
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE,
|
||||||
|
Settings.Secure.VOLUME_HUSH_MUTE);
|
||||||
|
mController.updateState(null);
|
||||||
|
assertThat(mController.mVibratePref.isChecked()).isFalse();
|
||||||
|
assertThat(mController.mNonePref.isChecked()).isFalse();
|
||||||
|
assertThat(mController.mMutePref.isChecked()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testUpdateState_vibrate() {
|
||||||
|
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE,
|
||||||
|
Settings.Secure.VOLUME_HUSH_VIBRATE);
|
||||||
|
mController.updateState(null);
|
||||||
|
assertThat(mController.mVibratePref.isChecked()).isTrue();
|
||||||
|
assertThat(mController.mNonePref.isChecked()).isFalse();
|
||||||
|
assertThat(mController.mMutePref.isChecked()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testUpdateState_other() {
|
||||||
|
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE,
|
||||||
|
7);
|
||||||
|
mController.updateState(null);
|
||||||
|
assertThat(mController.mVibratePref.isChecked()).isFalse();
|
||||||
|
assertThat(mController.mNonePref.isChecked()).isTrue();
|
||||||
|
assertThat(mController.mMutePref.isChecked()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testRadioButtonClicked_mute() {
|
||||||
|
RadioButtonPreference rbPref = new RadioButtonPreference(mContext);
|
||||||
|
rbPref.setKey(PreventRingingGesturePreferenceController.KEY_MUTE);
|
||||||
|
|
||||||
|
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE,
|
||||||
|
Settings.Secure.VOLUME_HUSH_OFF);
|
||||||
|
mController.onRadioButtonClicked(rbPref);
|
||||||
|
|
||||||
|
assertThat(Settings.Secure.VOLUME_HUSH_MUTE).isEqualTo(
|
||||||
|
Settings.Secure.getInt(mContext.getContentResolver(),
|
||||||
|
Settings.Secure.VOLUME_HUSH_GESTURE, Settings.Secure.VOLUME_HUSH_OFF));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testRadioButtonClicked_vibrate() {
|
||||||
|
RadioButtonPreference rbPref = new RadioButtonPreference(mContext);
|
||||||
|
rbPref.setKey(PreventRingingGesturePreferenceController.KEY_VIBRATE);
|
||||||
|
|
||||||
|
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE,
|
||||||
|
Settings.Secure.VOLUME_HUSH_OFF);
|
||||||
|
mController.onRadioButtonClicked(rbPref);
|
||||||
|
|
||||||
|
assertThat(Settings.Secure.VOLUME_HUSH_VIBRATE).isEqualTo(
|
||||||
|
Settings.Secure.getInt(mContext.getContentResolver(),
|
||||||
|
Settings.Secure.VOLUME_HUSH_GESTURE, Settings.Secure.VOLUME_HUSH_OFF));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testRadioButtonClicked_off() {
|
||||||
|
RadioButtonPreference rbPref = new RadioButtonPreference(mContext);
|
||||||
|
rbPref.setKey(PreventRingingGesturePreferenceController.KEY_NONE);
|
||||||
|
|
||||||
|
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE,
|
||||||
|
Settings.Secure.VOLUME_HUSH_MUTE);
|
||||||
|
|
||||||
|
mController.onRadioButtonClicked(rbPref);
|
||||||
|
|
||||||
|
assertThat(Settings.Secure.VOLUME_HUSH_OFF).isEqualTo(
|
||||||
|
Settings.Secure.getInt(mContext.getContentResolver(),
|
||||||
|
Settings.Secure.VOLUME_HUSH_GESTURE, Settings.Secure.VOLUME_HUSH_VIBRATE));
|
||||||
|
}
|
||||||
|
}
|
@@ -1,122 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2018 The Android Open Source Project
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.android.settings.gestures;
|
|
||||||
|
|
||||||
import static android.provider.Settings.Secure.VOLUME_HUSH_GESTURE;
|
|
||||||
import static android.provider.Settings.Secure.VOLUME_HUSH_MUTE;
|
|
||||||
import static android.provider.Settings.Secure.VOLUME_HUSH_OFF;
|
|
||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
|
||||||
|
|
||||||
import static junit.framework.Assert.assertEquals;
|
|
||||||
|
|
||||||
import static org.mockito.Mockito.mock;
|
|
||||||
import static org.mockito.Mockito.verify;
|
|
||||||
import static org.mockito.Mockito.when;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.provider.Settings;
|
|
||||||
|
|
||||||
import androidx.preference.ListPreference;
|
|
||||||
import androidx.preference.Preference;
|
|
||||||
|
|
||||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
|
||||||
|
|
||||||
import org.junit.Before;
|
|
||||||
import org.junit.Test;
|
|
||||||
import org.junit.runner.RunWith;
|
|
||||||
import org.mockito.Answers;
|
|
||||||
import org.mockito.Mock;
|
|
||||||
import org.mockito.MockitoAnnotations;
|
|
||||||
|
|
||||||
@RunWith(SettingsRobolectricTestRunner.class)
|
|
||||||
public class PreventRingingPreferenceControllerTest {
|
|
||||||
|
|
||||||
private static final String KEY_PICK_UP = "gesture_prevent_ringing";
|
|
||||||
|
|
||||||
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
|
||||||
private Context mContext;
|
|
||||||
|
|
||||||
private PreventRingingPreferenceController mController;
|
|
||||||
|
|
||||||
@Before
|
|
||||||
public void setUp() {
|
|
||||||
MockitoAnnotations.initMocks(this);
|
|
||||||
mController = new PreventRingingPreferenceController(mContext, KEY_PICK_UP);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testIsAvailable_configIsTrue_shouldReturnTrue() {
|
|
||||||
when(mContext.getResources().getBoolean(
|
|
||||||
com.android.internal.R.bool.config_volumeHushGestureEnabled)).thenReturn(true);
|
|
||||||
|
|
||||||
assertThat(mController.isAvailable()).isTrue();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testIsAvailable_configIsFalse_shouldReturnFalse() {
|
|
||||||
when(mContext.getResources().getBoolean(
|
|
||||||
com.android.internal.R.bool.config_volumeHushGestureEnabled)).thenReturn(false);
|
|
||||||
|
|
||||||
assertThat(mController.isAvailable()).isFalse();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testUpdateState_mute() {
|
|
||||||
ListPreference pref = mock(ListPreference.class);
|
|
||||||
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE,
|
|
||||||
Settings.Secure.VOLUME_HUSH_MUTE);
|
|
||||||
mController.updateState(pref);
|
|
||||||
verify(pref).setValue(String.valueOf(Settings.Secure.VOLUME_HUSH_MUTE));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testUpdateState_vibrate() {
|
|
||||||
ListPreference pref = mock(ListPreference.class);
|
|
||||||
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE,
|
|
||||||
Settings.Secure.VOLUME_HUSH_VIBRATE);
|
|
||||||
mController.updateState(pref);
|
|
||||||
verify(pref).setValue(String.valueOf(Settings.Secure.VOLUME_HUSH_VIBRATE));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testUpdateState_other() {
|
|
||||||
ListPreference pref = mock(ListPreference.class);
|
|
||||||
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE,
|
|
||||||
7);
|
|
||||||
mController.updateState(pref);
|
|
||||||
verify(pref).setValue(String.valueOf(Settings.Secure.VOLUME_HUSH_OFF));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testUpdateState_parentPage() {
|
|
||||||
Preference pref = mock(Preference.class);
|
|
||||||
// verify no exception
|
|
||||||
mController.updateState(pref);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testOnPreferenceChange() {
|
|
||||||
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE,
|
|
||||||
7);
|
|
||||||
|
|
||||||
mController.onPreferenceChange(mock(Preference.class), String.valueOf(VOLUME_HUSH_MUTE));
|
|
||||||
|
|
||||||
assertEquals(VOLUME_HUSH_MUTE, Settings.Secure.getInt(mContext.getContentResolver(),
|
|
||||||
VOLUME_HUSH_GESTURE, VOLUME_HUSH_OFF));
|
|
||||||
}
|
|
||||||
}
|
|
Reference in New Issue
Block a user