diff --git a/apps/Fallback/res/values-cs/strings.xml b/apps/Fallback/res/values-cs/strings.xml index b7e114ff1..b9d34f940 100644 --- a/apps/Fallback/res/values-cs/strings.xml +++ b/apps/Fallback/res/values-cs/strings.xml @@ -1,4 +1,18 @@ + "Záloha" diff --git a/apps/Fallback/res/values-de/strings.xml b/apps/Fallback/res/values-de/strings.xml index 0889ced7f..8d59ddf39 100644 --- a/apps/Fallback/res/values-de/strings.xml +++ b/apps/Fallback/res/values-de/strings.xml @@ -1,4 +1,18 @@ + "Fallback" diff --git a/apps/Fallback/res/values-es/strings.xml b/apps/Fallback/res/values-es/strings.xml index f0de2b6d5..0ce57511e 100644 --- a/apps/Fallback/res/values-es/strings.xml +++ b/apps/Fallback/res/values-es/strings.xml @@ -1,4 +1,18 @@ + "Fallback" diff --git a/apps/Fallback/res/values-fr/strings.xml b/apps/Fallback/res/values-fr/strings.xml index 58c84bd8a..024ae4203 100644 --- a/apps/Fallback/res/values-fr/strings.xml +++ b/apps/Fallback/res/values-fr/strings.xml @@ -1,4 +1,18 @@ + "Application de secours" diff --git a/apps/Fallback/res/values-it/strings.xml b/apps/Fallback/res/values-it/strings.xml index 74bef0845..d216e59d1 100644 --- a/apps/Fallback/res/values-it/strings.xml +++ b/apps/Fallback/res/values-it/strings.xml @@ -1,4 +1,18 @@ + "Fallback" diff --git a/apps/Fallback/res/values-ja/strings.xml b/apps/Fallback/res/values-ja/strings.xml index 6629b3385..79aeb42ee 100644 --- a/apps/Fallback/res/values-ja/strings.xml +++ b/apps/Fallback/res/values-ja/strings.xml @@ -1,4 +1,18 @@ + "Fallback" diff --git a/apps/Fallback/res/values-nl/strings.xml b/apps/Fallback/res/values-nl/strings.xml index d0fa5e16e..f347964e4 100644 --- a/apps/Fallback/res/values-nl/strings.xml +++ b/apps/Fallback/res/values-nl/strings.xml @@ -1,4 +1,18 @@ + "Reserve" diff --git a/apps/Fallback/res/values-pl/strings.xml b/apps/Fallback/res/values-pl/strings.xml index c63bf61f9..73a176ae2 100644 --- a/apps/Fallback/res/values-pl/strings.xml +++ b/apps/Fallback/res/values-pl/strings.xml @@ -1,4 +1,18 @@ + "Wycofanie" diff --git a/apps/Fallback/res/values-ru/strings.xml b/apps/Fallback/res/values-ru/strings.xml index 088fc6f1b..dc292a88d 100644 --- a/apps/Fallback/res/values-ru/strings.xml +++ b/apps/Fallback/res/values-ru/strings.xml @@ -1,4 +1,18 @@ + "Fallback" diff --git a/apps/Fallback/res/values-zh-rCN/strings.xml b/apps/Fallback/res/values-zh-rCN/strings.xml index cee12211e..13ef68773 100644 --- a/apps/Fallback/res/values-zh-rCN/strings.xml +++ b/apps/Fallback/res/values-zh-rCN/strings.xml @@ -1,4 +1,18 @@ + "Fallback" diff --git a/apps/Fallback/res/values-zh-rTW/strings.xml b/apps/Fallback/res/values-zh-rTW/strings.xml index ec10a8348..52afdbeb6 100644 --- a/apps/Fallback/res/values-zh-rTW/strings.xml +++ b/apps/Fallback/res/values-zh-rTW/strings.xml @@ -1,4 +1,18 @@ + "備用" diff --git a/host/windows/prebuilt/usb/driver_amd_64/androidusb.sys b/host/windows/prebuilt/usb/driver_amd_64/androidusb.sys index e610ebea0..70ce24fd1 100644 Binary files a/host/windows/prebuilt/usb/driver_amd_64/androidusb.sys and b/host/windows/prebuilt/usb/driver_amd_64/androidusb.sys differ diff --git a/host/windows/prebuilt/usb/driver_amd_64/androidusba64.cat b/host/windows/prebuilt/usb/driver_amd_64/androidusba64.cat index cabb288b4..dd7850d73 100644 Binary files a/host/windows/prebuilt/usb/driver_amd_64/androidusba64.cat and b/host/windows/prebuilt/usb/driver_amd_64/androidusba64.cat differ diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml index f8fc1b24f..67f14e06d 100644 --- a/samples/ApiDemos/AndroidManifest.xml +++ b/samples/ApiDemos/AndroidManifest.xml @@ -1582,6 +1582,13 @@ + + + + + + + diff --git a/samples/ApiDemos/src/com/example/android/apis/graphics/BitmapPixels.java b/samples/ApiDemos/src/com/example/android/apis/graphics/BitmapPixels.java new file mode 100644 index 000000000..88717bcc9 --- /dev/null +++ b/samples/ApiDemos/src/com/example/android/apis/graphics/BitmapPixels.java @@ -0,0 +1,168 @@ +/* + * Copyright (C) 2007 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.example.android.apis.graphics; + +import com.example.android.apis.R; + +import android.app.Activity; +import android.content.Context; +import android.graphics.*; +import android.graphics.drawable.*; +import android.os.Bundle; +import android.view.KeyEvent; +import android.view.*; + +import java.nio.IntBuffer; +import java.nio.ShortBuffer; + +public class BitmapPixels extends GraphicsActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(new SampleView(this)); + } + + private static class SampleView extends View { + private Bitmap mBitmap1; + private Bitmap mBitmap2; + private Bitmap mBitmap3; + private Bitmap mBitmap4; + + // access the red component from a premultiplied color + private static int getR32(int c) { return (c >> 0) & 0xFF; } + // access the red component from a premultiplied color + private static int getG32(int c) { return (c >> 8) & 0xFF; } + // access the red component from a premultiplied color + private static int getB32(int c) { return (c >> 16) & 0xFF; } + // access the red component from a premultiplied color + private static int getA32(int c) { return (c >> 24) & 0xFF; } + + /** + * This takes components that are already in premultiplied form, and + * packs them into an int in the correct device order. + */ + private static int pack8888(int r, int g, int b, int a) { + return (r << 0) | ( g << 8) | (b << 16) | (a << 24); + } + + private static short pack565(int r, int g, int b) { + return (short)((r << 11) | ( g << 5) | (b << 0)); + } + + private static short pack4444(int r, int g, int b, int a) { + return (short)((a << 0) | ( b << 4) | (g << 8) | (r << 12)); + } + + private static int mul255(int c, int a) { + int prod = c * a + 128; + return (prod + (prod >> 8)) >> 8; + } + + /** + * Turn a color int into a premultiplied device color + */ + private static int premultiplyColor(int c) { + int r = Color.red(c); + int g = Color.green(c); + int b = Color.blue(c); + int a = Color.alpha(c); + // now apply the alpha to r, g, b + r = mul255(r, a); + g = mul255(g, a); + b = mul255(b, a); + // now pack it in the correct order + return pack8888(r, g, b, a); + } + + private static void makeRamp(int from, int to, int n, + int[] ramp8888, short[] ramp565, + short[] ramp4444) { + int r = getR32(from) << 23; + int g = getG32(from) << 23; + int b = getB32(from) << 23; + int a = getA32(from) << 23; + // now compute our step amounts per componenet (biased by 23 bits) + int dr = ((getR32(to) << 23) - r) / (n - 1); + int dg = ((getG32(to) << 23) - g) / (n - 1); + int db = ((getB32(to) << 23) - b) / (n - 1); + int da = ((getA32(to) << 23) - a) / (n - 1); + + for (int i = 0; i < n; i++) { + ramp8888[i] = pack8888(r >> 23, g >> 23, b >> 23, a >> 23); + ramp565[i] = pack565(r >> (23+3), g >> (23+2), b >> (23+3)); + ramp4444[i] = pack4444(r >> (23+4), g >> (23+4), b >> (23+4), + a >> (23+4)); + r += dr; + g += dg; + b += db; + a += da; + } + } + + private static IntBuffer makeBuffer(int[] src, int n) { + IntBuffer dst = IntBuffer.allocate(n*n); + for (int i = 0; i < n; i++) { + dst.put(src); + } + dst.rewind(); + return dst; + } + + private static ShortBuffer makeBuffer(short[] src, int n) { + ShortBuffer dst = ShortBuffer.allocate(n*n); + for (int i = 0; i < n; i++) { + dst.put(src); + } + dst.rewind(); + return dst; + } + + public SampleView(Context context) { + super(context); + setFocusable(true); + + final int N = 100; + int[] data8888 = new int[N]; + short[] data565 = new short[N]; + short[] data4444 = new short[N]; + + makeRamp(premultiplyColor(Color.RED), premultiplyColor(Color.GREEN), + N, data8888, data565, data4444); + + mBitmap1 = Bitmap.createBitmap(N, N, Bitmap.Config.ARGB_8888); + mBitmap2 = Bitmap.createBitmap(N, N, Bitmap.Config.RGB_565); + mBitmap3 = Bitmap.createBitmap(N, N, Bitmap.Config.ARGB_4444); + + mBitmap1.copyPixelsFromBuffer(makeBuffer(data8888, N)); + mBitmap2.copyPixelsFromBuffer(makeBuffer(data565, N)); + mBitmap3.copyPixelsFromBuffer(makeBuffer(data4444, N)); + } + + @Override protected void onDraw(Canvas canvas) { + canvas.drawColor(0xFFCCCCCC); + + int y = 10; + canvas.drawBitmap(mBitmap1, 10, y, null); + y += mBitmap1.getHeight() + 10; + canvas.drawBitmap(mBitmap2, 10, y, null); + y += mBitmap2.getHeight() + 10; + canvas.drawBitmap(mBitmap3, 10, y, null); + } + } +} + diff --git a/samples/SoftKeyboard/src/com/example/android/softkeyboard/SoftKeyboard.java b/samples/SoftKeyboard/src/com/example/android/softkeyboard/SoftKeyboard.java index 36d4233ff..d26b1730d 100644 --- a/samples/SoftKeyboard/src/com/example/android/softkeyboard/SoftKeyboard.java +++ b/samples/SoftKeyboard/src/com/example/android/softkeyboard/SoftKeyboard.java @@ -68,6 +68,8 @@ public class SoftKeyboard extends InputMethodService private Keyboard mSymbolsShiftedKeyboard; private Keyboard mQwertyKeyboard; + private Keyboard mCurKeyboard; + private String mWordSeparators; /** @@ -132,8 +134,8 @@ public class SoftKeyboard extends InputMethodService * bound to the client, and are now receiving all of the detailed information * about the target of our edits. */ - @Override public void onStartInputView(EditorInfo attribute, boolean restarting) { - super.onStartInputView(attribute, restarting); + @Override public void onStartInput(EditorInfo attribute, boolean restarting) { + super.onStartInput(attribute, restarting); // Reset our state. We want to do this even if restarting, because // the underlying state of the text editor could have changed in any way. @@ -148,7 +150,6 @@ public class SoftKeyboard extends InputMethodService mPredictionOn = false; mCompletionOn = false; mCompletions = null; - Keyboard keyboard; // We are now going to initialize our state based on the type of // text being edited. @@ -157,13 +158,13 @@ public class SoftKeyboard extends InputMethodService case EditorInfo.TYPE_CLASS_DATETIME: // Numbers and dates default to the symbols keyboard, with // no extra features. - keyboard = mSymbolsKeyboard; + mCurKeyboard = mSymbolsKeyboard; break; case EditorInfo.TYPE_CLASS_PHONE: // Phones will also default to the symbols keyboard, though // often you will want to have a dedicated phone keyboard. - keyboard = mSymbolsKeyboard; + mCurKeyboard = mSymbolsKeyboard; break; case EditorInfo.TYPE_CLASS_TEXT: @@ -171,7 +172,7 @@ public class SoftKeyboard extends InputMethodService // normal alphabetic keyboard, and assume that we should // be doing predictive text (showing candidates as the // user types). - keyboard = mQwertyKeyboard; + mCurKeyboard = mQwertyKeyboard; mPredictionOn = true; // We now look for a few special variations of text that will @@ -209,13 +210,7 @@ public class SoftKeyboard extends InputMethodService default: // For all unknown input types, default to the alphabetic // keyboard with no special features. - keyboard = mQwertyKeyboard; - } - - // Apply the selected keyboard to the input view. - if (mInputView != null) { - mInputView.setKeyboard(keyboard); - mInputView.closing(); + mCurKeyboard = mQwertyKeyboard; } } @@ -236,11 +231,19 @@ public class SoftKeyboard extends InputMethodService // its window. setCandidatesViewShown(false); + mCurKeyboard = mQwertyKeyboard; if (mInputView != null) { mInputView.closing(); } } + @Override public void onStartInputView(EditorInfo attribute, boolean restarting) { + super.onStartInputView(attribute, restarting); + // Apply the selected keyboard to the input view. + mInputView.setKeyboard(mCurKeyboard); + mInputView.closing(); + } + /** * Deal with the editor reporting movement of its cursor. */ @@ -350,6 +353,10 @@ public class SoftKeyboard extends InputMethodService } break; + case KeyEvent.KEYCODE_ENTER: + // Let the underlying text editor always handle these. + return false; + default: // For all other keys, if we want to do transformations on // text being entered with a hard keyboard, we need to process @@ -500,13 +507,13 @@ public class SoftKeyboard extends InputMethodService public void setSuggestions(List suggestions, boolean completions, boolean typedWordValid) { + if (suggestions != null && suggestions.size() > 0) { + setCandidatesViewShown(true); + } else if (isFullscreenMode()) { + setCandidatesViewShown(true); + } if (mCandidateView != null) { mCandidateView.setSuggestions(suggestions, completions, typedWordValid); - if (suggestions != null && suggestions.size() > 0) { - setCandidatesViewShown(true); - } else if (isFullscreenMode()) { - setCandidatesViewShown(true); - } } }