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

Remove on/off subtext from gesture preferencecontrollers

Browse Source 
The toggle switch next to the subtitle already shows on/off clearly.

Fixes: 130652619
Fixes: 130652843
Fixes: 130653459
Fixes: 130653297
Test: robo
Change-Id: Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5
This commit is contained in:
Fan Zhang
2019-04-17 13:29:25 -07:00
parent 7af19fcb86
commit 57f18af554
6 changed files with 13 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
View File

@@ -33,13 +33,11 @@ public class DoubleTapPowerPreferenceController extends GesturePreferenceControl
static final int OFF = 1;
private static final String PREF_KEY_VIDEO = "gesture_double_tap_power_video";
private final String mDoubleTapPowerKey;
private final String SECURE_KEY = CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
public DoubleTapPowerPreferenceController(Context context, String key) {
super(context, key);
mDoubleTapPowerKey = key;
}
public static boolean isSuggestionComplete(Context context, SharedPreferences prefs) {

7
src/com/android/settings/gestures/GesturePreferenceController.java
View File

@@ -23,7 +23,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.widget.VideoPreference;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -64,12 +63,6 @@ public abstract class GesturePreferenceController extends TogglePreferenceContro
}
}
@Override
public CharSequence getSummary() {
return mContext.getText(
isChecked() ? R.string.gesture_setting_on : R.string.gesture_setting_off);
}
@Override
public void onCreate(Bundle savedInstanceState) {
if (savedInstanceState != null) {

29
src/com/android/settings/slices/SliceBuilderUtils.java
View File

@@ -189,39 +189,28 @@ public class SliceBuilderUtils {
*/
public static CharSequence getSubtitleText(Context context,
BasePreferenceController controller, SliceData sliceData) {
final boolean isDynamicSummaryAllowed = controller.useDynamicSliceSummary();
CharSequence summaryText = controller.getSummary();
// Priority 1 : User prefers showing the dynamic summary in slice view rather than static
// summary. Note it doesn't require a valid summary - so we can force some slices to have
// empty summaries (ex: volume).
if (isDynamicSummaryAllowed) {
if (controller.useDynamicSliceSummary()) {
return controller.getSummary();
}
// Priority 2: Show summary from slice data.
CharSequence summaryText = sliceData.getSummary();
if (isValidSummary(context, summaryText)) {
return summaryText;
}
// Priority 2 : Show screen title.
// Priority 3: Show screen title.
summaryText = sliceData.getScreenTitle();
if (isValidSummary(context, summaryText) && !TextUtils.equals(summaryText,
sliceData.getTitle())) {
return summaryText;
}
// Priority 3 : Show dynamic summary from preference controller.
if (controller != null) {
summaryText = controller.getSummary();
if (isValidSummary(context, summaryText)) {
return summaryText;
}
}
// Priority 4 : Show summary from slice data.
summaryText = sliceData.getSummary();
if (isValidSummary(context, summaryText)) {
return summaryText;
}
// Priority 5 : Show empty text.
// Priority 4: Show empty text.
return "";
}