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

Commit b9d07718 authored by Matthew Fritze's avatar Matthew Fritze Committed by android-build-merger
Browse files

Merge "Add remaining whitelisted controllers" into pi-dev 

am: da07a663

Change-Id: I1b4a9e25da8138409d20e960dc68a4e8b5b2e459
parents a8c26029 da07a663

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

+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ import android.content.Context; 
import android.os.Bundle;

import android.provider.Settings;

import android.support.v7.preference.Preference;

import android.text.TextUtils;



import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;
@@ -61,6 +62,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

+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ import android.content.Context; 
import android.os.Bundle;

import android.provider.Settings;

import android.support.v7.preference.Preference;

import android.text.TextUtils;



import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;
@@ -68,6 +69,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

+6 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.Context; 
import android.provider.Settings;

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.Preference;

import android.text.TextUtils;



import com.android.settings.core.BasePreferenceController;

import com.android.settings.overlay.FeatureFactory;
@@ -48,6 +49,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;