PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Suppress prevent ringer gesture parent page in search.

Browse Source 
The full page verion of prevent ringing is still searchable.

- Created a new controller for parent entry.
- On the child controller, inherit the same getAvailabilityStatus() but
  override AVILABLE_UNSEARCHABLE to AVAILABLE so it becomes searchable.

Fixes: 72748524
Test: existing robotests for PreventRingingPreferenceController

Change-Id: Id2454db110c81b59fa4a98338602b03de0812f8a
This commit is contained in:
Fan Zhang
2018-06-05 09:17:19 -07:00
parent 60f2f06855
commit 752350c8d8
5 changed files with 119 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/android/settings/gestures/PreventRingingParentPreferenceController.java Normal file
View File

@@ -0,0 +1,36 @@
/*
* 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.Context;
import com.android.settings.core.BasePreferenceController;
public class PreventRingingParentPreferenceController extends BasePreferenceController {
public PreventRingingParentPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@Override
public int getAvailabilityStatus() {
return mContext.getResources().getBoolean(
com.android.internal.R.bool.config_volumeHushGestureEnabled)
? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
}
}

23
src/com/android/settings/gestures/PreventRingingPreferenceController.java
View File

@@ -24,14 +24,8 @@ 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.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.widget.VideoPreference;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnCreate;
@@ -39,8 +33,13 @@ 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 BasePreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
public class PreventRingingPreferenceController extends PreventRingingParentPreferenceController
implements Preference.OnPreferenceChangeListener,
LifecycleObserver, OnResume, OnPause, OnCreate, OnSaveInstanceState {
private static final String PREF_KEY_VIDEO = "gesture_prevent_ringing_video";
@@ -59,9 +58,11 @@ public class PreventRingingPreferenceController extends BasePreferenceController
@Override
public int getAvailabilityStatus() {
return mContext.getResources().getBoolean(
com.android.internal.R.bool.config_volumeHushGestureEnabled)
? AVAILABLE : UNSUPPORTED_ON_DEVICE;
final int status = super.getAvailabilityStatus();
if (status == AVAILABLE_UNSEARCHABLE) {
return AVAILABLE;
}
return status;
}
@Override