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

Commit 9704e784 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Refactor SensorManager to move non-API bits into a subclass."

parents 1c23ed62 25157e45

api/16.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -9513,7 +9513,7 @@ package android.hardware { 
    method public abstract void onSensorChanged(int, float[]);

    method public abstract void onSensorChanged(int, float[]);

  }

  }

















  public class SensorManager {







  public abstract class SensorManager {











    method public static float getAltitude(float, float);







    method public static float getAltitude(float, float);











    method public static void getAngleChange(float[], float[], float[]);







    method public static void getAngleChange(float[], float[], float[]);











    method public android.hardware.Sensor getDefaultSensor(int);







    method public android.hardware.Sensor getDefaultSensor(int);

























api/current.txt



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -9782,7 +9782,7 @@ package android.hardware {









    method public abstract void onSensorChanged(int, float[]);







    method public abstract void onSensorChanged(int, float[]);











  }







  }



























  public class SensorManager {







  public abstract class SensorManager {











    method public static float getAltitude(float, float);







    method public static float getAltitude(float, float);











    method public static void getAngleChange(float[], float[], float[]);







    method public static void getAngleChange(float[], float[], float[]);











    method public android.hardware.Sensor getDefaultSensor(int);







    method public android.hardware.Sensor getDefaultSensor(int);

























core/java/android/app/ContextImpl.java



+2
−1




























Original line number
Original line
Diff line number
Diff line








@@ -45,6 +45,7 @@ import android.graphics.drawable.Drawable;









import android.hardware.ISerialManager;







import android.hardware.ISerialManager;











import android.hardware.SensorManager;







import android.hardware.SensorManager;











import android.hardware.SerialManager;







import android.hardware.SerialManager;














import android.hardware.SystemSensorManager;











import android.hardware.input.IInputManager;







import android.hardware.input.IInputManager;











import android.hardware.input.InputManager;







import android.hardware.input.InputManager;











import android.hardware.usb.IUsbManager;







import android.hardware.usb.IUsbManager;










@@ -407,7 +408,7 @@ class ContextImpl extends Context {





























        registerService(SENSOR_SERVICE, new ServiceFetcher() {







        registerService(SENSOR_SERVICE, new ServiceFetcher() {











                public Object createService(ContextImpl ctx) {







                public Object createService(ContextImpl ctx) {











                    return new SensorManager(ctx.mMainThread.getHandler().getLooper());







                    return new SystemSensorManager(ctx.mMainThread.getHandler().getLooper());











                }});







                }});































        registerService(STATUS_BAR_SERVICE, new ServiceFetcher() {







        registerService(STATUS_BAR_SERVICE, new ServiceFetcher() {

































core/java/android/hardware/Sensor.java



+0
−9




























Original line number
Original line
Diff line number
Diff line








@@ -131,7 +131,6 @@ public class Sensor {









    private float   mResolution;







    private float   mResolution;











    private float   mPower;







    private float   mPower;











    private int     mMinDelay;







    private int     mMinDelay;











    private int     mLegacyType;






















































    Sensor() {







    Sensor() {










@@ -203,12 +202,4 @@ public class Sensor {









        mMaxRange = max;







        mMaxRange = max;











        mResolution = res;







        mResolution = res;











    }







    }


























    void setLegacyType(int legacyType) {














        mLegacyType = legacyType;














    }





























    int getLegacyType() {














        return mLegacyType;














    }














}






}
























core/java/android/hardware/SensorManager.java



+377
−705


























File changed.
Preview size limit exceeded, changes collapsed.