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

Commit 579e08e6 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am f7896449: merge from open-source master 

Merge commit 'f7896449' into kraken

* commit 'f7896449':
  Add new keycodes for the convenience of Japanese IMEs
  Call register_localized_collators() with the current locale.
  Fixed deserialization problem in DatePicker.
  Fix for bug 2467152 files with spaces fail to open.
  Set alpha value for newly created dim surface.
  telephony: Fix CID when CID is unknown
parents 33232d26 f7896449

api/current.xml

+22 −0
Original line number Diff line number Diff line
@@ -173383,6 +173383,17 @@ 
 visibility="public"

>

</field>

<field name="KEYCODE_PICTSYMBOLS"

 type="int"

 transient="false"

 volatile="false"

 value="94"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_PLUS"

 type="int"

 transient="false"
@@ -173559,6 +173570,17 @@ 
 visibility="public"

>

</field>

<field name="KEYCODE_SWITCH_CHARSET"

 type="int"

 transient="false"

 volatile="false"

 value="95"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_SYM"

 type="int"

 transient="false"

core/java/android/view/KeyEvent.java

100644 → 100755
+5 −1
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ public class KeyEvent implements Parcelable { 
    public static final int KEYCODE_MUTE            = 91;

    public static final int KEYCODE_PAGE_UP         = 92;

    public static final int KEYCODE_PAGE_DOWN       = 93;

    public static final int KEYCODE_PICTSYMBOLS     = 94;   // switch symbol-sets (Emoji,Kao-moji)

    public static final int KEYCODE_SWITCH_CHARSET  = 95;   // switch char-sets (Kanji,Katakana)



    // NOTE: If you add a new keycode here you must also add it to:

    //  isSystem()
@@ -137,7 +139,7 @@ public class KeyEvent implements Parcelable { 
    //  those new codes.  This is intended to maintain a consistent

    //  set of key code definitions across all Android devices.

   

    private static final int LAST_KEYCODE           = KEYCODE_PAGE_DOWN;

    private static final int LAST_KEYCODE           = KEYCODE_SWITCH_CHARSET;

    

    /**

     * @deprecated There are now more than MAX_KEYCODE keycodes.
@@ -694,6 +696,8 @@ public class KeyEvent implements Parcelable { 
        case KEYCODE_CAMERA:

        case KEYCODE_FOCUS:

        case KEYCODE_SEARCH:

        case KEYCODE_PICTSYMBOLS:

        case KEYCODE_SWITCH_CHARSET:

            return true;

        default:

            return false;

core/java/android/webkit/MimeTypeMap.java

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public class MimeTypeMap { 
            // if the filename contains special characters, we don't

            // consider it valid for our matching purposes:

            if (filename.length() > 0 &&

                Pattern.matches("[a-zA-Z_0-9\\.\\-\\(\\)]+", filename)) {

                Pattern.matches("[a-zA-Z_0-9\\.\\-\\(\\)\\%]+", filename)) {

                int dotPos = filename.lastIndexOf('.');

                if (0 <= dotPos) {

                    return filename.substring(dotPos + 1);

core/java/android/widget/DatePicker.java

+1 −0
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ public class DatePicker extends FrameLayout { 
        mYear = ss.getYear();

        mMonth = ss.getMonth();

        mDay = ss.getDay();

        updateSpinners();

    }



    /**

core/res/res/values/attrs.xml

100644 → 100755
+2 −0
Original line number Diff line number Diff line
@@ -918,6 +918,8 @@ 
        <enum name="KEYCODE_MUTE" value="91" />

        <enum name="KEYCODE_PAGE_UP" value="92" />

        <enum name="KEYCODE_PAGE_DOWN" value="93" />

        <enum name="KEYCODE_PICTSYMBOLS" value="94" />

        <enum name="KEYCODE_SWITCH_CHARSET" value="95" />

    </attr>



    <!-- ***************************************************************** -->