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

Commit a2325fb2 authored by Steve Kondik's avatar Steve Kondik Committed by Steve Kondik
Browse files

settings: Move CMHW to CMSDK 

 * Update all references and API usage.

Change-Id: If6bda2547bdd251ccf9a04ad0deac7f2fd51fa29
parent 272d3cc0

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
    <uses-permission android:name="android.permission.READ_SEARCH_INDEXABLES" />

    <uses-permission android:name="android.permission.OEM_UNLOCK_STATE" />

    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

    <uses-permission android:name="android.permission.HARDWARE_ABSTRACTION_ACCESS" />

    <uses-permission android:name="cyanogenmod.permission.HARDWARE_ABSTRACTION_ACCESS" />

    <uses-permission android:name="com.cyanogen.permission.REQUEST_KILL_SWITCH_OP" />

    <uses-permission android:name="cyanogenmod.permission.FINISH_SETUP" />

    <uses-permission android:name="android.permission.ACCESS_FINGERPRINT_SERVICE" />

src/com/android/settings/ButtonSettings.java

+9 −11
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.content.pm.ResolveInfo; 
import android.content.res.Resources;

import android.content.SharedPreferences;

import android.content.SharedPreferences.Editor;

import android.hardware.CmHardwareManager;

import android.os.Bundle;

import android.os.RemoteException;

import android.os.Handler;
@@ -51,6 +50,8 @@ import com.android.settings.cyanogenmod.ButtonBacklightBrightness; 
import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;



import cyanogenmod.hardware.CMHardwareManager;



