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

Commit 15eb2133 authored by Sam Mortimer's avatar Sam Mortimer
Browse files

LineageParts: migrate to lineage-sdk LightsCapabilities 

Change-Id: I590280b2849156fa52f954d1e7147448798c7f4e
parent 8884f80d

src/org/lineageos/lineageparts/notificationlight/ApplicationLightPreference.java

+8 −8
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package org.lineageos.lineageparts.notificationlight; 


import android.app.AlertDialog;

import android.app.Dialog;

import android.app.NotificationManager;

import android.content.Context;

import android.content.DialogInterface;

import android.graphics.drawable.ShapeDrawable;
@@ -31,6 +30,7 @@ import android.view.View; 
import android.widget.ImageView;

import android.widget.TextView;



import org.lineageos.internal.notification.LightsCapabilities;

import org.lineageos.lineageparts.widget.CustomDialogPreference;

import org.lineageos.lineageparts.R;
@@ -63,13 +63,12 @@ public class ApplicationLightPreference extends CustomDialogPreference<LightSett 
     * @param attrs

     */

    public ApplicationLightPreference(Context context, AttributeSet attrs) {

        this(context, attrs, DEFAULT_COLOR, DEFAULT_TIME, DEFAULT_TIME,

                context.getSystemService(NotificationManager.class)

                        .doLightsSupport(NotificationManager.LIGHTS_PULSATING_LED));

        this(context, attrs, DEFAULT_COLOR, DEFAULT_TIME, DEFAULT_TIME);

    }



    /**

     * @param context

     * @param attrs

     * @param color

     * @param onValue

     * @param offValue
@@ -77,15 +76,16 @@ public class ApplicationLightPreference extends CustomDialogPreference<LightSett 
    public ApplicationLightPreference(Context context, AttributeSet attrs,

                                      int color, int onValue, int offValue) {

        this(context, attrs, color, onValue, offValue,

                context.getSystemService(NotificationManager.class)

                        .doLightsSupport(NotificationManager.LIGHTS_PULSATING_LED));

                LightsCapabilities.supports(context, LightsCapabilities.LIGHTS_PULSATING_LED));

    }



    /**

     * @param context

     * @param attrs

     * @param color

     * @param onValue

     * @param offValue

     * @param onOffChangeable

     */

    public ApplicationLightPreference(Context context, AttributeSet attrs,

                                      int color, int onValue, int offValue, boolean onOffChangeable) {
@@ -123,8 +123,8 @@ public class ApplicationLightPreference extends CustomDialogPreference<LightSett 
        TextView tView = (TextView) holder.findViewById(android.R.id.summary);

        tView.setVisibility(View.GONE);



        final NotificationManager nm = getContext().getSystemService(NotificationManager.class);

        if (!nm.doLightsSupport(NotificationManager.LIGHTS_RGB_NOTIFICATION_LED)) {

        if (!LightsCapabilities.supports(

                getContext(), LightsCapabilities.LIGHTS_RGB_NOTIFICATION_LED)) {

            mLightColorView.setVisibility(View.GONE);

        }

src/org/lineageos/lineageparts/notificationlight/BatteryLightSettings.java

+8 −8
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package org.lineageos.lineageparts.notificationlight;



import android.app.NotificationManager;

import android.content.ContentResolver;

import android.content.Context;

import android.content.res.Resources;
@@ -28,6 +27,7 @@ import android.view.Menu; 
import android.view.MenuInflater;

import android.view.MenuItem;



import org.lineageos.internal.notification.LightsCapabilities;

import org.lineageos.lineageparts.R;

import org.lineageos.lineageparts.SettingsPreferenceFragment;
@@ -57,6 +57,8 @@ public class BatteryLightSettings extends SettingsPreferenceFragment implements 
    public void onActivityCreated(Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);



        final Context context = getContext();



        addPreferencesFromResource(R.xml.battery_light_settings);

        getActivity().getActionBar().setTitle(R.string.battery_light_title);
@@ -67,15 +69,14 @@ public class BatteryLightSettings extends SettingsPreferenceFragment implements 
        mLightEnabledPref = (LineageSystemSettingSwitchPreference) prefSet.findPreference(LIGHT_ENABLED_PREF);

        mPulseEnabledPref = (LineageSystemSettingSwitchPreference) prefSet.findPreference(PULSE_ENABLED_PREF);



        final NotificationManager nm = getContext().getSystemService(NotificationManager.class);



        if (!nm.doLightsSupport(NotificationManager.LIGHTS_PULSATING_LED) ||

                nm.doLightsSupport(NotificationManager.LIGHTS_SEGMENTED_BATTERY_LED)) {

        if (!LightsCapabilities.supports(context, LightsCapabilities.LIGHTS_PULSATING_LED) ||

                LightsCapabilities.supports(

                        context, LightsCapabilities.LIGHTS_SEGMENTED_BATTERY_LED)) {

            mGeneralPrefs.removePreference(mPulseEnabledPref);

        }



        // Does the device support changing battery LED colors?

        if (nm.doLightsSupport(NotificationManager.LIGHTS_RGB_BATTERY_LED)) {

        if (LightsCapabilities.supports(context, LightsCapabilities.LIGHTS_RGB_BATTERY_LED)) {

            setHasOptionsMenu(true);



            // Low, Medium and full color preferences
@@ -144,8 +145,7 @@ public class BatteryLightSettings extends SettingsPreferenceFragment implements 


    @Override

    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

        final NotificationManager nm = getContext().getSystemService(NotificationManager.class);

        if (nm.doLightsSupport(NotificationManager.LIGHTS_RGB_BATTERY_LED)) {

        if (LightsCapabilities.supports(getContext(), LightsCapabilities.LIGHTS_RGB_BATTERY_LED)) {

            menu.add(0, MENU_RESET, 0, R.string.reset)

                    .setIcon(R.drawable.ic_settings_backup_restore)

                    .setAlphabeticShortcut('r')

src/org/lineageos/lineageparts/notificationlight/LightSettingsDialog.java

+3 −2
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import android.widget.Spinner; 
import android.widget.SpinnerAdapter;

import android.widget.TextView;



import org.lineageos.internal.notification.LightsCapabilities;

import org.lineageos.lineageparts.R;

import org.lineageos.lineageparts.notificationlight.ColorPickerView.OnColorChangedListener;
@@ -171,8 +172,8 @@ public class LightSettingsDialog extends AlertDialog implements 
        setView(layout);

        setTitle(R.string.edit_light_settings);



        if (!mNotificationManager.doLightsSupport(

                NotificationManager.LIGHTS_RGB_NOTIFICATION_LED)) {

        if (!LightsCapabilities.supports(

                mContext, LightsCapabilities.LIGHTS_RGB_NOTIFICATION_LED)) {

            mColorPicker.setVisibility(View.GONE);

            mColorPanel.setVisibility(View.GONE);

            mLightsDialogDivider.setVisibility(View.GONE);

src/org/lineageos/lineageparts/notificationlight/NotificationLightSettings.java

+9 −5
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.widget.AdapterView; 
import android.widget.AdapterView.OnItemClickListener;

import android.widget.ListView;



import org.lineageos.internal.notification.LightsCapabilities;

import org.lineageos.lineageparts.widget.PackageListAdapter;

import org.lineageos.lineageparts.widget.PackageListAdapter.PackageItem;

import org.lineageos.lineageparts.R;
@@ -92,6 +93,8 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem 
    public void onActivityCreated(Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);



        final Context context = getContext();



        addPreferencesFromResource(R.xml.notification_light_settings);

        getActivity().getActionBar().setTitle(R.string.notification_light_title);
@@ -110,9 +113,10 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem 
        mDefaultLedOff = resources.getInteger(

                com.android.internal.R.integer.config_defaultNotificationLedOff);



        final NotificationManager nm = getContext().getSystemService(NotificationManager.class);

        mLedCanPulse = nm.doLightsSupport(NotificationManager.LIGHTS_PULSATING_LED);

        mMultiColorLed = nm.doLightsSupport(NotificationManager.LIGHTS_RGB_NOTIFICATION_LED);

        mLedCanPulse = LightsCapabilities.supports(

                context, LightsCapabilities.LIGHTS_PULSATING_LED);

        mMultiColorLed = LightsCapabilities.supports(

                context, LightsCapabilities.LIGHTS_RGB_NOTIFICATION_LED);



        mEnabledPref = (SystemSettingSwitchPreference)

                findPreference(Settings.System.NOTIFICATION_LIGHT_PULSE);
@@ -131,8 +135,8 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem 
        mScreenOnLightsPref.setOnPreferenceChangeListener(this);

        mCustomEnabledPref = (LineageSystemSettingSwitchPreference)

                findPreference(LineageSettings.System.NOTIFICATION_LIGHT_PULSE_CUSTOM_ENABLE);

        if (!nm.doLightsSupport(

                NotificationManager.LIGHTS_ADJUSTABLE_NOTIFICATION_LED_BRIGHTNESS)) {

        if (!LightsCapabilities.supports(

                context, LightsCapabilities.LIGHTS_ADJUSTABLE_NOTIFICATION_LED_BRIGHTNESS)) {

            mAdvancedPrefs.removePreference(mNotificationLedBrightnessPref);

        } else {

            mNotificationLedBrightnessPref.setOnPreferenceChangeListener(this);