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

Commit 32e17467 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'eclair' of git://github.com/ChainsDD/android_frameworks_base into HEAD

parents 5bdd7c8a eb9b4154

core/java/android/os/IHardwareService.aidl

+3 −0
Original line number Diff line number Diff line
@@ -31,5 +31,8 @@ interface IHardwareService 


    // for the phone

    void setAttentionLight(boolean on, int color);



    // for LED color previews

    void pulseBreathingLightColor(int color);

}

core/java/com/android/internal/widget/NumberPicker.java

+2 −2
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener, 
        mText = (EditText) findViewById(R.id.timepicker_input);

        mText.setOnFocusChangeListener(this);

        mText.setFilters(new InputFilter[] {inputFilter});

        mText.setRawInputType(InputType.TYPE_CLASS_NUMBER);

        mText.setRawInputType(InputType.TYPE_CLASS_PHONE);



        if (!isEnabled()) {

            setEnabled(false);