import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;
@@ -265,13 +266,12 @@ public class ButtonSettings extends SettingsPreferenceFragment implements 
        final boolean showCameraWake = (deviceWakeKeys & KEY_MASK_CAMERA) != 0;

        final boolean showVolumeWake = (deviceWakeKeys & KEY_MASK_VOLUME) != 0;



        final CmHardwareManager cmHardwareManager =

                (CmHardwareManager) context.getSystemService(Context.CMHW_SERVICE);

        final CMHardwareManager hardware = CMHardwareManager.getInstance(context);



        // Only visible on devices that does not have a navigation bar already,

        // and don't even try unless the existing keys can be disabled

        boolean needsNavigationBar = false;

        if (cmHardwareManager.isSupported(CmHardwareManager.FEATURE_KEY_DISABLE)) {

        if (hardware.isSupported(CMHardwareManager.FEATURE_KEY_DISABLE)) {

            try {

                IWindowManager wm = WindowManagerGlobal.getWindowManagerService();

                needsNavigationBar = wm.needsNavigationBar();
@@ -452,7 +452,7 @@ public class ButtonSettings extends SettingsPreferenceFragment implements 
            }



            if (!hasNavBar && (needsNavigationBar ||

                    !cmHardwareManager.isSupported(CmHardwareManager.FEATURE_KEY_DISABLE))) {

                    !hardware.isSupported(CMHardwareManager.FEATURE_KEY_DISABLE))) {

                result.put(CATEGORY_NAVBAR, null);

            }

        } catch (RemoteException e) {
@@ -637,9 +637,8 @@ public class ButtonSettings extends SettingsPreferenceFragment implements 


        Settings.Secure.putInt(context.getContentResolver(),

                Settings.Secure.DEV_FORCE_SHOW_NAVBAR, enabled ? 1 : 0);

        CmHardwareManager cmHardwareManager =

                (CmHardwareManager) context.getSystemService(Context.CMHW_SERVICE);

        cmHardwareManager.set(CmHardwareManager.FEATURE_KEY_DISABLE, enabled);

        CMHardwareManager hardware = CMHardwareManager.getInstance(context);

        hardware.set(CMHardwareManager.FEATURE_KEY_DISABLE, enabled);



        /* Save/restore button timeouts to disable them in softkey mode */

        if (enabled) {
@@ -703,9 +702,8 @@ public class ButtonSettings extends SettingsPreferenceFragment implements 
    }



    public static void restoreKeyDisabler(Context context) {

        CmHardwareManager cmHardwareManager =

                (CmHardwareManager) context.getSystemService(Context.CMHW_SERVICE);

        if (!cmHardwareManager.isSupported(CmHardwareManager.FEATURE_KEY_DISABLE)) {

        CMHardwareManager hardware = CMHardwareManager.getInstance(context);

        if (!hardware.isSupported(CMHardwareManager.FEATURE_KEY_DISABLE)) {

            return;

        }

src/com/android/settings/DisplaySettings.java

+10 −11
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ import com.android.internal.view.RotationPolicy; 
import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;



import static android.hardware.CmHardwareManager.FEATURE_TAP_TO_WAKE;

import static android.provider.Settings.Secure.DOZE_ENABLED;

import static android.provider.Settings.Secure.WAKE_GESTURE_ENABLED;

import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;

import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;

import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;

import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;

import static cyanogenmod.hardware.CMHardwareManager.FEATURE_TAP_TO_WAKE;



import android.app.Activity;

import android.app.ActivityManagerNative;
@@ -48,7 +48,6 @@ import android.content.Context; 
import android.content.res.Configuration;

import android.content.res.Resources;

import android.content.SharedPreferences;

import android.hardware.CmHardwareManager;

import android.hardware.Sensor;

import android.hardware.SensorManager;

import android.os.AsyncTask;
@@ -79,6 +78,8 @@ import java.util.List; 
import com.android.settings.cyanogenmod.DisplayRotation;

import com.android.settings.Utils;



import cyanogenmod.hardware.CMHardwareManager;



public class DisplaySettings extends SettingsPreferenceFragment implements

        Preference.OnPreferenceChangeListener, OnPreferenceClickListener, Indexable {

    private static final String TAG = "DisplaySettings";
@@ -121,7 +122,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
    private SwitchPreference mTapToWake;

    private SwitchPreference mWakeWhenPluggedOrUnplugged;



    private CmHardwareManager mCmHardwareManager;

    private CMHardwareManager mHardware;



    private ContentObserver mAccelerometerRotationObserver =

            new ContentObserver(new Handler()) {
@@ -145,7 +146,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
        super.onCreate(savedInstanceState);

        final Activity activity = getActivity();

        final ContentResolver resolver = activity.getContentResolver();

        mCmHardwareManager = (CmHardwareManager) activity.getSystemService(Context.CMHW_SERVICE);

        mHardware = CMHardwareManager.getInstance(activity);



        addPreferencesFromResource(R.xml.display);
@@ -246,7 +247,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 


        mTapToWake = (SwitchPreference) findPreference(KEY_TAP_TO_WAKE);

        if (displayPrefs != null && mTapToWake != null

                && !mCmHardwareManager.isSupported(FEATURE_TAP_TO_WAKE)) {

                && !mHardware.isSupported(FEATURE_TAP_TO_WAKE)) {

            displayPrefs.removePreference(mTapToWake);

            mTapToWake = null;

        }
@@ -434,7 +435,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
        updateDisplayRotationPreferenceDescription();



        if (mTapToWake != null) {

            mTapToWake.setChecked(mCmHardwareManager.get(FEATURE_TAP_TO_WAKE));

            mTapToWake.setChecked(mHardware.get(FEATURE_TAP_TO_WAKE));

        }



        RotationPolicy.registerRotationPolicyListener(getActivity(),
@@ -603,7 +604,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
    @Override

    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {

        if (preference == mTapToWake) {

            return mCmHardwareManager.set(FEATURE_TAP_TO_WAKE, mTapToWake.isChecked());

            return mHardware.set(FEATURE_TAP_TO_WAKE, mTapToWake.isChecked());

        } else if (preference == mWakeWhenPluggedOrUnplugged) {

            Settings.Global.putInt(getContentResolver(),

                    Settings.Global.WAKE_WHEN_PLUGGED_OR_UNPLUGGED,
@@ -678,8 +679,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
     */

    public static void restore(Context ctx) {

        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);

        CmHardwareManager cmHardwareManager =

            (CmHardwareManager) ctx.getSystemService(Context.CMHW_SERVICE);

        CMHardwareManager cmHardwareManager = CMHardwareManager.getInstance(ctx);

        if (cmHardwareManager.isSupported(FEATURE_TAP_TO_WAKE)) {

            final boolean enabled = prefs.getBoolean(KEY_TAP_TO_WAKE,

                cmHardwareManager.get(FEATURE_TAP_TO_WAKE));
@@ -710,8 +710,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 


                @Override

                public List<String> getNonIndexableKeys(Context context) {

                    CmHardwareManager cmHardwareManager =

                        (CmHardwareManager) context.getSystemService(Context.CMHW_SERVICE);

                    CMHardwareManager cmHardwareManager = CMHardwareManager.getInstance(context);

                    ArrayList<String> result = new ArrayList<String>();

                    if (!context.getResources().getBoolean(

                            com.android.internal.R.bool.config_dreamsSupported)) {

src/com/android/settings/SoundSettings.java

+6 −7
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.content.pm.ServiceInfo; 
import android.database.ContentObserver;

import android.database.Cursor;

import android.database.sqlite.SQLiteException;

import android.hardware.CmHardwareManager;

import android.media.AudioManager;

import android.media.RingtoneManager;

import android.net.Uri;
@@ -59,6 +58,8 @@ import com.android.settings.notification.VolumeSeekBarPreference; 
import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;



import cyanogenmod.hardware.CMHardwareManager;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;
@@ -155,9 +156,8 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab 
            volumes.removePreference(volumes.findPreference(KEY_VOLUME_LINK_NOTIFICATION));

        }



        CmHardwareManager cmHardwareManager =

                (CmHardwareManager) getSystemService(Context.CMHW_SERVICE);

        if (!cmHardwareManager.isSupported(CmHardwareManager.FEATURE_VIBRATOR)) {

        CMHardwareManager hardware = CMHardwareManager.getInstance(mContext);

        if (!hardware.isSupported(CMHardwareManager.FEATURE_VIBRATOR)) {

            Preference preference = vibrate.findPreference(KEY_VIBRATION_INTENSITY);

            if (preference != null) {

                vibrate.removePreference(preference);
@@ -631,9 +631,8 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab 
            if (vib == null || !vib.hasVibrator()) {

                rt.add(KEY_VIBRATE);

            }

            CmHardwareManager cmHardwareManager =

                    (CmHardwareManager) context.getSystemService(Context.CMHW_SERVICE);

            if (!cmHardwareManager.isSupported(CmHardwareManager.FEATURE_VIBRATOR)) {

            CMHardwareManager hardware = CMHardwareManager.getInstance(context);

            if (!hardware.isSupported(CMHardwareManager.FEATURE_VIBRATOR)) {

                rt.add(KEY_VIBRATION_INTENSITY);

            }

src/com/android/settings/cyanogenmod/LtoService.java

+11 −10
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.settings.cyanogenmod;



import static android.hardware.CmHardwareManager.FEATURE_LONG_TERM_ORBITS;

import static cyanogenmod.hardware.CMHardwareManager.FEATURE_LONG_TERM_ORBITS;



import android.app.AlarmManager;

import android.app.PendingIntent;
@@ -24,7 +24,6 @@ import android.app.Service; 
import android.content.Context;

import android.content.Intent;

import android.content.SharedPreferences;

import android.hardware.CmHardwareManager;

import android.net.ConnectivityManager;

import android.net.NetworkInfo;

import android.os.AsyncTask;
@@ -37,6 +36,8 @@ import android.util.Log; 


import com.android.settings.location.LocationSettings;



import cyanogenmod.hardware.CMHardwareManager;



import java.io.BufferedInputStream;

import java.io.BufferedOutputStream;

import java.io.File;
@@ -58,13 +59,13 @@ public class LtoService extends Service { 


    private static final int DOWNLOAD_TIMEOUT = 45000; /* 45 seconds */



    private CmHardwareManager mCmHardwareManager;

    private CMHardwareManager mHardware;

    private LtoDownloadTask mTask;



    @Override

    public int onStartCommand(Intent intent, int flags, int startId) {

        if (mCmHardwareManager == null ||

                !mCmHardwareManager.isSupported(FEATURE_LONG_TERM_ORBITS)) {

        if (mHardware == null ||

                !mHardware.isSupported(FEATURE_LONG_TERM_ORBITS)) {

            if (ALOGV) Log.v(TAG, "LTO is not supported by this device");

            return START_NOT_STICKY;

        }
@@ -84,8 +85,8 @@ public class LtoService extends Service { 
            return START_NOT_STICKY;

        }



        mTask = new LtoDownloadTask(mCmHardwareManager.getLtoSource(),

                new File(mCmHardwareManager.getLtoDestination()));

        mTask = new LtoDownloadTask(mHardware.getLtoSource(),

                new File(mHardware.getLtoDestination()));

        mTask.execute();



        return START_REDELIVER_INTENT;
@@ -99,7 +100,7 @@ public class LtoService extends Service { 
    @Override

    public void onCreate() {

        super.onCreate();

        mCmHardwareManager = (CmHardwareManager) getSystemService(Context.CMHW_SERVICE);

        mHardware = CMHardwareManager.getInstance(this);

    }



    @Override
@@ -131,7 +132,7 @@ public class LtoService extends Service { 


        long now = System.currentTimeMillis();

        long lastDownload = getLastDownload();

        long due = lastDownload + mCmHardwareManager.getLtoDownloadInterval();

        long due = lastDownload + mHardware.getLtoDownloadInterval();



        if (ALOGV) {

            Log.v(TAG, "Now " + now + " due " + due + "(" + new Date(due) + ")");
@@ -325,7 +326,7 @@ public class LtoService extends Service { 
        PendingIntent pi = PendingIntent.getService(this, 0, intent,

                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT);



        long nextLtoDownload = lastDownload + mCmHardwareManager.getLtoDownloadInterval();

        long nextLtoDownload = lastDownload + mHardware.getLtoDownloadInterval();

        am.set(AlarmManager.RTC, nextLtoDownload, pi);

        return pi;

    }