Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AI 143296: Merge from donut Change 143147

Browse Source 
Automated import of CL 143296
This commit is contained in:
Jean-Baptiste Queru
2009-03-27 17:43:53 -07:00
committed by The Android Open Source Project
parent f8dd2e1d4b
commit bf62297bd1
9 changed files with 107 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/inputmethodservice/KeyboardView.java
View File

@@ -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) {

66
core/java/com/android/internal/widget/Smileys.java Normal file
View File

@@ -0,0 +1,66 @@
/*
* 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];
}
}