Commit d6660fc9 authored by Doug Turner's avatar Doug Turner
Browse files

Bug 734854 - Merge PROXIMITY_EVENT with SENSOR_EVENT. r=jdm

parent 23746e5e

mobile/android/base/GeckoEvent.java

+22 −27
Original line number Diff line number Diff line
@@ -71,28 +71,25 @@ public class GeckoEvent { 
    private static final int KEY_EVENT = 1;

    private static final int MOTION_EVENT = 2;

    private static final int SENSOR_EVENT = 3;

    private static final int UNUSED1_EVENT = 4;

    private static final int LOCATION_EVENT = 5;

    private static final int IME_EVENT = 6;

    private static final int DRAW = 7;

    private static final int SIZE_CHANGED = 8;

    private static final int ACTIVITY_STOPPING = 9;

    private static final int ACTIVITY_PAUSING = 10;

    private static final int ACTIVITY_SHUTDOWN = 11;

    private static final int LOAD_URI = 12;

    private static final int SURFACE_CREATED = 13;

    private static final int SURFACE_DESTROYED = 14;

    private static final int GECKO_EVENT_SYNC = 15;

    private static final int ACTIVITY_START = 17;

    private static final int BROADCAST = 19;

    private static final int VIEWPORT = 20;

    private static final int VISITED = 21;

    private static final int NETWORK_CHANGED = 22;

    private static final int PROXIMITY_EVENT = 23;

    private static final int ACTIVITY_RESUMING = 24;

    private static final int SCREENSHOT = 25;

    private static final int UNUSED2_EVENT = 26;

    private static final int SCREENORIENTATION_CHANGED = 27;

    private static final int LOCATION_EVENT = 4;

    private static final int IME_EVENT = 5;

    private static final int DRAW = 6;

    private static final int SIZE_CHANGED = 7;

    private static final int ACTIVITY_STOPPING = 8;

    private static final int ACTIVITY_PAUSING = 9;

    private static final int ACTIVITY_SHUTDOWN = 10;

    private static final int LOAD_URI = 11;

    private static final int SURFACE_CREATED = 12;

    private static final int SURFACE_DESTROYED = 13;

    private static final int GECKO_EVENT_SYNC = 14;

    private static final int ACTIVITY_START = 15;

    private static final int BROADCAST = 16;

    private static final int VIEWPORT = 17;

    private static final int VISITED = 18;

    private static final int NETWORK_CHANGED = 19;

    private static final int ACTIVITY_RESUMING = 20;

    private static final int SCREENSHOT = 21;

    private static final int SCREENORIENTATION_CHANGED = 22;



    public static final int IME_COMPOSITION_END = 0;

    public static final int IME_COMPOSITION_BEGIN = 1;
@@ -124,7 +121,6 @@ public class GeckoEvent { 
    public Point[] mPointRadii;

    public Rect mRect;

    public double mX, mY, mZ;

    public double mDistance;



    public int mMetaState, mFlags;

    public int mKeyCode, mUnicodeChar;
@@ -340,10 +336,9 @@ public class GeckoEvent { 
            break;



        case Sensor.TYPE_PROXIMITY:

            // bug 734854 - maybe we can get rid of this event.  is

            // values[1] and values[2] valid?

            event = new GeckoEvent(PROXIMITY_EVENT);

            event.mDistance = s.values[0];

            event = new GeckoEvent(SENSOR_EVENT);

            event.mFlags = GeckoHalDefines.SENSOR_PROXIMITY;

            event.mX = s.values[0];

            break;

        }

        return event;

widget/android/AndroidJavaWrappers.cpp

+0 −6
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ AndroidGeckoEvent::InitGeckoEventClass(JNIEnv *jEnv) 
    jXField = getField("mX", "D");

    jYField = getField("mY", "D");

    jZField = getField("mZ", "D");

    jDistanceField = getField("mDistance", "D");

    jRectField = getField("mRect", "Landroid/graphics/Rect;");



    jCharactersField = getField("mCharacters", "Ljava/lang/String;");
@@ -507,11 +506,6 @@ AndroidGeckoEvent::Init(JNIEnv *jenv, jobject jobj) 
            break;

        }



        case PROXIMITY_EVENT: {

            mDistance = jenv->GetDoubleField(jobj, jDistanceField);

            break;

        }



        case ACTIVITY_STOPPING:

        case ACTIVITY_START:

        case ACTIVITY_PAUSING:

widget/android/AndroidJavaWrappers.h

+20 −24
Original line number Diff line number Diff line
@@ -466,7 +466,6 @@ public: 
    double X() { return mX; }

    double Y() { return mY; }

    double Z() { return mZ; }

    double Distance() { return mDistance; }

    const nsIntRect& Rect() { return mRect; }

    nsAString& Characters() { return mCharacters; }

    nsAString& CharactersExtra() { return mCharactersExtra; }
@@ -568,29 +567,26 @@ public: 
        KEY_EVENT = 1,

        MOTION_EVENT = 2,

        SENSOR_EVENT = 3,

        UNUSED1_EVENT = 4,

        LOCATION_EVENT = 5,

        IME_EVENT = 6,

        DRAW = 7,

        SIZE_CHANGED = 8,

        ACTIVITY_STOPPING = 9,

        ACTIVITY_PAUSING = 10,

        ACTIVITY_SHUTDOWN = 11,

        LOAD_URI = 12,

        SURFACE_CREATED = 13,

        SURFACE_DESTROYED = 14,

        GECKO_EVENT_SYNC = 15,

        FORCED_RESIZE = 16,

        ACTIVITY_START = 17,

        BROADCAST = 19,

        VIEWPORT = 20,

        VISITED = 21,

        NETWORK_CHANGED = 22,

        PROXIMITY_EVENT = 23,

        ACTIVITY_RESUMING = 24,

        SCREENSHOT = 25,

        UNUSED2_EVENT = 26,

        SCREENORIENTATION_CHANGED = 27,

        LOCATION_EVENT = 4,

        IME_EVENT = 5,

        DRAW = 6,

        SIZE_CHANGED = 7,

        ACTIVITY_STOPPING = 8,

        ACTIVITY_PAUSING = 9,

        ACTIVITY_SHUTDOWN = 10,

        LOAD_URI = 11,

        SURFACE_CREATED = 12,

        SURFACE_DESTROYED = 13,

        GECKO_EVENT_SYNC = 14,

        FORCED_RESIZE = 15,

        ACTIVITY_START = 16,

        BROADCAST = 17,

        VIEWPORT = 18,

        VISITED = 19,

        NETWORK_CHANGED = 20,

        ACTIVITY_RESUMING = 21,

        SCREENSHOT = 22,

        SCREENORIENTATION_CHANGED = 22,

        dummy_java_enum_list_end

    };

widget/android/nsAppShell.cpp

+4 −9
Original line number Diff line number Diff line
@@ -352,6 +352,10 @@ nsAppShell::ProcessNextNativeEvent(bool mayWait) 
            values.AppendElement(curEvent->Z());

            break;



        case hal::SENSOR_PROXIMITY:

            values.AppendElement(curEvent->X());

            break;



        default:

            __android_log_print(ANDROID_LOG_ERROR,

                                "Gecko", "### SENSOR_EVENT fired, but type wasn't known %d",
@@ -376,15 +380,6 @@ nsAppShell::ProcessNextNativeEvent(bool mayWait) 
        break;

    }



    case AndroidGeckoEvent::PROXIMITY_EVENT: {

        InfallibleTArray<float> values;

        values.AppendElement(curEvent->Distance());

        

        hal::SensorData sdata(hal::SENSOR_PROXIMITY, PR_Now(), values, hal::SENSOR_ACCURACY_UNKNOWN);

        hal::NotifySensorChange(sdata);

        break;

    }



    case AndroidGeckoEvent::ACTIVITY_STOPPING: {

        if (curEvent->Flags() > 0)

            break;