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

Commit 88fb1069 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by The Android Open Source Project
Browse files

AI 143147: Manual integration 

Automated import of CL 143147
parent 7ec434e2

api/current.xml

+12 −210
Original line number Diff line number Diff line
@@ -3181,7 +3181,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843377"

 value="16843371"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -3841,7 +3841,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843367"

 value="16843308"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -6708,17 +6708,6 @@ 
 visibility="public"

>

</field>

<field name="starStyleButtonless"

 type="int"

 transient="false"

 volatile="false"

 value="16843308"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="startColor"

 type="int"

 transient="false"
@@ -7207,7 +7196,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843376"

 value="16843370"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -8870,7 +8859,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="17301686"

 value="17301669"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -8987,193 +8976,6 @@ 
 visibility="public"

>

</field>

<field name="emo_im_angel"

 type="int"

 transient="false"

 volatile="false"

 value="17301668"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="emo_im_cool"

 type="int"

 transient="false"

 volatile="false"

 value="17301669"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="emo_im_crying"

 type="int"

 transient="false"

 volatile="false"

 value="17301670"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="emo_im_embarrassed"

 type="int"

 transient="false"

 volatile="false"

 value="17301671"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="emo_im_foot_in_mouth"

 type="int"

 transient="false"

 volatile="false"

 value="17301672"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="emo_im_happy"

 type="int"

 transient="false"

 volatile="false"

 value="17301673"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="emo_im_kissing"

 type="int"

 transient="false"

 volatile="false"

 value="17301674"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="emo_im_laughing"

 type="int"

 transient="false"

 volatile="false"

 value="17301675"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="emo_im_lips_are_sealed"

 type="int"

 transient="false"

 volatile="false"

 value="17301676"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="emo_im_money_mouth"

 type="int"

 transient="false"

 volatile="false"

 value="17301677"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="emo_im_sad"

 type="int"

 transient="false"

 volatile="false"

 value="17301678"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="emo_im_surprised"

 type="int"

 transient="false"

 volatile="false"

 value="17301679"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="emo_im_tongue_sticking_out"

 type="int"

 transient="false"

 volatile="false"

 value="17301680"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="emo_im_undecided"

 type="int"

 transient="false"

 volatile="false"

 value="17301681"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="emo_im_winking"

 type="int"

 transient="false"

 volatile="false"

 value="17301682"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="emo_im_wtf"

 type="int"

 transient="false"

 volatile="false"

 value="17301683"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="emo_im_yelling"

 type="int"

 transient="false"

 volatile="false"

 value="17301684"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="gallery_thumb"

 type="int"

 transient="false"
@@ -9189,7 +8991,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="17301685"

 value="17301668"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -10586,7 +10388,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="17301687"

 value="17301670"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -10687,33 +10489,33 @@ 
 visibility="public"

>

</field>

<field name="button_close"

<field name="candidatesArea"

 type="int"

 transient="false"

 volatile="false"

 value="16908327"

 value="16908317"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="candidatesArea"

<field name="checkbox"

 type="int"

 transient="false"

 volatile="false"

 value="16908317"

 value="16908289"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="checkbox"

<field name="closeButton"

 type="int"

 transient="false"

 volatile="false"

 value="16908289"

 value="16908327"

 static="true"

 final="true"

 deprecated="not deprecated"

core/java/android/inputmethodservice/KeyboardView.java

+1 −1
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ public class KeyboardView extends View implements View.OnClickListener { 
                mMiniKeyboard = (KeyboardView) mMiniKeyboardContainer.findViewById(

                        com.android.internal.R.id.keyboardView);

                View closeButton = mMiniKeyboardContainer.findViewById(

                        com.android.internal.R.id.button_close);

                        com.android.internal.R.id.closeButton);

                if (closeButton != null) closeButton.setOnClickListener(this);

                mMiniKeyboard.setOnKeyboardActionListener(new OnKeyboardActionListener() {

                    public void onKey(int primaryCode, int[] keyCodes) {

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

0 → 100644
+66 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.internal.widget;



import com.android.internal.R;



/**

 * Temp stupidity until we have a real emoticon API.

 */

public class Smileys {

    private static final int[] sIconIds = {

        R.drawable.emo_im_happy,

        R.drawable.emo_im_sad,

        R.drawable.emo_im_winking,

        R.drawable.emo_im_tongue_sticking_out,

        R.drawable.emo_im_surprised,

        R.drawable.emo_im_kissing,

        R.drawable.emo_im_yelling,

        R.drawable.emo_im_cool,

        R.drawable.emo_im_money_mouth,

        R.drawable.emo_im_foot_in_mouth,

        R.drawable.emo_im_embarrassed,

        R.drawable.emo_im_angel,

        R.drawable.emo_im_undecided,

        R.drawable.emo_im_crying,

        R.drawable.emo_im_lips_are_sealed,

        R.drawable.emo_im_laughing,

        R.drawable.emo_im_wtf

    };



    public static int HAPPY = 0;

    public static int SAD = 1;

    public static int WINKING = 2;

    public static int TONGUE_STICKING_OUT = 3;

    public static int SURPRISED = 4;

    public static int KISSING = 5;

    public static int YELLING = 6;

    public static int COOL = 7;

    public static int MONEY_MOUTH = 8;

    public static int FOOT_IN_MOUTH = 9;

    public static int EMBARRASSED = 10;

    public static int ANGEL = 11;

    public static int UNDECIDED = 12;

    public static int CRYING = 13;

    public static int LIPS_ARE_SEALED = 14;

    public static int LAUGHING = 15;

    public static int WTF = 16;

    

    public static int getSmileyResource(int which) {

        return sIconIds[which];

    }

}

core/res/res/layout/keyboard_popup_keyboard.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
            android:popupLayout="@layout/keyboard_popup_keyboard"

            android:keyTextSize="22sp"

            />

    <ImageButton android:id="@android:id/button_close"

    <ImageButton android:id="@android:id/closeButton"

        android:background="@android:color/transparent"

        android:src="@drawable/btn_close" 

        android:layout_width="wrap_content"

core/res/res/values/attrs.xml

+0 −2
Original line number Diff line number Diff line
@@ -353,8 +353,6 @@ 
        <attr name="spinnerStyle" format="reference" />

        <!-- Default Star style. -->

        <attr name="starStyle" format="reference" />

        <!-- Buttonless Star style. -->

        <attr name="starStyleButtonless" format="reference" />

        <!-- Default TabWidget style. -->

        <attr name="tabWidgetStyle" format="reference" />

        <!-- Default TextView style. -->