Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdef0464 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add remaining whitelisted controllers"

parents cf84bf0d 0cb62643

res/xml/smart_battery_detail.xml

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
        android:key="smart_battery"

        android:title="@string/smart_battery_title"

        android:summary="@string/smart_battery_summary"

        settings:controller="com.android.settings.fuelgauge.SmartBatteryPreferenceController"

        settings:allowDividerAbove="true"/>



    <SwitchPreference

src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java

+8 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ package com.android.settings.accessibility; 
import android.content.Context;

import android.os.Bundle;

import android.provider.Settings;

import android.text.TextUtils;



import androidx.preference.Preference;



import com.android.settings.R;
@@ -61,6 +63,12 @@ public class MagnificationGesturesPreferenceController extends TogglePreferenceC 
        return AVAILABLE;

    }



    @Override

    public boolean isSliceable() {

        return TextUtils.equals(getPreferenceKey(),

                "screen_magnification_gestures_preference_screen");

    }



    @Override

    public CharSequence getSummary() {

        int resId = 0;

src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java

+8 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ package com.android.settings.accessibility; 
import android.content.Context;

import android.os.Bundle;

import android.provider.Settings;

import android.text.TextUtils;



import androidx.preference.Preference;



import com.android.settings.R;
@@ -68,6 +70,12 @@ public class MagnificationNavbarPreferenceController extends TogglePreferenceCon 
                : UNSUPPORTED_ON_DEVICE;

    }



    @Override

    public boolean isSliceable() {

        return TextUtils.equals(getPreferenceKey(),

                "screen_magnification_navbar_preference_screen");

    }



    @Override

    public CharSequence getSummary() {

        int resId = 0;

src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.settings.fuelgauge; 


import android.content.Context;

import android.provider.Settings;

import android.text.TextUtils;



import androidx.preference.SwitchPreference;

import androidx.preference.Preference;
@@ -48,6 +50,11 @@ public class SmartBatteryPreferenceController extends BasePreferenceController i 
                : UNSUPPORTED_ON_DEVICE;

    }



    @Override

    public boolean isSliceable() {

        return TextUtils.equals(getPreferenceKey(), "smart_battery");

    }



    @Override

    public void updateState(Preference preference) {

        super.updateState(preference);

src/com/android/settings/notification/AlarmVolumePreferenceController.java

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.notification; 


import android.content.Context;

import android.media.AudioManager;

import android.text.TextUtils;



import com.android.settings.R;
@@ -36,6 +37,11 @@ public class AlarmVolumePreferenceController extends 
                && !mHelper.isSingleVolume() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;

    }



    @Override

    public boolean isSliceable() {

        return TextUtils.equals(getPreferenceKey(), "alarm_volume");

    }



    @Override

    public String getPreferenceKey() {

        return KEY_ALARM_VOLUME;