diff options
183 files changed, 4286 insertions, 2560 deletions
diff --git a/api/current.txt b/api/current.txt index 7fe166ec8788..4236eae6aaec 100644 --- a/api/current.txt +++ b/api/current.txt @@ -18442,6 +18442,7 @@ package android.provider { } protected static abstract interface ContactsContract.ContactsColumns { + field public static final java.lang.String CONTACT_LAST_UPDATED_TIMESTAMP = "contact_last_updated_timestamp"; field public static final java.lang.String DISPLAY_NAME = "display_name"; field public static final java.lang.String HAS_PHONE_NUMBER = "has_phone_number"; field public static final java.lang.String IN_VISIBLE_GROUP = "in_visible_group"; @@ -18504,10 +18505,16 @@ package android.provider { protected static abstract interface ContactsContract.DataUsageStatColumns { field public static final java.lang.String LAST_TIME_USED = "last_time_used"; field public static final java.lang.String TIMES_USED = "times_used"; - field public static final java.lang.String USAGE_TYPE = "usage_type"; - field public static final int USAGE_TYPE_CALL = 0; // 0x0 - field public static final int USAGE_TYPE_LONG_TEXT = 1; // 0x1 - field public static final int USAGE_TYPE_SHORT_TEXT = 2; // 0x2 + } + + public static final class ContactsContract.DeletedContacts implements android.provider.ContactsContract.DeletedContactsColumns { + field public static final android.net.Uri CONTENT_URI; + field public static final long DAYS_KEPT_MILLISECONDS = 2592000000L; // 0x9a7ec800L + } + + protected static abstract interface ContactsContract.DeletedContactsColumns { + field public static final java.lang.String CONTACT_DELETED_TIMESTAMP = "contact_deleted_timestamp"; + field public static final java.lang.String CONTACT_ID = "contact_id"; } public static final class ContactsContract.Directory implements android.provider.BaseColumns { @@ -18589,6 +18596,7 @@ package android.provider { public static final class ContactsContract.Intents { ctor public ContactsContract.Intents(); field public static final java.lang.String ATTACH_IMAGE = "com.android.contacts.action.ATTACH_IMAGE"; + field public static final java.lang.String CONTACTS_DATABASE_CREATED = "android.provider.Contacts.DATABASE_CREATED"; field public static final java.lang.String EXTRA_CREATE_DESCRIPTION = "com.android.contacts.action.CREATE_DESCRIPTION"; field public static final java.lang.String EXTRA_FORCE_CREATE = "com.android.contacts.action.FORCE_CREATE"; field public static final java.lang.String INVITE_CONTACT = "com.android.contacts.action.INVITE_CONTACT"; @@ -19653,8 +19661,7 @@ package android.renderscript { method public int getUsage(); method public void ioReceive(); method public void ioSend(); - method public synchronized void resize(int); - method public synchronized void resize(int, int); + method public deprecated synchronized void resize(int); method public void setFromFieldPacker(int, android.renderscript.FieldPacker); method public void setFromFieldPacker(int, int, android.renderscript.FieldPacker); method public void setSurface(android.view.Surface); @@ -27593,8 +27600,6 @@ package android.webkit { method public synchronized int getMinimumFontSize(); method public synchronized int getMinimumLogicalFontSize(); method public deprecated synchronized android.webkit.WebSettings.PluginState getPluginState(); - method public deprecated synchronized boolean getPluginsEnabled(); - method public deprecated synchronized java.lang.String getPluginsPath(); method public synchronized java.lang.String getSansSerifFontFamily(); method public boolean getSaveFormData(); method public deprecated boolean getSavePassword(); @@ -27640,8 +27645,6 @@ package android.webkit { method public synchronized void setMinimumLogicalFontSize(int); method public void setNeedInitialFocus(boolean); method public deprecated synchronized void setPluginState(android.webkit.WebSettings.PluginState); - method public deprecated synchronized void setPluginsEnabled(boolean); - method public deprecated synchronized void setPluginsPath(java.lang.String); method public deprecated synchronized void setRenderPriority(android.webkit.WebSettings.RenderPriority); method public synchronized void setSansSerifFontFamily(java.lang.String); method public void setSaveFormData(boolean); diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk index b39c335db1d9..b9afe4024f63 100644 --- a/cmds/app_process/Android.mk +++ b/cmds/app_process/Android.mk @@ -7,6 +7,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libcutils \ libutils \ + liblog \ libbinder \ libandroid_runtime @@ -27,6 +28,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libcutils \ libutils \ + liblog \ libbinder \ libandroid_runtime diff --git a/cmds/bootanimation/Android.mk b/cmds/bootanimation/Android.mk index 8c46b212814a..d5ff84e7dbbb 100644 --- a/cmds/bootanimation/Android.mk +++ b/cmds/bootanimation/Android.mk @@ -9,6 +9,7 @@ LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_SHARED_LIBRARIES := \ libcutils \ + liblog \ libandroidfw \ libutils \ libbinder \ diff --git a/cmds/input/src/com/android/commands/input/Input.java b/cmds/input/src/com/android/commands/input/Input.java index cdbc405cbe57..e43501cb6568 100644 --- a/cmds/input/src/com/android/commands/input/Input.java +++ b/cmds/input/src/com/android/commands/input/Input.java @@ -75,11 +75,14 @@ public class Input { Float.parseFloat(args[3]), Float.parseFloat(args[4]), -1); return; } - } else if (command.equals("touchscreen") || command.equals("touchpad")) { + } else if (command.equals("touchscreen") || command.equals("touchpad") + || command.equals("touchnavigation")) { // determine input source int inputSource = InputDevice.SOURCE_TOUCHSCREEN; if (command.equals("touchpad")) { inputSource = InputDevice.SOURCE_TOUCHPAD; + } else if (command.equals("touchnavigation")) { + inputSource = InputDevice.SOURCE_TOUCH_NAVIGATION; } // determine subcommand if (args.length > 1) { @@ -247,8 +250,9 @@ public class Input { System.err.println("usage: input ..."); System.err.println(" input text <string>"); System.err.println(" input keyevent <key code number or name>"); - System.err.println(" input [touchscreen|touchpad] tap <x> <y>"); - System.err.println(" input [touchscreen|touchpad] swipe <x1> <y1> <x2> <y2> [duration(ms)]"); + System.err.println(" input [touchscreen|touchpad|touchnavigation] tap <x> <y>"); + System.err.println(" input [touchscreen|touchpad|touchnavigation] swipe " + + "<x1> <y1> <x2> <y2> [duration(ms)]"); System.err.println(" input trackball press"); System.err.println(" input trackball roll <dx> <dy>"); } diff --git a/cmds/system_server/Android.mk b/cmds/system_server/Android.mk index ad537977d9eb..3083e31acb41 100644 --- a/cmds/system_server/Android.mk +++ b/cmds/system_server/Android.mk @@ -7,7 +7,8 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libutils \ libbinder \ - libsystem_server + libsystem_server \ + liblog LOCAL_C_INCLUDES := \ $(JNI_H_INCLUDE) @@ -17,4 +18,3 @@ LOCAL_MODULE:= system_server include $(BUILD_EXECUTABLE) include $(LOCAL_PATH)/library/Android.mk - diff --git a/cmds/system_server/library/Android.mk b/cmds/system_server/library/Android.mk index c42424c607b4..d78474e90815 100644 --- a/cmds/system_server/library/Android.mk +++ b/cmds/system_server/library/Android.mk @@ -16,10 +16,11 @@ LOCAL_SHARED_LIBRARIES := \ libandroid_runtime \ libsensorservice \ libsurfaceflinger \ - libinput \ + libinput \ libutils \ libbinder \ - libcutils + libcutils \ + liblog LOCAL_MODULE:= libsystem_server diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java index aca4f9cdd311..c99051ba4dd6 100644 --- a/core/java/android/app/ActivityManagerNative.java +++ b/core/java/android/app/ActivityManagerNative.java @@ -1853,6 +1853,15 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM return true; } + case KILL_UID_TRANSACTION: { + data.enforceInterface(IActivityManager.descriptor); + int uid = data.readInt(); + String reason = data.readString(); + killUid(uid, reason); + reply.writeNoException(); + return true; + } + } return super.onTransact(code, data, reply, flags); @@ -3335,6 +3344,7 @@ class ActivityManagerProxy implements IActivityManager data.writeString(reason); data.writeInt(secure ? 1 : 0); mRemote.transact(KILL_PIDS_TRANSACTION, data, reply, 0); + reply.readException(); boolean res = reply.readInt() != 0; data.recycle(); reply.recycle(); @@ -4229,5 +4239,17 @@ class ActivityManagerProxy implements IActivityManager reply.recycle(); } + public void killUid(int uid, String reason) throws RemoteException { + Parcel data = Parcel.obtain(); + Parcel reply = Parcel.obtain(); + data.writeInterfaceToken(IActivityManager.descriptor); + data.writeInt(uid); + data.writeString(reason); + mRemote.transact(KILL_UID_TRANSACTION, data, reply, 0); + reply.readException(); + data.recycle(); + reply.recycle(); + } + private IBinder mRemote; } diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 68a239773ee3..e6ce963a8d1c 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -4322,6 +4322,10 @@ public final class ActivityThread { GLUtils.setTracingLevel(1); } + // Allow application-generated systrace messages if we're debuggable. + boolean appTracingAllowed = (data.appInfo.flags&ApplicationInfo.FLAG_DEBUGGABLE) != 0; + Trace.setAppTracingAllowed(appTracingAllowed); + /** * Initialize the default http proxy in this process for the reasons we set the time zone. */ diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 9bf8830d6b0c..19d495bc8163 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -371,9 +371,9 @@ class ContextImpl extends Context { return new DisplayManager(ctx.getOuterContext()); }}); - registerService(INPUT_METHOD_SERVICE, new ServiceFetcher() { - public Object createService(ContextImpl ctx) { - return InputMethodManager.getInstance(ctx); + registerService(INPUT_METHOD_SERVICE, new StaticServiceFetcher() { + public Object createStaticService() { + return InputMethodManager.getInstance(); }}); registerService(TEXT_SERVICES_MANAGER_SERVICE, new ServiceFetcher() { diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java index cf4c72939a61..fa8839a66b3d 100644 --- a/core/java/android/app/IActivityManager.java +++ b/core/java/android/app/IActivityManager.java @@ -373,6 +373,8 @@ public interface IActivityManager extends IInterface { public void reportTopActivityExtras(IBinder token, Bundle extras) throws RemoteException; + public void killUid(int uid, String reason) throws RemoteException; + /* * Private non-Binder interfaces */ @@ -632,4 +634,5 @@ public interface IActivityManager extends IInterface { int GET_TOP_ACTIVITY_EXTRAS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+161; int REPORT_TOP_ACTIVITY_EXTRAS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+162; int GET_LAUNCHED_FROM_PACKAGE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+163; + int KILL_UID_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+164; } diff --git a/core/java/android/app/NativeActivity.java b/core/java/android/app/NativeActivity.java index 51867bcab693..7d8a36e34f5a 100644 --- a/core/java/android/app/NativeActivity.java +++ b/core/java/android/app/NativeActivity.java @@ -1,7 +1,20 @@ +/* + * Copyright (C) 2010 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 android.app; -import com.android.internal.view.IInputMethodSession; - import android.content.Context; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; @@ -25,7 +38,6 @@ import android.view.ViewTreeObserver.OnGlobalLayoutListener; import android.view.inputmethod.InputMethodManager; import java.io.File; -import java.lang.ref.WeakReference; /** * Convenience for implementing an activity that will be implemented @@ -65,7 +77,6 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, private NativeContentView mNativeContentView; private InputMethodManager mIMM; - private InputMethodCallback mInputMethodCallback; private int mNativeHandle; @@ -117,22 +128,6 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, super(context, attrs); } } - - static final class InputMethodCallback implements InputMethodManager.FinishedEventCallback { - WeakReference<NativeActivity> mNa; - - InputMethodCallback(NativeActivity na) { - mNa = new WeakReference<NativeActivity>(na); - } - - @Override - public void finishedEvent(int seq, boolean handled) { - NativeActivity na = mNa.get(); - if (na != null) { - na.finishPreDispatchKeyEventNative(na.mNativeHandle, seq, handled); - } - } - } @Override protected void onCreate(Bundle savedInstanceState) { @@ -141,7 +136,6 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, ActivityInfo ai; mIMM = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE); - mInputMethodCallback = new InputMethodCallback(this); getWindow().takeSurface(this); getWindow().takeInputQueue(this); @@ -353,7 +347,8 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, } void preDispatchKeyEvent(KeyEvent event, int seq) { - mIMM.dispatchInputEvent(this, seq, event, mInputMethodCallback); + // FIXME: Input dispatch should be redirected back through ViewRootImpl again. + finishPreDispatchKeyEventNative(mNativeHandle, seq, false); } void setWindowFlags(int flags, int mask) { diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index 9c0064efe65e..3342068a48eb 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -709,7 +709,7 @@ public class WallpaperManager { public void setWallpaperOffsets(IBinder windowToken, float xOffset, float yOffset) { try { //Log.v(TAG, "Sending new wallpaper offsets from app..."); - WindowManagerGlobal.getWindowSession(mContext.getMainLooper()).setWallpaperPosition( + WindowManagerGlobal.getWindowSession().setWallpaperPosition( windowToken, xOffset, yOffset, mWallpaperXStep, mWallpaperYStep); //Log.v(TAG, "...app returning after sending offsets!"); } catch (RemoteException e) { @@ -747,7 +747,7 @@ public class WallpaperManager { int x, int y, int z, Bundle extras) { try { //Log.v(TAG, "Sending new wallpaper offsets from app..."); - WindowManagerGlobal.getWindowSession(mContext.getMainLooper()).sendWallpaperCommand( + WindowManagerGlobal.getWindowSession().sendWallpaperCommand( windowToken, action, x, y, z, extras, false); //Log.v(TAG, "...app returning after sending offsets!"); } catch (RemoteException e) { @@ -767,7 +767,7 @@ public class WallpaperManager { */ public void clearWallpaperOffsets(IBinder windowToken) { try { - WindowManagerGlobal.getWindowSession(mContext.getMainLooper()).setWallpaperPosition( + WindowManagerGlobal.getWindowSession().setWallpaperPosition( windowToken, -1, -1, -1, -1); } catch (RemoteException e) { // Ignore. diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index ef9b0bf80e00..03e241afe5ed 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -256,6 +256,12 @@ public abstract class Context { * Return the Looper for the main thread of the current process. This is * the thread used to dispatch calls to application components (activities, * services, etc). + * <p> + * By definition, this method returns the same result as would be obtained + * by calling {@link Looper#getMainLooper() Looper.getMainLooper()}. + * </p> + * + * @return The main looper. */ public abstract Looper getMainLooper(); diff --git a/core/java/android/os/LatencyTimer.java b/core/java/android/os/LatencyTimer.java deleted file mode 100644 index ed2f0f9e3eff..000000000000 --- a/core/java/android/os/LatencyTimer.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * 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 android.os; - -import android.util.Log; - -import java.util.HashMap; - -/** - * A class to help with measuring latency in your code. - * - * Suggested usage: - * 1) Instanciate a LatencyTimer as a class field. - * private [static] LatencyTimer mLt = new LatencyTimer(100, 1000); - * 2) At various points in the code call sample with a string and the time delta to some fixed time. - * The string should be unique at each point of the code you are measuring. - * mLt.sample("before processing event", System.nanoTime() - event.getEventTimeNano()); - * processEvent(event); - * mLt.sample("after processing event ", System.nanoTime() - event.getEventTimeNano()); - * - * @hide - */ -public final class LatencyTimer -{ - final String TAG = "LatencyTimer"; - final int mSampleSize; - final int mScaleFactor; - volatile HashMap<String, long[]> store = new HashMap<String, long[]>(); - - /** - * Creates a LatencyTimer object - * @param sampleSize number of samples to collect before printing out the average - * @param scaleFactor divisor used to make each sample smaller to prevent overflow when - * (sampleSize * average sample value)/scaleFactor > Long.MAX_VALUE - */ - public LatencyTimer(int sampleSize, int scaleFactor) { - if (scaleFactor == 0) { - scaleFactor = 1; - } - mScaleFactor = scaleFactor; - mSampleSize = sampleSize; - } - - /** - * Add a sample delay for averaging. - * @param tag string used for printing out the result. This should be unique at each point of - * this called. - * @param delta time difference from an unique point of reference for a particular iteration - */ - public void sample(String tag, long delta) { - long[] array = getArray(tag); - - // array[mSampleSize] holds the number of used entries - final int index = (int) array[mSampleSize]++; - array[index] = delta; - if (array[mSampleSize] == mSampleSize) { - long totalDelta = 0; - for (long d : array) { - totalDelta += d/mScaleFactor; - } - array[mSampleSize] = 0; - Log.i(TAG, tag + " average = " + totalDelta / mSampleSize); - } - } - - private long[] getArray(String tag) { - long[] data = store.get(tag); - if (data == null) { - synchronized(store) { - data = store.get(tag); - if (data == null) { - data = new long[mSampleSize + 1]; - store.put(tag, data); - data[mSampleSize] = 0; - } - } - } - return data; - } -} diff --git a/core/java/android/os/Looper.java b/core/java/android/os/Looper.java index 38f4d5e54f13..363a1bfd4c55 100644 --- a/core/java/android/os/Looper.java +++ b/core/java/android/os/Looper.java @@ -192,6 +192,14 @@ public final class Looper { } /** + * Returns true if the current thread is this looper's thread. + * @hide + */ + public boolean isCurrentThread() { + return Thread.currentThread() == mThread; + } + + /** * Quits the looper. * * Causes the {@link #loop} method to terminate as soon as possible. diff --git a/core/java/android/os/Trace.java b/core/java/android/os/Trace.java index 27ed6b61fe87..310b12cb9592 100644 --- a/core/java/android/os/Trace.java +++ b/core/java/android/os/Trace.java @@ -19,41 +19,55 @@ package android.os; import android.util.Log; /** - * Writes trace events to the kernel trace buffer. These trace events can be - * collected using the "atrace" program for offline analysis. + * Writes trace events to the system trace buffer. These trace events can be + * collected and visualized using the Systrace tool. * * This tracing mechanism is independent of the method tracing mechanism * offered by {@link Debug#startMethodTracing}. In particular, it enables - * tracing of events that occur across processes. + * tracing of events that occur across multiple processes. * * @hide */ public final class Trace { + /* + * Writes trace events to the kernel trace buffer. These trace events can be + * collected using the "atrace" program for offline analysis. + */ + private static final String TAG = "Trace"; // These tags must be kept in sync with system/core/include/cutils/trace.h. + /** @hide */ public static final long TRACE_TAG_NEVER = 0; + /** @hide */ public static final long TRACE_TAG_ALWAYS = 1L << 0; + /** @hide */ public static final long TRACE_TAG_GRAPHICS = 1L << 1; + /** @hide */ public static final long TRACE_TAG_INPUT = 1L << 2; + /** @hide */ public static final long TRACE_TAG_VIEW = 1L << 3; + /** @hide */ public static final long TRACE_TAG_WEBVIEW = 1L << 4; + /** @hide */ public static final long TRACE_TAG_WINDOW_MANAGER = 1L << 5; + /** @hide */ public static final long TRACE_TAG_ACTIVITY_MANAGER = 1L << 6; + /** @hide */ public static final long TRACE_TAG_SYNC_MANAGER = 1L << 7; + /** @hide */ public static final long TRACE_TAG_AUDIO = 1L << 8; + /** @hide */ public static final long TRACE_TAG_VIDEO = 1L << 9; + /** @hide */ public static final long TRACE_TAG_CAMERA = 1L << 10; + /** @hide */ public static final long TRACE_TAG_HAL = 1L << 11; - private static final long TRACE_TAG_NOT_READY = 1L << 63; - - public static final int TRACE_FLAGS_START_BIT = 1; - public static final String[] TRACE_TAGS = { - "Graphics", "Input", "View", "WebView", "Window Manager", - "Activity Manager", "Sync Manager", "Audio", "Video", "Camera", "HAL", - }; + /** @hide */ + public static final long TRACE_TAG_APP = 1L << 12; - public static final String PROPERTY_TRACE_TAG_ENABLEFLAGS = "debug.atrace.tags.enableflags"; + private static final long TRACE_TAG_NOT_READY = 1L << 63; + private static final int MAX_SECTION_NAME_LEN = 127; // Must be volatile to avoid word tearing. private static volatile long sEnabledTags = TRACE_TAG_NOT_READY; @@ -62,6 +76,7 @@ public final class Trace { private static native void nativeTraceCounter(long tag, String name, int value); private static native void nativeTraceBegin(long tag, String name); private static native void nativeTraceEnd(long tag); + private static native void nativeSetAppTracingAllowed(boolean allowed); static { // We configure two separate change callbacks, one in Trace.cpp and one here. The @@ -111,6 +126,8 @@ public final class Trace { * * @param traceTag The trace tag to check. * @return True if the trace tag is valid. + * + * @hide */ public static boolean isTagEnabled(long traceTag) { long tags = sEnabledTags; @@ -126,6 +143,8 @@ public final class Trace { * @param traceTag The trace tag. * @param counterName The counter name to appear in the trace. * @param counterValue The counter value. + * + * @hide */ public static void traceCounter(long traceTag, String counterName, int counterValue) { if (isTagEnabled(traceTag)) { @@ -134,11 +153,28 @@ public final class Trace { } /** - * Writes a trace message to indicate that a given method has begun. - * Must be followed by a call to {@link #traceEnd} using the same tag. + * Set whether application tracing is allowed for this process. This is intended to be set + * once at application start-up time based on whether the application is debuggable. + * + * @hide + */ + public static void setAppTracingAllowed(boolean allowed) { + nativeSetAppTracingAllowed(allowed); + + // Setting whether app tracing is allowed may change the tags, so we update the cached + // tags here. + cacheEnabledTags(); + } + + /** + * Writes a trace message to indicate that a given section of code has + * begun. Must be followed by a call to {@link #traceEnd} using the same + * tag. * * @param traceTag The trace tag. * @param methodName The method name to appear in the trace. + * + * @hide */ public static void traceBegin(long traceTag, String methodName) { if (isTagEnabled(traceTag)) { @@ -151,10 +187,48 @@ public final class Trace { * Must be called exactly once for each call to {@link #traceBegin} using the same tag. * * @param traceTag The trace tag. + * + * @hide */ public static void traceEnd(long traceTag) { if (isTagEnabled(traceTag)) { nativeTraceEnd(traceTag); } } + + /** + * Writes a trace message to indicate that a given section of code has begun. This call must + * be followed by a corresponding call to {@link #traceEnd()} on the same thread. + * + * <p class="note"> At this time the vertical bar character '|', newline character '\n', and + * null character '\0' are used internally by the tracing mechanism. If sectionName contains + * these characters they will be replaced with a space character in the trace. + * + * @param sectionName The name of the code section to appear in the trace. This may be at + * most 127 Unicode code units long. + * + * @hide + */ + public static void traceBegin(String sectionName) { + if (isTagEnabled(TRACE_TAG_APP)) { + if (sectionName.length() > MAX_SECTION_NAME_LEN) { + throw new IllegalArgumentException("sectionName is too long"); + } + nativeTraceBegin(TRACE_TAG_APP, sectionName); + } + } + + /** + * Writes a trace message to indicate that a given section of code has ended. This call must + * be preceeded by a corresponding call to {@link #traceBegin(String)}. Calling this method + * will mark the end of the most recently begun section of code, so care must be taken to + * ensure that traceBegin / traceEnd pairs are properly nested and called from the same thread. + * + * @hide + */ + public static void traceEnd() { + if (isTagEnabled(TRACE_TAG_APP)) { + nativeTraceEnd(TRACE_TAG_APP); + } + } } diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 66083c8e6469..c41c35ef1e3a 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -35,9 +35,7 @@ import android.database.Cursor; import android.database.DatabaseUtils; import android.graphics.Rect; import android.net.Uri; -import android.os.Bundle; import android.os.RemoteException; -import android.os.UserHandle; import android.text.TextUtils; import android.util.DisplayMetrics; import android.util.Pair; @@ -939,6 +937,15 @@ public final class ContactsContract { * its row id changed as a result of a sync or aggregation. */ public static final String LOOKUP_KEY = "lookup"; + + /** + * Timestamp (milliseconds since epoch) of when this contact was last updated. This + * includes updates to all data associated with this contact including raw contacts. Any + * modification (including deletes and inserts) of underlying contact data are also + * reflected in this timestamp. + */ + public static final String CONTACT_LAST_UPDATED_TIMESTAMP = + "contact_last_updated_timestamp"; } /** @@ -2113,6 +2120,56 @@ public final class ContactsContract { return id >= Profile.MIN_ID; } + protected interface DeletedContactsColumns { + + /** + * A reference to the {@link ContactsContract.Contacts#_ID} that was deleted. + * <P>Type: INTEGER</P> + */ + public static final String CONTACT_ID = "contact_id"; + + /** + * Time (milliseconds since epoch) that the contact was deleted. + */ + public static final String CONTACT_DELETED_TIMESTAMP = "contact_deleted_timestamp"; + } + + /** + * Constants for the deleted contact table. This table holds a log of deleted contacts. + * <p> + * Log older than {@link #DAYS_KEPT_MILLISECONDS} may be deleted. + */ + public static final class DeletedContacts implements DeletedContactsColumns { + + /** + * This utility class cannot be instantiated + */ + private DeletedContacts() { + } + + /** + * The content:// style URI for this table, which requests a directory of raw contact rows + * matching the selection criteria. + */ + public static final Uri CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI, + "deleted_contacts"); + + /** + * Number of days that the delete log will be kept. After this time, delete records may be + * deleted. + * + * @hide + */ + private static final int DAYS_KEPT = 30; + + /** + * Milliseconds that the delete log will be kept. After this time, delete records may be + * deleted. + */ + public static final long DAYS_KEPT_MILLISECONDS = 1000L * 60L * 60L * 24L * (long)DAYS_KEPT; + } + + protected interface RawContactsColumns { /** * A reference to the {@link ContactsContract.Contacts#_ID} that this @@ -3796,50 +3853,11 @@ public final class ContactsContract { * Columns in the Data_Usage_Stat table */ protected interface DataUsageStatColumns { - /** What the referenced {@link Data} was used for. - * @see DataUsageStatColumns#USAGE_TYPE_CALL - * @see DataUsageStatColumns#USAGE_TYPE_LONG_TEXT - * @see DataUsageStatColumns#USAGE_TYPE_SHORT_TEXT - */ - public static final String USAGE_TYPE = "usage_type"; - /** The last time (in milliseconds) this {@link Data} was used. */ public static final String LAST_TIME_USED = "last_time_used"; - /** The number of times the referenced {@link Data} has been used for the purpose described - * in {@link DataUsageStatColumns#USAGE_TYPE}. - */ + /** The number of times the referenced {@link Data} has been used. */ public static final String TIMES_USED = "times_used"; - - /** - * Integer value for USAGE_TYPE. - * This type of usage refers to voice interaction, which includes phone calls, voice chat, - * and video chat. - * - * @see DataUsageFeedback#USAGE_TYPE - * @see DataUsageStatColumns#USAGE_TYPE - */ - public static final int USAGE_TYPE_CALL = 0; - - /** - * Integer value for USAGE_TYPE. - * This type of usage refers to text interaction involving longer messages, which includes - * email. - * - * @see DataUsageFeedback#USAGE_TYPE - * @see DataUsageStatColumns#USAGE_TYPE - */ - public static final int USAGE_TYPE_LONG_TEXT = 1; - - /** - * Integer value for USAGE_TYPE. - * This type of usage for text interaction involving shorter messages, which includes SMS - * and text chat with email addresses. - * - * @see DataUsageFeedback#USAGE_TYPE - * @see DataUsageStatColumns#USAGE_TYPE - */ - public static final int USAGE_TYPE_SHORT_TEXT = 2; } /** @@ -7948,6 +7966,13 @@ public final class ContactsContract { "android.provider.Contacts.SEARCH_SUGGESTION_CREATE_CONTACT_CLICKED"; /** + * This is the intent that is fired when the contacts database is created. <p> The + * READ_CONTACT permission is required to receive these broadcasts. + */ + public static final String CONTACTS_DATABASE_CREATED = + "android.provider.Contacts.DATABASE_CREATED"; + + /** * Starts an Activity that lets the user pick a contact to attach an image to. * After picking the contact it launches the image cropper in face detection mode. */ diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index 71d8fb647551..5db81689afb7 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -762,7 +762,7 @@ public abstract class WallpaperService extends Service { mWindowToken = wrapper.mWindowToken; mSurfaceHolder.setSizeFromLayout(); mInitializing = true; - mSession = WindowManagerGlobal.getWindowSession(getMainLooper()); + mSession = WindowManagerGlobal.getWindowSession(); mWindow.setSession(mSession); diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java index 8055077d58b9..83084591f1c5 100644 --- a/core/java/android/view/HardwareRenderer.java +++ b/core/java/android/view/HardwareRenderer.java @@ -1368,7 +1368,7 @@ public abstract class HardwareRenderer { callbacks.onHardwarePreDraw(canvas); if (displayList != null) { - status = drawDisplayList(attachInfo, canvas, displayList, status); + status |= drawDisplayList(attachInfo, canvas, displayList, status); } else { // Shouldn't reach here view.draw(canvas); diff --git a/core/java/android/view/LayoutInflater.java b/core/java/android/view/LayoutInflater.java index 26a5b26889fd..85695fc98d66 100644 --- a/core/java/android/view/LayoutInflater.java +++ b/core/java/android/view/LayoutInflater.java @@ -19,6 +19,7 @@ package android.view; import android.graphics.Canvas; import android.os.Handler; import android.os.Message; +import android.os.Trace; import android.widget.FrameLayout; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -423,6 +424,8 @@ public abstract class LayoutInflater { */ public View inflate(XmlPullParser parser, ViewGroup root, boolean attachToRoot) { synchronized (mConstructorArgs) { + Trace.traceBegin(Trace.TRACE_TAG_VIEW, "inflate"); + final AttributeSet attrs = Xml.asAttributeSet(parser); Context lastContext = (Context)mConstructorArgs[0]; mConstructorArgs[0] = mContext; @@ -520,6 +523,8 @@ public abstract class LayoutInflater { mConstructorArgs[1] = null; } + Trace.traceEnd(Trace.TRACE_TAG_VIEW); + return result; } } @@ -547,6 +552,8 @@ public abstract class LayoutInflater { Class<? extends View> clazz = null; try { + Trace.traceBegin(Trace.TRACE_TAG_VIEW, name); + if (constructor == null) { // Class not found in the cache, see if it's real, and try to add it clazz = mContext.getClassLoader().loadClass( @@ -615,6 +622,8 @@ public abstract class LayoutInflater { + (clazz == null ? "<unknown>" : clazz.getName())); ie.initCause(e); throw ie; + } finally { + Trace.traceEnd(Trace.TRACE_TAG_VIEW); } } diff --git a/core/java/android/view/SimulatedDpad.java b/core/java/android/view/SimulatedDpad.java deleted file mode 100644 index c889328fb4e2..000000000000 --- a/core/java/android/view/SimulatedDpad.java +++ /dev/null @@ -1,298 +0,0 @@ -/* - * Copyright (C) 2012 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 android.view; - -import android.app.SearchManager; -import android.content.ActivityNotFoundException; -import android.content.Context; -import android.content.Intent; -import android.os.Handler; -import android.os.Message; -import android.os.SystemClock; -import android.os.SystemProperties; -import android.os.UserHandle; -import android.util.Log; - -/** - * This class creates DPAD events from TouchNavigation events. - * - * @see ViewRootImpl - */ - -//TODO: Make this class an internal class of ViewRootImpl.java -class SimulatedDpad { - - private static final String TAG = "SimulatedDpad"; - - // Maximum difference in milliseconds between the down and up of a touch - // event for it to be considered a tap - // TODO:Read this value from a configuration file - private static final int MAX_TAP_TIME = 250; - // Where the cutoff is for determining an edge swipe - private static final float EDGE_SWIPE_THRESHOLD = 0.9f; - private static final int MSG_FLICK = 313; - // TODO: Pass touch slop from the input device - private static final int TOUCH_SLOP = 30; - // The position of the previous TouchNavigation event - private float mLastTouchNavigationXPosition; - private float mLastTouchNavigationYPosition; - // Where the Touch Navigation was initially pressed - private float mTouchNavigationEnterXPosition; - private float mTouchNavigationEnterYPosition; - // When the most recent ACTION_HOVER_ENTER occurred - private long mLastTouchNavigationStartTimeMs = 0; - // When the most recent direction key was sent - private long mLastTouchNavigationKeySendTimeMs = 0; - // When the most recent touch event of any type occurred - private long mLastTouchNavigationEventTimeMs = 0; - // Did the swipe begin in a valid region - private boolean mEdgeSwipePossible; - - private final Context mContext; - - // How quickly keys were sent; - private int mKeySendRateMs = 0; - private int mLastKeySent; - // Last movement in device screen pixels - private float mLastMoveX = 0; - private float mLastMoveY = 0; - // Offset from the initial touch. Gets reset as direction keys are sent. - private float mAccumulatedX; - private float mAccumulatedY; - - // Change in position allowed during tap events - private float mTouchSlop; - private float mTouchSlopSquared; - // Has the TouchSlop constraint been invalidated - private boolean mAlwaysInTapRegion = true; - - // Information from the most recent event. - // Used to determine what device sent the event during a fling. - private int mLastSource; - private int mLastMetaState; - private int mLastDeviceId; - - // TODO: Currently using screen dimensions tuned to a Galaxy Nexus, need to - // read this from a config file instead - private int mDistancePerTick; - private int mDistancePerTickSquared; - // Highest rate that the flinged events can occur at before dying out - private int mMaxRepeatDelay; - // The square of the minimum distance needed for a flick to register - private int mMinFlickDistanceSquared; - // How quickly the repeated events die off - private float mFlickDecay; - - public SimulatedDpad(Context context) { - mDistancePerTick = SystemProperties.getInt("persist.vr_dist_tick", 64); - mDistancePerTickSquared = mDistancePerTick * mDistancePerTick; - mMaxRepeatDelay = SystemProperties.getInt("persist.vr_repeat_delay", 300); - mMinFlickDistanceSquared = SystemProperties.getInt("persist.vr_min_flick", 20); - mMinFlickDistanceSquared *= mMinFlickDistanceSquared; - mFlickDecay = Float.parseFloat(SystemProperties.get( - "persist.sys.vr_flick_decay", "1.3")); - mTouchSlop = TOUCH_SLOP; - mTouchSlopSquared = mTouchSlop * mTouchSlop; - - mContext = context; - } - - private final Handler mHandler = new Handler(true /*async*/) { - @Override - public void handleMessage(Message msg) { - switch (msg.what) { - case MSG_FLICK: { - final long time = SystemClock.uptimeMillis(); - ViewRootImpl viewroot = (ViewRootImpl) msg.obj; - // Send the key - viewroot.enqueueInputEvent(new KeyEvent(time, time, - KeyEvent.ACTION_DOWN, msg.arg2, 0, mLastMetaState, - mLastDeviceId, 0, KeyEvent.FLAG_FALLBACK, mLastSource)); - viewroot.enqueueInputEvent(new KeyEvent(time, time, - KeyEvent.ACTION_UP, msg.arg2, 0, mLastMetaState, - mLastDeviceId, 0, KeyEvent.FLAG_FALLBACK, mLastSource)); - - // Increase the delay by the decay factor and resend - final int delay = (int) Math.ceil(mFlickDecay * msg.arg1); - if (delay <= mMaxRepeatDelay) { - Message msgCopy = Message.obtain(msg); - msgCopy.arg1 = delay; - msgCopy.setAsynchronous(true); - mHandler.sendMessageDelayed(msgCopy, delay); - } - break; - } - } - } - }; - - public void updateTouchNavigation(ViewRootImpl viewroot, MotionEvent event, - boolean synthesizeNewKeys) { - if (!synthesizeNewKeys) { - mHandler.removeMessages(MSG_FLICK); - } - InputDevice device = event.getDevice(); - if (device == null) { - return; - } - // Store what time the TouchNavigation event occurred - final long time = SystemClock.uptimeMillis(); - switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: - mLastTouchNavigationStartTimeMs = time; - mAlwaysInTapRegion = true; - mTouchNavigationEnterXPosition = event.getX(); - mTouchNavigationEnterYPosition = event.getY(); - mAccumulatedX = 0; - mAccumulatedY = 0; - mLastMoveX = 0; - mLastMoveY = 0; - if (device.getMotionRange(MotionEvent.AXIS_Y).getMax() - * EDGE_SWIPE_THRESHOLD < event.getY()) { - // Did the swipe begin in a valid region - mEdgeSwipePossible = true; - } - // Clear any flings - if (synthesizeNewKeys) { - mHandler.removeMessages(MSG_FLICK); - } - break; - case MotionEvent.ACTION_MOVE: - // Determine whether the move is slop or an intentional move - float deltaX = event.getX() - mTouchNavigationEnterXPosition; - float deltaY = event.getY() - mTouchNavigationEnterYPosition; - if (mTouchSlopSquared < deltaX * deltaX + deltaY * deltaY) { - mAlwaysInTapRegion = false; - } - // Checks if the swipe has crossed the midpoint - // and if our swipe gesture is complete - if (event.getY() < (device.getMotionRange(MotionEvent.AXIS_Y).getMax() - * .5) && mEdgeSwipePossible) { - mEdgeSwipePossible = false; - - Intent intent = - ((SearchManager)mContext.getSystemService(Context.SEARCH_SERVICE)) - .getAssistIntent(mContext, false, UserHandle.USER_CURRENT_OR_SELF); - if (intent != null) { - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - try { - mContext.startActivity(intent); - } catch (ActivityNotFoundException e){ - Log.e(TAG, "Could not start search activity"); - } - } else { - Log.e(TAG, "Could not find a search activity"); - } - } - // Find the difference in position between the two most recent - // TouchNavigation events - mLastMoveX = event.getX() - mLastTouchNavigationXPosition; - mLastMoveY = event.getY() - mLastTouchNavigationYPosition; - mAccumulatedX += mLastMoveX; - mAccumulatedY += mLastMoveY; - float mAccumulatedXSquared = mAccumulatedX * mAccumulatedX; - float mAccumulatedYSquared = mAccumulatedY * mAccumulatedY; - // Determine if we've moved far enough to send a key press - if (mAccumulatedXSquared > mDistancePerTickSquared || - mAccumulatedYSquared > mDistancePerTickSquared) { - float dominantAxis; - float sign; - boolean isXAxis; - int key; - int repeatCount = 0; - // Determine dominant axis - if (mAccumulatedXSquared > mAccumulatedYSquared) { - dominantAxis = mAccumulatedX; - isXAxis = true; - } else { - dominantAxis = mAccumulatedY; - isXAxis = false; - } - // Determine sign of axis - sign = (dominantAxis > 0) ? 1 : -1; - // Determine key to send - if (isXAxis) { - key = (sign == 1) ? KeyEvent.KEYCODE_DPAD_RIGHT : - KeyEvent.KEYCODE_DPAD_LEFT; - } else { - key = (sign == 1) ? KeyEvent.KEYCODE_DPAD_DOWN : KeyEvent.KEYCODE_DPAD_UP; - } - // Send key until maximum distance constraint is satisfied - while (dominantAxis * dominantAxis > mDistancePerTickSquared) { - repeatCount++; - dominantAxis -= sign * mDistancePerTick; - if (synthesizeNewKeys) { - viewroot.enqueueInputEvent(new KeyEvent(time, time, - KeyEvent.ACTION_DOWN, key, 0, event.getMetaState(), - event.getDeviceId(), 0, KeyEvent.FLAG_FALLBACK, - event.getSource())); - viewroot.enqueueInputEvent(new KeyEvent(time, time, - KeyEvent.ACTION_UP, key, 0, event.getMetaState(), - event.getDeviceId(), 0, KeyEvent.FLAG_FALLBACK, - event.getSource())); - } - } - // Save new axis values - mAccumulatedX = isXAxis ? dominantAxis : 0; - mAccumulatedY = isXAxis ? 0 : dominantAxis; - - mLastKeySent = key; - mKeySendRateMs = (int) (time - mLastTouchNavigationKeySendTimeMs) / repeatCount; - mLastTouchNavigationKeySendTimeMs = time; - } - break; - case MotionEvent.ACTION_UP: - if (time - mLastTouchNavigationStartTimeMs < MAX_TAP_TIME && mAlwaysInTapRegion) { - if (synthesizeNewKeys) { - viewroot.enqueueInputEvent(new KeyEvent(mLastTouchNavigationStartTimeMs, - time, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_CENTER, 0, - event.getMetaState(), event.getDeviceId(), 0, - KeyEvent.FLAG_FALLBACK, event.getSource())); - viewroot.enqueueInputEvent(new KeyEvent(mLastTouchNavigationStartTimeMs, - time, KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DPAD_CENTER, 0, - event.getMetaState(), event.getDeviceId(), 0, - KeyEvent.FLAG_FALLBACK, event.getSource())); - } - } else { - float xMoveSquared = mLastMoveX * mLastMoveX; - float yMoveSquared = mLastMoveY * mLastMoveY; - // Determine whether the last gesture was a fling. - if (mMinFlickDistanceSquared <= xMoveSquared + yMoveSquared && - time - mLastTouchNavigationEventTimeMs <= MAX_TAP_TIME && - mKeySendRateMs <= mMaxRepeatDelay && mKeySendRateMs > 0) { - mLastDeviceId = event.getDeviceId(); - mLastSource = event.getSource(); - mLastMetaState = event.getMetaState(); - - if (synthesizeNewKeys) { - Message message = Message.obtain(mHandler, MSG_FLICK, - mKeySendRateMs, mLastKeySent, viewroot); - message.setAsynchronous(true); - mHandler.sendMessageDelayed(message, mKeySendRateMs); - } - } - } - mEdgeSwipePossible = false; - break; - } - - // Store touch event position and time - mLastTouchNavigationEventTimeMs = time; - mLastTouchNavigationXPosition = event.getX(); - mLastTouchNavigationYPosition = event.getY(); - } -} diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index a520e173a7da..7c82f7e85ac3 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -14060,6 +14060,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * managed: remove them when they should not be displayed anymore. The * overlay will always have the same size as its host view. * + * <p>Note: Overlays do not currently work correctly with {@link + * SurfaceView} or {@link TextureView}; contents in overlays for these + * types of views may not display correctly.</p> + * * @return The ViewOverlay object for this view. * @see ViewOverlay */ diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index c07191ae5bdc..311d1d033890 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -2975,6 +2975,10 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * representation of a view in a parent container, such as might be used * by an animation effect. * + * <p>Note: Overlays do not currently work correctly with {@link + * SurfaceView} or {@link TextureView}; contents in overlays for these + * types of views may not display correctly.</p> + * * @return The ViewGroupOverlay object for this view. * @see ViewGroupOverlay */ diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index efa8a9e0a664..98b787765d08 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -42,7 +42,6 @@ import android.os.Binder; import android.os.Bundle; import android.os.Debug; import android.os.Handler; -import android.os.LatencyTimer; import android.os.Looper; import android.os.Message; import android.os.ParcelFileDescriptor; @@ -116,9 +115,6 @@ public final class ViewRootImpl implements ViewParent, * at 60 Hz. This can be used to measure the potential framerate. */ private static final String PROPERTY_PROFILE_RENDERING = "viewancestor.profile_rendering"; - - private static final boolean MEASURE_LATENCY = false; - private static LatencyTimer lt; /** * Maximum time we allow the user to roll the trackball enough to generate @@ -138,26 +134,15 @@ public final class ViewRootImpl implements ViewParent, private static boolean sRenderThreadQueried = false; private static final Object[] sRenderThreadQueryLock = new Object[0]; + final Context mContext; final IWindowSession mWindowSession; final Display mDisplay; final String mBasePackageName; - long mLastTrackballTime = 0; - final TrackballAxis mTrackballAxisX = new TrackballAxis(); - final TrackballAxis mTrackballAxisY = new TrackballAxis(); - - final SimulatedDpad mSimulatedDpad; - - int mLastJoystickXDirection; - int mLastJoystickYDirection; - int mLastJoystickXKeyCode; - int mLastJoystickYKeyCode; - final int[] mTmpLocation = new int[2]; final TypedValue mTmpValue = new TypedValue(); - - final InputMethodCallback mInputMethodCallback; + final Thread mThread; final WindowLeaked mLocation; @@ -231,38 +216,23 @@ public final class ViewRootImpl implements ViewParent, int mClientWindowLayoutFlags; boolean mLastOverscanRequested; - /** Event was not handled and is finished. - * @hide */ - public static final int EVENT_NOT_HANDLED = 0; - /** Event was handled and is finished. - * @hide */ - public static final int EVENT_HANDLED = 1; - /** Event is waiting on the IME. - * @hide */ - public static final int EVENT_PENDING_IME = 2; - /** Event requires post-IME dispatch. - * @hide */ - public static final int EVENT_POST_IME = 3; - // Pool of queued input events. private static final int MAX_QUEUED_INPUT_EVENT_POOL_SIZE = 10; private QueuedInputEvent mQueuedInputEventPool; private int mQueuedInputEventPoolSize; /* Input event queue. - * Pending input events are input events waiting to be handled by the application. Current - * input events are input events which are being handled but are waiting on some action by the - * IME, even if they themselves may not need to be handled by the IME. + * Pending input events are input events waiting to be delivered to the input stages + * and handled by the application. */ QueuedInputEvent mPendingInputEventHead; QueuedInputEvent mPendingInputEventTail; int mPendingInputEventCount; - QueuedInputEvent mActiveInputEventHead; - QueuedInputEvent mActiveInputEventTail; - int mActiveInputEventCount; boolean mProcessInputEventsScheduled; String mPendingInputEventQueueLengthCounterName = "pq"; - String mActiveInputEventQueueLengthCounterName = "aq"; + + InputStage mFirstInputStage; + InputStage mFirstPostImeInputStage; boolean mWindowAttributesChanged = false; int mWindowAttributesChangesFlag = 0; @@ -361,18 +331,8 @@ public final class ViewRootImpl implements ViewParent, } public ViewRootImpl(Context context, Display display) { - super(); - - if (MEASURE_LATENCY) { - if (lt == null) { - lt = new LatencyTimer(100, 1000); - } - } - - // Initialize the statics when this class is first instantiated. This is - // done here instead of in the static block because Zygote does not - // allow the spawning of threads. - mWindowSession = WindowManagerGlobal.getWindowSession(context.getMainLooper()); + mContext = context; + mWindowSession = WindowManagerGlobal.getWindowSession(); mDisplay = display; mBasePackageName = context.getBasePackageName(); @@ -390,7 +350,6 @@ public final class ViewRootImpl implements ViewParent, mWinFrame = new Rect(); mWindow = new W(this); mTargetSdkVersion = context.getApplicationInfo().targetSdkVersion; - mInputMethodCallback = new InputMethodCallback(this); mViewVisibility = View.GONE; mTransparentRegion = new Region(); mPreviousTransparentRegion = new Region(); @@ -411,7 +370,6 @@ public final class ViewRootImpl implements ViewParent, PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE); mAttachInfo.mScreenOn = powerManager.isScreenOn(); loadSystemProperties(); - mSimulatedDpad = new SimulatedDpad(context); } /** @@ -659,8 +617,22 @@ public final class ViewRootImpl implements ViewParent, view.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES); } - mPendingInputEventQueueLengthCounterName = "pq:" + attrs.getTitle(); - mActiveInputEventQueueLengthCounterName = "aq:" + attrs.getTitle(); + // Set up the input pipeline. + CharSequence counterSuffix = attrs.getTitle(); + InputStage syntheticStage = new SyntheticInputStage(); + InputStage viewPostImeStage = new ViewPostImeInputStage(syntheticStage); + InputStage nativePostImeStage = new NativePostImeInputStage(viewPostImeStage, + "aq:native-post-ime:" + counterSuffix); + InputStage earlyPostImeStage = new EarlyPostImeInputStage(nativePostImeStage); + InputStage imeStage = new ImeInputStage(earlyPostImeStage, + "aq:ime:" + counterSuffix); + InputStage viewPreImeStage = new ViewPreImeInputStage(imeStage); + InputStage nativePreImeStage = new NativePreImeInputStage(viewPreImeStage, + "aq:native-pre-ime:" + counterSuffix); + + mFirstInputStage = nativePreImeStage; + mFirstPostImeInputStage = earlyPostImeStage; + mPendingInputEventQueueLengthCounterName = "aq:pending:" + counterSuffix; } } } @@ -2859,7 +2831,7 @@ public final class ViewRootImpl implements ViewParent, mWindowSession.remove(mWindow); } catch (RemoteException e) { } - + // Dispose the input channel after removing the window so the Window Manager // doesn't interpret the input channel being closed as an abnormal termination. if (mInputChannel != null) { @@ -2951,8 +2923,6 @@ public final class ViewRootImpl implements ViewParent, private final static int MSG_DISPATCH_DONE_ANIMATING = 22; private final static int MSG_INVALIDATE_WORLD = 23; private final static int MSG_WINDOW_MOVED = 24; - private final static int MSG_ENQUEUE_X_AXIS_KEY_REPEAT = 25; - private final static int MSG_ENQUEUE_Y_AXIS_KEY_REPEAT = 26; final class ViewRootHandler extends Handler { @Override @@ -3002,10 +2972,6 @@ public final class ViewRootImpl implements ViewParent, return "MSG_DISPATCH_DONE_ANIMATING"; case MSG_WINDOW_MOVED: return "MSG_WINDOW_MOVED"; - case MSG_ENQUEUE_X_AXIS_KEY_REPEAT: - return "MSG_ENQUEUE_X_AXIS_KEY_REPEAT"; - case MSG_ENQUEUE_Y_AXIS_KEY_REPEAT: - return "MSG_ENQUEUE_Y_AXIS_KEY_REPEAT"; } return super.getMessageName(message); } @@ -3228,18 +3194,6 @@ public final class ViewRootImpl implements ViewParent, invalidateWorld(mView); } } break; - case MSG_ENQUEUE_X_AXIS_KEY_REPEAT: - case MSG_ENQUEUE_Y_AXIS_KEY_REPEAT: { - KeyEvent oldEvent = (KeyEvent)msg.obj; - KeyEvent e = KeyEvent.changeTimeRepeat(oldEvent, SystemClock.uptimeMillis(), - oldEvent.getRepeatCount() + 1); - if (mAttachInfo.mHasWindowFocus) { - enqueueInputEvent(e); - Message m = obtainMessage(msg.what, e); - m.setAsynchronous(true); - sendMessageDelayed(m, mViewConfiguration.getKeyRepeatDelay()); - } - } break; } } } @@ -3362,366 +3316,1425 @@ public final class ViewRootImpl implements ViewParent, return false; } - private int deliverInputEvent(QueuedInputEvent q) { - Trace.traceBegin(Trace.TRACE_TAG_VIEW, "deliverInputEvent"); - try { - if (q.mEvent instanceof KeyEvent) { - return deliverKeyEvent(q); + /** + * Base class for implementing a stage in the chain of responsibility + * for processing input events. + * <p> + * Events are delivered to the stage by the {@link #deliver} method. The stage + * then has the choice of finishing the event or forwarding it to the next stage. + * </p> + */ + abstract class InputStage { + private final InputStage mNext; + + protected static final int FORWARD = 0; + protected static final int FINISH_HANDLED = 1; + protected static final int FINISH_NOT_HANDLED = 2; + + /** + * Creates an input stage. + * @param next The next stage to which events should be forwarded. + */ + public InputStage(InputStage next) { + mNext = next; + } + + /** + * Delivers an event to be processed. + */ + public final void deliver(QueuedInputEvent q) { + if ((q.mFlags & QueuedInputEvent.FLAG_FINISHED) != 0) { + forward(q); + } else if (mView == null || !mAdded) { + finish(q, false); } else { - final int source = q.mEvent.getSource(); - if ((source & InputDevice.SOURCE_CLASS_POINTER) != 0) { - return deliverPointerEvent(q); - } else if ((source & InputDevice.SOURCE_CLASS_TRACKBALL) != 0) { - return deliverTrackballEvent(q); + apply(q, onProcess(q)); + } + } + + /** + * Marks the the input event as finished then forwards it to the next stage. + */ + protected void finish(QueuedInputEvent q, boolean handled) { + q.mFlags |= QueuedInputEvent.FLAG_FINISHED; + if (handled) { + q.mFlags |= QueuedInputEvent.FLAG_FINISHED_HANDLED; + } + forward(q); + } + + /** + * Forwards the event to the next stage. + */ + protected void forward(QueuedInputEvent q) { + onDeliverToNext(q); + } + + /** + * Applies a result code from {@link #onProcess} to the specified event. + */ + protected void apply(QueuedInputEvent q, int result) { + if (result == FORWARD) { + forward(q); + } else if (result == FINISH_HANDLED) { + finish(q, true); + } else if (result == FINISH_NOT_HANDLED) { + finish(q, false); + } else { + throw new IllegalArgumentException("Invalid result: " + result); + } + } + + /** + * Called when an event is ready to be processed. + * @return A result code indicating how the event was handled. + */ + protected int onProcess(QueuedInputEvent q) { + return FORWARD; + } + + /** + * Called when an event is being delivered to the next stage. + */ + protected void onDeliverToNext(QueuedInputEvent q) { + if (mNext != null) { + mNext.deliver(q); + } else { + finishInputEvent(q); + } + } + } + + /** + * Base class for implementing an input pipeline stage that supports + * asynchronous and out-of-order processing of input events. + * <p> + * In addition to what a normal input stage can do, an asynchronous + * input stage may also defer an input event that has been delivered to it + * and finish or forward it later. + * </p> + */ + abstract class AsyncInputStage extends InputStage { + private final String mTraceCounter; + + private QueuedInputEvent mQueueHead; + private QueuedInputEvent mQueueTail; + private int mQueueLength; + + protected static final int DEFER = 3; + + /** + * Creates an asynchronous input stage. + * @param next The next stage to which events should be forwarded. + * @param traceCounter The name of a counter to record the size of + * the queue of pending events. + */ + public AsyncInputStage(InputStage next, String traceCounter) { + super(next); + mTraceCounter = traceCounter; + } + + /** + * Marks the event as deferred, which is to say that it will be handled + * asynchronously. The caller is responsible for calling {@link #forward} + * or {@link #finish} later when it is done handling the event. + */ + protected void defer(QueuedInputEvent q) { + q.mFlags |= QueuedInputEvent.FLAG_DEFERRED; + enqueue(q); + } + + @Override + protected void forward(QueuedInputEvent q) { + // Clear the deferred flag. + q.mFlags &= ~QueuedInputEvent.FLAG_DEFERRED; + + // Fast path if the queue is empty. + QueuedInputEvent curr = mQueueHead; + if (curr == null) { + super.forward(q); + return; + } + + // Determine whether the event must be serialized behind any others + // before it can be delivered to the next stage. This is done because + // deferred events might be handled out of order by the stage. + final int deviceId = q.mEvent.getDeviceId(); + QueuedInputEvent prev = null; + boolean blocked = false; + while (curr != null && curr != q) { + if (!blocked && deviceId == curr.mEvent.getDeviceId()) { + blocked = true; + } + prev = curr; + curr = curr.mNext; + } + + // If the event is blocked, then leave it in the queue to be delivered later. + // Note that the event might not yet be in the queue if it was not previously + // deferred so we will enqueue it if needed. + if (blocked) { + if (curr == null) { + enqueue(q); + } + return; + } + + // The event is not blocked. Deliver it immediately. + if (curr != null) { + curr = curr.mNext; + dequeue(q, prev); + } + super.forward(q); + + // Dequeuing this event may have unblocked successors. Deliver them. + while (curr != null) { + if (deviceId == curr.mEvent.getDeviceId()) { + if ((curr.mFlags & QueuedInputEvent.FLAG_DEFERRED) != 0) { + break; + } + QueuedInputEvent next = curr.mNext; + dequeue(curr, prev); + super.forward(curr); + curr = next; } else { - return deliverGenericMotionEvent(q); + prev = curr; + curr = curr.mNext; } } - } finally { - Trace.traceEnd(Trace.TRACE_TAG_VIEW); + } + + @Override + protected void apply(QueuedInputEvent q, int result) { + if (result == DEFER) { + defer(q); + } else { + super.apply(q, result); + } + } + + private void enqueue(QueuedInputEvent q) { + if (mQueueTail == null) { + mQueueHead = q; + mQueueTail = q; + } else { + mQueueTail.mNext = q; + mQueueTail = q; + } + + mQueueLength += 1; + Trace.traceCounter(Trace.TRACE_TAG_INPUT, mTraceCounter, mQueueLength); + } + + private void dequeue(QueuedInputEvent q, QueuedInputEvent prev) { + if (prev == null) { + mQueueHead = q.mNext; + } else { + prev.mNext = q.mNext; + } + if (mQueueTail == q) { + mQueueTail = prev; + } + q.mNext = null; + + mQueueLength -= 1; + Trace.traceCounter(Trace.TRACE_TAG_INPUT, mTraceCounter, mQueueLength); } } - private int deliverInputEventPostIme(QueuedInputEvent q) { - Trace.traceBegin(Trace.TRACE_TAG_VIEW, "deliverInputEventPostIme"); - try { + /** + * Delivers pre-ime input events to a native activity. + * Does not support pointer events. + */ + final class NativePreImeInputStage extends AsyncInputStage { + public NativePreImeInputStage(InputStage next, String traceCounter) { + super(next, traceCounter); + } + + @Override + protected int onProcess(QueuedInputEvent q) { + return FORWARD; + } + } + + /** + * Delivers pre-ime input events to the view hierarchy. + * Does not support pointer events. + */ + final class ViewPreImeInputStage extends InputStage { + public ViewPreImeInputStage(InputStage next) { + super(next); + } + + @Override + protected int onProcess(QueuedInputEvent q) { + if (q.mEvent instanceof KeyEvent) { + return processKeyEvent(q); + } + return FORWARD; + } + + private int processKeyEvent(QueuedInputEvent q) { + final KeyEvent event = (KeyEvent)q.mEvent; + if (mView.dispatchKeyEventPreIme(event)) { + return FINISH_HANDLED; + } + return FORWARD; + } + } + + /** + * Delivers input events to the ime. + * Does not support pointer events. + */ + final class ImeInputStage extends AsyncInputStage + implements InputMethodManager.FinishedInputEventCallback { + public ImeInputStage(InputStage next, String traceCounter) { + super(next, traceCounter); + } + + @Override + protected int onProcess(QueuedInputEvent q) { + if (mLastWasImTarget) { + InputMethodManager imm = InputMethodManager.peekInstance(); + if (imm != null) { + final InputEvent event = q.mEvent; + if (DEBUG_IMF) Log.v(TAG, "Sending input event to IME: " + event); + int result = imm.dispatchInputEvent(event, q, this, mHandler); + if (result == InputMethodManager.DISPATCH_HANDLED) { + return FINISH_HANDLED; + } else if (result == InputMethodManager.DISPATCH_NOT_HANDLED) { + return FINISH_NOT_HANDLED; + } else { + return DEFER; // callback will be invoked later + } + } + } + return FORWARD; + } + + @Override + public void onFinishedInputEvent(Object token, boolean handled) { + QueuedInputEvent q = (QueuedInputEvent)token; + if (handled) { + finish(q, true); + return; + } + + // If the window doesn't currently have input focus, then drop + // this event. This could be an event that came back from the + // IME dispatch but the window has lost focus in the meantime. + if (!mAttachInfo.mHasWindowFocus && !isTerminalInputEvent(q.mEvent)) { + Slog.w(TAG, "Dropping event due to no window focus: " + q.mEvent); + finish(q, false); + return; + } + + forward(q); + } + } + + /** + * Performs early processing of post-ime input events. + */ + final class EarlyPostImeInputStage extends InputStage { + public EarlyPostImeInputStage(InputStage next) { + super(next); + } + + @Override + protected int onProcess(QueuedInputEvent q) { if (q.mEvent instanceof KeyEvent) { - return deliverKeyEventPostIme(q); + return processKeyEvent(q); } else { final int source = q.mEvent.getSource(); - if ((source & InputDevice.SOURCE_CLASS_TRACKBALL) != 0) { - return deliverTrackballEventPostIme(q); - } else { - return deliverGenericMotionEventPostIme(q); + if ((source & InputDevice.SOURCE_CLASS_POINTER) != 0) { + return processPointerEvent(q); } } - } finally { - Trace.traceEnd(Trace.TRACE_TAG_VIEW); + return FORWARD; + } + + private int processKeyEvent(QueuedInputEvent q) { + final KeyEvent event = (KeyEvent)q.mEvent; + + // If the key's purpose is to exit touch mode then we consume it + // and consider it handled. + if (checkForLeavingTouchModeAndConsume(event)) { + return FINISH_HANDLED; + } + + // Make sure the fallback event policy sees all keys that will be + // delivered to the view hierarchy. + mFallbackEventHandler.preDispatchKeyEvent(event); + return FORWARD; + } + + private int processPointerEvent(QueuedInputEvent q) { + final MotionEvent event = (MotionEvent)q.mEvent; + + // Translate the pointer event for compatibility, if needed. + if (mTranslator != null) { + mTranslator.translateEventInScreenToAppWindow(event); + } + + // Enter touch mode on down or scroll. + final int action = event.getAction(); + if (action == MotionEvent.ACTION_DOWN || action == MotionEvent.ACTION_SCROLL) { + ensureTouchMode(true); + } + + // Offset the scroll position. + if (mCurScrollY != 0) { + event.offsetLocation(0, mCurScrollY); + } + + // Remember the touch position for possible drag-initiation. + if (event.isTouchEvent()) { + mLastTouchPoint.x = event.getRawX(); + mLastTouchPoint.y = event.getRawY(); + } + return FORWARD; } } - private int deliverPointerEvent(QueuedInputEvent q) { - final MotionEvent event = (MotionEvent)q.mEvent; - final boolean isTouchEvent = event.isTouchEvent(); - if (mInputEventConsistencyVerifier != null) { - if (isTouchEvent) { - mInputEventConsistencyVerifier.onTouchEvent(event, 0); + /** + * Delivers post-ime input events to a native activity. + */ + final class NativePostImeInputStage extends AsyncInputStage { + public NativePostImeInputStage(InputStage next, String traceCounter) { + super(next, traceCounter); + } + + @Override + protected int onProcess(QueuedInputEvent q) { + return FORWARD; + } + } + + /** + * Delivers post-ime input events to the view hierarchy. + */ + final class ViewPostImeInputStage extends InputStage { + public ViewPostImeInputStage(InputStage next) { + super(next); + } + + @Override + protected int onProcess(QueuedInputEvent q) { + if (q.mEvent instanceof KeyEvent) { + return processKeyEvent(q); } else { - mInputEventConsistencyVerifier.onGenericMotionEvent(event, 0); + final int source = q.mEvent.getSource(); + if ((source & InputDevice.SOURCE_CLASS_POINTER) != 0) { + return processPointerEvent(q); + } else if ((source & InputDevice.SOURCE_CLASS_TRACKBALL) != 0) { + return processTrackballEvent(q); + } else { + return processGenericMotionEvent(q); + } } } - // If there is no view, then the event will not be handled. - if (mView == null || !mAdded) { - return EVENT_NOT_HANDLED; + private int processKeyEvent(QueuedInputEvent q) { + final KeyEvent event = (KeyEvent)q.mEvent; + + // Deliver the key to the view hierarchy. + if (mView.dispatchKeyEvent(event)) { + return FINISH_HANDLED; + } + + // If the Control modifier is held, try to interpret the key as a shortcut. + if (event.getAction() == KeyEvent.ACTION_DOWN + && event.isCtrlPressed() + && event.getRepeatCount() == 0 + && !KeyEvent.isModifierKey(event.getKeyCode())) { + if (mView.dispatchKeyShortcutEvent(event)) { + return FINISH_HANDLED; + } + } + + // Apply the fallback event policy. + if (mFallbackEventHandler.dispatchKeyEvent(event)) { + return FINISH_HANDLED; + } + + // Handle automatic focus changes. + if (event.getAction() == KeyEvent.ACTION_DOWN) { + int direction = 0; + switch (event.getKeyCode()) { + case KeyEvent.KEYCODE_DPAD_LEFT: + if (event.hasNoModifiers()) { + direction = View.FOCUS_LEFT; + } + break; + case KeyEvent.KEYCODE_DPAD_RIGHT: + if (event.hasNoModifiers()) { + direction = View.FOCUS_RIGHT; + } + break; + case KeyEvent.KEYCODE_DPAD_UP: + if (event.hasNoModifiers()) { + direction = View.FOCUS_UP; + } + break; + case KeyEvent.KEYCODE_DPAD_DOWN: + if (event.hasNoModifiers()) { + direction = View.FOCUS_DOWN; + } + break; + case KeyEvent.KEYCODE_TAB: + if (event.hasNoModifiers()) { + direction = View.FOCUS_FORWARD; + } else if (event.hasModifiers(KeyEvent.META_SHIFT_ON)) { + direction = View.FOCUS_BACKWARD; + } + break; + } + if (direction != 0) { + View focused = mView.findFocus(); + if (focused != null) { + View v = focused.focusSearch(direction); + if (v != null && v != focused) { + // do the math the get the interesting rect + // of previous focused into the coord system of + // newly focused view + focused.getFocusedRect(mTempRect); + if (mView instanceof ViewGroup) { + ((ViewGroup) mView).offsetDescendantRectToMyCoords( + focused, mTempRect); + ((ViewGroup) mView).offsetRectIntoDescendantCoords( + v, mTempRect); + } + if (v.requestFocus(direction, mTempRect)) { + playSoundEffect(SoundEffectConstants + .getContantForFocusDirection(direction)); + return FINISH_HANDLED; + } + } + + // Give the focused view a last chance to handle the dpad key. + if (mView.dispatchUnhandledMove(focused, direction)) { + return FINISH_HANDLED; + } + } else { + // find the best view to give focus to in this non-touch-mode with no-focus + View v = focusSearch(null, direction); + if (v != null && v.requestFocus(direction)) { + return FINISH_HANDLED; + } + } + } + } + return FORWARD; } - // Translate the pointer event for compatibility, if needed. - if (mTranslator != null) { - mTranslator.translateEventInScreenToAppWindow(event); + private int processPointerEvent(QueuedInputEvent q) { + final MotionEvent event = (MotionEvent)q.mEvent; + + if (mView.dispatchPointerEvent(event)) { + return FINISH_HANDLED; + } + return FORWARD; } - // Enter touch mode on down or scroll. - final int action = event.getAction(); - if (action == MotionEvent.ACTION_DOWN || action == MotionEvent.ACTION_SCROLL) { - ensureTouchMode(true); + private int processTrackballEvent(QueuedInputEvent q) { + final MotionEvent event = (MotionEvent)q.mEvent; + + if (mView.dispatchTrackballEvent(event)) { + return FINISH_HANDLED; + } + return FORWARD; } - // Offset the scroll position. - if (mCurScrollY != 0) { - event.offsetLocation(0, mCurScrollY); + private int processGenericMotionEvent(QueuedInputEvent q) { + final MotionEvent event = (MotionEvent)q.mEvent; + + // Deliver the event to the view. + if (mView.dispatchGenericMotionEvent(event)) { + return FINISH_HANDLED; + } + return FORWARD; } - if (MEASURE_LATENCY) { - lt.sample("A Dispatching PointerEvents", System.nanoTime() - event.getEventTimeNano()); + } + + /** + * Performs synthesis of new input events from unhandled input events. + */ + final class SyntheticInputStage extends InputStage { + private final SyntheticTrackballHandler mTrackball = new SyntheticTrackballHandler(); + private final SyntheticJoystickHandler mJoystick = new SyntheticJoystickHandler(); + private final SyntheticTouchNavigationHandler mTouchNavigation = + new SyntheticTouchNavigationHandler(); + + public SyntheticInputStage() { + super(null); } - // Remember the touch position for possible drag-initiation. - if (isTouchEvent) { - mLastTouchPoint.x = event.getRawX(); - mLastTouchPoint.y = event.getRawY(); + @Override + protected int onProcess(QueuedInputEvent q) { + q.mFlags |= QueuedInputEvent.FLAG_RESYNTHESIZED; + if (q.mEvent instanceof MotionEvent) { + final MotionEvent event = (MotionEvent)q.mEvent; + final int source = event.getSource(); + if ((source & InputDevice.SOURCE_CLASS_TRACKBALL) != 0) { + mTrackball.process(event); + return FINISH_HANDLED; + } else if ((source & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) { + mJoystick.process(event); + return FINISH_HANDLED; + } else if ((source & InputDevice.SOURCE_TOUCH_NAVIGATION) + == InputDevice.SOURCE_TOUCH_NAVIGATION) { + mTouchNavigation.process(event); + return FINISH_HANDLED; + } + } + return FORWARD; } - // Dispatch touch to view hierarchy. - boolean handled = mView.dispatchPointerEvent(event); - if (MEASURE_LATENCY) { - lt.sample("B Dispatched PointerEvents ", System.nanoTime() - event.getEventTimeNano()); + @Override + protected void onDeliverToNext(QueuedInputEvent q) { + if ((q.mFlags & QueuedInputEvent.FLAG_RESYNTHESIZED) == 0) { + // Cancel related synthetic events if any prior stage has handled the event. + if (q.mEvent instanceof MotionEvent) { + final MotionEvent event = (MotionEvent)q.mEvent; + final int source = event.getSource(); + if ((source & InputDevice.SOURCE_CLASS_TRACKBALL) != 0) { + mTrackball.cancel(event); + } else if ((source & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) { + mJoystick.cancel(event); + } else if ((source & InputDevice.SOURCE_TOUCH_NAVIGATION) + == InputDevice.SOURCE_TOUCH_NAVIGATION) { + mTouchNavigation.cancel(event); + } + } + } + super.onDeliverToNext(q); } - return handled ? EVENT_HANDLED : EVENT_NOT_HANDLED; } - private int deliverTrackballEvent(QueuedInputEvent q) { - final MotionEvent event = (MotionEvent)q.mEvent; - if (mInputEventConsistencyVerifier != null) { - mInputEventConsistencyVerifier.onTrackballEvent(event, 0); + /** + * Creates dpad events from unhandled trackball movements. + */ + final class SyntheticTrackballHandler { + private final TrackballAxis mX = new TrackballAxis(); + private final TrackballAxis mY = new TrackballAxis(); + private long mLastTime; + + public void process(MotionEvent event) { + // Translate the trackball event into DPAD keys and try to deliver those. + long curTime = SystemClock.uptimeMillis(); + if ((mLastTime + MAX_TRACKBALL_DELAY) < curTime) { + // It has been too long since the last movement, + // so restart at the beginning. + mX.reset(0); + mY.reset(0); + mLastTime = curTime; + } + + final int action = event.getAction(); + final int metaState = event.getMetaState(); + switch (action) { + case MotionEvent.ACTION_DOWN: + mX.reset(2); + mY.reset(2); + enqueueInputEvent(new KeyEvent(curTime, curTime, + KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_CENTER, 0, metaState, + KeyCharacterMap.VIRTUAL_KEYBOARD, 0, KeyEvent.FLAG_FALLBACK, + InputDevice.SOURCE_KEYBOARD)); + break; + case MotionEvent.ACTION_UP: + mX.reset(2); + mY.reset(2); + enqueueInputEvent(new KeyEvent(curTime, curTime, + KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DPAD_CENTER, 0, metaState, + KeyCharacterMap.VIRTUAL_KEYBOARD, 0, KeyEvent.FLAG_FALLBACK, + InputDevice.SOURCE_KEYBOARD)); + break; + } + + if (DEBUG_TRACKBALL) Log.v(TAG, "TB X=" + mX.position + " step=" + + mX.step + " dir=" + mX.dir + " acc=" + mX.acceleration + + " move=" + event.getX() + + " / Y=" + mY.position + " step=" + + mY.step + " dir=" + mY.dir + " acc=" + mY.acceleration + + " move=" + event.getY()); + final float xOff = mX.collect(event.getX(), event.getEventTime(), "X"); + final float yOff = mY.collect(event.getY(), event.getEventTime(), "Y"); + + // Generate DPAD events based on the trackball movement. + // We pick the axis that has moved the most as the direction of + // the DPAD. When we generate DPAD events for one axis, then the + // other axis is reset -- we don't want to perform DPAD jumps due + // to slight movements in the trackball when making major movements + // along the other axis. + int keycode = 0; + int movement = 0; + float accel = 1; + if (xOff > yOff) { + movement = mX.generate(); + if (movement != 0) { + keycode = movement > 0 ? KeyEvent.KEYCODE_DPAD_RIGHT + : KeyEvent.KEYCODE_DPAD_LEFT; + accel = mX.acceleration; + mY.reset(2); + } + } else if (yOff > 0) { + movement = mY.generate(); + if (movement != 0) { + keycode = movement > 0 ? KeyEvent.KEYCODE_DPAD_DOWN + : KeyEvent.KEYCODE_DPAD_UP; + accel = mY.acceleration; + mX.reset(2); + } + } + + if (keycode != 0) { + if (movement < 0) movement = -movement; + int accelMovement = (int)(movement * accel); + if (DEBUG_TRACKBALL) Log.v(TAG, "Move: movement=" + movement + + " accelMovement=" + accelMovement + + " accel=" + accel); + if (accelMovement > movement) { + if (DEBUG_TRACKBALL) Log.v(TAG, "Delivering fake DPAD: " + + keycode); + movement--; + int repeatCount = accelMovement - movement; + enqueueInputEvent(new KeyEvent(curTime, curTime, + KeyEvent.ACTION_MULTIPLE, keycode, repeatCount, metaState, + KeyCharacterMap.VIRTUAL_KEYBOARD, 0, KeyEvent.FLAG_FALLBACK, + InputDevice.SOURCE_KEYBOARD)); + } + while (movement > 0) { + if (DEBUG_TRACKBALL) Log.v(TAG, "Delivering fake DPAD: " + + keycode); + movement--; + curTime = SystemClock.uptimeMillis(); + enqueueInputEvent(new KeyEvent(curTime, curTime, + KeyEvent.ACTION_DOWN, keycode, 0, metaState, + KeyCharacterMap.VIRTUAL_KEYBOARD, 0, KeyEvent.FLAG_FALLBACK, + InputDevice.SOURCE_KEYBOARD)); + enqueueInputEvent(new KeyEvent(curTime, curTime, + KeyEvent.ACTION_UP, keycode, 0, metaState, + KeyCharacterMap.VIRTUAL_KEYBOARD, 0, KeyEvent.FLAG_FALLBACK, + InputDevice.SOURCE_KEYBOARD)); + } + mLastTime = curTime; + } } - int result = EVENT_POST_IME; - if (mView != null && mAdded && (q.mFlags & QueuedInputEvent.FLAG_DELIVER_POST_IME) == 0) { - if (LOCAL_LOGV) - Log.v(TAG, "Dispatching trackball " + event + " to " + mView); + public void cancel(MotionEvent event) { + mLastTime = Integer.MIN_VALUE; - // Dispatch to the IME before propagating down the view hierarchy. - result = dispatchImeInputEvent(q); + // If we reach this, we consumed a trackball event. + // Because we will not translate the trackball event into a key event, + // touch mode will not exit, so we exit touch mode here. + if (mView != null && mAdded) { + ensureTouchMode(false); + } } - return result; } - private int deliverTrackballEventPostIme(QueuedInputEvent q) { - final MotionEvent event = (MotionEvent) q.mEvent; + /** + * Maintains state information for a single trackball axis, generating + * discrete (DPAD) movements based on raw trackball motion. + */ + static final class TrackballAxis { + /** + * The maximum amount of acceleration we will apply. + */ + static final float MAX_ACCELERATION = 20; - // If there is no view, then the event will not be handled. - if (mView == null || !mAdded) { - return EVENT_NOT_HANDLED; + /** + * The maximum amount of time (in milliseconds) between events in order + * for us to consider the user to be doing fast trackball movements, + * and thus apply an acceleration. + */ + static final long FAST_MOVE_TIME = 150; + + /** + * Scaling factor to the time (in milliseconds) between events to how + * much to multiple/divide the current acceleration. When movement + * is < FAST_MOVE_TIME this multiplies the acceleration; when > + * FAST_MOVE_TIME it divides it. + */ + static final float ACCEL_MOVE_SCALING_FACTOR = (1.0f/40); + + static final float FIRST_MOVEMENT_THRESHOLD = 0.5f; + static final float SECOND_CUMULATIVE_MOVEMENT_THRESHOLD = 2.0f; + static final float SUBSEQUENT_INCREMENTAL_MOVEMENT_THRESHOLD = 1.0f; + + float position; + float acceleration = 1; + long lastMoveTime = 0; + int step; + int dir; + int nonAccelMovement; + + void reset(int _step) { + position = 0; + acceleration = 1; + lastMoveTime = 0; + step = _step; + dir = 0; } - // Deliver the trackball event to the view. - if (mView.dispatchTrackballEvent(event)) { - // If we reach this, we delivered a trackball event to mView and - // mView consumed it. Because we will not translate the trackball - // event into a key event, touch mode will not exit, so we exit - // touch mode here. - ensureTouchMode(false); - mLastTrackballTime = Integer.MIN_VALUE; - return EVENT_HANDLED; + /** + * Add trackball movement into the state. If the direction of movement + * has been reversed, the state is reset before adding the + * movement (so that you don't have to compensate for any previously + * collected movement before see the result of the movement in the + * new direction). + * + * @return Returns the absolute value of the amount of movement + * collected so far. + */ + float collect(float off, long time, String axis) { + long normTime; + if (off > 0) { + normTime = (long)(off * FAST_MOVE_TIME); + if (dir < 0) { + if (DEBUG_TRACKBALL) Log.v(TAG, axis + " reversed to positive!"); + position = 0; + step = 0; + acceleration = 1; + lastMoveTime = 0; + } + dir = 1; + } else if (off < 0) { + normTime = (long)((-off) * FAST_MOVE_TIME); + if (dir > 0) { + if (DEBUG_TRACKBALL) Log.v(TAG, axis + " reversed to negative!"); + position = 0; + step = 0; + acceleration = 1; + lastMoveTime = 0; + } + dir = -1; + } else { + normTime = 0; + } + + // The number of milliseconds between each movement that is + // considered "normal" and will not result in any acceleration + // or deceleration, scaled by the offset we have here. + if (normTime > 0) { + long delta = time - lastMoveTime; + lastMoveTime = time; + float acc = acceleration; + if (delta < normTime) { + // The user is scrolling rapidly, so increase acceleration. + float scale = (normTime-delta) * ACCEL_MOVE_SCALING_FACTOR; + if (scale > 1) acc *= scale; + if (DEBUG_TRACKBALL) Log.v(TAG, axis + " accelerate: off=" + + off + " normTime=" + normTime + " delta=" + delta + + " scale=" + scale + " acc=" + acc); + acceleration = acc < MAX_ACCELERATION ? acc : MAX_ACCELERATION; + } else { + // The user is scrolling slowly, so decrease acceleration. + float scale = (delta-normTime) * ACCEL_MOVE_SCALING_FACTOR; + if (scale > 1) acc /= scale; + if (DEBUG_TRACKBALL) Log.v(TAG, axis + " deccelerate: off=" + + off + " normTime=" + normTime + " delta=" + delta + + " scale=" + scale + " acc=" + acc); + acceleration = acc > 1 ? acc : 1; + } + } + position += off; + return Math.abs(position); + } + + /** + * Generate the number of discrete movement events appropriate for + * the currently collected trackball movement. + * + * @return Returns the number of discrete movements, either positive + * or negative, or 0 if there is not enough trackball movement yet + * for a discrete movement. + */ + int generate() { + int movement = 0; + nonAccelMovement = 0; + do { + final int dir = position >= 0 ? 1 : -1; + switch (step) { + // If we are going to execute the first step, then we want + // to do this as soon as possible instead of waiting for + // a full movement, in order to make things look responsive. + case 0: + if (Math.abs(position) < FIRST_MOVEMENT_THRESHOLD) { + return movement; + } + movement += dir; + nonAccelMovement += dir; + step = 1; + break; + // If we have generated the first movement, then we need + // to wait for the second complete trackball motion before + // generating the second discrete movement. + case 1: + if (Math.abs(position) < SECOND_CUMULATIVE_MOVEMENT_THRESHOLD) { + return movement; + } + movement += dir; + nonAccelMovement += dir; + position -= SECOND_CUMULATIVE_MOVEMENT_THRESHOLD * dir; + step = 2; + break; + // After the first two, we generate discrete movements + // consistently with the trackball, applying an acceleration + // if the trackball is moving quickly. This is a simple + // acceleration on top of what we already compute based + // on how quickly the wheel is being turned, to apply + // a longer increasing acceleration to continuous movement + // in one direction. + default: + if (Math.abs(position) < SUBSEQUENT_INCREMENTAL_MOVEMENT_THRESHOLD) { + return movement; + } + movement += dir; + position -= dir * SUBSEQUENT_INCREMENTAL_MOVEMENT_THRESHOLD; + float acc = acceleration; + acc *= 1.1f; + acceleration = acc < MAX_ACCELERATION ? acc : acceleration; + break; + } + } while (true); } + } - // Translate the trackball event into DPAD keys and try to deliver those. - final TrackballAxis x = mTrackballAxisX; - final TrackballAxis y = mTrackballAxisY; + /** + * Creates dpad events from unhandled joystick movements. + */ + final class SyntheticJoystickHandler extends Handler { + private final static int MSG_ENQUEUE_X_AXIS_KEY_REPEAT = 1; + private final static int MSG_ENQUEUE_Y_AXIS_KEY_REPEAT = 2; + + private int mLastXDirection; + private int mLastYDirection; + private int mLastXKeyCode; + private int mLastYKeyCode; - long curTime = SystemClock.uptimeMillis(); - if ((mLastTrackballTime + MAX_TRACKBALL_DELAY) < curTime) { - // It has been too long since the last movement, - // so restart at the beginning. - x.reset(0); - y.reset(0); - mLastTrackballTime = curTime; + public SyntheticJoystickHandler() { + super(true); } - final int action = event.getAction(); - final int metaState = event.getMetaState(); - switch (action) { - case MotionEvent.ACTION_DOWN: - x.reset(2); - y.reset(2); - enqueueInputEvent(new KeyEvent(curTime, curTime, - KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_CENTER, 0, metaState, - KeyCharacterMap.VIRTUAL_KEYBOARD, 0, KeyEvent.FLAG_FALLBACK, - InputDevice.SOURCE_KEYBOARD)); - break; - case MotionEvent.ACTION_UP: - x.reset(2); - y.reset(2); - enqueueInputEvent(new KeyEvent(curTime, curTime, - KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DPAD_CENTER, 0, metaState, - KeyCharacterMap.VIRTUAL_KEYBOARD, 0, KeyEvent.FLAG_FALLBACK, - InputDevice.SOURCE_KEYBOARD)); - break; + @Override + public void handleMessage(Message msg) { + switch (msg.what) { + case MSG_ENQUEUE_X_AXIS_KEY_REPEAT: + case MSG_ENQUEUE_Y_AXIS_KEY_REPEAT: { + KeyEvent oldEvent = (KeyEvent)msg.obj; + KeyEvent e = KeyEvent.changeTimeRepeat(oldEvent, + SystemClock.uptimeMillis(), + oldEvent.getRepeatCount() + 1); + if (mAttachInfo.mHasWindowFocus) { + enqueueInputEvent(e); + Message m = obtainMessage(msg.what, e); + m.setAsynchronous(true); + sendMessageDelayed(m, ViewConfiguration.getKeyRepeatDelay()); + } + } break; + } + } + + public void process(MotionEvent event) { + update(event, true); } - if (DEBUG_TRACKBALL) Log.v(TAG, "TB X=" + x.position + " step=" - + x.step + " dir=" + x.dir + " acc=" + x.acceleration - + " move=" + event.getX() - + " / Y=" + y.position + " step=" - + y.step + " dir=" + y.dir + " acc=" + y.acceleration - + " move=" + event.getY()); - final float xOff = x.collect(event.getX(), event.getEventTime(), "X"); - final float yOff = y.collect(event.getY(), event.getEventTime(), "Y"); - - // Generate DPAD events based on the trackball movement. - // We pick the axis that has moved the most as the direction of - // the DPAD. When we generate DPAD events for one axis, then the - // other axis is reset -- we don't want to perform DPAD jumps due - // to slight movements in the trackball when making major movements - // along the other axis. - int keycode = 0; - int movement = 0; - float accel = 1; - if (xOff > yOff) { - movement = x.generate((2/event.getXPrecision())); - if (movement != 0) { - keycode = movement > 0 ? KeyEvent.KEYCODE_DPAD_RIGHT - : KeyEvent.KEYCODE_DPAD_LEFT; - accel = x.acceleration; - y.reset(2); - } - } else if (yOff > 0) { - movement = y.generate((2/event.getYPrecision())); - if (movement != 0) { - keycode = movement > 0 ? KeyEvent.KEYCODE_DPAD_DOWN - : KeyEvent.KEYCODE_DPAD_UP; - accel = y.acceleration; - x.reset(2); - } - } - - if (keycode != 0) { - if (movement < 0) movement = -movement; - int accelMovement = (int)(movement * accel); - if (DEBUG_TRACKBALL) Log.v(TAG, "Move: movement=" + movement - + " accelMovement=" + accelMovement - + " accel=" + accel); - if (accelMovement > movement) { - if (DEBUG_TRACKBALL) Log.v(TAG, "Delivering fake DPAD: " - + keycode); - movement--; - int repeatCount = accelMovement - movement; - enqueueInputEvent(new KeyEvent(curTime, curTime, - KeyEvent.ACTION_MULTIPLE, keycode, repeatCount, metaState, - KeyCharacterMap.VIRTUAL_KEYBOARD, 0, KeyEvent.FLAG_FALLBACK, - InputDevice.SOURCE_KEYBOARD)); - } - while (movement > 0) { - if (DEBUG_TRACKBALL) Log.v(TAG, "Delivering fake DPAD: " - + keycode); - movement--; - curTime = SystemClock.uptimeMillis(); - enqueueInputEvent(new KeyEvent(curTime, curTime, - KeyEvent.ACTION_DOWN, keycode, 0, metaState, - KeyCharacterMap.VIRTUAL_KEYBOARD, 0, KeyEvent.FLAG_FALLBACK, - InputDevice.SOURCE_KEYBOARD)); - enqueueInputEvent(new KeyEvent(curTime, curTime, - KeyEvent.ACTION_UP, keycode, 0, metaState, - KeyCharacterMap.VIRTUAL_KEYBOARD, 0, KeyEvent.FLAG_FALLBACK, - InputDevice.SOURCE_KEYBOARD)); - } - mLastTrackballTime = curTime; - } - - // Unfortunately we can't tell whether the application consumed the keys, so - // we always consider the trackball event handled. - return EVENT_HANDLED; - } - - private int deliverGenericMotionEvent(QueuedInputEvent q) { - final MotionEvent event = (MotionEvent)q.mEvent; - if (mInputEventConsistencyVerifier != null) { - mInputEventConsistencyVerifier.onGenericMotionEvent(event, 0); - } - - int result = EVENT_POST_IME; - if (mView != null && mAdded && (q.mFlags & QueuedInputEvent.FLAG_DELIVER_POST_IME) == 0) { - if (LOCAL_LOGV) - Log.v(TAG, "Dispatching generic motion " + event + " to " + mView); - - // Dispatch to the IME before propagating down the view hierarchy. - result = dispatchImeInputEvent(q); - } - return result; - } - - private int deliverGenericMotionEventPostIme(QueuedInputEvent q) { - final MotionEvent event = (MotionEvent) q.mEvent; - final int source = event.getSource(); - final boolean isJoystick = event.isFromSource(InputDevice.SOURCE_CLASS_JOYSTICK); - final boolean isTouchNavigation = event.isFromSource(InputDevice.SOURCE_TOUCH_NAVIGATION); - - // If there is no view, then the event will not be handled. - if (mView == null || !mAdded) { - if (isJoystick) { - updateJoystickDirection(event, false); - } else if (isTouchNavigation) { - mSimulatedDpad.updateTouchNavigation(this, event, false); - } - return EVENT_NOT_HANDLED; - } - - // Deliver the event to the view. - if (mView.dispatchGenericMotionEvent(event)) { - if (isJoystick) { - updateJoystickDirection(event, false); - } else if (isTouchNavigation) { - mSimulatedDpad.updateTouchNavigation(this, event, false); - } - return EVENT_HANDLED; - } - - if (isJoystick) { - // Translate the joystick event into DPAD keys and try to deliver - // those. - updateJoystickDirection(event, true); - return EVENT_HANDLED; + public void cancel(MotionEvent event) { + update(event, false); + } + + private void update(MotionEvent event, boolean synthesizeNewKeys) { + final long time = event.getEventTime(); + final int metaState = event.getMetaState(); + final int deviceId = event.getDeviceId(); + final int source = event.getSource(); + + int xDirection = joystickAxisValueToDirection( + event.getAxisValue(MotionEvent.AXIS_HAT_X)); + if (xDirection == 0) { + xDirection = joystickAxisValueToDirection(event.getX()); + } + + int yDirection = joystickAxisValueToDirection( + event.getAxisValue(MotionEvent.AXIS_HAT_Y)); + if (yDirection == 0) { + yDirection = joystickAxisValueToDirection(event.getY()); + } + + if (xDirection != mLastXDirection) { + if (mLastXKeyCode != 0) { + removeMessages(MSG_ENQUEUE_X_AXIS_KEY_REPEAT); + enqueueInputEvent(new KeyEvent(time, time, + KeyEvent.ACTION_UP, mLastXKeyCode, 0, metaState, + deviceId, 0, KeyEvent.FLAG_FALLBACK, source)); + mLastXKeyCode = 0; + } + + mLastXDirection = xDirection; + + if (xDirection != 0 && synthesizeNewKeys) { + mLastXKeyCode = xDirection > 0 + ? KeyEvent.KEYCODE_DPAD_RIGHT : KeyEvent.KEYCODE_DPAD_LEFT; + final KeyEvent e = new KeyEvent(time, time, + KeyEvent.ACTION_DOWN, mLastXKeyCode, 0, metaState, + deviceId, 0, KeyEvent.FLAG_FALLBACK, source); + enqueueInputEvent(e); + Message m = obtainMessage(MSG_ENQUEUE_X_AXIS_KEY_REPEAT, e); + m.setAsynchronous(true); + mHandler.sendMessageDelayed(m, ViewConfiguration.getKeyRepeatTimeout()); + } + } + + if (yDirection != mLastYDirection) { + if (mLastYKeyCode != 0) { + removeMessages(MSG_ENQUEUE_Y_AXIS_KEY_REPEAT); + enqueueInputEvent(new KeyEvent(time, time, + KeyEvent.ACTION_UP, mLastYKeyCode, 0, metaState, + deviceId, 0, KeyEvent.FLAG_FALLBACK, source)); + mLastYKeyCode = 0; + } + + mLastYDirection = yDirection; + + if (yDirection != 0 && synthesizeNewKeys) { + mLastYKeyCode = yDirection > 0 + ? KeyEvent.KEYCODE_DPAD_DOWN : KeyEvent.KEYCODE_DPAD_UP; + final KeyEvent e = new KeyEvent(time, time, + KeyEvent.ACTION_DOWN, mLastYKeyCode, 0, metaState, + deviceId, 0, KeyEvent.FLAG_FALLBACK, source); + enqueueInputEvent(e); + Message m = obtainMessage(MSG_ENQUEUE_Y_AXIS_KEY_REPEAT, e); + m.setAsynchronous(true); + sendMessageDelayed(m, ViewConfiguration.getKeyRepeatTimeout()); + } + } } - if (isTouchNavigation) { - mSimulatedDpad.updateTouchNavigation(this, event, true); - return EVENT_HANDLED; + + private int joystickAxisValueToDirection(float value) { + if (value >= 0.5f) { + return 1; + } else if (value <= -0.5f) { + return -1; + } else { + return 0; + } } - return EVENT_NOT_HANDLED; } - private void updateJoystickDirection(MotionEvent event, boolean synthesizeNewKeys) { - final long time = event.getEventTime(); - final int metaState = event.getMetaState(); - final int deviceId = event.getDeviceId(); - final int source = event.getSource(); + /** + * Creates dpad events from unhandled touch navigation movements. + */ + final class SyntheticTouchNavigationHandler extends Handler { + private static final String LOCAL_TAG = "SyntheticTouchNavigationHandler"; + private static final boolean LOCAL_DEBUG = false; + + // Assumed nominal width and height in millimeters of a touch navigation pad, + // if no resolution information is available from the input system. + private static final float DEFAULT_WIDTH_MILLIMETERS = 48; + private static final float DEFAULT_HEIGHT_MILLIMETERS = 48; + + /* TODO: These constants should eventually be moved to ViewConfiguration. */ + + // Tap timeout in milliseconds. + private static final int TAP_TIMEOUT = 250; + + // The maximum distance traveled for a gesture to be considered a tap in millimeters. + private static final int TAP_SLOP_MILLIMETERS = 5; + + // The nominal distance traveled to move by one unit. + private static final int TICK_DISTANCE_MILLIMETERS = 12; + + // Minimum and maximum fling velocity in ticks per second. + // The minimum velocity should be set such that we perform enough ticks per + // second that the fling appears to be fluid. For example, if we set the minimum + // to 2 ticks per second, then there may be up to half a second delay between the next + // to last and last ticks which is noticeably discrete and jerky. This value should + // probably not be set to anything less than about 4. + // If fling accuracy is a problem then consider tuning the tick distance instead. + private static final float MIN_FLING_VELOCITY_TICKS_PER_SECOND = 6f; + private static final float MAX_FLING_VELOCITY_TICKS_PER_SECOND = 20f; + + // Fling velocity decay factor applied after each new key is emitted. + // This parameter controls the deceleration and overall duration of the fling. + // The fling stops automatically when its velocity drops below the minimum + // fling velocity defined above. + private static final float FLING_TICK_DECAY = 0.8f; + + /* The input device that we are tracking. */ + + private int mCurrentDeviceId = -1; + private int mCurrentSource; + private boolean mCurrentDeviceSupported; + + /* Configuration for the current input device. */ + + // The tap timeout and scaled slop. + private int mConfigTapTimeout; + private float mConfigTapSlop; + + // The scaled tick distance. A movement of this amount should generally translate + // into a single dpad event in a given direction. + private float mConfigTickDistance; + + // The minimum and maximum scaled fling velocity. + private float mConfigMinFlingVelocity; + private float mConfigMaxFlingVelocity; + + /* Tracking state. */ + + // The velocity tracker for detecting flings. + private VelocityTracker mVelocityTracker; + + // The active pointer id, or -1 if none. + private int mActivePointerId = -1; + + // Time and location where tracking started. + private long mStartTime; + private float mStartX; + private float mStartY; + + // Most recently observed position. + private float mLastX; + private float mLastY; + + // Accumulated movement delta since the last direction key was sent. + private float mAccumulatedX; + private float mAccumulatedY; + + // Set to true if any movement was delivered to the app. + // Implies that tap slop was exceeded. + private boolean mConsumedMovement; + + // The most recently sent key down event. + // The keycode remains set until the direction changes or a fling ends + // so that repeated key events may be generated as required. + private long mPendingKeyDownTime; + private int mPendingKeyCode = KeyEvent.KEYCODE_UNKNOWN; + private int mPendingKeyRepeatCount; + private int mPendingKeyMetaState; + + // The current fling velocity while a fling is in progress. + private boolean mFlinging; + private float mFlingVelocity; + + public SyntheticTouchNavigationHandler() { + super(true); + } + + public void process(MotionEvent event) { + // Update the current device information. + final long time = event.getEventTime(); + final int deviceId = event.getDeviceId(); + final int source = event.getSource(); + if (mCurrentDeviceId != deviceId || mCurrentSource != source) { + finishKeys(time); + finishTracking(time); + mCurrentDeviceId = deviceId; + mCurrentSource = source; + mCurrentDeviceSupported = false; + InputDevice device = event.getDevice(); + if (device != null) { + // In order to support an input device, we must know certain + // characteristics about it, such as its size and resolution. + InputDevice.MotionRange xRange = device.getMotionRange(MotionEvent.AXIS_X); + InputDevice.MotionRange yRange = device.getMotionRange(MotionEvent.AXIS_Y); + if (xRange != null && yRange != null) { + mCurrentDeviceSupported = true; + + // Infer the resolution if it not actually known. + float xRes = xRange.getResolution(); + if (xRes <= 0) { + xRes = xRange.getRange() / DEFAULT_WIDTH_MILLIMETERS; + } + float yRes = yRange.getResolution(); + if (yRes <= 0) { + yRes = yRange.getRange() / DEFAULT_HEIGHT_MILLIMETERS; + } + float nominalRes = (xRes + yRes) * 0.5f; + + // Precompute all of the configuration thresholds we will need. + mConfigTapTimeout = TAP_TIMEOUT; + mConfigTapSlop = TAP_SLOP_MILLIMETERS * nominalRes; + mConfigTickDistance = TICK_DISTANCE_MILLIMETERS * nominalRes; + mConfigMinFlingVelocity = + MIN_FLING_VELOCITY_TICKS_PER_SECOND * mConfigTickDistance; + mConfigMaxFlingVelocity = + MAX_FLING_VELOCITY_TICKS_PER_SECOND * mConfigTickDistance; + + if (LOCAL_DEBUG) { + Log.d(LOCAL_TAG, "Configured device " + mCurrentDeviceId + + " (" + Integer.toHexString(mCurrentSource) + "): " + + "mConfigTapTimeout=" + mConfigTapTimeout + + ", mConfigTapSlop=" + mConfigTapSlop + + ", mConfigTickDistance=" + mConfigTickDistance + + ", mConfigMinFlingVelocity=" + mConfigMinFlingVelocity + + ", mConfigMaxFlingVelocity=" + mConfigMaxFlingVelocity); + } + } + } + } + if (!mCurrentDeviceSupported) { + return; + } + + // Handle the event. + final int action = event.getActionMasked(); + switch (action) { + case MotionEvent.ACTION_DOWN: { + boolean caughtFling = mFlinging; + finishKeys(time); + finishTracking(time); + mActivePointerId = event.getPointerId(0); + mVelocityTracker = VelocityTracker.obtain(); + mVelocityTracker.addMovement(event); + mStartTime = time; + mStartX = event.getX(); + mStartY = event.getY(); + mLastX = mStartX; + mLastY = mStartY; + mAccumulatedX = 0; + mAccumulatedY = 0; + + // If we caught a fling, then pretend that the tap slop has already + // been exceeded to suppress taps whose only purpose is to stop the fling. + mConsumedMovement = caughtFling; + break; + } + + case MotionEvent.ACTION_MOVE: + case MotionEvent.ACTION_UP: { + if (mActivePointerId < 0) { + break; + } + final int index = event.findPointerIndex(mActivePointerId); + if (index < 0) { + finishKeys(time); + finishTracking(time); + break; + } - int xDirection = joystickAxisValueToDirection(event.getAxisValue(MotionEvent.AXIS_HAT_X)); - if (xDirection == 0) { - xDirection = joystickAxisValueToDirection(event.getX()); + mVelocityTracker.addMovement(event); + final float x = event.getX(index); + final float y = event.getY(index); + mAccumulatedX += x - mLastX; + mAccumulatedY += y - mLastY; + mLastX = x; + mLastY = y; + + // Consume any accumulated movement so far. + final int metaState = event.getMetaState(); + consumeAccumulatedMovement(time, metaState); + + // Detect taps and flings. + if (action == MotionEvent.ACTION_UP) { + if (!mConsumedMovement + && Math.hypot(mLastX - mStartX, mLastY - mStartY) < mConfigTapSlop + && time <= mStartTime + mConfigTapTimeout) { + // It's a tap! + finishKeys(time); + sendKeyDownOrRepeat(time, KeyEvent.KEYCODE_DPAD_CENTER, metaState); + sendKeyUp(time); + } else if (mConsumedMovement + && mPendingKeyCode != KeyEvent.KEYCODE_UNKNOWN) { + // It might be a fling. + mVelocityTracker.computeCurrentVelocity(1000, mConfigMaxFlingVelocity); + final float vx = mVelocityTracker.getXVelocity(mActivePointerId); + final float vy = mVelocityTracker.getYVelocity(mActivePointerId); + if (!startFling(time, vx, vy)) { + finishKeys(time); + } + } + finishTracking(time); + } + break; + } + + case MotionEvent.ACTION_CANCEL: { + finishKeys(time); + finishTracking(time); + break; + } + } + } + + public void cancel(MotionEvent event) { + if (mCurrentDeviceId == event.getDeviceId() + && mCurrentSource == event.getSource()) { + final long time = event.getEventTime(); + finishKeys(time); + finishTracking(time); + } } - int yDirection = joystickAxisValueToDirection(event.getAxisValue(MotionEvent.AXIS_HAT_Y)); - if (yDirection == 0) { - yDirection = joystickAxisValueToDirection(event.getY()); + private void finishKeys(long time) { + cancelFling(); + sendKeyUp(time); } - if (xDirection != mLastJoystickXDirection) { - if (mLastJoystickXKeyCode != 0) { - mHandler.removeMessages(MSG_ENQUEUE_X_AXIS_KEY_REPEAT); - enqueueInputEvent(new KeyEvent(time, time, - KeyEvent.ACTION_UP, mLastJoystickXKeyCode, 0, metaState, - deviceId, 0, KeyEvent.FLAG_FALLBACK, source)); - mLastJoystickXKeyCode = 0; + private void finishTracking(long time) { + if (mActivePointerId >= 0) { + mActivePointerId = -1; + mVelocityTracker.recycle(); + mVelocityTracker = null; } + } - mLastJoystickXDirection = xDirection; + private void consumeAccumulatedMovement(long time, int metaState) { + final float absX = Math.abs(mAccumulatedX); + final float absY = Math.abs(mAccumulatedY); + if (absX >= absY) { + if (absX >= mConfigTickDistance) { + mAccumulatedX = consumeAccumulatedMovement(time, metaState, mAccumulatedX, + KeyEvent.KEYCODE_DPAD_LEFT, KeyEvent.KEYCODE_DPAD_RIGHT); + mAccumulatedY = 0; + mConsumedMovement = true; + } + } else { + if (absY >= mConfigTickDistance) { + mAccumulatedY = consumeAccumulatedMovement(time, metaState, mAccumulatedY, + KeyEvent.KEYCODE_DPAD_UP, KeyEvent.KEYCODE_DPAD_DOWN); + mAccumulatedX = 0; + mConsumedMovement = true; + } + } + } - if (xDirection != 0 && synthesizeNewKeys) { - mLastJoystickXKeyCode = xDirection > 0 - ? KeyEvent.KEYCODE_DPAD_RIGHT : KeyEvent.KEYCODE_DPAD_LEFT; - final KeyEvent e = new KeyEvent(time, time, - KeyEvent.ACTION_DOWN, mLastJoystickXKeyCode, 0, metaState, - deviceId, 0, KeyEvent.FLAG_FALLBACK, source); - enqueueInputEvent(e); - Message m = mHandler.obtainMessage(MSG_ENQUEUE_X_AXIS_KEY_REPEAT, e); - m.setAsynchronous(true); - mHandler.sendMessageDelayed(m, mViewConfiguration.getKeyRepeatTimeout()); + private float consumeAccumulatedMovement(long time, int metaState, + float accumulator, int negativeKeyCode, int positiveKeyCode) { + while (accumulator <= -mConfigTickDistance) { + sendKeyDownOrRepeat(time, negativeKeyCode, metaState); + accumulator += mConfigTickDistance; + } + while (accumulator >= mConfigTickDistance) { + sendKeyDownOrRepeat(time, positiveKeyCode, metaState); + accumulator -= mConfigTickDistance; } + return accumulator; } - if (yDirection != mLastJoystickYDirection) { - if (mLastJoystickYKeyCode != 0) { - mHandler.removeMessages(MSG_ENQUEUE_Y_AXIS_KEY_REPEAT); - enqueueInputEvent(new KeyEvent(time, time, - KeyEvent.ACTION_UP, mLastJoystickYKeyCode, 0, metaState, - deviceId, 0, KeyEvent.FLAG_FALLBACK, source)); - mLastJoystickYKeyCode = 0; + private void sendKeyDownOrRepeat(long time, int keyCode, int metaState) { + if (mPendingKeyCode != keyCode) { + sendKeyUp(time); + mPendingKeyDownTime = time; + mPendingKeyCode = keyCode; + mPendingKeyRepeatCount = 0; + } else { + mPendingKeyRepeatCount += 1; } + mPendingKeyMetaState = metaState; - mLastJoystickYDirection = yDirection; + // Note: Normally we would pass FLAG_LONG_PRESS when the repeat count is 1 + // but it doesn't quite make sense when simulating the events in this way. + if (LOCAL_DEBUG) { + Log.d(LOCAL_TAG, "Sending key down: keyCode=" + mPendingKeyCode + + ", repeatCount=" + mPendingKeyRepeatCount + + ", metaState=" + Integer.toHexString(mPendingKeyMetaState)); + } + enqueueInputEvent(new KeyEvent(mPendingKeyDownTime, time, + KeyEvent.ACTION_DOWN, mPendingKeyCode, mPendingKeyRepeatCount, + mPendingKeyMetaState, mCurrentDeviceId, + KeyEvent.FLAG_FALLBACK, mCurrentSource)); + } - if (yDirection != 0 && synthesizeNewKeys) { - mLastJoystickYKeyCode = yDirection > 0 - ? KeyEvent.KEYCODE_DPAD_DOWN : KeyEvent.KEYCODE_DPAD_UP; - final KeyEvent e = new KeyEvent(time, time, - KeyEvent.ACTION_DOWN, mLastJoystickYKeyCode, 0, metaState, - deviceId, 0, KeyEvent.FLAG_FALLBACK, source); - enqueueInputEvent(e); - Message m = mHandler.obtainMessage(MSG_ENQUEUE_Y_AXIS_KEY_REPEAT, e); - m.setAsynchronous(true); - mHandler.sendMessageDelayed(m, mViewConfiguration.getKeyRepeatTimeout()); + private void sendKeyUp(long time) { + if (mPendingKeyCode != KeyEvent.KEYCODE_UNKNOWN) { + if (LOCAL_DEBUG) { + Log.d(LOCAL_TAG, "Sending key up: keyCode=" + mPendingKeyCode + + ", metaState=" + Integer.toHexString(mPendingKeyMetaState)); + } + enqueueInputEvent(new KeyEvent(mPendingKeyDownTime, time, + KeyEvent.ACTION_UP, mPendingKeyCode, 0, mPendingKeyMetaState, + mCurrentDeviceId, 0, KeyEvent.FLAG_FALLBACK, + mCurrentSource)); + mPendingKeyCode = KeyEvent.KEYCODE_UNKNOWN; } } - } - private static int joystickAxisValueToDirection(float value) { - if (value >= 0.5f) { - return 1; - } else if (value <= -0.5f) { - return -1; - } else { - return 0; + private boolean startFling(long time, float vx, float vy) { + if (LOCAL_DEBUG) { + Log.d(LOCAL_TAG, "Considering fling: vx=" + vx + ", vy=" + vy + + ", min=" + mConfigMinFlingVelocity); + } + + // Flings must be oriented in the same direction as the preceding movements. + switch (mPendingKeyCode) { + case KeyEvent.KEYCODE_DPAD_LEFT: + if (-vx >= mConfigMinFlingVelocity + && Math.abs(vy) < mConfigMinFlingVelocity) { + mFlingVelocity = -vx; + break; + } + return false; + + case KeyEvent.KEYCODE_DPAD_RIGHT: + if (vx >= mConfigMinFlingVelocity + && Math.abs(vy) < mConfigMinFlingVelocity) { + mFlingVelocity = vx; + break; + } + return false; + + case KeyEvent.KEYCODE_DPAD_UP: + if (-vy >= mConfigMinFlingVelocity + && Math.abs(vx) < mConfigMinFlingVelocity) { + mFlingVelocity = -vy; + break; + } + return false; + + case KeyEvent.KEYCODE_DPAD_DOWN: + if (vy >= mConfigMinFlingVelocity + && Math.abs(vx) < mConfigMinFlingVelocity) { + mFlingVelocity = vy; + break; + } + return false; + } + + // Post the first fling event. + mFlinging = postFling(time); + return mFlinging; } + + private boolean postFling(long time) { + // The idea here is to estimate the time when the pointer would have + // traveled one tick distance unit given the current fling velocity. + // This effect creates continuity of motion. + if (mFlingVelocity >= mConfigMinFlingVelocity) { + long delay = (long)(mConfigTickDistance / mFlingVelocity * 1000); + postAtTime(mFlingRunnable, time + delay); + if (LOCAL_DEBUG) { + Log.d(LOCAL_TAG, "Posted fling: velocity=" + + mFlingVelocity + ", delay=" + delay + + ", keyCode=" + mPendingKeyCode); + } + return true; + } + return false; + } + + private void cancelFling() { + if (mFlinging) { + removeCallbacks(mFlingRunnable); + mFlinging = false; + } + } + + private final Runnable mFlingRunnable = new Runnable() { + @Override + public void run() { + final long time = SystemClock.uptimeMillis(); + sendKeyDownOrRepeat(time, mPendingKeyCode, mPendingKeyMetaState); + mFlingVelocity *= FLING_TICK_DECAY; + if (!postFling(time)) { + mFlinging = false; + finishKeys(time); + } + } + }; } /** @@ -3800,136 +4813,6 @@ public final class ViewRootImpl implements ViewParent, return false; } - private int deliverKeyEvent(QueuedInputEvent q) { - final KeyEvent event = (KeyEvent)q.mEvent; - if (mInputEventConsistencyVerifier != null) { - mInputEventConsistencyVerifier.onKeyEvent(event, 0); - } - - int result = EVENT_POST_IME; - if (mView != null && mAdded && (q.mFlags & QueuedInputEvent.FLAG_DELIVER_POST_IME) == 0) { - if (LOCAL_LOGV) Log.v(TAG, "Dispatching key " + event + " to " + mView); - - // Perform predispatching before the IME. - if (mView.dispatchKeyEventPreIme(event)) { - return EVENT_HANDLED; - } - - // Dispatch to the IME before propagating down the view hierarchy. - result = dispatchImeInputEvent(q); - } - return result; - } - - private int deliverKeyEventPostIme(QueuedInputEvent q) { - final KeyEvent event = (KeyEvent)q.mEvent; - - // If the view went away, then the event will not be handled. - if (mView == null || !mAdded) { - return EVENT_NOT_HANDLED; - } - - // If the key's purpose is to exit touch mode then we consume it and consider it handled. - if (checkForLeavingTouchModeAndConsume(event)) { - return EVENT_HANDLED; - } - - // Make sure the fallback event policy sees all keys that will be delivered to the - // view hierarchy. - mFallbackEventHandler.preDispatchKeyEvent(event); - - // Deliver the key to the view hierarchy. - if (mView.dispatchKeyEvent(event)) { - return EVENT_HANDLED; - } - - // If the Control modifier is held, try to interpret the key as a shortcut. - if (event.getAction() == KeyEvent.ACTION_DOWN - && event.isCtrlPressed() - && event.getRepeatCount() == 0 - && !KeyEvent.isModifierKey(event.getKeyCode())) { - if (mView.dispatchKeyShortcutEvent(event)) { - return EVENT_HANDLED; - } - } - - // Apply the fallback event policy. - if (mFallbackEventHandler.dispatchKeyEvent(event)) { - return EVENT_HANDLED; - } - - // Handle automatic focus changes. - if (event.getAction() == KeyEvent.ACTION_DOWN) { - int direction = 0; - switch (event.getKeyCode()) { - case KeyEvent.KEYCODE_DPAD_LEFT: - if (event.hasNoModifiers()) { - direction = View.FOCUS_LEFT; - } - break; - case KeyEvent.KEYCODE_DPAD_RIGHT: - if (event.hasNoModifiers()) { - direction = View.FOCUS_RIGHT; - } - break; - case KeyEvent.KEYCODE_DPAD_UP: - if (event.hasNoModifiers()) { - direction = View.FOCUS_UP; - } - break; - case KeyEvent.KEYCODE_DPAD_DOWN: - if (event.hasNoModifiers()) { - direction = View.FOCUS_DOWN; - } - break; - case KeyEvent.KEYCODE_TAB: - if (event.hasNoModifiers()) { - direction = View.FOCUS_FORWARD; - } else if (event.hasModifiers(KeyEvent.META_SHIFT_ON)) { - direction = View.FOCUS_BACKWARD; - } - break; - } - if (direction != 0) { - View focused = mView.findFocus(); - if (focused != null) { - View v = focused.focusSearch(direction); - if (v != null && v != focused) { - // do the math the get the interesting rect - // of previous focused into the coord system of - // newly focused view - focused.getFocusedRect(mTempRect); - if (mView instanceof ViewGroup) { - ((ViewGroup) mView).offsetDescendantRectToMyCoords( - focused, mTempRect); - ((ViewGroup) mView).offsetRectIntoDescendantCoords( - v, mTempRect); - } - if (v.requestFocus(direction, mTempRect)) { - playSoundEffect(SoundEffectConstants - .getContantForFocusDirection(direction)); - return EVENT_HANDLED; - } - } - - // Give the focused view a last chance to handle the dpad key. - if (mView.dispatchUnhandledMove(focused, direction)) { - return EVENT_HANDLED; - } - } else { - // find the best view to give focus to in this non-touch-mode with no-focus - View v = focusSearch(null, direction); - if (v != null && v.requestFocus(direction)) { - return EVENT_HANDLED; - } - } - } - } - - // Key was unhandled. - return EVENT_NOT_HANDLED; - } - /* drag/drop */ void setLocalDragState(Object obj) { mLocalDragState = obj; @@ -4361,13 +5244,25 @@ public final class ViewRootImpl implements ViewParent, * needing a queue on the application's side. */ private static final class QueuedInputEvent { - public static final int FLAG_DELIVER_POST_IME = 1; + public static final int FLAG_DELIVER_POST_IME = 1 << 0; + public static final int FLAG_DEFERRED = 1 << 1; + public static final int FLAG_FINISHED = 1 << 2; + public static final int FLAG_FINISHED_HANDLED = 1 << 3; + public static final int FLAG_RESYNTHESIZED = 1 << 4; public QueuedInputEvent mNext; public InputEvent mEvent; public InputEventReceiver mReceiver; public int mFlags; + + public boolean shouldSkipIme() { + if ((mFlags & FLAG_DELIVER_POST_IME) != 0) { + return true; + } + return mEvent instanceof MotionEvent + && mEvent.isFromSource(InputDevice.SOURCE_CLASS_POINTER); + } } private QueuedInputEvent obtainQueuedInputEvent(InputEvent event, @@ -4440,14 +5335,7 @@ public final class ViewRootImpl implements ViewParent, } void doProcessInputEvents() { - // Handle all of the available pending input events. Currently this will immediately - // process all of the events it can until it encounters one that must go through the IME. - // After that it will continue adding events to the active input queue but will wait for a - // response from the IME, regardless of whether that particular event needs it or not, in - // order to guarantee ordering consistency. This could be slightly improved by only - // queueing events whose source has previously encountered something that needs to be - // handled by the IME, and otherwise handling them immediately since we only need to - // guarantee ordering within a given source. + // Deliver all pending input events in the queue. while (mPendingInputEventHead != null) { QueuedInputEvent q = mPendingInputEventHead; mPendingInputEventHead = q.mNext; @@ -4460,25 +5348,7 @@ public final class ViewRootImpl implements ViewParent, Trace.traceCounter(Trace.TRACE_TAG_INPUT, mPendingInputEventQueueLengthCounterName, mPendingInputEventCount); - int result = deliverInputEvent(q); - - if (result == EVENT_HANDLED || result == EVENT_NOT_HANDLED) { - finishInputEvent(q, result == EVENT_HANDLED); - } else if (result == EVENT_PENDING_IME) { - enqueueActiveInputEvent(q); - } else { - q.mFlags |= QueuedInputEvent.FLAG_DELIVER_POST_IME; - // If the IME decided not to handle this event, and we have no events already being - // handled by the IME, go ahead and handle this one and then continue to the next - // input event. Otherwise, queue it up and handle it after whatever in front of it - // in the queue has been handled. - if (mActiveInputEventHead == null) { - result = deliverInputEventPostIme(q); - finishInputEvent(q, result == EVENT_HANDLED); - } else { - enqueueActiveInputEvent(q); - } - } + deliverInputEvent(q); } // We are done processing all input events that we can process right now @@ -4489,114 +5359,27 @@ public final class ViewRootImpl implements ViewParent, } } - private void enqueueActiveInputEvent(QueuedInputEvent q) { - if (mActiveInputEventHead == null) { - mActiveInputEventHead = q; - mActiveInputEventTail = q; - } else { - mActiveInputEventTail.mNext = q; - mActiveInputEventTail = q; - } - mActiveInputEventCount += 1; - Trace.traceCounter(Trace.TRACE_TAG_INPUT, mActiveInputEventQueueLengthCounterName, - mActiveInputEventCount); - } - - private QueuedInputEvent dequeueActiveInputEvent() { - return dequeueActiveInputEvent(mActiveInputEventHead); - } - - - private QueuedInputEvent dequeueActiveInputEvent(QueuedInputEvent q) { - QueuedInputEvent curr = mActiveInputEventHead; - QueuedInputEvent prev = null; - while (curr != null && curr != q) { - prev = curr; - curr = curr.mNext; - } - if (curr != null) { - if (mActiveInputEventHead == curr) { - mActiveInputEventHead = curr.mNext; - } else { - prev.mNext = curr.mNext; - } - if (mActiveInputEventTail == curr) { - mActiveInputEventTail = prev; - } - curr.mNext = null; - - mActiveInputEventCount -= 1; - Trace.traceCounter(Trace.TRACE_TAG_INPUT, mActiveInputEventQueueLengthCounterName, - mActiveInputEventCount); - } - return curr; - } - - private QueuedInputEvent findActiveInputEvent(int seq) { - QueuedInputEvent q = mActiveInputEventHead; - while (q != null && q.mEvent.getSequenceNumber() != seq) { - q = q.mNext; - } - return q; - } - - int dispatchImeInputEvent(QueuedInputEvent q) { - if (mLastWasImTarget) { - InputMethodManager imm = InputMethodManager.peekInstance(); - if (imm != null) { - final InputEvent event = q.mEvent; - final int seq = event.getSequenceNumber(); - if (DEBUG_IMF) - Log.v(TAG, "Sending input event to IME: seq=" + seq + " event=" + event); - return imm.dispatchInputEvent(mView.getContext(), seq, event, - mInputMethodCallback); - } - } - return EVENT_POST_IME; - } - - void handleImeFinishedEvent(int seq, boolean handled) { - QueuedInputEvent q = findActiveInputEvent(seq); - if (q != null) { - if (DEBUG_IMF) { - Log.v(TAG, "IME finished event: seq=" + seq - + " handled=" + handled + " event=" + q); + private void deliverInputEvent(QueuedInputEvent q) { + Trace.traceBegin(Trace.TRACE_TAG_VIEW, "deliverInputEvent"); + try { + if (mInputEventConsistencyVerifier != null) { + mInputEventConsistencyVerifier.onInputEvent(q.mEvent, 0); } - if (handled) { - dequeueActiveInputEvent(q); - finishInputEvent(q, true); + InputStage stage = q.shouldSkipIme() ? mFirstPostImeInputStage : mFirstInputStage; + if (stage != null) { + stage.deliver(q); } else { - q.mFlags |= QueuedInputEvent.FLAG_DELIVER_POST_IME; - } - - - // Flush all of the input events that are no longer waiting on the IME - while (mActiveInputEventHead != null && (mActiveInputEventHead.mFlags & - QueuedInputEvent.FLAG_DELIVER_POST_IME) != 0) { - q = dequeueActiveInputEvent(); - // If the window doesn't currently have input focus, then drop - // this event. This could be an event that came back from the - // IME dispatch but the window has lost focus in the meantime. - handled = false; - if (!mAttachInfo.mHasWindowFocus && !isTerminalInputEvent(q.mEvent)) { - Slog.w(TAG, "Dropping event due to no window focus: " + q.mEvent); - } else { - handled = (deliverInputEventPostIme(q) == EVENT_HANDLED); - } - finishInputEvent(q, handled); - } - } else { - if (DEBUG_IMF) { - Log.v(TAG, "IME finished event: seq=" + seq - + " handled=" + handled + ", event not found!"); + finishInputEvent(q); } + } finally { + Trace.traceEnd(Trace.TRACE_TAG_VIEW); } - } - private void finishInputEvent(QueuedInputEvent q, boolean handled) { + private void finishInputEvent(QueuedInputEvent q) { if (q.mReceiver != null) { + boolean handled = (q.mFlags & QueuedInputEvent.FLAG_FINISHED_HANDLED) != 0; q.mReceiver.finishInputEvent(q.mEvent, handled); } else { q.mEvent.recycleIfNeededAfterDispatch(); @@ -4605,7 +5388,7 @@ public final class ViewRootImpl implements ViewParent, recycleQueuedInputEvent(q); } - private static boolean isTerminalInputEvent(InputEvent event) { + static boolean isTerminalInputEvent(InputEvent event) { if (event instanceof KeyEvent) { final KeyEvent keyEvent = (KeyEvent)event; return keyEvent.getAction() == KeyEvent.ACTION_UP; @@ -5141,22 +5924,6 @@ public final class ViewRootImpl implements ViewParent, ((RootViewSurfaceTaker)mView).setSurfaceKeepScreenOn(screenOn); } } - - static final class InputMethodCallback implements InputMethodManager.FinishedEventCallback { - private WeakReference<ViewRootImpl> mViewAncestor; - - public InputMethodCallback(ViewRootImpl viewAncestor) { - mViewAncestor = new WeakReference<ViewRootImpl>(viewAncestor); - } - - @Override - public void finishedEvent(int seq, boolean handled) { - final ViewRootImpl viewAncestor = mViewAncestor.get(); - if (viewAncestor != null) { - viewAncestor.handleImeFinishedEvent(seq, handled); - } - } - } static class W extends IWindow.Stub { private final WeakReference<ViewRootImpl> mViewAncestor; @@ -5304,176 +6071,6 @@ public final class ViewRootImpl implements ViewParent, } } - /** - * Maintains state information for a single trackball axis, generating - * discrete (DPAD) movements based on raw trackball motion. - */ - static final class TrackballAxis { - /** - * The maximum amount of acceleration we will apply. - */ - static final float MAX_ACCELERATION = 20; - - /** - * The maximum amount of time (in milliseconds) between events in order - * for us to consider the user to be doing fast trackball movements, - * and thus apply an acceleration. - */ - static final long FAST_MOVE_TIME = 150; - - /** - * Scaling factor to the time (in milliseconds) between events to how - * much to multiple/divide the current acceleration. When movement - * is < FAST_MOVE_TIME this multiplies the acceleration; when > - * FAST_MOVE_TIME it divides it. - */ - static final float ACCEL_MOVE_SCALING_FACTOR = (1.0f/40); - - float position; - float absPosition; - float acceleration = 1; - long lastMoveTime = 0; - int step; - int dir; - int nonAccelMovement; - - void reset(int _step) { - position = 0; - acceleration = 1; - lastMoveTime = 0; - step = _step; - dir = 0; - } - - /** - * Add trackball movement into the state. If the direction of movement - * has been reversed, the state is reset before adding the - * movement (so that you don't have to compensate for any previously - * collected movement before see the result of the movement in the - * new direction). - * - * @return Returns the absolute value of the amount of movement - * collected so far. - */ - float collect(float off, long time, String axis) { - long normTime; - if (off > 0) { - normTime = (long)(off * FAST_MOVE_TIME); - if (dir < 0) { - if (DEBUG_TRACKBALL) Log.v(TAG, axis + " reversed to positive!"); - position = 0; - step = 0; - acceleration = 1; - lastMoveTime = 0; - } - dir = 1; - } else if (off < 0) { - normTime = (long)((-off) * FAST_MOVE_TIME); - if (dir > 0) { - if (DEBUG_TRACKBALL) Log.v(TAG, axis + " reversed to negative!"); - position = 0; - step = 0; - acceleration = 1; - lastMoveTime = 0; - } - dir = -1; - } else { - normTime = 0; - } - - // The number of milliseconds between each movement that is - // considered "normal" and will not result in any acceleration - // or deceleration, scaled by the offset we have here. - if (normTime > 0) { - long delta = time - lastMoveTime; - lastMoveTime = time; - float acc = acceleration; - if (delta < normTime) { - // The user is scrolling rapidly, so increase acceleration. - float scale = (normTime-delta) * ACCEL_MOVE_SCALING_FACTOR; - if (scale > 1) acc *= scale; - if (DEBUG_TRACKBALL) Log.v(TAG, axis + " accelerate: off=" - + off + " normTime=" + normTime + " delta=" + delta - + " scale=" + scale + " acc=" + acc); - acceleration = acc < MAX_ACCELERATION ? acc : MAX_ACCELERATION; - } else { - // The user is scrolling slowly, so decrease acceleration. - float scale = (delta-normTime) * ACCEL_MOVE_SCALING_FACTOR; - if (scale > 1) acc /= scale; - if (DEBUG_TRACKBALL) Log.v(TAG, axis + " deccelerate: off=" - + off + " normTime=" + normTime + " delta=" + delta - + " scale=" + scale + " acc=" + acc); - acceleration = acc > 1 ? acc : 1; - } - } - position += off; - return (absPosition = Math.abs(position)); - } - - /** - * Generate the number of discrete movement events appropriate for - * the currently collected trackball movement. - * - * @param precision The minimum movement required to generate the - * first discrete movement. - * - * @return Returns the number of discrete movements, either positive - * or negative, or 0 if there is not enough trackball movement yet - * for a discrete movement. - */ - int generate(float precision) { - int movement = 0; - nonAccelMovement = 0; - do { - final int dir = position >= 0 ? 1 : -1; - switch (step) { - // If we are going to execute the first step, then we want - // to do this as soon as possible instead of waiting for - // a full movement, in order to make things look responsive. - case 0: - if (absPosition < precision) { - return movement; - } - movement += dir; - nonAccelMovement += dir; - step = 1; - break; - // If we have generated the first movement, then we need - // to wait for the second complete trackball motion before - // generating the second discrete movement. - case 1: - if (absPosition < 2) { - return movement; - } - movement += dir; - nonAccelMovement += dir; - position += dir > 0 ? -2 : 2; - absPosition = Math.abs(position); - step = 2; - break; - // After the first two, we generate discrete movements - // consistently with the trackball, applying an acceleration - // if the trackball is moving quickly. This is a simple - // acceleration on top of what we already compute based - // on how quickly the wheel is being turned, to apply - // a longer increasing acceleration to continuous movement - // in one direction. - default: - if (absPosition < 1) { - return movement; - } - movement += dir; - position += dir >= 0 ? -1 : 1; - absPosition = Math.abs(position); - float acc = acceleration; - acc *= 1.1f; - acceleration = acc < MAX_ACCELERATION ? acc : acceleration; - break; - } - } while (true); - } - } - public static final class CalledFromWrongThreadException extends AndroidRuntimeException { public CalledFromWrongThreadException(String msg) { super(msg); diff --git a/core/java/android/view/WindowManagerGlobal.java b/core/java/android/view/WindowManagerGlobal.java index 7eb26fa5d182..0ff46e966288 100644 --- a/core/java/android/view/WindowManagerGlobal.java +++ b/core/java/android/view/WindowManagerGlobal.java @@ -136,11 +136,11 @@ public final class WindowManagerGlobal { } } - public static IWindowSession getWindowSession(Looper mainLooper) { + public static IWindowSession getWindowSession() { synchronized (WindowManagerGlobal.class) { if (sWindowSession == null) { try { - InputMethodManager imm = InputMethodManager.getInstance(mainLooper); + InputMethodManager imm = InputMethodManager.getInstance(); IWindowManager windowManager = getWindowManagerService(); sWindowSession = windowManager.openSession( imm.getClient(), imm.getInputContext()); @@ -351,7 +351,7 @@ public final class WindowManagerGlobal { View view = root.getView(); if (view != null) { - InputMethodManager imm = InputMethodManager.getInstance(view.getContext()); + InputMethodManager imm = InputMethodManager.getInstance(); if (imm != null) { imm.windowDismissed(mViews[index].getWindowToken()); } diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 855b6d4fc126..4df4734cd98d 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -34,9 +34,11 @@ import android.os.Message; import android.os.RemoteException; import android.os.ResultReceiver; import android.os.ServiceManager; -import android.os.SystemClock; +import android.os.Trace; import android.text.style.SuggestionSpan; import android.util.Log; +import android.util.Pools.Pool; +import android.util.Pools.SimplePool; import android.util.PrintWriterPrinter; import android.util.Printer; import android.view.InputChannel; @@ -45,6 +47,7 @@ import android.view.InputEventSender; import android.view.KeyEvent; import android.view.View; import android.view.ViewRootImpl; +import android.util.SparseArray; import java.io.FileDescriptor; import java.io.PrintWriter; @@ -200,8 +203,9 @@ public final class InputMethodManager { static final boolean DEBUG = false; static final String TAG = "InputMethodManager"; - static final Object mInstanceSync = new Object(); - static InputMethodManager mInstance; + static final String PENDING_EVENT_COUNTER = "aq:imm"; + + static InputMethodManager sInstance; /** * @hide Flag for IInputMethodManager.windowGainedFocus: a view in @@ -232,7 +236,14 @@ public final class InputMethodManager { */ static final long INPUT_METHOD_NOT_RESPONDING_TIMEOUT = 2500; - private static final int MAX_PENDING_EVENT_POOL_SIZE = 4; + /** @hide */ + public static final int DISPATCH_IN_PROGRESS = -1; + + /** @hide */ + public static final int DISPATCH_NOT_HANDLED = 0; + + /** @hide */ + public static final int DISPATCH_HANDLED = 1; final IInputMethodManager mService; final Looper mMainLooper; @@ -323,10 +334,8 @@ public final class InputMethodManager { InputChannel mCurChannel; ImeInputEventSender mCurSender; - PendingEvent mPendingEventPool; - int mPendingEventPoolSize; - PendingEvent mPendingEventHead; - PendingEvent mPendingEventTail; + final Pool<PendingEvent> mPendingEventPool = new SimplePool<PendingEvent>(20); + final SparseArray<PendingEvent> mPendingEvents = new SparseArray<PendingEvent>(20); // ----------------------------------------------------------- @@ -334,8 +343,10 @@ public final class InputMethodManager { static final int MSG_BIND = 2; static final int MSG_UNBIND = 3; static final int MSG_SET_ACTIVE = 4; - static final int MSG_EVENT_TIMEOUT = 5; - + static final int MSG_SEND_INPUT_EVENT = 5; + static final int MSG_TIMEOUT_INPUT_EVENT = 6; + static final int MSG_FLUSH_INPUT_EVENT = 7; + class H extends Handler { H(Looper looper) { super(looper, null, true); @@ -453,15 +464,16 @@ public final class InputMethodManager { } return; } - case MSG_EVENT_TIMEOUT: { - // Even though the message contains both the sequence number - // and the PendingEvent object itself, we only pass the - // sequence number to the timeoutEvent function because it's - // possible for the PendingEvent object to be dequeued and - // recycled concurrently. To avoid a possible race, we make - // a point of always looking up the PendingEvent within the - // queue given only the sequence number of the event. - timeoutEvent(msg.arg1); + case MSG_SEND_INPUT_EVENT: { + sendInputEventAndReportResultOnMainLooper((PendingEvent)msg.obj); + return; + } + case MSG_TIMEOUT_INPUT_EVENT: { + finishedInputEvent(msg.arg1, false, true); + return; + } + case MSG_FLUSH_INPUT_EVENT: { + finishedInputEvent(msg.arg1, false, false); return; } } @@ -538,10 +550,6 @@ public final class InputMethodManager { mH = new H(looper); mIInputContext = new ControlledInputConnectionWrapper(looper, mDummyInputConnection, this); - - if (mInstance == null) { - mInstance = this; - } } /** @@ -549,25 +557,15 @@ public final class InputMethodManager { * doesn't already exist. * @hide */ - static public InputMethodManager getInstance(Context context) { - return getInstance(context.getMainLooper()); - } - - /** - * Internally, the input method manager can't be context-dependent, so - * we have this here for the places that need it. - * @hide - */ - static public InputMethodManager getInstance(Looper mainLooper) { - synchronized (mInstanceSync) { - if (mInstance != null) { - return mInstance; + public static InputMethodManager getInstance() { + synchronized (InputMethodManager.class) { + if (sInstance == null) { + IBinder b = ServiceManager.getService(Context.INPUT_METHOD_SERVICE); + IInputMethodManager service = IInputMethodManager.Stub.asInterface(b); + sInstance = new InputMethodManager(service, Looper.getMainLooper()); } - IBinder b = ServiceManager.getService(Context.INPUT_METHOD_SERVICE); - IInputMethodManager service = IInputMethodManager.Stub.asInterface(b); - mInstance = new InputMethodManager(service, mainLooper); + return sInstance; } - return mInstance; } /** @@ -575,8 +573,8 @@ public final class InputMethodManager { * if it exists. * @hide */ - static public InputMethodManager peekInstance() { - return mInstance; + public static InputMethodManager peekInstance() { + return sInstance; } /** @hide */ @@ -1585,13 +1583,18 @@ public final class InputMethodManager { } /** + * Dispatches an input event to the IME. + * + * Returns {@link #DISPATCH_HANDLED} if the event was handled. + * Returns {@link #DISPATCH_NOT_HANDLED} if the event was not handled. + * Returns {@link #DISPATCH_IN_PROGRESS} if the event is in progress and the + * callback will be invoked later. + * * @hide */ - public int dispatchInputEvent(Context context, int seq, InputEvent event, - FinishedEventCallback callback) { + public int dispatchInputEvent(InputEvent event, Object token, + FinishedInputEventCallback callback, Handler handler) { synchronized (mH) { - if (DEBUG) Log.d(TAG, "dispatchInputEvent"); - if (mCurMethod != null) { if (event instanceof KeyEvent) { KeyEvent keyEvent = (KeyEvent)event; @@ -1599,142 +1602,138 @@ public final class InputMethodManager { && keyEvent.getKeyCode() == KeyEvent.KEYCODE_SYM && keyEvent.getRepeatCount() == 0) { showInputMethodPickerLocked(); - return ViewRootImpl.EVENT_HANDLED; + return DISPATCH_HANDLED; } } if (DEBUG) Log.v(TAG, "DISPATCH INPUT EVENT: " + mCurMethod); - final long startTime = SystemClock.uptimeMillis(); - if (mCurChannel != null) { - if (mCurSender == null) { - mCurSender = new ImeInputEventSender(mCurChannel, mH.getLooper()); - } - if (mCurSender.sendInputEvent(seq, event)) { - enqueuePendingEventLocked(startTime, seq, mCurId, callback); - return ViewRootImpl.EVENT_PENDING_IME; - } else { - Log.w(TAG, "Unable to send input event to IME: " - + mCurId + " dropping: " + event); - } + + PendingEvent p = obtainPendingEventLocked( + event, token, mCurId, callback, handler); + if (mMainLooper.isCurrentThread()) { + // Already running on the IMM thread so we can send the event immediately. + return sendInputEventOnMainLooperLocked(p); } + + // Post the event to the IMM thread. + Message msg = mH.obtainMessage(MSG_SEND_INPUT_EVENT, p); + msg.setAsynchronous(true); + mH.sendMessage(msg); + return DISPATCH_IN_PROGRESS; } } - return ViewRootImpl.EVENT_POST_IME; + return DISPATCH_NOT_HANDLED; } - void finishedEvent(int seq, boolean handled) { - final FinishedEventCallback callback; + // Must be called on the main looper + void sendInputEventAndReportResultOnMainLooper(PendingEvent p) { + final boolean handled; synchronized (mH) { - PendingEvent p = dequeuePendingEventLocked(seq); - if (p == null) { - return; // spurious, event already finished or timed out + int result = sendInputEventOnMainLooperLocked(p); + if (result == DISPATCH_IN_PROGRESS) { + return; } - mH.removeMessages(MSG_EVENT_TIMEOUT, p); - callback = p.mCallback; - recyclePendingEventLocked(p); + + handled = (result == DISPATCH_HANDLED); + } + + invokeFinishedInputEventCallback(p, handled); + } + + // Must be called on the main looper + int sendInputEventOnMainLooperLocked(PendingEvent p) { + if (mCurChannel != null) { + if (mCurSender == null) { + mCurSender = new ImeInputEventSender(mCurChannel, mH.getLooper()); + } + + final InputEvent event = p.mEvent; + final int seq = event.getSequenceNumber(); + if (mCurSender.sendInputEvent(seq, event)) { + mPendingEvents.put(seq, p); + Trace.traceCounter(Trace.TRACE_TAG_INPUT, PENDING_EVENT_COUNTER, + mPendingEvents.size()); + + Message msg = mH.obtainMessage(MSG_TIMEOUT_INPUT_EVENT, p); + msg.setAsynchronous(true); + mH.sendMessageDelayed(msg, INPUT_METHOD_NOT_RESPONDING_TIMEOUT); + return DISPATCH_IN_PROGRESS; + } + + Log.w(TAG, "Unable to send input event to IME: " + + mCurId + " dropping: " + event); } - callback.finishedEvent(seq, handled); + return DISPATCH_NOT_HANDLED; } - void timeoutEvent(int seq) { - final FinishedEventCallback callback; + void finishedInputEvent(int seq, boolean handled, boolean timeout) { + final PendingEvent p; synchronized (mH) { - PendingEvent p = dequeuePendingEventLocked(seq); - if (p == null) { + int index = mPendingEvents.indexOfKey(seq); + if (index < 0) { return; // spurious, event already finished or timed out } - long delay = SystemClock.uptimeMillis() - p.mStartTime; - Log.w(TAG, "Timeout waiting for IME to handle input event after " - + delay + "ms: " + p.mInputMethodId); - callback = p.mCallback; - recyclePendingEventLocked(p); + + p = mPendingEvents.valueAt(index); + mPendingEvents.removeAt(index); + Trace.traceCounter(Trace.TRACE_TAG_INPUT, PENDING_EVENT_COUNTER, mPendingEvents.size()); + + if (timeout) { + Log.w(TAG, "Timeout waiting for IME to handle input event after " + + INPUT_METHOD_NOT_RESPONDING_TIMEOUT + " ms: " + p.mInputMethodId); + } else { + mH.removeMessages(MSG_TIMEOUT_INPUT_EVENT, p); + } } - callback.finishedEvent(seq, false); + + invokeFinishedInputEventCallback(p, handled); } - private void enqueuePendingEventLocked( - long startTime, int seq, String inputMethodId, FinishedEventCallback callback) { - PendingEvent p = obtainPendingEventLocked(startTime, seq, inputMethodId, callback); - if (mPendingEventTail != null) { - mPendingEventTail.mNext = p; - mPendingEventTail = p; + // Assumes the event has already been removed from the queue. + void invokeFinishedInputEventCallback(PendingEvent p, boolean handled) { + p.mHandled = handled; + if (p.mHandler.getLooper().isCurrentThread()) { + // Already running on the callback handler thread so we can send the + // callback immediately. + p.run(); } else { - mPendingEventHead = p; - mPendingEventTail = p; + // Post the event to the callback handler thread. + // In this case, the callback will be responsible for recycling the event. + Message msg = Message.obtain(p.mHandler, p); + msg.setAsynchronous(true); + msg.sendToTarget(); } - - Message msg = mH.obtainMessage(MSG_EVENT_TIMEOUT, seq, 0, p); - msg.setAsynchronous(true); - mH.sendMessageDelayed(msg, INPUT_METHOD_NOT_RESPONDING_TIMEOUT); } - private PendingEvent dequeuePendingEventLocked(int seq) { - PendingEvent p = mPendingEventHead; - if (p == null) { - return null; - } - if (p.mSeq == seq) { - mPendingEventHead = p.mNext; - if (mPendingEventHead == null) { - mPendingEventTail = null; - } - } else { - PendingEvent prev; - do { - prev = p; - p = p.mNext; - if (p == null) { - return null; - } - } while (p.mSeq != seq); - prev.mNext = p.mNext; - if (mPendingEventTail == p) { - mPendingEventTail = prev; - } + private void flushPendingEventsLocked() { + mH.removeMessages(MSG_FLUSH_INPUT_EVENT); + + final int count = mPendingEvents.size(); + for (int i = 0; i < count; i++) { + int seq = mPendingEvents.keyAt(i); + Message msg = mH.obtainMessage(MSG_FLUSH_INPUT_EVENT, seq, 0); + msg.setAsynchronous(true); + msg.sendToTarget(); } - p.mNext = null; - return p; } - private PendingEvent obtainPendingEventLocked( - long startTime, int seq, String inputMethodId, FinishedEventCallback callback) { - PendingEvent p = mPendingEventPool; - if (p != null) { - mPendingEventPoolSize -= 1; - mPendingEventPool = p.mNext; - p.mNext = null; - } else { + private PendingEvent obtainPendingEventLocked(InputEvent event, Object token, + String inputMethodId, FinishedInputEventCallback callback, Handler handler) { + PendingEvent p = mPendingEventPool.acquire(); + if (p == null) { p = new PendingEvent(); } - - p.mStartTime = startTime; - p.mSeq = seq; + p.mEvent = event; + p.mToken = token; p.mInputMethodId = inputMethodId; p.mCallback = callback; + p.mHandler = handler; return p; } private void recyclePendingEventLocked(PendingEvent p) { - p.mInputMethodId = null; - p.mCallback = null; - - if (mPendingEventPoolSize < MAX_PENDING_EVENT_POOL_SIZE) { - mPendingEventPoolSize += 1; - p.mNext = mPendingEventPool; - mPendingEventPool = p; - } - } - - private void flushPendingEventsLocked() { - mH.removeMessages(MSG_EVENT_TIMEOUT); - - PendingEvent p = mPendingEventHead; - while (p != null) { - Message msg = mH.obtainMessage(MSG_EVENT_TIMEOUT, p.mSeq, 0, p); - msg.setAsynchronous(true); - mH.sendMessage(msg); - p = p.mNext; - } + p.recycle(); + mPendingEventPool.release(p); } public void showInputMethodPicker() { @@ -1946,8 +1945,8 @@ public final class InputMethodManager { * the IME has been finished. * @hide */ - public interface FinishedEventCallback { - public void finishedEvent(int seq, boolean handled); + public interface FinishedInputEventCallback { + public void onFinishedInputEvent(Object token, boolean handled); } private final class ImeInputEventSender extends InputEventSender { @@ -1957,16 +1956,34 @@ public final class InputMethodManager { @Override public void onInputEventFinished(int seq, boolean handled) { - finishedEvent(seq, handled); + finishedInputEvent(seq, handled, false); } } - private static final class PendingEvent { - public PendingEvent mNext; - - public long mStartTime; - public int mSeq; + private final class PendingEvent implements Runnable { + public InputEvent mEvent; + public Object mToken; public String mInputMethodId; - public FinishedEventCallback mCallback; + public FinishedInputEventCallback mCallback; + public Handler mHandler; + public boolean mHandled; + + public void recycle() { + mEvent = null; + mToken = null; + mInputMethodId = null; + mCallback = null; + mHandler = null; + mHandled = false; + } + + @Override + public void run() { + mCallback.onFinishedInputEvent(mToken, mHandled); + + synchronized (mH) { + recyclePendingEventLocked(this); + } + } } } diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index d901d0a2c2a1..8ae00210eea5 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -1004,6 +1004,7 @@ public abstract class WebSettings { * @param flag true if plugins should be enabled * @deprecated This method has been deprecated in favor of * {@link #setPluginState} + * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2} */ @Deprecated public synchronized void setPluginsEnabled(boolean flag) { @@ -1032,6 +1033,7 @@ public abstract class WebSettings { * @param pluginsPath a String path to the directory containing plugins * @deprecated This method is no longer used as plugins are loaded from * their own APK via the system's package manager. + * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2} */ @Deprecated public synchronized void setPluginsPath(String pluginsPath) { @@ -1224,6 +1226,7 @@ public abstract class WebSettings { * @return true if plugins are enabled * @see #setPluginsEnabled * @deprecated This method has been replaced by {@link #getPluginState} + * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2} */ @Deprecated public synchronized boolean getPluginsEnabled() { @@ -1249,6 +1252,7 @@ public abstract class WebSettings { * @return an empty string * @deprecated This method is no longer used as plugins are loaded from * their own APK via the system's package manager. + * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2} */ @Deprecated public synchronized String getPluginsPath() { diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 3fa09408f58e..94dadb4379b6 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -2606,7 +2606,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te mGlobalLayoutListenerAddedFilter = false; } - if (mAdapter != null) { + if (mAdapter != null && mDataSetObserver != null) { mAdapter.unregisterDataSetObserver(mDataSetObserver); mDataSetObserver = null; } diff --git a/core/java/com/android/internal/widget/ScrollingTabContainerView.java b/core/java/com/android/internal/widget/ScrollingTabContainerView.java index b6205689bcec..04931e726bb7 100644 --- a/core/java/com/android/internal/widget/ScrollingTabContainerView.java +++ b/core/java/com/android/internal/widget/ScrollingTabContainerView.java @@ -179,6 +179,9 @@ public class ScrollingTabContainerView extends HorizontalScrollView animateToTab(position); } } + if (mTabSpinner != null && position >= 0) { + mTabSpinner.setSelection(position); + } } public void setContentHeight(int contentHeight) { diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 66cea9d77989..3e5586e62c8a 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -179,6 +179,7 @@ LOCAL_SHARED_LIBRARIES := \ libandroidfw \ libexpat \ libnativehelper \ + liblog \ libcutils \ libutils \ libbinder \ diff --git a/core/jni/android/graphics/Canvas.cpp b/core/jni/android/graphics/Canvas.cpp index 9a9f6c8a151a..11c70530e96a 100644 --- a/core/jni/android/graphics/Canvas.cpp +++ b/core/jni/android/graphics/Canvas.cpp @@ -77,7 +77,14 @@ public: } static SkCanvas* initRaster(JNIEnv* env, jobject, SkBitmap* bitmap) { - return bitmap ? new SkCanvas(*bitmap) : new SkCanvas; + if (bitmap) { + return new SkCanvas(*bitmap); + } else { + // Create an empty bitmap device to prevent callers from crashing + // if they attempt to draw into this canvas. + SkBitmap emptyBitmap; + return new SkCanvas(emptyBitmap); + } } static void copyCanvasState(JNIEnv* env, jobject clazz, diff --git a/core/jni/android_os_Trace.cpp b/core/jni/android_os_Trace.cpp index f028c86d5f5c..00ecd0a60061 100644 --- a/core/jni/android_os_Trace.cpp +++ b/core/jni/android_os_Trace.cpp @@ -18,6 +18,9 @@ #include <JNIHelp.h> #include <ScopedUtfChars.h> +#include <ScopedStringChars.h> + +#include <utils/String8.h> #include <cutils/trace.h> #include <cutils/log.h> @@ -36,8 +39,20 @@ static void android_os_Trace_nativeTraceCounter(JNIEnv* env, jclass clazz, static void android_os_Trace_nativeTraceBegin(JNIEnv* env, jclass clazz, jlong tag, jstring nameStr) { - ScopedUtfChars name(env, nameStr); - atrace_begin(tag, name.c_str()); + const size_t MAX_SECTION_NAME_LEN = 127; + ScopedStringChars jchars(env, nameStr); + String8 utf8Chars(reinterpret_cast<const char16_t*>(jchars.get()), + jchars.size()); + size_t size = utf8Chars.size(); + char* str = utf8Chars.lockBuffer(size); + for (size_t i = 0; i < size; i++) { + char c = str[i]; + if (c == '\0' || c == '\n' || c == '|') { + str[i] = ' '; + } + } + utf8Chars.unlockBuffer(); + atrace_begin(tag, utf8Chars.string()); } static void android_os_Trace_nativeTraceEnd(JNIEnv* env, jclass clazz, @@ -45,6 +60,11 @@ static void android_os_Trace_nativeTraceEnd(JNIEnv* env, jclass clazz, atrace_end(tag); } +static void android_os_Trace_nativeSetAppTracingAllowed(JNIEnv* env, + jclass clazz, jboolean allowed) { + atrace_set_debuggable(allowed); +} + static JNINativeMethod gTraceMethods[] = { /* name, signature, funcPtr */ { "nativeGetEnabledTags", @@ -59,6 +79,9 @@ static JNINativeMethod gTraceMethods[] = { { "nativeTraceEnd", "(J)V", (void*)android_os_Trace_nativeTraceEnd }, + { "nativeSetAppTracingAllowed", + "(Z)V", + (void*)android_os_Trace_nativeSetAppTracingAllowed }, }; int register_android_os_Trace(JNIEnv* env) { diff --git a/core/res/res/anim/rotation_animation_xfade_exit.xml b/core/res/res/anim/rotation_animation_xfade_exit.xml index 73007247602a..1dedde46a8c6 100644 --- a/core/res/res/anim/rotation_animation_xfade_exit.xml +++ b/core/res/res/anim/rotation_animation_xfade_exit.xml @@ -18,6 +18,6 @@ <set xmlns:android="http://schemas.android.com/apk/res/android"> <alpha android:fromAlpha="1.0" android:toAlpha="0.0" - android:duration="500" + android:duration="150" android:interpolator="@interpolator/decelerate_quad" /> </set> diff --git a/core/res/res/drawable-hdpi/menu_popup_panel_holo_dark.9.png b/core/res/res/drawable-hdpi/menu_popup_panel_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..e5ff886ecaa5 --- /dev/null +++ b/core/res/res/drawable-hdpi/menu_popup_panel_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/menu_popup_panel_holo_light.9.png b/core/res/res/drawable-hdpi/menu_popup_panel_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..06d16530dfad --- /dev/null +++ b/core/res/res/drawable-hdpi/menu_popup_panel_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/menu_popup_panel_holo_dark.9.png b/core/res/res/drawable-mdpi/menu_popup_panel_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..2020a42433e2 --- /dev/null +++ b/core/res/res/drawable-mdpi/menu_popup_panel_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/menu_popup_panel_holo_light.9.png b/core/res/res/drawable-mdpi/menu_popup_panel_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..7cae402e1e8d --- /dev/null +++ b/core/res/res/drawable-mdpi/menu_popup_panel_holo_light.9.png diff --git a/core/res/res/drawable-xhdpi/menu_popup_panel_holo_dark.9.png b/core/res/res/drawable-xhdpi/menu_popup_panel_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..e85b0c2a61d4 --- /dev/null +++ b/core/res/res/drawable-xhdpi/menu_popup_panel_holo_dark.9.png diff --git a/core/res/res/drawable-xhdpi/menu_popup_panel_holo_light.9.png b/core/res/res/drawable-xhdpi/menu_popup_panel_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..eea215dda792 --- /dev/null +++ b/core/res/res/drawable-xhdpi/menu_popup_panel_holo_light.9.png diff --git a/core/res/res/drawable/menu_panel_holo_dark.xml b/core/res/res/drawable/menu_panel_holo_dark.xml new file mode 100644 index 000000000000..658a3acc2767 --- /dev/null +++ b/core/res/res/drawable/menu_panel_holo_dark.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2013 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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_above_anchor="true" android:drawable="@android:drawable/menu_popup_panel_holo_dark" /> + <item android:drawable="@android:drawable/menu_dropdown_panel_holo_dark" /> +</selector> diff --git a/core/res/res/drawable/menu_panel_holo_light.xml b/core/res/res/drawable/menu_panel_holo_light.xml new file mode 100644 index 000000000000..a37e9348b831 --- /dev/null +++ b/core/res/res/drawable/menu_panel_holo_light.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2013 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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_above_anchor="true" android:drawable="@android:drawable/menu_popup_panel_holo_light" /> + <item android:drawable="@android:drawable/menu_dropdown_panel_holo_light" /> +</selector> diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index 1e266ed012bf..ce76d4003ca3 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Laat die program toe om te verander hoe netwerkgebruik teenoor programme gemeet word. Nie vir gebruik deur normale programme nie."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"kry toegang tot kennisgewings"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Laat die program toe om kennisgewings op te haal, te bestudeer en te verwyder, insluitende die kennisgewings wat deur ander programme geplaas is."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Stel wagwoordreëls"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Beheer lengte en watter karakters wat in die skermontsluit-wagwoorde gebruik word."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Monitor pogings om skerm te ontsluit"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Teksaksies"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Bergingspasie word min"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Sommige stelselfunksies werk moontlik nie"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> loop"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> loop tans"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Kanselleer"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Toeganklikheid"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Muurpapier"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Verander muurpapier"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN geaktiveer"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN is geaktiveer deur <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Raak om die netwerk te bestuur."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Navigeer tuis"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Navigeer op"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Meer opsies"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Interne geheue"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kaart"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-berging"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Fout"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Hierdie program werk nie met rekeninge vir beperkte gebruikers nie"</string> <string name="app_not_found" msgid="3429141853498927379">"Geen program gevind om hierdie handeling te hanteer nie"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index 54dfd50ec2de..132d4cc18edf 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"ከመተግበሪያዎች በተለየ መልኩ እንዴት የአውታረ መረብ አጠቃቀም እንደተመዘገበ ለመቀየር ለመተግበሪያው ይፈቅዳሉ።ለመደበኛ መተግበሪያዎች አገልግሎት አይውልም።"</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"ማሳወቂያዎችን ይድረሱ"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"መተግበሪያው ማሳወቂያዎችን እንዲያስመጣ፣ እንዲመረምር እና እንዲያጸዳ ያስችለዋል፣ በሌሎች መተግበሪያዎች የተለጠፉትንም ጨምሮ።"</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"የይለፍ ቃል ድንቦች አዘጋጅ"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"በማያ-መክፈት የተፈቀዱ የይለፍ ቃል ርዝመት እና ቁምፊዎች ተቆጣጠር።"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"የማሳያ-ክፈት ሙከራዎችን አሳይ"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"የፅሁፍ እርምጃዎች"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"የማከማቻ ቦታ እያለቀ ነው"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"አንዳንድ የስርዓት ተግባራት ላይሰሩ ይችላሉ"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> በማሄድ ላይ"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> በአሁኑ ጊዜ እያሄደ ነው"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"እሺ"</string> <string name="cancel" msgid="6442560571259935130">"ይቅር"</string> <string name="yes" msgid="5362982303337969312">"እሺ"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"ተደራሽነት"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"ልጣፍ"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"ልጣፍ ለውጥ"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN ነቅቷል።"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN በ<xliff:g id="APP">%s</xliff:g>ገብሯል"</string> <string name="vpn_text" msgid="3011306607126450322">"አውታረመረብ ለማደራጀት ንካ።"</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"መነሻ ዳስስ"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"አስስ"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"ተጨማሪ አማራጮች"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"ውስጣዊ ማከማቻ"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD ካርድ"</string> <string name="storage_usb" msgid="3017954059538517278">"የUSB ማከማቻ"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"ስህተት"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"ይህ መተግበሪያ የተገደቡ ተጠቃሚዎች መለያዎችን አይደግፍም"</string> <string name="app_not_found" msgid="3429141853498927379">"ይህን እርምጃ የሚያከናውን ምንም መተግበሪያ አልተገኘም"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 0c6cd781b05e..e13c0f2082a2 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"للسماح للتطبيق بتعديل كيفية حساب استخدام الشبكة في التطبيقات. ليس للاستخدام بواسطة التطبيقات العادية."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"إشعارات الدخول"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"يتيح للتطبيق استرجاع الإشعارات وفحصها ومسحها، بما في ذلك تلك التي نشرتها تطبيقات أخرى."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"تعيين قواعد كلمة المرور"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"يمكنك التحكم في الطول والأحرف المسموح بها في كلمات مرور إلغاء تأمين الشاشة."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"مراقبة محاولات إلغاء قفل الشاشة"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"إجراءات النص"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"مساحة التخزين منخفضة"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"قد لا تعمل بعض وظائف النظام"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> قيد التشغيل"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> قيد التشغيل حاليًا"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"موافق"</string> <string name="cancel" msgid="6442560571259935130">"إلغاء"</string> <string name="yes" msgid="5362982303337969312">"موافق"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"إمكانية الدخول"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"الخلفية"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"تغيير الخلفية"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"تم تنشيط الشبكة الظاهرية الخاصة (VPN)"</string> <string name="vpn_title_long" msgid="6400714798049252294">"تم تنشيط VPN بواسطة <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"المس لإدارة الشبكة."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"التنقل إلى الشاشة الرئيسية"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"التنقل إلى أعلى"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"المزيد من الخيارات"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"وحدة تخزين داخلية"</string> <string name="storage_sd_card" msgid="3282948861378286745">"بطاقة SD"</string> <string name="storage_usb" msgid="3017954059538517278">"وحدة تخزين USB"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"خطأ"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"لا يوفر هذا التطبيق حسابات للمستخدمين المقيّدين"</string> <string name="app_not_found" msgid="3429141853498927379">"لم يتم العثور على تطبيق يمكنه التعامل مع هذا الإجراء."</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index e6c9ee7f0446..6653ac107a15 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Дазваляе прыкладанням змяняць метад уліку выкарыстання сеткі прыкладаннямі. Не для выкарыстання звычайнымі прыкладаннямі."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"доступ да паведамленняў"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Дазваляе прыкладанню атрымлiваць, правяраць i выдаляць апавяшчэннi, у тым лiку апублiкаваныя iншымi прыкладаннямi."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Устанавіць правілы паролю"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Кіраванне даўжынёй і колькасцю знакаў у паролі разблакоўкі экрана."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Сачыць за спробамі разблакоўкі экрана"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Дзеянні з тэкстам"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Месца для захавання на зыходзе"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Некаторыя сістэмныя функцыі могуць не працаваць"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"Прыкладанне <xliff:g id="APP_NAME">%1$s</xliff:g> працуе"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"Прыкладанне <xliff:g id="APP_NAME">%1$s</xliff:g> зараз працуе"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"ОК"</string> <string name="cancel" msgid="6442560571259935130">"Адмяніць"</string> <string name="yes" msgid="5362982303337969312">"ОК"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Спецыяльныя магчымасці"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Шпалеры"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Змена шпалер"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN актываваны"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN актывуецца прыкладаннем <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Дакраніцеся, каб кіраваць сеткай."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Перайсці да пачатковай старонкі"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Перайсці ўверх"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Больш налад"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Унутраная памяць"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-карта"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-назапашвальнік"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Памылка"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Гэтае прыкладанне не падтрымлівае уліковыя запісы для карыстальнікаў з абмежаванымі правамі"</string> <string name="app_not_found" msgid="3429141853498927379">"Прыкладанне для гэтага дзеяння не знойдзенае"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index 79600f784d48..3d3e19599dc4 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Разрешава на приложението да променя това как употребата на мрежа се отчита спрямо приложенията. Не е предназначено за нормални приложения."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"достъп до известията"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Разрешава на приложението да извлича, преглежда и изчиства известия, включително публикуваните от други приложения."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Задаване на правила за паролата"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Контролирайте дължината и разрешените знаци за паролите за отключване на екрана."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Наблюдаване на опитите за отключване на екрана"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Действия с текста"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Мястото в хранилището е на изчерпване"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Възможно е някои функции на системата да не работят"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> се изпълнява"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"Понастоящем <xliff:g id="APP_NAME">%1$s</xliff:g> се изпълнява"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Отказ"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Достъпност"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Тапет"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Промяна на тапета"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN е активирана"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN е активирана от <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Докоснете за управление на мрежата."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Придвижване към „Начало“"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Придвижване нагоре"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Още опции"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Вътрешно хранилище"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD карта"</string> <string name="storage_usb" msgid="3017954059538517278">"USB хранилище"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Грешка"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Това приложение не поддържа профили за потребители с ограничения"</string> <string name="app_not_found" msgid="3429141853498927379">"Няма намерено приложение за извършване на това действие"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index 975dc40adcdb..c96bef8065ea 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Permet que l\'aplicació modifiqui la manera com es calcula l\'ús de la xarxa per part de les aplicacions. No indicat per a les aplicacions normals."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"accedeix a les notificacions"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Permet que l\'aplicació recuperi, examini i esborri les notificacions, incloses les que han publicat altres aplicacions."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Defineix les normes de contrasenya"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Controla la longitud i els caràcters permesos a les contrasenyes de desbloqueig de pantalla."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Control d\'intents de desbloqueig de pantalla"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Accions de text"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"S\'està acabant l\'espai d\'emmagatzematge"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"És possible que algunes funcions del sistema no funcionin"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> s\'està executant"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> s\'està executant en aquests moments"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"D\'acord"</string> <string name="cancel" msgid="6442560571259935130">"Cancel·la"</string> <string name="yes" msgid="5362982303337969312">"D\'acord"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Accessibilitat"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Fons de pantalla"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Canvia el fons de pantalla"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN activada"</string> <string name="vpn_title_long" msgid="6400714798049252294">"<xliff:g id="APP">%s</xliff:g> ha activat VPN"</string> <string name="vpn_text" msgid="3011306607126450322">"Toca per gestionar la xarxa."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Torna a la pàgina d\'inici"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Mou cap a dalt"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Més opcions"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Emmagatzematge intern"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Targeta SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Emmagatzematge USB"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Error"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Aquesta aplicació no admet comptes per a usuaris limitats"</string> <string name="app_not_found" msgid="3429141853498927379">"No s\'ha trobat cap aplicació per processar aquesta acció"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 0adebe969a66..4738834dd496 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Umožňuje aplikaci upravit způsob výpočtu využití sítě aplikacemi. Toto oprávnění není určeno pro běžné aplikace."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"přístup k oznámením"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Umožňuje aplikacím načítat, zobrazovat a mazat oznámení včetně těch přidaných jinými aplikacemi."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Nastavit pravidla pro heslo"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Řídit délku hesel pro odemčení obrazovky a povolené znaky."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Sledovat pokusy o odemčení obrazovky"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Operace s textem"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"V úložišti je málo místa"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Některé systémové funkce nemusí fungovat"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> je spuštěna"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> je aktuálně spuštěná"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Zrušit"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Usnadnění"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Tapeta"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Změnit tapetu"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"Síť VPN je aktivována"</string> <string name="vpn_title_long" msgid="6400714798049252294">"Aplikace <xliff:g id="APP">%s</xliff:g> aktivovala síť VPN"</string> <string name="vpn_text" msgid="3011306607126450322">"Dotykem zobrazíte správu sítě."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Přejít na plochu"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Přejít nahoru"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Další možnosti"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Interní úložiště"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Karta SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Úložiště USB"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Chyba"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Tato aplikace u omezeného počtu uživatelů nepodporuje účty"</string> <string name="app_not_found" msgid="3429141853498927379">"Aplikace potřebná k provedení této akce nebyla nalezena"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index d2676c9954bf..6c16e560ce26 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Tillader, at appen kan ændre den måde, som netværksforbrug udregnes på i forhold til apps. Anvendes ikke af normale apps."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"adgang til underretninger"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Tillader, at appen kan hente, undersøge og rydde underretninger, herunder dem, der er sendt af andre apps."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Indstil regler for adgangskode"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontroller længden samt tilladte tegn i adgangskoder til oplåsning af skærmen."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Overvåg forsøg på oplåsning af skærm"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Teksthandlinger"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Der er snart ikke mere lagerplads"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Nogle systemfunktioner virker måske ikke"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> kører"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> kører i øjeblikket"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Annuller"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Tilgængelighed"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Tapet"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Skift tapet"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN er aktiveret."</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN aktiveres af <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Tryk for at administrere netværket."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Naviger hjem"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Naviger op"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Flere valgmuligheder"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Internt lager"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kort"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-lager"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Fejl"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Denne applikation understøtter ikke konti for brugere med begrænsede rettigheder"</string> <string name="app_not_found" msgid="3429141853498927379">"Der blev ikke fundet nogen applikation, der kan håndtere denne handling"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 6a488c720b05..ead40043c318 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Ermöglicht der App, die Art und Weise zu ändern, wie der Netzwerkverbrauch im Hinblick auf Apps berechnet wird. Nicht für normale Apps vorgesehen."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"Auf Benachrichtigungen zugreifen"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Ermöglicht der App das Abrufen, Überprüfen und Löschen von Benachrichtigungen, einschließlich Benachrichtigungen, die von anderen Apps gepostet wurden"</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Passwortregeln festlegen"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Zulässige Länge und Zeichen für Passwörter zum Entsperren des Bildschirms festlegen"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Versuche zum Entsperren des Displays überwachen"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Textaktionen"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Der Speicherplatz wird knapp"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Einige Systemfunktionen funktionieren möglicherweise nicht."</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> wird ausgeführt."</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> wird gerade ausgeführt."</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Abbrechen"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Bedienungshilfen"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Hintergrund"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Hintergrund ändern"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN aktiviert"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN wurde von <xliff:g id="APP">%s</xliff:g> aktiviert."</string> <string name="vpn_text" msgid="3011306607126450322">"Zum Verwalten des Netzwerks berühren"</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Zur Startseite navigieren"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Nach oben navigieren"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Weitere Optionen"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Interner Speicher"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-Karte"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-Speicher"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Fehler"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Diese App unterstützt keine Konten für eingeschränkte Nutzer."</string> <string name="app_not_found" msgid="3429141853498927379">"Für diese Aktion wurde keine App gefunden."</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 21b014c6c6f8..ac4ec2ec29f5 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Επιτρέπει στην εφαρμογή την τροποποίηση του τρόπου υπολογισμού της χρήσης δικτύου έναντι των εφαρμογών. Δεν προορίζεται για χρήση από συνήθεις εφαρμογές."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"πρόσβαση στις ειδοποιήσεις"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Επιτρέπει στην εφαρμογή να ανακτά, να εξετάζει και να απαλείφει ειδοποιήσεις, συμπεριλαμβανομένων εκείνων που δημοσιεύονται από άλλες εφαρμογές."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Ορισμός κανόνων κωδικού πρόσβασης"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Έλεγχος του μεγέθους και των χαρακτήρων που επιτρέπονται στους κωδικούς πρόσβασης ξεκλειδώματος οθόνης."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Παρακολούθηση προσπαθειών ξεκλειδώματος οθόνης"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Ενέργειες κειμένου"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Ο χώρος αποθήκευσης εξαντλείται"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Ορισμένες λειτουργίες συστήματος ενδέχεται να μην λειτουργούν"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> εκτελείται"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> εκτελείται τώρα."</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Ακύρωση"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Προσβασιμότητα"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Ταπετσαρία"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Αλλαγή ταπετσαρίας"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"Το VPN ενεργοποιήθηκε"</string> <string name="vpn_title_long" msgid="6400714798049252294">"Το VPN ενεργοποιήθηκε από την εφαρμογή <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Αγγίξτε για τη διαχείριση του δικτύου."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Πλοήγηση στην αρχική σελίδα"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Πλοήγηση προς τα επάνω"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Περισσότερες επιλογές"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Εσωτερικός χώρος αποθήκευσης"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Κάρτα SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Χώρος αποθήκευσης USB"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Σφάλμα"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Αυτή η εφαρμογή δεν υποστηρίζει λογαριασμούς για περιορισμένους χρήστες"</string> <string name="app_not_found" msgid="3429141853498927379">"Δεν υπάρχει εφαρμογή για τη διαχείριση αυτής της ενέργειας"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index ae698e1b61fe..5285532ff5b7 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Allows the app to modify how network usage is accounted against apps. Not for use by normal apps."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"access notifications"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Allows the app to retrieve, examine, and clear notifications, including those posted by other apps."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Set password rules"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Control the length and the characters allowed in screen-unlock passwords."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Monitor screen-unlock attempts"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Text actions"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Storage space running out"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Some system functions may not work"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> running"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> is currently running"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Cancel"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Accessibility"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Wallpaper"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Change wallpaper"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN activated"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN is activated by <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Touch to manage the network."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Navigate home"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Navigate up"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"More options"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Internal storage"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD card"</string> <string name="storage_usb" msgid="3017954059538517278">"USB storage"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Error"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"This application does not support accounts for limited users"</string> <string name="app_not_found" msgid="3429141853498927379">"No application found to handle this action"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index f3f0afc1a1f4..20f0c33a6476 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Permite que la aplicación modifique cómo se registra el uso de red en relación con las aplicaciones. Las aplicaciones normales no deben usar este permiso."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"acceder a las notificaciones"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Permite que la aplicación recupere, examine y elimine notificaciones, incluidas aquellas publicadas por otras aplicaciones."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Establecer reglas de contraseña"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Controlar la longitud y los caracteres permitidos en las contraseñas para desbloquear la pantalla"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Supervisa los intentos para desbloquear la pantalla"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Acciones de texto"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Queda poco espacio de almacenamiento"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Es posible que algunas funciones del sistema no estén disponibles."</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> en ejecución"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> se está ejecutando en este momento."</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"Aceptar"</string> <string name="cancel" msgid="6442560571259935130">"Cancelar"</string> <string name="yes" msgid="5362982303337969312">"Aceptar"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Accesibilidad"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Papel tapiz"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Cambiar fondo de pantalla"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN activada"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN está activado por <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Toca para administrar la red."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Desplazarse hasta la página principal"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Desplazarse hacia arriba"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Más opciones"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Almacenamiento interno"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Tarjeta SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Almacenamiento USB"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Error"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Esta aplicación no admite cuentas para usuarios restringidos."</string> <string name="app_not_found" msgid="3429141853498927379">"No se encontró una aplicación para manejar esta acción."</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index d3e63af0228a..7dc03beca87a 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Permite que la aplicación modifique cómo se registra el uso de red en relación con las aplicaciones. Las aplicaciones normales no deben usar este permiso."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"acceder a las notificaciones"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Permite que la aplicación recupere, examine y borre notificaciones, incluidas las que han publicado otras aplicaciones."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Establecimiento de reglas de contraseña"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Controlar la longitud y los caracteres permitidos en las contraseñas de bloqueo de pantalla"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Control de intentos de bloqueo de pantalla"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Acciones de texto"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Queda poco espacio"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Es posible que algunas funciones del sistema no funcionen."</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> se está ejecutando"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> se está ejecutando."</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"Aceptar"</string> <string name="cancel" msgid="6442560571259935130">"Cancelar"</string> <string name="yes" msgid="5362982303337969312">"Aceptar"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Accesibilidad"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Fondo de pantalla"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Cambiar fondo de pantalla"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN activada"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN activada por <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Toca para administrar la red."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Ir al escritorio"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Desplazarse hacia arriba"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Más opciones"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Almacenamiento interno"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Tarjeta SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Almacenamiento USB"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Error"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Esta aplicación no admite cuentas de usuarios limitados."</string> <string name="app_not_found" msgid="3429141853498927379">"No se ha encontrado ninguna aplicación que pueda realizar esta acción."</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index bb00bfc6b073..e78e1698b5c2 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Võimaldab rakendusel muuta võrgukasutuse loendamist rakenduste suhtes. Mitte kasutada tavarakenduste puhul."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"juurdepääsu märguanded"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Võimaldab rakendusel tuua, kontrollida ja kustutada märguandeid, sh neid, mille on postitanud teised rakendused."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Parooli reeglite määramine"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontrollige ekraaniluku avamise paroolide pikkust ja tähemärke."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Ekraani avamiskatsed"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Tekstitoimingud"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Talletusruum saab täis"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Mõned süsteemifunktsioonid ei pruugi töötada"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> töötab"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> töötab praegu"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Tühista"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Juurdepääsetavus"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Taustapilt"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Muutke taustapilti"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN on aktiveeritud"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN-i aktiveeris <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Võrgu haldamiseks puudutage."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Liigu avalehele"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Liigu üles"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Rohkem valikuid"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Sisemine salvestusruum"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kaart"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-mäluseade"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Viga"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Rakendus ei toeta piiratud õigustega kasutajate kontosid"</string> <string name="app_not_found" msgid="3429141853498927379">"Selle toimingu käsitlemiseks ei leitud ühtegi rakendust"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index 322cbeee4d28..3ab64c035a6d 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"به برنامه اجازه میدهد تا نحوه محاسبه کاربرد شبکه در برنامه را تغییر دهد. برای استفاده برنامههای عادی نیست."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"اعلانهای دسترسی"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"به برنامه اجازه میدهد به بازیابی، بررسی و پاک کردن اعلانها از جمله موارد پست شده توسط سایر برنامهها بپردازد."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"تنظیم قوانین رمز ورود"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"طول و نویسههای مجاز در گذرواژههای بازکردن قفل صفحه را کنترل کنید."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"نمایش تلاشهای قفل گشایی صفحه"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"عملکردهای متنی"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"فضای ذخیرهسازی رو به اتمام است"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"برخی از عملکردهای سیستم ممکن است کار نکنند"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> در حال اجرا"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> در حال حاضر در حال اجرا است"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"تأیید"</string> <string name="cancel" msgid="6442560571259935130">"لغو"</string> <string name="yes" msgid="5362982303337969312">"تأیید"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"قابلیت دسترسی"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"تصویر زمینه"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"تغییر تصویر زمینه"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN فعال شد"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN توسط <xliff:g id="APP">%s</xliff:g> فعال شده است"</string> <string name="vpn_text" msgid="3011306607126450322">"برای مدیریت شبکه لمس کنید."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"رفتن به صفحهٔ اصلی"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"حرکت به بالا"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"سایر گزینهها"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"حافظهٔ داخلی"</string> <string name="storage_sd_card" msgid="3282948861378286745">"کارت SD"</string> <string name="storage_usb" msgid="3017954059538517278">"حافظهٔ USB"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"خطا"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"این برنامه حسابهای تعداد محدودی از کاربران را پشتیبانی نمیکند"</string> <string name="app_not_found" msgid="3429141853498927379">"برنامهای برای انجام این عملکرد موجود نیست"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index 0f7102098946..86a9faedc100 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Antaa sovelluksen muokata, miten sovellusten verkonkäyttöä lasketaan. Ei tavallisten sovellusten käyttöön."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"käytä ilmoituksia"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Antaa sovelluksen noutaa, tutkia ja tyhjentää ilmoituksia (myös muiden sovelluksien lähettämiä)."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Aseta salasanasäännöt"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Hallinnoi ruudun lukituksenpoistosalasanoissa sallittuja merkkejä ja salasanan pituutta."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Tarkkaile ruudun lukituksen poistoyrityksiä"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Tekstitoiminnot"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Tallennustila loppumassa"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Kaikki järjestelmätoiminnot eivät välttämättä toimi"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> on käynnissä"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> on käynnissä"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Peruuta"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Esteettömyys"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Taustakuva"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Vaihda taustakuvaa"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN on aktivoitu"</string> <string name="vpn_title_long" msgid="6400714798049252294">"<xliff:g id="APP">%s</xliff:g> on aktivoinut VPN-yhteyden"</string> <string name="vpn_text" msgid="3011306607126450322">"Voit hallinnoida verkkoa koskettamalla."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Siirry etusivulle"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Siirry ylös"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Lisää asetuksia"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Sisäinen tallennustila"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kortti"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-tallennustila"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Virhe"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Tämä sovellus ei tue rajoitettujen käyttäjien tilejä"</string> <string name="app_not_found" msgid="3429141853498927379">"Tätä toimintoa käsittelevää sovellusta ei löydy"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 2026f564b80f..3b539da8f209 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Permet à l\'application de modifier l\'utilisation du réseau par les autres applications. Les applications standards ne doivent pas utiliser cette fonctionnalité."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"accéder aux notifications"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Permet aux applications de récupérer, d\'examiner et d\'autoriser les notifications, y compris celles envoyées par d\'autres applications."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Définir les règles du mot de passe"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Choisir le nombre et le type de caractères autorisés dans les mots de passe de déverrouillage de l\'écran"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Gérer les tentatives de déverrouillage de l\'écran"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Actions sur le texte"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Espace de stockage bientôt saturé"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Il est possible que certaines fonctionnalités du système ne soient pas opérationnelles."</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> en cours d\'exécution"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> est en cours d\'exécution."</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Annuler"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Accessibilité"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Fond d\'écran"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Changer de fond d\'écran"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN activé"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN activé par <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Appuyez ici pour gérer le réseau."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Retour à l\'accueil"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Parcourir vers le haut"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Plus d\'options"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Mémoire de stockage interne"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Carte SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Mémoire de stockage USB"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Erreur"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Les comptes des utilisateurs en accès limité ne sont pas acceptés pour cette application."</string> <string name="app_not_found" msgid="3429141853498927379">"Aucune application trouvée pour gérer cette action."</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 1b3e6d7274e4..ac209192938e 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"एप्लिकेशन को यह संशोधित करने देता है कि एप्लिकेशन की तुलना में नेटवर्क उपयोग का मूल्यांकन कैसे किया जाता है. सामान्य एप्लिकेशन द्वारा उपयोग करने के लिए नहीं."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"सूचनाओं तक पहुंचें"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"एप्लिकेशन को सूचनाओं को प्राप्त करने, जांच करने, और साफ़ करने देता है, जिनमें अन्य एप्लिकेशन के द्वारा पोस्ट की गई सूचनाएं भी शामिल हैं."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"पासवर्ड नियम सेट करें"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"स्क्रीन-अनलॉक पासवर्ड में अनुमति प्राप्त लंबाई और वर्णों को नियंत्रित करें."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"स्क्रीन-अनलॉक के प्रयासों पर निगरानी रखें"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"पाठ क्रियाएं"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"संग्रहण स्थान समाप्त हो रहा है"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"हो सकता है कुछ सिस्टम फ़ंक्शन कार्य न करें"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> चल रहा है"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> वर्तमान में चल रहा है"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"ठीक"</string> <string name="cancel" msgid="6442560571259935130">"रद्द करें"</string> <string name="yes" msgid="5362982303337969312">"ठीक"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"पहुंच-योग्यता"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"वॉलपेपर"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"वॉलपेपर बदलें"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN सक्रिय"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN को <xliff:g id="APP">%s</xliff:g> द्वारा सक्रिय किया गया है"</string> <string name="vpn_text" msgid="3011306607126450322">"नेटवर्क प्रबंधित करने के लिए स्पर्श करें."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"होम पर नेविगेट करें"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"ऊपर नेविगेट करें"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"अधिक विकल्प"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"आंतरिक संग्रहण"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD कार्ड"</string> <string name="storage_usb" msgid="3017954059538517278">"USB संग्रहण"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"त्रुटि"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"यह एप्लिकेशन सीमित उपयोगकर्ताओं के खातों का समर्थन नहीं करता है"</string> <string name="app_not_found" msgid="3429141853498927379">"इस कार्यवाही को प्रबंधित करने के लिए कोई एप्लिकेशन नहीं मिला"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 7b1eee3e2e69..9569a6c79c5a 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Omogućuje aplikaciji izmjenu načina upotrebe mreže u odnosu na aplikacije. Nije namijenjeno uobičajenim aplikacijama."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"pristup obavijestima"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Omogućuje aplikaciji dohvaćanje, pregledavanje i brisanje obavijesti, uključujući obavijesti drugih aplikacija."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Postavi pravila zaporke"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Upravljajte duljinom zaporki za otključavanje zaslona i dopuštenim znakovima u tim zaporkama."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Nadgledaj pokušaje otključavanja zaslona"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Radnje s tekstom"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Ponestaje prostora za pohranu"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Neke sistemske funkcije možda neće raditi"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"Izvodi se aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"Trenutačno se izvodi aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"U redu"</string> <string name="cancel" msgid="6442560571259935130">"Odustani"</string> <string name="yes" msgid="5362982303337969312">"U redu"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Dostupnost"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Pozadinska slika"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Promjena pozadinske slike"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN aktiviran"</string> <string name="vpn_title_long" msgid="6400714798049252294">"Aplikacija <xliff:g id="APP">%s</xliff:g> aktivirala je VPN"</string> <string name="vpn_text" msgid="3011306607126450322">"Dodirnite za upravljanje mrežom."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Kreni na početnu"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Kreni gore"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Više opcija"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Interna pohrana"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD kartica"</string> <string name="storage_usb" msgid="3017954059538517278">"USB pohrana"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Pogreška"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Aplikacija ne podržava račune za ograničene korisnike"</string> <string name="app_not_found" msgid="3429141853498927379">"Nije pronađena aplikacija za upravljanje ovom radnjom"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index fc1d663192e6..61e370752259 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Lehetővé teszi az alkalmazás számára annak módosítását, hogy a hálózathasználatot hogyan számolják el az alkalmazások esetében. Normál alkalmazások nem használhatják."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"hozzáférési értesítések"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Lehetővé teszi, hogy az alkalmazás értesítéseket kérdezzen le, vizsgáljon és tisztítson meg, beleértve az egyéb alkalmazások által közzétett értesítéseket is."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Jelszavakkal kapcsolatos szabályok beállítása"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"A képernyőzár-feloldási jelszavakban engedélyezett karakterek és hosszúság vezérlése."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Képernyőzár-feloldási kísérletek figyelése"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Műveletek szöveggel"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Kevés a szabad terület"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Előfordulhat, hogy néhány rendszerfunkció nem működik."</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> fut"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> jelenleg fut"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Mégse"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Kisegítő lehetőségek"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Háttérkép"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Háttérkép megváltoztatása"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN aktiválva"</string> <string name="vpn_title_long" msgid="6400714798049252294">"A(z) <xliff:g id="APP">%s</xliff:g> aktiválta a VPN-t"</string> <string name="vpn_text" msgid="3011306607126450322">"Érintse meg a hálózat kezeléséhez."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Ugrás a főoldalra"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Felfele mozgás"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"További lehetőségek"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Belső tárhely"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kártya"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-tár"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Hiba"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Ez az alkalmazás nem támogatja a korlátozott jogokkal rendelkező felhasználói fiókokat."</string> <string name="app_not_found" msgid="3429141853498927379">"Nincs megfelelő alkalmazás a művelet elvégzésére."</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 2a9f2fc6f8dd..f4664e9a8001 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Mengizinkan apl memodifikasi cara penggunaan jaringan diperhitungkan terhadap apl. Tidak untuk digunakan oleh apl normal."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"mengakses pemberitahuan"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Mengizinkan aplikasi mengambil, memeriksa, dan menghapus pemberitahuan, termasuk pemberitahuan yang diposkan oleh aplikasi lain."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Setel aturan sandi"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontrol panjang dan karakter yang diizinkan dalam sandi pembuka layar."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Upaya pembukaan kunci layar monitor"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Tindakan teks"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Ruang penyimpanan hampir habis"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Beberapa fungsi sistem mungkin tidak dapat bekerja"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> berjalan"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> sedang berjalan"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"Oke"</string> <string name="cancel" msgid="6442560571259935130">"Batal"</string> <string name="yes" msgid="5362982303337969312">"Oke"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Aksesibilitas"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Wallpaper"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Ubah wallpaper"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN diaktifkan"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN diaktifkan oleh <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Sentuh untuk mengelola jaringan."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Navigasi ke beranda"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Navigasi naik"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Opsi lainnya"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Penyimpanan internal"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Kartu SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Penyimpanan USB"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Kesalahan"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Aplikasi ini tidak mendukung akun untuk pengguna terbatas"</string> <string name="app_not_found" msgid="3429141853498927379">"Tidak ada aplikasi yang ditemukan untuk menangani tindakan ini"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 22734598b9ea..592492a92a66 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Consente all\'applicazione di modificare il calcolo dell\'utilizzo della rete tra le applicazioni. Da non usare per normali applicazioni."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"accesso a notifiche"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Consente all\'app di recuperare, esaminare e cancellare notifiche, comprese quelle pubblicate da altre app."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Imposta regole password"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Controlla la lunghezza e i caratteri ammessi nelle password di sblocco dello schermo."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Monitora tentativi di sblocco dello schermo"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Azioni testo"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Spazio di archiviazione in esaurimento"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Alcune funzioni di sistema potrebbero non funzionare"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> in esecuzione"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> è attualmente in esecuzione"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Annulla"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Accessibilità"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Sfondo"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Cambia sfondo"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN attiva"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN attivata da <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Tocca per gestire la rete."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Vai alla home page"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Vai in alto"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Altre opzioni"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Memoria interna"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Scheda SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Archivio USB"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Errore"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Questa applicazione non supporta account di utenti con limitazioni"</string> <string name="app_not_found" msgid="3429141853498927379">"Nessuna applicazione trovata in grado di gestire questa azione"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 8c7c74eab9cb..97c52c5d69e7 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"הרשאה זו מאפשרת ליישום לשנות את אופן החישוב של נתוני שימוש ברשת מול כל יישום. לא מיועד לשימוש ביישומים רגילים."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"גישה להתראות"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"מאפשר ליישום לאחזר, לבדוק ולמחוק התראות, כולל כאלה שפורסמו על ידי יישומים אחרים."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"הגדר כללי סיסמה"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"שלוט באורך ובתווים המותרים בסיסמאות לביטול נעילת מסך."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"עקוב אחר ניסיונות לביטול נעילת מסך"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"פעולות טקסט"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"שטח האחסון אוזל"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"ייתכן שפונקציות מערכת מסוימות לא יפעלו"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> פועל"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> פועל כרגע"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"אישור"</string> <string name="cancel" msgid="6442560571259935130">"ביטול"</string> <string name="yes" msgid="5362982303337969312">"אישור"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"נגישות"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"טפט"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"שנה טפט"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN מופעל"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN מופעל על ידי <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"גע כדי לנהל את הרשת."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"נווט לדף הבית"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"נווט למעלה"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"אפשרויות נוספות"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"אחסון פנימי"</string> <string name="storage_sd_card" msgid="3282948861378286745">"כרטיס SD"</string> <string name="storage_usb" msgid="3017954059538517278">"אחסון USB"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"שגיאה"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"היישום הזה לא תומך בחשבונות עבור משתמשים מוגבלים"</string> <string name="app_not_found" msgid="3429141853498927379">"לא נמצא יישום שתומך בפעולה זו"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 4ec756e02826..0abacb151280 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"アプリに対するネットワーク利用の計算方法を変更することをアプリに許可します。通常のアプリでは使用しません。"</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"通知にアクセス"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"通知（他のアプリから投稿されたものも含む）を取得、調査、クリアすることをアプリに許可します。"</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"パスワードルールの設定"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"画面ロック解除パスワードの長さと使用できる文字を制御します。"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"画面ロック解除試行の監視"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"テキスト操作"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"空き容量わずか"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"一部のシステム機能が動作しない可能性があります"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g>を実行中"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"現在<xliff:g id="APP_NAME">%1$s</xliff:g>を実行しています"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"キャンセル"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"ユーザー補助"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"壁紙"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"壁紙を変更"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPNが有効になりました"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPNが<xliff:g id="APP">%s</xliff:g>により有効化されました"</string> <string name="vpn_text" msgid="3011306607126450322">"タップしてネットワークを管理します。"</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"ホームへ移動"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"上へ移動"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"その他のオプション"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"内部ストレージ"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SDカード"</string> <string name="storage_usb" msgid="3017954059538517278">"USBストレージ"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"エラー"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"このアプリでは限定ユーザー用のアカウントはサポートしていません"</string> <string name="app_not_found" msgid="3429141853498927379">"この操作を行うアプリが見つかりません"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index e6010ac7f770..b07878c47286 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"애플리케이션이 애플리케이션의 네트워크 사용량을 계산하는 방식을 수정할 수 있도록 허용합니다. 일반 애플리케이션에서는 사용하지 않습니다."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"알림 액세스"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"앱이 다른 앱에서 게시한 알림을 비롯하여 알림을 검색하고 살펴보며 삭제할 수 있도록 허용합니다."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"비밀번호 규칙 설정"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"화면 잠금해제 비밀번호에 허용되는 길이 및 문자 수를 제어합니다."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"화면 잠금해제 시도 모니터링"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"텍스트 작업"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"저장 공간이 부족함"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"일부 시스템 기능이 작동하지 않을 수 있습니다."</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> 실행 중"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g>이(가) 현재 실행 중입니다."</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"확인"</string> <string name="cancel" msgid="6442560571259935130">"취소"</string> <string name="yes" msgid="5362982303337969312">"확인"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"접근성"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"배경화면"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"배경화면 변경"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN이 활성화됨"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN이 <xliff:g id="APP">%s</xliff:g>에 의해 활성화됨"</string> <string name="vpn_text" msgid="3011306607126450322">"네트워크를 관리하려면 터치하세요."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"홈 탐색"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"위로 탐색"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"옵션 더보기"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"내부 저장소"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD 카드"</string> <string name="storage_usb" msgid="3017954059538517278">"USB 저장소"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"오류"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"이 애플리케이션은 제한된 사용자를 위한 계정을 지원하지 않습니다."</string> <string name="app_not_found" msgid="3429141853498927379">"이 작업을 처리하는 애플리케이션을 찾을 수 없습니다."</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index e8d7c26636df..1b7b68e14764 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Leidžiama programai keisti, kaip tinklas naudojamas, palyginti su programomis. Neskirta naudoti įprastoms programoms."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"pasiekti pranešimus"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Programai leidžiama gauti, patikrinti ir išvalyti pranešimus, įskaitant pranešimus, kuriuos paskelbė kitos programos."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Nustatyti slaptažodžio taisykles"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Valdyti leidžiamą ekrano atrakinimo slaptažodžių ilgį ir leidžiamus naudoti simbolius."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Stebėti bandymus atrakinti ekraną"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Teksto veiksmai"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Mažėja laisvos saugyklos vietos"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Kai kurios sistemos funkcijos gali neveikti"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ paleista"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ šiuo metu paleista"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"Gerai"</string> <string name="cancel" msgid="6442560571259935130">"Atšaukti"</string> <string name="yes" msgid="5362982303337969312">"Gerai"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Pasiekiamumas"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Darbalaukio fonas"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Keisti darbalaukio foną"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN suaktyvintas"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN suaktyvino „<xliff:g id="APP">%s</xliff:g>“"</string> <string name="vpn_text" msgid="3011306607126450322">"Palieskite, kad valdytumėte tinklą."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Naršyti pagrindinį puslapį"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Naršyti į viršų"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Daugiau parinkčių"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Vidinė atmintis"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD kortelė"</string> <string name="storage_usb" msgid="3017954059538517278">"USB atmintis"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Klaida"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Ši programa nepalaiko apribotų naudotojų paskyrų"</string> <string name="app_not_found" msgid="3429141853498927379">"Nerasta programa šiam veiksmui apdoroti"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index f134005ab8d4..9ae5381d71b7 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Ļauj lietotnei mainīt to, kā tīkla lietojums tiek uzskaitīts saistībā ar lietotnēm. Atļauja neattiecas uz parastām lietotnēm."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"piekļuve paziņojumiem"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Ļauj lietotnei izgūt, pārbaudīt un dzēst paziņojumus, tostarp lietotņu publicētos paziņojumus."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Paroles kārtulu iestatīšana"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontrolē ekrāna atbloķēšanas parolē atļautās rakstzīmes un garumu."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Ekrāna atbloķēšanas mēģinājumu pārraudzīšana"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Teksta darbības"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Paliek maz brīvas vietas"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Dažas sistēmas funkcijas var nedarboties."</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"Lietotne <xliff:g id="APP_NAME">%1$s</xliff:g> darbojas"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"Lietotne <xliff:g id="APP_NAME">%1$s</xliff:g> pašlaik darbojas"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"Labi"</string> <string name="cancel" msgid="6442560571259935130">"Atcelt"</string> <string name="yes" msgid="5362982303337969312">"Labi"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Pieejamība"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Fona tapete"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Tapetes maiņa"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN ir aktivizēts."</string> <string name="vpn_title_long" msgid="6400714798049252294">"Lietojumprogramma <xliff:g id="APP">%s</xliff:g> aktivizēja VPN."</string> <string name="vpn_text" msgid="3011306607126450322">"Pieskarieties, lai pārvaldītu tīklu."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Pārvietoties uz sākuma ekrānu"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Pārvietoties augšup"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Vairāk opciju"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Iekšējā atmiņa"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD karte"</string> <string name="storage_usb" msgid="3017954059538517278">"USB atmiņa"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Kļūda"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Šajā lietojumprogrammā netiek atbalstīti ierobežotu lietotāju konti."</string> <string name="app_not_found" msgid="3429141853498927379">"Netika atrasta neviena lietojumprogramma, kas var veikt šo darbību."</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index 3091e7dd128d..bbde90dd4ff0 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Membenarkan apl untuk mengubah suai bagaimana penggunaan rangkaian diambil kira terhadap apl. Bukan untuk digunakan oleh apl biasa."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"pemberitahuan akses"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Membenarkan apl untuk mendapatkan semula, memeriksa dan memadam bersih pemberitahuan, termasuk yang disiarkan oleh apl lain."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Tetapkan peraturan kata laluan"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Mengawal panjang dan aksara yang dibenarkan dalam kata laluan buka kunci skrin."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Memantau percubaan buka kunci skrin"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Tindakan teks"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Ruang storan semakin berkurangan"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Beberapa fungsi sistem mungkin tidak berfungsi"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> berjalan"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> sedang berjalan"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Batal"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Kebolehaksesan"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Kertas dinding"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Tukar kertas dinding"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN diaktifkan"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN diaktifkan oleh <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Sentuh untuk mengurus rangkaian."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Navigasi laman utama"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Navigasi ke atas"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Lagi pilihan"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Storan dalaman"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Kad SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Storan USB"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Ralat"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Aplikasi ini tidak menyokong akaun untuk pengguna terhad"</string> <string name="app_not_found" msgid="3429141853498927379">"Tidak menemui aplikasi untuk mengendalikan tindakan ini"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 9d39ac8057fa..3bb502272414 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Lar appen endre hvordan nettverksbruk regnes ut for apper. Ikke beregnet på vanlige apper."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"varseltilgang"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Lar appen hente, gjennomgå og fjerne varsler, inkludert de som sendes fra andre apper."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Angi passordregler"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontroller tillatt lengde og tillatte tegn i passord for opplåsing av skjerm."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Overvåk forsøk på opplåsing av skjerm"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Teksthandlinger"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Lite ledig lagringsplass"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Enkelte systemfunksjoner fungerer muligens ikke slik de skal"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> kjører"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> kjører for øyeblikket"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Avbryt"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Tilgjengelighet"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Bakgrunnsbilde"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Velg bakgrunnsbilde"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN er aktivert"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN er aktivert av <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Trykk for å administrere nettverket."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Gå til startsiden"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Gå opp"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Flere alternativer"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Intern lagring"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kort"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-lagring"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Feil"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Denne appen støtter ikke kontoer for brukere med begrensninger"</string> <string name="app_not_found" msgid="3429141853498927379">"Finner ingen apper som kan utføre denne handlingen"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index b0a6d30fa7b9..4d71f0802986 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Hiermee kan een app aanpassen hoe het netwerkgebruik wordt toegekend aan apps. Dit wordt niet gebruikt door normale apps."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"toegang tot meldingen"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Hiermee kan de app meldingen ophalen, onderzoeken en wissen, waaronder meldingen die zijn verzonden door andere apps."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Wachtwoordregels instellen"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"De lengte en tekens beheren die zijn toegestaan in wachtwoorden voor schermontgrendeling."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Pogingen voor schermontgrendeling bijhouden"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Tekstacties"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Opslagruimte is bijna vol"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Bepaalde systeemfuncties werken mogelijk niet"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> is actief"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> is momenteel actief"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Annuleren"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Toegankelijkheid"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Achtergrond"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Achtergrond wijzigen"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN is geactiveerd"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN wordt geactiveerd door <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Raak aan om het netwerk te beheren."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Navigeren naar startpositie"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Omhoog navigeren"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Meer opties"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Interne opslag"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kaart"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-opslag"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Fout"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Deze app ondersteunt geen accounts voor beperkte gebruikers"</string> <string name="app_not_found" msgid="3429141853498927379">"Er is geen app gevonden om deze actie uit te voeren"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 0414be81dcdc..f4fe46646beb 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Pozwala aplikacji na zmienianie sposobu rozliczania wykorzystania sieci przez aplikacje. Nieprzeznaczone dla zwykłych aplikacji."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"dostęp do powiadomień"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Umożliwia aplikacji pobieranie, sprawdzanie i usuwanie powiadomień, także tych, które pochodzą z innych aplikacji."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Określ reguły hasła"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontrolowanie długości haseł odblokowania ekranu i dozwolonych w nich znaków"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Monitoruj próby odblokowania ekranu"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Działania na tekście"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Kończy się miejsce"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Niektóre funkcje systemu mogą nie działać"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"Aplikacja <xliff:g id="APP_NAME">%1$s</xliff:g> uruchomiona"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"Aplikacja <xliff:g id="APP_NAME">%1$s</xliff:g> jest uruchomiona"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Anuluj"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Ułatwienia dostępu"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Tapeta"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Zmień tapetę"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN aktywny"</string> <string name="vpn_title_long" msgid="6400714798049252294">"Obsługa sieci VPN została włączona przez aplikację <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Dotknij, aby zarządzać siecią."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Przejdź do strony głównej"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Przejdź wyżej"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Więcej opcji"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Pamięć wewnętrzna"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Karta SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Nośnik USB"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Błąd"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Ta aplikacja nie obsługuje kont użytkowników z ograniczeniami"</string> <string name="app_not_found" msgid="3429141853498927379">"Nie znaleziono aplikacji do obsługi tej akcji"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 5eba00c5bb03..36751b1728dc 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Permite que a aplicação modifique o modo como a utilização da rede é contabilizada em relação a aplicações. Nunca é necessário para aplicações normais."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"aceder às notificações"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Permite que a aplicação obtenha, examine e limpe notificações, incluindo as que foram publicadas por outras aplicações."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Definir regras de palavra-passe"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Controlar o comprimento e os caracteres permitidos nas palavras-passe de desbloqueio do ecrã."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Monitorizar tentativas de desbloqueio do ecrã"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Acções de texto"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Está quase sem espaço de armazenamento"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Algumas funções do sistema poderão não funcionar"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> em execução"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> está a ser executado"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Cancelar"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Acessibilidade"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Imagem de fundo"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Alterar imagem de fundo"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN ativada"</string> <string name="vpn_title_long" msgid="6400714798049252294">"A VPN foi ativada pelo <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Toque para gerir a rede."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Navegar para página inicial"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Navegar para cima"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Mais opções"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"memória de armazenamento interno"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Cartão SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Armazenamento USB"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Erro"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Esta aplicação não suporta contas de utilizadores limitados"</string> <string name="app_not_found" msgid="3429141853498927379">"Não foram encontradas aplicações para executar esta ação"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 6b0d18ae8c42..61716fe5768e 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Permite que o aplicativo modifique como o uso da rede é contabilizado em relação aos aplicativos. Não deve ser usado em aplicativos normais."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"acessar notificações"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Permite que o aplicativo recupere, examine e limpe notificações, inclusive as postadas por outros aplicativos."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Definir regras para senha"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Controle o tamanho e os caracteres permitidos nas senhas de desbloqueio de tela."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Monitorar tentativas de desbloqueio da tela"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Ações de texto"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Pouco espaço de armazenamento"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Algumas funções do sistema podem não funcionar"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> em execução"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> está em execução"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Cancelar"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Acessibilidade"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Plano de fundo"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Alterar plano de fundo"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN ativada"</string> <string name="vpn_title_long" msgid="6400714798049252294">"A VPN está ativada por <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Toque para gerenciar a rede."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Navegar na página inicial"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Navegar para cima"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Mais opções"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Armazenamento interno"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Cartão SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Armazenamento USB"</string> @@ -1415,7 +1427,7 @@ <string name="default_audio_route_name" product="tablet" msgid="4617053898167127471">"Tablet"</string> <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Telefone"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Fones de ouvido"</string> - <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Alto-falantes do dock"</string> + <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Alto-falantes da dock"</string> <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistema"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Áudio Bluetooth"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Erro"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"O aplicativo não suporta contas para usuários limitados"</string> <string name="app_not_found" msgid="3429141853498927379">"Nenhum aplicativo encontrado para executar a ação"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-rm/strings.xml b/core/res/res/values-rm/strings.xml index 99fd59d9a20f..ba863cbdc9f3 100644 --- a/core/res/res/values-rm/strings.xml +++ b/core/res/res/values-rm/strings.xml @@ -1040,6 +1040,10 @@ <skip /> <!-- no translation found for permdesc_accessNotifications (458457742683431387) --> <skip /> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <!-- no translation found for policylab_limitPassword (4497420728857585791) --> <skip /> <!-- no translation found for policydesc_limitPassword (3252114203919510394) --> @@ -1634,9 +1638,9 @@ <skip /> <!-- no translation found for low_internal_storage_view_text (6640505817617414371) --> <skip /> - <!-- no translation found for app_running_notification_title (4625479411505090209) --> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> <skip /> - <!-- no translation found for app_running_notification_text (3368349329989620597) --> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Interrumper"</string> @@ -1989,6 +1993,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Agids d\'access"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Fund davos"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Midar il fund davos"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <!-- no translation found for vpn_title (19615213552042827) --> <skip /> <!-- no translation found for vpn_title_long (6400714798049252294) --> @@ -2178,6 +2184,10 @@ <skip /> <!-- no translation found for action_menu_overflow_description (2295659037509008453) --> <skip /> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <!-- no translation found for storage_internal (4891916833657929263) --> <skip /> <!-- no translation found for storage_sd_card (3282948861378286745) --> @@ -2397,4 +2407,6 @@ <skip /> <!-- no translation found for app_not_found (3429141853498927379) --> <skip /> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index b11cc2fb72a2..003f932d48af 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Permite aplicaţiei să modifice modul în care este calculată utilizarea reţelei pentru aplicaţii. Nu se utilizează de aplicaţiile obişnuite."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"accesare notificări"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Permite aplicației să recupereze, să examineze și să șteargă notificări, inclusiv pe cele postate de alte aplicații."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Setaţi reguli pentru parolă"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Stabiliţi lungimea şi tipul de caractere permise în parolele pentru deblocarea ecranului."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Monitorizaţi încercările de deblocare a ecranului"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Acţiuni pentru text"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Spaţiul de stocare aproape ocupat"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Este posibil ca unele funcţii de sistem să nu funcţioneze"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> rulează"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> rulează acum"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Anulaţi"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Accesibilitate"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Imagine de fundal"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Modificaţi imaginea de fundal"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN activat"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN este activată de <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Atingeţi pentru a gestiona reţeaua."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Navigaţi la ecranul de pornire"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Navigaţi în sus"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Mai multe opţiuni"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Stocare internă"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Card SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Dsipozitiv de stocare USB"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Eroare"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Această aplicație nu acceptă conturile pentru utilizatori cu permisiuni limitate"</string> <string name="app_not_found" msgid="3429141853498927379">"Nicio aplicație pentru gestionarea acestei acțiuni"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 3da7211c0ce4..2c8dfe800a72 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Приложение сможет изменять порядок расчета использования сетевых ресурсов различными программами. Это разрешение не используется обычными приложениями."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"доступ к уведомлениям"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Приложение сможет получать, проверять и удалять уведомления, включая те, что опубликованы другими приложениями."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Правила выбора паролей"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Контролировать длину и символы при вводе паролей для снятия блокировки экрана."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Отслеживать попытки снятия блокировки экрана"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Операции с текстом"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Заканчивается свободное место"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Некоторые системные функции могут не работать"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"Приложение <xliff:g id="APP_NAME">%1$s</xliff:g> выполняется"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"Приложение <xliff:g id="APP_NAME">%1$s</xliff:g> выполняется в данный момент"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"ОК"</string> <string name="cancel" msgid="6442560571259935130">"Отмена"</string> <string name="yes" msgid="5362982303337969312">"ОК"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Спец. возможности"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Фоновый рисунок"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Сменить обои"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"Сеть VPN активна"</string> <string name="vpn_title_long" msgid="6400714798049252294">"Сеть VPN активирована приложением <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Нажмите, чтобы открыть настройки."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Перейти на главную"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Перейти вверх"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Ещё"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Внутренняя память"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-карта"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-накопитель"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Ошибка"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Приложение не поддерживает аккаунты с ограниченным доступом"</string> <string name="app_not_found" msgid="3429141853498927379">"Невозможно обработать это действие"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 9ffe30dd320e..80a2c31ee6c3 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Umožňuje aplikácii upraviť používanie siete jednotlivými aplikáciami. Bežné aplikácie toto nastavenie nepoužívajú."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"prístup k upozorneniam"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Umožňuje aplikácii načítať, zobrazovať a mazať upozornenia vrátane tých, ktoré boli uverejnené inými aplikáciami."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Nastaviť pravidlá pre heslo"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Ovládanie dĺžky hesiel na odomknutie obrazovky a v nich používané znaky."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Sledovať pokusy o odomknutie obrazovky"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Operácie s textom"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Nedostatok ukladacieho priestoru"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Niektoré systémové funkcie nemusia fungovať"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> je spustená"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> je práve spustená"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Zrušiť"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Zjednodušenie"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Tapeta"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Zmeniť tapetu"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"Sieť VPN je aktivovaná"</string> <string name="vpn_title_long" msgid="6400714798049252294">"Aplikáciu <xliff:g id="APP">%s</xliff:g> aktivovala sieť VPN"</string> <string name="vpn_text" msgid="3011306607126450322">"Dotykom môžete spravovať sieť."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Prejsť na plochu"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Prejsť na"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Viac možností"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Interné úložisko"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Karta SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Ukladací priestor USB"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Chyba"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Táto aplikácia nepodporuje účty v prípade používateľov s obmedzením"</string> <string name="app_not_found" msgid="3429141853498927379">"Aplikácia potrebná na spracovanie tejto akcie sa nenašla"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index ac1b6ad240f3..766b605d4039 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Programu omogoča, da spremeni uporabo omrežja na podlagi programov. Ni za uporabo z navadnimi programi."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"dostop do obvestil"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Dovoli aplikaciji, da prenese, razišče in izbriše obvestila, tudi tista, ki so jih objavile druge aplikacije."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Nastavitev pravil za geslo"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Nadzor nad dolžino in znaki, ki so dovoljeni v geslih za odklepanje zaslona."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"nadzor nad poskusi odklepanja zaslona"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Besedilna dejanja"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Prostor za shranjevanje bo pošel"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Nekatere sistemske funkcije morda ne delujejo"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"Izvaja se aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"Trenutno se izvaja aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"V redu"</string> <string name="cancel" msgid="6442560571259935130">"Prekliči"</string> <string name="yes" msgid="5362982303337969312">"V redu"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Pripomočki za osebe s posebnimi potrebami"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Ozadje"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Spreminjanje ozadja"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN aktiviran"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN je aktiviral program <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Dotaknite se, če želite upravljati omrežje."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Krmarjenje domov"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Krmarjenje navzgor"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Več možnosti"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Notranji pomnilnik"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Kartica SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Pomnilnik USB"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Napaka"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Ta aplikacija ne podpira računov za uporabnike z omejitvami"</string> <string name="app_not_found" msgid="3429141853498927379">"Najdena ni bila nobena aplikacija za izvedbo tega dejanja"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 7e8cf01ed9ce..15b9ec54bf49 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Дозвољава апликацији да измени начин на који апликације користе мрежу. Не користе је уобичајене апликације."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"приступ обавештењима"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Дозвољава апликацији да преузима, испитује и брише обавештења, укључујући она која постављају друге апликације."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Подешавање правила за лозинку"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Контролишите дужину и знакове дозвољене у лозинкама за откључавање екрана."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Надгледање покушаја откључавања екрана"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Радње у вези са текстом"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Простор за складиштење је на измаку"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Неке системске функције можда не функционишу"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> је покренута"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> је тренутно покренута"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"Потврди"</string> <string name="cancel" msgid="6442560571259935130">"Откажи"</string> <string name="yes" msgid="5362982303337969312">"Потврди"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Приступачност"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Позадина"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Промена позадине"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN је активиран"</string> <string name="vpn_title_long" msgid="6400714798049252294">"Апликација <xliff:g id="APP">%s</xliff:g> је активирала VPN"</string> <string name="vpn_text" msgid="3011306607126450322">"Додирните да бисте управљали мрежом."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Кретање до Почетне"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Кретање нагоре"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Још опција"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Интерна меморија"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD картица"</string> <string name="storage_usb" msgid="3017954059538517278">"USB меморија"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Грешка"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Ова апликација не подржава налоге за кориснике са ограничењем"</string> <string name="app_not_found" msgid="3429141853498927379">"Није пронађена ниједна апликација која би могла да обави ову радњу"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 5a54f71c8bd1..291681c38b92 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Tillåter att appen ändrar hur nätverksanvändning redovisas för appar. Används inte av vanliga appar."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"få åtkomst till meddelanden"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Tillåter att appen hämtar, granskar och raderar meddelanden, även sådana som skickats av andra appar."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Ange lösenordsregler"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Bestäm hur många och vilka tecken som är tillåtna i skärmlåsets lösenord."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Övervaka försök att låsa upp skärmen"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Textåtgärder"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Lagringsutrymmet börjar ta slut"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Det kan hända att vissa systemfunktioner inte fungerar"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> körs"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> körs"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Avbryt"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Tillgänglighet"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Bakgrund"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Ändra bakgrund"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN är aktiverat"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN aktiveras av <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Tryck om du vill hantera nätverket."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Visa startsidan"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Navigera uppåt"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Fler alternativ"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Internminne"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kort"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-lagring"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Fel"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Appen har inte stöd för användarkonton med begränsningar"</string> <string name="app_not_found" msgid="3429141853498927379">"Ingen app som kan hantera åtgärden hittades"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 67b4608697a2..c8f13436ab59 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Huruhusu programu kurekebisha jinsi matumizi ya mtandao yana hesabika dhidi ya programu. Sio ya matumizi na programu za kawaida."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"fikia arifa"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Huruhusu programu kurejesha, kuchunguza, na kuondoa arifa, ikiwa ni pamoja na zile zilizochapishwa na programu nyingine."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Weka kanuni za nenosiri"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Dhibiti urefu na vibambo vinavyoruhusiwa katika manenosiri ya kufungua skrini."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Chunguza majaribio ya kutofun gua skrini"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Vitendo vya maandishi"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Nafasi ya kuhafadhi inakwisha"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Baadhi ya vipengee vya mfumo huenda visifanye kazi"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> inaendeshwa"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> inaendeshwa kwa sasa"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"Sawa"</string> <string name="cancel" msgid="6442560571259935130">"Ghairi"</string> <string name="yes" msgid="5362982303337969312">"Sawa"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Ufikiaji"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Mandhari"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Badilisha mandhari"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN imewezeshwa"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN imeamilishwa na <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Gusa ili kudhibiti mtandao."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Abiri nyumbani"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Ongoza"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Chaguo zaidi"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Hifadhi ya mfumo"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Kadi ya SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Hifadhi ya USB"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Hitilafu"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Programu hii haiwezi kutumiwa na akaunti za watumiaji waliowekewa vizuizi"</string> <string name="app_not_found" msgid="3429141853498927379">"Hakuna programu iliyopatikana ili kushughulikia kitendo hiki"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 2d56e381462b..66b319901623 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"อนุญาตให้แอปพลิเคชันแก้ไขวิธีการบันทึกบัญชีการใช้งานเครือข่ายของแอปพลิเคชัน ไม่ใช้สำหรับแอปพลิเคชันทั่วไป"</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"เข้าถึงการแจ้งเตือน"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"ทำให้แอปสามารถเรียกดู ตรวจสอบ และล้างการแจ้งเตือนได้ ซึ่งรวมถึงการแจ้งเตือนที่โพสต์โดยแอปอื่นๆ ด้วย"</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"ตั้งค่ากฎรหัสผ่าน"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"ควบคุมความยาวและอักขระที่อนุญาตให้ใช้ในรหัสผ่านการปลดล็อกหน้าจอ"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"ตรวจสอบความพยายามในการปลดล็อกหน้าจอ"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"การทำงานของข้อความ"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"พื้นที่จัดเก็บเหลือน้อย"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"บางฟังก์ชันระบบอาจไม่ทำงาน"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> กำลังทำงาน"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> กำลังทำงานในขณะนี้"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"ตกลง"</string> <string name="cancel" msgid="6442560571259935130">"ยกเลิก"</string> <string name="yes" msgid="5362982303337969312">"ตกลง"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"การเข้าถึง"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"วอลเปเปอร์"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"เปลี่ยนวอลเปเปอร์"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN เปิดใช้งานแล้ว"</string> <string name="vpn_title_long" msgid="6400714798049252294">"เปิดใช้งาน VPN โดย <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"แตะเพื่อจัดการเครือข่าย"</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"นำทางไปหน้าแรก"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"นำทางขึ้น"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"ตัวเลือกเพิ่มเติม"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"ที่จัดเก็บข้อมูลภายใน"</string> <string name="storage_sd_card" msgid="3282948861378286745">"การ์ด SD"</string> <string name="storage_usb" msgid="3017954059538517278">"ที่เก็บข้อมูล USB"</string> @@ -1477,6 +1489,8 @@ <string name="user_switched" msgid="3768006783166984410">"ผู้ใช้ปัจจุบัน <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="owner_name" msgid="2716755460376028154">"เจ้าของ"</string> <string name="error_message_title" msgid="4510373083082500195">"ข้อผิดพลาด"</string> - <string name="app_no_restricted_accounts" msgid="5322164210667258876">"แอปพลิเคชันนี้ไม่สนับสนุนบัญชีของผู้ใช้บางรายที่ถูกจำกัด"</string> + <string name="app_no_restricted_accounts" msgid="5322164210667258876">"แอปพลิเคชันนี้ไม่สนับสนุนบัญชีผู้ใช้ที่ถูกจำกัด"</string> <string name="app_not_found" msgid="3429141853498927379">"ไม่พบแอปพลิเคชันสำหรับการทำงานนี้"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index beeb6c04f513..bd5f99df062f 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Pinapayagan ang app na baguhin kung paano isinasaalang-alang ang paggamit ng network laban sa apps. Hindi para sa paggamit ng normal na apps."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"i-access ang mga notification"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Pinapayagan ang app na kumuha, sumuri, at mag-clear ng mga notification, kabilang ang mga na-post ng iba pang apps."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Magtakda ng mga panuntunan sa password"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontrolin ang haba at mga character na pinapayagan sa mga password sa pag-unlock ng screen."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Subaybayan ang mga pagsubok sa pag-unlock ng screen"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Pagkilos ng teksto"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Nauubusan na ang puwang ng storage"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Maaaring hindi gumana nang tama ang ilang paggana ng system"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"Tumatakbo ang <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"Kasalukuyang tumatakbo ang <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Kanselahin"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Kakayahang Ma-access"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Wallpaper"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Baguhin ang wallpaper"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"Naka-activate ang VPN"</string> <string name="vpn_title_long" msgid="6400714798049252294">"Isinaaktibo ang VPN ng <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Pindutin upang pamahalaan ang network."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Magnabiga sa home"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Magnabiga pataas"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Higit pang mga pagpipilian"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Panloob na storage"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD card"</string> <string name="storage_usb" msgid="3017954059538517278">"USB storage"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Error"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Hindi sinusuportahan ng application na ito ang mga account para sa mga limitadong user"</string> <string name="app_not_found" msgid="3429141853498927379">"Walang nakitang application na mangangasiwa sa pagkilos na ito"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index c8d3ae486770..79c3706b3a62 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Uygulamaya, ağın uygulamalara göre nasıl kullanılacağını değiştirme izni verir. Normal uygulamalar tarafından kullanılmak için değildir."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"bildirimlere eriş"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Uygulamanın bildirimler almasına, bildirimleri incelemesine ve temizlemesine izin verir. Buna diğer uygulamalar tarafından yayınlanan bildirimler de dahildir."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Şifre kuralları ayarla"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Ekran kilidini açma şifrelerinde izin verilen uzunluğu ve karakterleri denetleme."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Ekran kilidini açma denemelerini izle"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Metin eylemleri"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Depolama alanı bitiyor"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Bazı sistem işlevleri çalışmayabilir"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> çalışıyor"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> şu anda çalışıyor"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"Tamam"</string> <string name="cancel" msgid="6442560571259935130">"İptal"</string> <string name="yes" msgid="5362982303337969312">"Tamam"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Erişebilirlik"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Duvar Kağıdı"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Duvar kağıdını değiştir"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN etkinleştirildi"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN, <xliff:g id="APP">%s</xliff:g> tarafından etkinleştirildi"</string> <string name="vpn_text" msgid="3011306607126450322">"Ağı yönetmek için dokunun."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Ana sayfaya git"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Yukarı git"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Diğer seçenekler"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Dahili depolama birimi"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD kart"</string> <string name="storage_usb" msgid="3017954059538517278">"USB bellek"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Hata"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Bu uygulama, kısıtlı kullanıcı hesaplarını desteklemiyor"</string> <string name="app_not_found" msgid="3429141853498927379">"Bu eylemi gerçekleştirecek bir uygulama bulunamadı"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 6f505b129006..ad206d3f9397 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Дозволяє програмі змінювати метод підрахунку того, як програми використовують мережу. Не для використання звичайними програмами."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"отримувати доступ до сповіщень"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Дозволяє програмі отримувати, перевіряти й очищати сповіщення, зокрема опубліковані іншими програмами."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Устан. правила пароля"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Контролювати довжину паролів для розблокування екрана та дозволені в них символи."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Відстежув. спроби розблок. екрана"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Дії з текстом"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Закінчується пам’ять"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Деякі системні функції можуть не працювати"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> працює"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> зараз працює"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Скасувати"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Доступність"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Фоновий мал."</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Змінити фоновий малюнок"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"Мережу VPN активовано"</string> <string name="vpn_title_long" msgid="6400714798049252294">"Мережу VPN активовано програмою <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Торкніться, щоб керувати мережею."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Перейти на головну"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Перейти вгору"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Інші варіанти"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Внутрішня пам’ять"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Карта SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Носій USB"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Помилка"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Ця програма не підтримує облікові записи для обмежених користувачів"</string> <string name="app_not_found" msgid="3429141853498927379">"Не знайдено програму для обробки цієї дії"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 4fe8d656794f..4022f04291f6 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Cho phép ứng dụng sửa đổi cách tính mức sử dụng mạng so với ứng dụng. Không dành cho các ứng dụng thông thường."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"truy cập thông báo"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Cho phép ứng dụng truy xuất, kiểm tra và xóa thông báo, bao gồm những thông báo được đăng bởi các ứng dụng khác."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Đặt quy tắc mật khẩu"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kiểm soát độ dài và ký tự được phép trong mật khẩu mở khóa màn hình."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Giám sát những lần thử mở khóa màn hình"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Tác vụ văn bản"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Sắp hết dung lượng lưu trữ"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Một số chức năng hệ thống có thể không hoạt động"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g> đang chạy"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g> hiện đang chạy"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Hủy"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Khả năng truy cập"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Hình nền"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Thay đổi hình nền"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"Đã kích hoạt VPN"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN được <xliff:g id="APP">%s</xliff:g> kích hoạt"</string> <string name="vpn_text" msgid="3011306607126450322">"Chạm để quản lý mạng."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Điều hướng về trang chủ"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Điều hướng lên trên"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Tùy chọn khác"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Bộ nhớ trong"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Thẻ SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Bộ lưu trữ USB"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Lỗi"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Ứng dụng này không hỗ trợ tài khoản cho người dùng giới hạn"</string> <string name="app_not_found" msgid="3429141853498927379">"Không tìm thấy ứng dụng nào để xử lý tác vụ này"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index af1a2ea1be76..5ebd3c7a70fd 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"允许该应用修改对于各应用的网络使用情况的统计方式。普通应用不应使用此权限。"</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"查看通知"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"允许该应用检索、检查并清除通知，包括其他应用发布的通知。"</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"设置密码规则"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"控制屏幕解锁密码所允许的长度和字符。"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"监视屏幕解锁尝试次数"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"文字操作"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"存储空间不足"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"某些系统功能可能无法正常使用"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"<xliff:g id="APP_NAME">%1$s</xliff:g>正在运行"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"<xliff:g id="APP_NAME">%1$s</xliff:g>目前正在运行"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"确定"</string> <string name="cancel" msgid="6442560571259935130">"取消"</string> <string name="yes" msgid="5362982303337969312">"确定"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"辅助功能"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"壁纸"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"更改壁纸"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN 已激活"</string> <string name="vpn_title_long" msgid="6400714798049252294">"“<xliff:g id="APP">%s</xliff:g>”已激活 VPN"</string> <string name="vpn_text" msgid="3011306607126450322">"触摸可管理网络。"</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"导航首页"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"向上导航"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"更多选项"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"内存设备"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD 卡"</string> <string name="storage_usb" msgid="3017954059538517278">"USB 存储器"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"错误"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"此应用不支持受限用户的帐户"</string> <string name="app_not_found" msgid="3429141853498927379">"找不到可处理此操作的应用"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index cea93697fb1f..a0c8c055a744 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"允許應用程式修改應用程式網路使用量的計算方式 (不建議一般應用程式使用)。"</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"存取通知"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"允許應用程式擷取、檢查及清除通知 (包括由其他應用程式發佈的通知)。"</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"設定密碼規則"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"控制螢幕解鎖密碼所允許的長度和字元。"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"監視螢幕解鎖嘗試次數"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"文字動作"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"儲存空間即將用盡"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"部分系統功能可能無法運作"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」正在執行"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」目前正在執行"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"確定"</string> <string name="cancel" msgid="6442560571259935130">"取消"</string> <string name="yes" msgid="5362982303337969312">"確定"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"協助工具"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"桌布"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"變更桌布"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"VPN 已啟用"</string> <string name="vpn_title_long" msgid="6400714798049252294">"<xliff:g id="APP">%s</xliff:g> 已啟用 VPN"</string> <string name="vpn_text" msgid="3011306607126450322">"輕觸即可管理網路。"</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"瀏覽首頁"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"向上瀏覽"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"更多選項"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"內部儲存空間"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD 卡"</string> <string name="storage_usb" msgid="3017954059538517278">"USB 儲存裝置"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"錯誤"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"這個應用程式不支援受限的使用者帳戶。"</string> <string name="app_not_found" msgid="3429141853498927379">"找不到支援此操作的應用程式"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 8bf3aae2a312..7f6260354dea 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -621,6 +621,10 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Ivumela insiza ukuthi iguqule ukuthii ukusetshenziswa kwenethiwekhi kumiswa kanjani ezinsizeni. Ayisetshenziswa izinsiza ezijwayelekile."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"finyelela kuzaziso"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Ivumela uhlelo lokusebenza ukuthi lithole, lihlole, liphinde lisuse izaziso, ezifaka lezo ezithunyelwe ezinye izinhlelo zokusebenza."</string> + <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> + <skip /> + <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"Misa imithetho yephasiwedi"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Lawula ubude nezinhlamvu ezivunyelwe kumaphasiwedi okuvula isikrini"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Gaka imizamo yokuvula isikrini"</string> @@ -1048,8 +1052,10 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Izenzo zombhalo"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Isikhala sokulondoloza siyaphela"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Eminye imisebenzi yohlelo ingahle ingasebenzi"</string> - <string name="app_running_notification_title" msgid="4625479411505090209">"I-<xliff:g id="APP_NAME">%1$s</xliff:g> iyasebenza"</string> - <string name="app_running_notification_text" msgid="3368349329989620597">"I-<xliff:g id="APP_NAME">%1$s</xliff:g> isebenza manje"</string> + <!-- no translation found for app_running_notification_title (8718335121060787914) --> + <skip /> + <!-- no translation found for app_running_notification_text (4653586947747330058) --> + <skip /> <string name="ok" msgid="5970060430562524910">"KULUNGILE"</string> <string name="cancel" msgid="6442560571259935130">"Khansela"</string> <string name="yes" msgid="5362982303337969312">"KULUNGILE"</string> @@ -1267,6 +1273,8 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Ukufinyeleleka"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Iphephadonga"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Shintsha iphephadonga"</string> + <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> + <skip /> <string name="vpn_title" msgid="19615213552042827">"I-VPN isiyasebenza"</string> <string name="vpn_title_long" msgid="6400714798049252294">"i-VPN ivuswe ngu <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Thinta ukuze wengamele inethiwekhi."</string> @@ -1370,6 +1378,10 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Zulazulela ekhaya"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Zulazulela phezulu"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Izinketho ezingaphezulu"</string> + <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> + <skip /> + <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> + <skip /> <string name="storage_internal" msgid="4891916833657929263">"Isitoreji sangaphakathi"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Ikhadi le-SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Isitoreji se-USB"</string> @@ -1479,4 +1491,6 @@ <string name="error_message_title" msgid="4510373083082500195">"Iphutha"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Lolu hlelo lokusebenza alusekeli ama-akhawunti wabasebenzisi abakhawulelwe"</string> <string name="app_not_found" msgid="3429141853498927379">"Alukho uhlelo lokusebenza olutholakele lokuphatha lesi senzo"</string> + <!-- no translation found for revoke (5404479185228271586) --> + <skip /> </resources> diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml index f7ff77bfee8b..146607ef9c37 100644 --- a/core/res/res/values/arrays.xml +++ b/core/res/res/values/arrays.xml @@ -141,6 +141,10 @@ <item>@drawable/menu_submenu_background</item> <item>@drawable/menu_dropdown_panel_holo_light</item> <item>@drawable/menu_dropdown_panel_holo_dark</item> + <item>@drawable/menu_popup_panel_holo_light</item> + <item>@drawable/menu_popup_panel_holo_dark</item> + <item>@drawable/menu_panel_holo_light</item> + <item>@drawable/menu_panel_holo_dark</item> <item>@drawable/overscroll_edge</item> <item>@drawable/overscroll_glow</item> <item>@drawable/spinner_16_outer_holo</item> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 56c22357f344..f494d8c6f031 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -1869,7 +1869,7 @@ please see styles_device_defaults.xml. <style name="Widget.Holo.ListPopupWindow" parent="Widget.ListPopupWindow"> <item name="android:dropDownSelector">@android:drawable/list_selector_holo_dark</item> - <item name="android:popupBackground">@android:drawable/menu_dropdown_panel_holo_dark</item> + <item name="android:popupBackground">@android:drawable/menu_panel_holo_dark</item> <item name="android:dropDownVerticalOffset">0dip</item> <item name="android:dropDownHorizontalOffset">0dip</item> <item name="android:dropDownWidth">wrap_content</item> @@ -2242,7 +2242,7 @@ please see styles_device_defaults.xml. <style name="Widget.Holo.Light.ListPopupWindow" parent="Widget.ListPopupWindow"> <item name="android:dropDownSelector">@android:drawable/list_selector_holo_light</item> - <item name="android:popupBackground">@android:drawable/menu_dropdown_panel_holo_light</item> + <item name="android:popupBackground">@android:drawable/menu_panel_holo_light</item> <item name="android:dropDownVerticalOffset">0dip</item> <item name="android:dropDownHorizontalOffset">0dip</item> <item name="android:dropDownWidth">wrap_content</item> diff --git a/core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/downloadmanagertests/DownloadManagerTestApp.java b/core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/downloadmanagertests/DownloadManagerTestApp.java index 9c44d6117dfe..0518e6422b89 100644 --- a/core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/downloadmanagertests/DownloadManagerTestApp.java +++ b/core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/downloadmanagertests/DownloadManagerTestApp.java @@ -265,8 +265,8 @@ public class DownloadManagerTestApp extends DownloadManagerBaseTest { * @throws Exception if unsuccessful */ public void runDownloadMultipleSwitching() throws Exception { - String filename = DOWNLOAD_500K_FILENAME; - long filesize = DOWNLOAD_500K_FILESIZE; + String filename = DOWNLOAD_5MB_FILENAME; + long filesize = DOWNLOAD_5MB_FILESIZE; doCommonDownloadSetup(); String localDownloadDirectory = Environment.getExternalStorageDirectory().getPath(); @@ -340,8 +340,8 @@ public class DownloadManagerTestApp extends DownloadManagerBaseTest { * @throws Exception if unsuccessful */ public void runDownloadMultipleWiFiEnableDisable() throws Exception { - String filename = DOWNLOAD_500K_FILENAME; - long filesize = DOWNLOAD_500K_FILESIZE; + String filename = DOWNLOAD_5MB_FILENAME; + long filesize = DOWNLOAD_5MB_FILESIZE; doCommonDownloadSetup(); String localDownloadDirectory = Environment.getExternalStorageDirectory().getPath(); @@ -409,8 +409,8 @@ public class DownloadManagerTestApp extends DownloadManagerBaseTest { * @throws Exception if unsuccessful */ public void runDownloadMultipleAirplaneModeEnableDisable() throws Exception { - String filename = DOWNLOAD_500K_FILENAME; - long filesize = DOWNLOAD_500K_FILESIZE; + String filename = DOWNLOAD_5MB_FILENAME; + long filesize = DOWNLOAD_5MB_FILESIZE; // make sure WiFi is enabled, and airplane mode is not on doCommonDownloadSetup(); diff --git a/data/fonts/DroidSerif-Bold.ttf b/data/fonts/DroidSerif-Bold.ttf Binary files differindex 838d255888b4..16a914e2f6fd 100644 --- a/data/fonts/DroidSerif-Bold.ttf +++ b/data/fonts/DroidSerif-Bold.ttf diff --git a/data/fonts/DroidSerif-BoldItalic.ttf b/data/fonts/DroidSerif-BoldItalic.ttf Binary files differindex 0b1601f61bd7..50324fc1640c 100644 --- a/data/fonts/DroidSerif-BoldItalic.ttf +++ b/data/fonts/DroidSerif-BoldItalic.ttf diff --git a/data/fonts/DroidSerif-Italic.ttf b/data/fonts/DroidSerif-Italic.ttf Binary files differindex 2972809daaa8..bb2757cdc378 100644 --- a/data/fonts/DroidSerif-Italic.ttf +++ b/data/fonts/DroidSerif-Italic.ttf diff --git a/data/fonts/DroidSerif-Regular.ttf b/data/fonts/DroidSerif-Regular.ttf Binary files differindex 5b4fe815d2d8..da0a2cc3b7fa 100644 --- a/data/fonts/DroidSerif-Regular.ttf +++ b/data/fonts/DroidSerif-Regular.ttf diff --git a/docs/html/tools/debugging/debugging-ui.jd b/docs/html/tools/debugging/debugging-ui.jd index 8ca51920bc6b..f927d08c7347 100644 --- a/docs/html/tools/debugging/debugging-ui.jd +++ b/docs/html/tools/debugging/debugging-ui.jd @@ -60,7 +60,9 @@ Sometimes your application's layout can slow down your application. <p>The Hierarchy Viewer application allows you to debug and optimize your user interface. It provides a visual representation of the layout's View hierarchy (the View Hierarchy window) - and a magnified view of the display (the Pixel Perfect window).</p> + with performance information for each node in the layout, + and a magnified view of the display (the Pixel Perfect window) to closely examine the pixels + in your layout.</p> <p>Android <code>lint</code> is a static code scanning tool that helps you optimize the layouts and layout hierarchies of your applications, as well as detect other common coding problems. You can run it against your layout files or resource diff --git a/docs/html/training/basics/firstapp/building-ui.jd b/docs/html/training/basics/firstapp/building-ui.jd index 0f188618f440..2615bee81feb 100644 --- a/docs/html/training/basics/firstapp/building-ui.jd +++ b/docs/html/training/basics/firstapp/building-ui.jd @@ -240,7 +240,7 @@ the "hello_world" string.)</p> <string name="app_name">My First App</string> <string name="edit_message">Enter a message</string> <string name="button_send">Send</string> - <string name="menu_settings">Settings</string> + <string name="action_settings">Settings</string> <string name="title_activity_main">MainActivity</string> </resources> </pre> diff --git a/drm/jni/Android.mk b/drm/jni/Android.mk index fff7eee3ab04..474b9b299f86 100644 --- a/drm/jni/Android.mk +++ b/drm/jni/Android.mk @@ -23,6 +23,7 @@ LOCAL_MODULE:= libdrmframework_jni LOCAL_SHARED_LIBRARIES := \ libdrmframework \ + liblog \ libutils \ libandroid_runtime \ libnativehelper \ @@ -43,4 +44,3 @@ LOCAL_C_INCLUDES += \ LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) - diff --git a/graphics/java/android/renderscript/Allocation.java b/graphics/java/android/renderscript/Allocation.java index b8564b60bbf2..575133146008 100644 --- a/graphics/java/android/renderscript/Allocation.java +++ b/graphics/java/android/renderscript/Allocation.java @@ -274,12 +274,20 @@ public class Allocation extends BaseObj { } } + // don't need to account for USAGE_SHARED Allocations + if ((usage & USAGE_SHARED) == 0) { + int numBytes = t.getCount() * t.getElement().getBytesSize(); + rs.addAllocSizeForGC(numBytes); + mGCSize = numBytes; + } + mType = t; mUsage = usage; if (t != null) { updateCacheInfo(t); } + } private void validateIsInt32() { @@ -492,7 +500,9 @@ public class Allocation extends BaseObj { */ public void copyFromUnchecked(int[] d) { mRS.validate(); - if (mCurrentDimY > 0) { + if (mCurrentDimZ > 0) { + copy3DRangeFromUnchecked(0, 0, 0, mCurrentDimX, mCurrentDimY, mCurrentDimZ, d); + } else if (mCurrentDimY > 0) { copy2DRangeFromUnchecked(0, 0, mCurrentDimX, mCurrentDimY, d); } else { copy1DRangeFromUnchecked(0, mCurrentCount, d); @@ -507,7 +517,9 @@ public class Allocation extends BaseObj { */ public void copyFromUnchecked(short[] d) { mRS.validate(); - if (mCurrentDimY > 0) { + if (mCurrentDimZ > 0) { + copy3DRangeFromUnchecked(0, 0, 0, mCurrentDimX, mCurrentDimY, mCurrentDimZ, d); + } else if (mCurrentDimY > 0) { copy2DRangeFromUnchecked(0, 0, mCurrentDimX, mCurrentDimY, d); } else { copy1DRangeFromUnchecked(0, mCurrentCount, d); @@ -522,7 +534,9 @@ public class Allocation extends BaseObj { */ public void copyFromUnchecked(byte[] d) { mRS.validate(); - if (mCurrentDimY > 0) { + if (mCurrentDimZ > 0) { + copy3DRangeFromUnchecked(0, 0, 0, mCurrentDimX, mCurrentDimY, mCurrentDimZ, d); + } else if (mCurrentDimY > 0) { copy2DRangeFromUnchecked(0, 0, mCurrentDimX, mCurrentDimY, d); } else { copy1DRangeFromUnchecked(0, mCurrentCount, d); @@ -537,7 +551,9 @@ public class Allocation extends BaseObj { */ public void copyFromUnchecked(float[] d) { mRS.validate(); - if (mCurrentDimY > 0) { + if (mCurrentDimZ > 0) { + copy3DRangeFromUnchecked(0, 0, 0, mCurrentDimX, mCurrentDimY, mCurrentDimZ, d); + } else if (mCurrentDimY > 0) { copy2DRangeFromUnchecked(0, 0, mCurrentDimX, mCurrentDimY, d); } else { copy1DRangeFromUnchecked(0, mCurrentCount, d); @@ -553,7 +569,9 @@ public class Allocation extends BaseObj { */ public void copyFrom(int[] d) { mRS.validate(); - if (mCurrentDimY > 0) { + if (mCurrentDimZ > 0) { + copy3DRangeFrom(0, 0, 0, mCurrentDimX, mCurrentDimY, mCurrentDimZ, d); + } else if (mCurrentDimY > 0) { copy2DRangeFrom(0, 0, mCurrentDimX, mCurrentDimY, d); } else { copy1DRangeFrom(0, mCurrentCount, d); @@ -569,7 +587,9 @@ public class Allocation extends BaseObj { */ public void copyFrom(short[] d) { mRS.validate(); - if (mCurrentDimY > 0) { + if (mCurrentDimZ > 0) { + copy3DRangeFrom(0, 0, 0, mCurrentDimX, mCurrentDimY, mCurrentDimZ, d); + } else if (mCurrentDimY > 0) { copy2DRangeFrom(0, 0, mCurrentDimX, mCurrentDimY, d); } else { copy1DRangeFrom(0, mCurrentCount, d); @@ -585,7 +605,9 @@ public class Allocation extends BaseObj { */ public void copyFrom(byte[] d) { mRS.validate(); - if (mCurrentDimY > 0) { + if (mCurrentDimZ > 0) { + copy3DRangeFrom(0, 0, 0, mCurrentDimX, mCurrentDimY, mCurrentDimZ, d); + } else if (mCurrentDimY > 0) { copy2DRangeFrom(0, 0, mCurrentDimX, mCurrentDimY, d); } else { copy1DRangeFrom(0, mCurrentCount, d); @@ -601,7 +623,9 @@ public class Allocation extends BaseObj { */ public void copyFrom(float[] d) { mRS.validate(); - if (mCurrentDimY > 0) { + if (mCurrentDimZ > 0) { + copy3DRangeFrom(0, 0, 0, mCurrentDimX, mCurrentDimY, mCurrentDimZ, d); + } else if (mCurrentDimY > 0) { copy2DRangeFrom(0, 0, mCurrentDimX, mCurrentDimY, d); } else { copy1DRangeFrom(0, mCurrentCount, d); @@ -967,12 +991,144 @@ public class Allocation extends BaseObj { Canvas c = new Canvas(newBitmap); c.drawBitmap(data, 0, 0, null); copy2DRangeFrom(xoff, yoff, newBitmap); + return; } validateBitmapFormat(data); validate2DRange(xoff, yoff, data.getWidth(), data.getHeight()); mRS.nAllocationData2D(getIDSafe(), xoff, yoff, mSelectedLOD, mSelectedFace.mID, data); } + private void validate3DRange(int xoff, int yoff, int zoff, int w, int h, int d) { + if (mAdaptedAllocation != null) { + + } else { + + if (xoff < 0 || yoff < 0 || zoff < 0) { + throw new RSIllegalArgumentException("Offset cannot be negative."); + } + if (h < 0 || w < 0 || d < 0) { + throw new RSIllegalArgumentException("Height or width cannot be negative."); + } + if (((xoff + w) > mCurrentDimX) || ((yoff + h) > mCurrentDimY) || ((zoff + d) > mCurrentDimZ)) { + throw new RSIllegalArgumentException("Updated region larger than allocation."); + } + } + } + + /** + * @hide + * + */ + void copy3DRangeFromUnchecked(int xoff, int yoff, int zoff, int w, int h, int d, byte[] data) { + mRS.validate(); + validate3DRange(xoff, yoff, zoff, w, h, d); + mRS.nAllocationData3D(getIDSafe(), xoff, yoff, zoff, mSelectedLOD, + w, h, d, data, data.length); + } + + /** + * @hide + * + */ + void copy3DRangeFromUnchecked(int xoff, int yoff, int zoff, int w, int h, int d, short[] data) { + mRS.validate(); + validate3DRange(xoff, yoff, zoff, w, h, d); + mRS.nAllocationData3D(getIDSafe(), xoff, yoff, zoff, mSelectedLOD, + w, h, d, data, data.length * 2); + } + + /** + * @hide + * + */ + void copy3DRangeFromUnchecked(int xoff, int yoff, int zoff, int w, int h, int d, int[] data) { + mRS.validate(); + validate3DRange(xoff, yoff, zoff, w, h, d); + mRS.nAllocationData3D(getIDSafe(), xoff, yoff, zoff, mSelectedLOD, + w, h, d, data, data.length * 4); + } + + /** + * @hide + * + */ + void copy3DRangeFromUnchecked(int xoff, int yoff, int zoff, int w, int h, int d, float[] data) { + mRS.validate(); + validate3DRange(xoff, yoff, zoff, w, h, d); + mRS.nAllocationData3D(getIDSafe(), xoff, yoff, zoff, mSelectedLOD, + w, h, d, data, data.length * 4); + } + + + /** + * @hide + * Copy a rectangular region from the array into the allocation. + * The incoming array is assumed to be tightly packed. + * + * @param xoff X offset of the region to update + * @param yoff Y offset of the region to update + * @param zoff Z offset of the region to update + * @param w Width of the incoming region to update + * @param h Height of the incoming region to update + * @param d Depth of the incoming region to update + * @param data to be placed into the allocation + */ + public void copy3DRangeFrom(int xoff, int yoff, int zoff, int w, int h, int d, byte[] data) { + validateIsInt8(); + copy3DRangeFromUnchecked(xoff, yoff, zoff, w, h, d, data); + } + + /** + * @hide + * + */ + public void copy3DRangeFrom(int xoff, int yoff, int zoff, int w, int h, int d, short[] data) { + validateIsInt16(); + copy3DRangeFromUnchecked(xoff, yoff, zoff, w, h, d, data); + } + + /** + * @hide + * + */ + public void copy3DRangeFrom(int xoff, int yoff, int zoff, int w, int h, int d, int[] data) { + validateIsInt32(); + copy3DRangeFromUnchecked(xoff, yoff, zoff, w, h, d, data); + } + + /** + * @hide + * + */ + public void copy3DRangeFrom(int xoff, int yoff, int zoff, int w, int h, int d, float[] data) { + validateIsFloat32(); + copy3DRangeFromUnchecked(xoff, yoff, zoff, w, h, d, data); + } + + /** + * @hide + * Copy a rectangular region into the allocation from another + * allocation. + * + * @param xoff X offset of the region to update. + * @param yoff Y offset of the region to update. + * @param w Width of the incoming region to update. + * @param h Height of the incoming region to update. + * @param d Depth of the incoming region to update. + * @param data source allocation. + * @param dataXoff X offset in data of the region to update. + * @param dataYoff Y offset in data of the region to update. + * @param dataZoff Z offset in data of the region to update + */ + public void copy3DRangeFrom(int xoff, int yoff, int zoff, int w, int h, int d, + Allocation data, int dataXoff, int dataYoff, int dataZoff) { + mRS.validate(); + validate3DRange(xoff, yoff, zoff, w, h, d); + mRS.nAllocationData3D(getIDSafe(), xoff, yoff, zoff, mSelectedLOD, + w, h, d, data.getID(mRS), dataXoff, dataYoff, dataZoff, + data.mSelectedLOD); + } + /** * Copy from the Allocation into a Bitmap. The bitmap must @@ -1050,6 +1206,10 @@ public class Allocation extends BaseObj { * A new type will be created with the new dimension. * * @param dimX The new size of the allocation. + * + * @deprecated Renderscript objects should be immutable once + * created. The replacement is to create a new allocation and copy the + * contents. */ public synchronized void resize(int dimX) { if ((mType.getY() > 0)|| (mType.getZ() > 0) || mType.hasFaces() || mType.hasMipmaps()) { @@ -1064,38 +1224,6 @@ public class Allocation extends BaseObj { updateCacheInfo(mType); } - /** - * Resize a 2D allocation. The contents of the allocation are - * preserved. If new elements are allocated objects are created - * with null contents and the new region is otherwise undefined. - * - * If the new region is smaller the references of any objects - * outside the new region will be released. - * - * A new type will be created with the new dimension. - * - * @param dimX The new size of the allocation. - * @param dimY The new size of the allocation. - */ - public synchronized void resize(int dimX, int dimY) { - if ((mType.getZ() > 0) || mType.hasFaces() || mType.hasMipmaps()) { - throw new RSInvalidStateException( - "Resize only support for 2D allocations at this time."); - } - if (mType.getY() == 0) { - throw new RSInvalidStateException( - "Resize only support for 2D allocations at this time."); - } - mRS.nAllocationResize2D(getID(mRS), dimX, dimY); - mRS.finish(); // Necessary because resize is fifoed and update is async. - - int typeID = mRS.nAllocationGetType(getID(mRS)); - mType = new Type(typeID, mRS); - mType.updateFromNative(); - updateCacheInfo(mType); - } - - // creation @@ -1117,6 +1245,7 @@ public class Allocation extends BaseObj { if (type.getID(rs) == 0) { throw new RSInvalidStateException("Bad Type"); } + int id = rs.nAllocationCreateTyped(type.getID(rs), mips.mID, usage, 0); if (id == 0) { throw new RSRuntimeException("Allocation creation failed."); @@ -1266,7 +1395,6 @@ public class Allocation extends BaseObj { return alloc; } - int id = rs.nAllocationCreateFromBitmap(t.getID(rs), mips.mID, b, usage); if (id == 0) { throw new RSRuntimeException("Load failed."); diff --git a/graphics/java/android/renderscript/BaseObj.java b/graphics/java/android/renderscript/BaseObj.java index f464f9bb1025..c2ebc9f79d6a 100644 --- a/graphics/java/android/renderscript/BaseObj.java +++ b/graphics/java/android/renderscript/BaseObj.java @@ -71,6 +71,9 @@ public class BaseObj { private int mID; private boolean mDestroyed; private String mName; + + int mGCSize; + RenderScript mRS; /** @@ -135,6 +138,9 @@ public class BaseObj { throw new RSInvalidStateException("Object already destroyed."); } mDestroyed = true; + if (mGCSize != 0) { + mRS.removeAllocSizeForGC(mGCSize); + } mRS.nObjDestroy(mID); } diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java index bef28aa89709..d5af2767bb40 100644 --- a/graphics/java/android/renderscript/RenderScript.java +++ b/graphics/java/android/renderscript/RenderScript.java @@ -83,11 +83,7 @@ public class RenderScript { native void nContextInitToClient(int con); native void nContextDeinitToClient(int con); - /** - * Name of the file that holds the object cache. - */ - private static final String CACHE_PATH = "com.android.renderscript.cache"; - static String mCachePath; + static File mCacheDir; /** * Sets the directory to use as a persistent storage for the @@ -97,9 +93,8 @@ public class RenderScript { * @param cacheDir A directory the current process can write to */ public static void setupDiskCache(File cacheDir) { - File f = new File(cacheDir, CACHE_PATH); - mCachePath = f.getAbsolutePath(); - f.mkdirs(); + // Defer creation of cache path to nScriptCCreate(). + mCacheDir = cacheDir; } public enum ContextType { @@ -420,6 +415,46 @@ public class RenderScript { rsnAllocationData2D(mContext, id, xoff, yoff, mip, face, b); } + native void rsnAllocationData3D(int con, + int dstAlloc, int dstXoff, int dstYoff, int dstZoff, + int dstMip, + int width, int height, int depth, + int srcAlloc, int srcXoff, int srcYoff, int srcZoff, + int srcMip); + synchronized void nAllocationData3D(int dstAlloc, int dstXoff, int dstYoff, int dstZoff, + int dstMip, + int width, int height, int depth, + int srcAlloc, int srcXoff, int srcYoff, int srcZoff, + int srcMip) { + validate(); + rsnAllocationData3D(mContext, + dstAlloc, dstXoff, dstYoff, dstZoff, + dstMip, width, height, depth, + srcAlloc, srcXoff, srcYoff, srcZoff, srcMip); + } + + native void rsnAllocationData3D(int con, int id, int xoff, int yoff, int zoff, int mip, int w, int h, int depth, byte[] d, int sizeBytes); + synchronized void nAllocationData3D(int id, int xoff, int yoff, int zoff, int mip, int w, int h, int depth, byte[] d, int sizeBytes) { + validate(); + rsnAllocationData3D(mContext, id, xoff, yoff, zoff, mip, w, h, depth, d, sizeBytes); + } + native void rsnAllocationData3D(int con, int id, int xoff, int yoff, int zoff, int mip, int w, int h, int depth, short[] d, int sizeBytes); + synchronized void nAllocationData3D(int id, int xoff, int yoff, int zoff, int mip, int w, int h, int depth, short[] d, int sizeBytes) { + validate(); + rsnAllocationData3D(mContext, id, xoff, yoff, zoff, mip, w, h, depth, d, sizeBytes); + } + native void rsnAllocationData3D(int con, int id, int xoff, int yoff, int zoff, int mip, int w, int h, int depth, int[] d, int sizeBytes); + synchronized void nAllocationData3D(int id, int xoff, int yoff, int zoff, int mip, int w, int h, int depth, int[] d, int sizeBytes) { + validate(); + rsnAllocationData3D(mContext, id, xoff, yoff, zoff, mip, w, h, depth, d, sizeBytes); + } + native void rsnAllocationData3D(int con, int id, int xoff, int yoff, int zoff, int mip, int w, int h, int depth, float[] d, int sizeBytes); + synchronized void nAllocationData3D(int id, int xoff, int yoff, int zoff, int mip, int w, int h, int depth, float[] d, int sizeBytes) { + validate(); + rsnAllocationData3D(mContext, id, xoff, yoff, zoff, mip, w, h, depth, d, sizeBytes); + } + + native void rsnAllocationRead(int con, int id, byte[] d); synchronized void nAllocationRead(int id, byte[] d) { validate(); @@ -451,11 +486,6 @@ public class RenderScript { validate(); rsnAllocationResize1D(mContext, id, dimX); } - native void rsnAllocationResize2D(int con, int id, int dimX, int dimY); - synchronized void nAllocationResize2D(int id, int dimX, int dimY) { - validate(); - rsnAllocationResize2D(mContext, id, dimX, dimY); - } native int rsnFileA3DCreateFromAssetStream(int con, int assetStream); synchronized int nFileA3DCreateFromAssetStream(int assetStream) { @@ -724,6 +754,8 @@ public class RenderScript { int mContext; @SuppressWarnings({"FieldCanBeLocal"}) MessageThread mMessageThread; + GCThread mGCThread; + Element mElement_U8; Element mElement_I8; @@ -1006,6 +1038,49 @@ public class RenderScript { } } + static class GCThread extends Thread { + RenderScript mRS; + boolean mRun = true; + + int currentSize = 0; + final static int targetSize = 256*1024*1024; // call System.gc after 256MB of allocs + + GCThread(RenderScript rs) { + super("RSGCThread"); + mRS = rs; + + } + + public void run() { + while(mRun) { + boolean doGC = false; + synchronized(this) { + if (currentSize >= targetSize) { + doGC = true; + } + } + if (doGC == true) { + System.gc(); + } + try { + sleep(1, 0); + } catch(InterruptedException e) { + } + } + Log.d(LOG_TAG, "GCThread exiting."); + } + + public synchronized void addAllocSize(int bytes) { + currentSize += bytes; + } + + public synchronized void removeAllocSize(int bytes) { + currentSize -= bytes; + } + + } + + RenderScript(Context ctx) { if (ctx != null) { mApplicationContext = ctx.getApplicationContext(); @@ -1028,6 +1103,15 @@ public class RenderScript { return create(ctx, sdkVersion, ContextType.NORMAL); } + void addAllocSizeForGC(int bytes) { + mGCThread.addAllocSize(bytes); + } + + void removeAllocSizeForGC(int bytes) { + mGCThread.removeAllocSize(bytes); + } + + /** * Create a basic RenderScript context. * @@ -1044,7 +1128,9 @@ public class RenderScript { throw new RSDriverException("Failed to create RS context."); } rs.mMessageThread = new MessageThread(rs); + rs.mGCThread = new GCThread(rs); rs.mMessageThread.start(); + rs.mGCThread.start(); return rs; } @@ -1099,8 +1185,10 @@ public class RenderScript { validate(); nContextDeinitToClient(mContext); mMessageThread.mRun = false; + mGCThread.mRun = false; try { mMessageThread.join(); + mGCThread.join(); } catch(InterruptedException e) { } diff --git a/graphics/java/android/renderscript/RenderScriptGL.java b/graphics/java/android/renderscript/RenderScriptGL.java index 52034b19e706..fad883873458 100644 --- a/graphics/java/android/renderscript/RenderScriptGL.java +++ b/graphics/java/android/renderscript/RenderScriptGL.java @@ -198,6 +198,9 @@ public class RenderScriptGL extends RenderScript { } mMessageThread = new MessageThread(this); mMessageThread.start(); + mGCThread = new GCThread(this); + mGCThread.start(); + } /** diff --git a/graphics/java/android/renderscript/ScriptC.java b/graphics/java/android/renderscript/ScriptC.java index 108b230f1a5b..2f69775a20ae 100644 --- a/graphics/java/android/renderscript/ScriptC.java +++ b/graphics/java/android/renderscript/ScriptC.java @@ -60,8 +60,16 @@ public class ScriptC extends Script { throw new RSRuntimeException("Loading of ScriptC script failed."); } setID(id); + mGCSize = 2 * 1024 * 1024; + rs.addAllocSizeForGC(mGCSize); } + /** + * Name of the file that holds the object cache. + */ + private static final String CACHE_PATH = "com.android.renderscript.cache"; + + static String mCachePath; private static synchronized int internalCreate(RenderScript rs, Resources resources, int resourceID) { byte[] pgm; @@ -94,7 +102,13 @@ public class ScriptC extends Script { String resName = resources.getResourceEntryName(resourceID); + // Create the RS cache path if we haven't done so already. + if (mCachePath == null) { + File f = new File(rs.mCacheDir, CACHE_PATH); + mCachePath = f.getAbsolutePath(); + f.mkdirs(); + } Log.v(TAG, "Create script for resource = " + resName); - return rs.nScriptCCreate(resName, rs.mCachePath, pgm, pgmLength); + return rs.nScriptCCreate(resName, mCachePath, pgm, pgmLength); } } diff --git a/graphics/jni/Android.mk b/graphics/jni/Android.mk index 80d77281df32..e8beae53d324 100644 --- a/graphics/jni/Android.mk +++ b/graphics/jni/Android.mk @@ -10,6 +10,7 @@ LOCAL_SHARED_LIBRARIES := \ libnativehelper \ libRS \ libcutils \ + liblog \ libskia \ libutils \ libui \ diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp index 8757b194a682..460a51677b1b 100644 --- a/graphics/jni/android_renderscript_RenderScript.cpp +++ b/graphics/jni/android_renderscript_RenderScript.cpp @@ -725,6 +725,72 @@ nAllocationData2D_alloc(JNIEnv *_env, jobject _this, RsContext con, } static void +nAllocationData3D_s(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint xoff, jint yoff, jint zoff, jint lod, + jint w, jint h, jint d, jshortArray data, int sizeBytes) +{ + jint len = _env->GetArrayLength(data); + LOG_API("nAllocation3DData_s, con(%p), adapter(%p), xoff(%i), yoff(%i), w(%i), h(%i), len(%i)", con, (RsAllocation)alloc, xoff, yoff, zoff, w, h, d, len); + jshort *ptr = _env->GetShortArrayElements(data, NULL); + rsAllocation3DData(con, (RsAllocation)alloc, xoff, yoff, zoff, lod, w, h, d, ptr, sizeBytes, 0); + _env->ReleaseShortArrayElements(data, ptr, JNI_ABORT); +} + +static void +nAllocationData3D_b(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint xoff, jint yoff, jint zoff, jint lod, + jint w, jint h, jint d, jbyteArray data, int sizeBytes) +{ + jint len = _env->GetArrayLength(data); + LOG_API("nAllocation3DData_b, con(%p), adapter(%p), xoff(%i), yoff(%i), w(%i), h(%i), len(%i)", con, (RsAllocation)alloc, xoff, yoff, zoff, w, h, d, len); + jbyte *ptr = _env->GetByteArrayElements(data, NULL); + rsAllocation3DData(con, (RsAllocation)alloc, xoff, yoff, zoff, lod, w, h, d, ptr, sizeBytes, 0); + _env->ReleaseByteArrayElements(data, ptr, JNI_ABORT); +} + +static void +nAllocationData3D_i(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint xoff, jint yoff, jint zoff, jint lod, + jint w, jint h, jint d, jintArray data, int sizeBytes) +{ + jint len = _env->GetArrayLength(data); + LOG_API("nAllocation3DData_i, con(%p), adapter(%p), xoff(%i), yoff(%i), w(%i), h(%i), len(%i)", con, (RsAllocation)alloc, xoff, yoff, zoff, w, h, d, len); + jint *ptr = _env->GetIntArrayElements(data, NULL); + rsAllocation3DData(con, (RsAllocation)alloc, xoff, yoff, zoff, lod, w, h, d, ptr, sizeBytes, 0); + _env->ReleaseIntArrayElements(data, ptr, JNI_ABORT); +} + +static void +nAllocationData3D_f(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint xoff, jint yoff, jint zoff, jint lod, + jint w, jint h, jint d, jfloatArray data, int sizeBytes) +{ + jint len = _env->GetArrayLength(data); + LOG_API("nAllocation3DData_f, con(%p), adapter(%p), xoff(%i), yoff(%i), w(%i), h(%i), len(%i)", con, (RsAllocation)alloc, xoff, yoff, zoff, w, h, d, len); + jfloat *ptr = _env->GetFloatArrayElements(data, NULL); + rsAllocation3DData(con, (RsAllocation)alloc, xoff, yoff, zoff, lod, w, h, d, ptr, sizeBytes, 0); + _env->ReleaseFloatArrayElements(data, ptr, JNI_ABORT); +} + +static void +nAllocationData3D_alloc(JNIEnv *_env, jobject _this, RsContext con, + jint dstAlloc, jint dstXoff, jint dstYoff, jint dstZoff, + jint dstMip, + jint width, jint height, jint depth, + jint srcAlloc, jint srcXoff, jint srcYoff, jint srcZoff, + jint srcMip) +{ + LOG_API("nAllocationData3D_alloc, con(%p), dstAlloc(%p), dstXoff(%i), dstYoff(%i)," + " dstMip(%i), width(%i), height(%i)," + " srcAlloc(%p), srcXoff(%i), srcYoff(%i), srcMip(%i)", + con, (RsAllocation)dstAlloc, dstXoff, dstYoff, dstMip, dstFace, + width, height, (RsAllocation)srcAlloc, srcXoff, srcYoff, srcMip, srcFace); + + rsAllocationCopy3DRange(con, + (RsAllocation)dstAlloc, + dstXoff, dstYoff, dstZoff, dstMip, + width, height, depth, + (RsAllocation)srcAlloc, + srcXoff, srcYoff, srcZoff, srcMip); +} + +static void nAllocationRead_i(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jintArray data) { jint len = _env->GetArrayLength(data); @@ -782,13 +848,6 @@ nAllocationResize1D(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint rsAllocationResize1D(con, (RsAllocation)alloc, dimX); } -static void -nAllocationResize2D(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint dimX, jint dimY) -{ - LOG_API("nAllocationResize1D, con(%p), alloc(%p), sizeX(%i), sizeY(%i)", con, (RsAllocation)alloc, dimX, dimY); - rsAllocationResize2D(con, (RsAllocation)alloc, dimX, dimY); -} - // ----------------------------------- static int @@ -1519,13 +1578,17 @@ static JNINativeMethod methods[] = { {"rsnAllocationData2D", "(IIIIIIII[BI)V", (void*)nAllocationData2D_b }, {"rsnAllocationData2D", "(IIIIIIII[FI)V", (void*)nAllocationData2D_f }, {"rsnAllocationData2D", "(IIIIIIIIIIIII)V", (void*)nAllocationData2D_alloc }, +{"rsnAllocationData3D", "(IIIIIIIII[II)V", (void*)nAllocationData3D_i }, +{"rsnAllocationData3D", "(IIIIIIIII[SI)V", (void*)nAllocationData3D_s }, +{"rsnAllocationData3D", "(IIIIIIIII[BI)V", (void*)nAllocationData3D_b }, +{"rsnAllocationData3D", "(IIIIIIIII[FI)V", (void*)nAllocationData3D_f }, +{"rsnAllocationData3D", "(IIIIIIIIIIIIII)V", (void*)nAllocationData3D_alloc }, {"rsnAllocationRead", "(II[I)V", (void*)nAllocationRead_i }, {"rsnAllocationRead", "(II[S)V", (void*)nAllocationRead_s }, {"rsnAllocationRead", "(II[B)V", (void*)nAllocationRead_b }, {"rsnAllocationRead", "(II[F)V", (void*)nAllocationRead_f }, {"rsnAllocationGetType", "(II)I", (void*)nAllocationGetType}, {"rsnAllocationResize1D", "(III)V", (void*)nAllocationResize1D }, -{"rsnAllocationResize2D", "(IIII)V", (void*)nAllocationResize2D }, {"rsnAllocationGenerateMipmaps", "(II)V", (void*)nAllocationGenerateMipmaps }, {"rsnScriptBindAllocation", "(IIII)V", (void*)nScriptBindAllocation }, diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk index 06e658d0ef8d..7b59bf24576f 100644 --- a/libs/hwui/Android.mk +++ b/libs/hwui/Android.mk @@ -58,7 +58,7 @@ ifeq ($(USE_OPENGL_RENDERER),true) LOCAL_CFLAGS += -DUSE_OPENGL_RENDERER -DGL_GLEXT_PROTOTYPES LOCAL_MODULE_CLASS := SHARED_LIBRARIES - LOCAL_SHARED_LIBRARIES := libcutils libutils libGLESv2 libskia libui libRS libRScpp + LOCAL_SHARED_LIBRARIES := liblog libcutils libutils libGLESv2 libskia libui libRS libRScpp LOCAL_MODULE := libhwui LOCAL_MODULE_TAGS := optional diff --git a/libs/hwui/Dither.cpp b/libs/hwui/Dither.cpp index 9bc5c140e8d5..51f1e39c1501 100644 --- a/libs/hwui/Dither.cpp +++ b/libs/hwui/Dither.cpp @@ -38,6 +38,10 @@ void Dither::bindDitherTexture() { glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); if (useFloatTexture) { + // We use a R16F texture, let's remap the alpha channel to the + // red channel to avoid changing the shader sampling code on GL ES 3.0+ + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_A, GL_RED); + float dither = 1.0f / (255.0f * DITHER_KERNEL_SIZE * DITHER_KERNEL_SIZE); const GLfloat pattern[] = { 0 * dither, 8 * dither, 2 * dither, 10 * dither, diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 373001797632..e18d92223ed4 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -1905,14 +1905,15 @@ void OpenGLRenderer::finishDrawTexture() { status_t OpenGLRenderer::drawDisplayList(DisplayList* displayList, Rect& dirty, int32_t replayFlags) { + status_t status; // All the usual checks and setup operations (quickReject, setupDraw, etc.) // will be performed by the display list itself if (displayList && displayList->isRenderable()) { if (CC_UNLIKELY(mCaches.drawDeferDisabled)) { - startFrame(); + status = startFrame(); ReplayStateStruct replayStruct(*this, dirty, replayFlags); displayList->replay(replayStruct, 0); - return replayStruct.mDrawGlStatus; + return status | replayStruct.mDrawGlStatus; } DeferredDisplayList deferredList; @@ -1920,9 +1921,9 @@ status_t OpenGLRenderer::drawDisplayList(DisplayList* displayList, Rect& dirty, displayList->defer(deferStruct, 0); flushLayers(); - startFrame(); + status = startFrame(); - return deferredList.flush(*this, dirty); + return status | deferredList.flush(*this, dirty); } return DrawGlInfo::kStatusDone; diff --git a/libs/hwui/ProgramCache.cpp b/libs/hwui/ProgramCache.cpp index 2479630daea5..8eb85e5547eb 100644 --- a/libs/hwui/ProgramCache.cpp +++ b/libs/hwui/ProgramCache.cpp @@ -186,7 +186,7 @@ const char* gFS_Main_Dither[2] = { // ES 2.0 "texture2D(ditherSampler, ditherTexCoords).a * " STR(DITHER_KERNEL_SIZE_INV_SQUARE), // ES 3.0 - "texture2D(ditherSampler, ditherTexCoords).r" + "texture2D(ditherSampler, ditherTexCoords).a" }; const char* gFS_Main_AddDitherToGradient = " gradientColor += %s;\n"; diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index 773d7b61cd7a..637ac858fa9b 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -3534,6 +3534,9 @@ public class AudioService extends IAudioService.Stub implements OnFinished { onNewPlaybackStateForRcc(msg.arg1 /* rccId */, msg.arg2 /* state */, (RccPlaybackState)msg.obj /* newState */); break; + case MSG_RCC_SEEK_REQUEST: + onSetRemoteControlClientPlaybackPosition(msg.arg1 /* generationId */, + ((Long)msg.obj).longValue() /* timeMs */); case MSG_SET_RSX_CONNECTION_STATE: onSetRsxConnectionState(msg.arg1/*available*/, msg.arg2/*address*/); @@ -5867,7 +5870,16 @@ public class AudioService extends IAudioService.Stub implements OnFinished { } public void setRemoteControlClientPlaybackPosition(int generationId, long timeMs) { - sendMsg(mAudioHandler, MSG_RCC_SEEK_REQUEST, SENDMSG_QUEUE, generationId /* arg1 */, + // ignore position change requests if invalid generation ID + synchronized(mRCStack) { + synchronized(mCurrentRcLock) { + if (mCurrentRcClientGen != generationId) { + return; + } + } + } + // discard any unprocessed seek request in the message queue, and replace with latest + sendMsg(mAudioHandler, MSG_RCC_SEEK_REQUEST, SENDMSG_REPLACE, generationId /* arg1 */, 0 /* arg2 ignored*/, new Long(timeMs) /* obj */, 0 /* delay */); } diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java index b6b49a287d9e..45a8b995678d 100644 --- a/media/java/android/media/MediaCodec.java +++ b/media/java/android/media/MediaCodec.java @@ -22,6 +22,7 @@ import android.media.MediaCrypto; import android.media.MediaFormat; import android.view.Surface; import java.nio.ByteBuffer; +import java.util.Arrays; import java.util.Map; /** @@ -395,6 +396,27 @@ final public class MediaCodec { * see {@link #CRYPTO_MODE_UNENCRYPTED} and {@link #CRYPTO_MODE_AES_CTR}. */ public int mode; + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append(numSubSamples + " subsamples, key ["); + String hexdigits = "0123456789abcdef"; + for (int i = 0; i < key.length; i++) { + builder.append(hexdigits.charAt((key[i] & 0xf0) >> 4)); + builder.append(hexdigits.charAt(key[i] & 0x0f)); + } + builder.append("], iv ["); + for (int i = 0; i < key.length; i++) { + builder.append(hexdigits.charAt((iv[i] & 0xf0) >> 4)); + builder.append(hexdigits.charAt(iv[i] & 0x0f)); + } + builder.append("], clear "); + builder.append(Arrays.toString(numBytesOfClearData)); + builder.append(", encrypted "); + builder.append(Arrays.toString(numBytesOfEncryptedData)); + return builder.toString(); + } }; /** diff --git a/media/java/android/media/MediaExtractor.java b/media/java/android/media/MediaExtractor.java index 749ef12cfb75..286e203c0d61 100644 --- a/media/java/android/media/MediaExtractor.java +++ b/media/java/android/media/MediaExtractor.java @@ -26,7 +26,10 @@ import android.net.Uri; import java.io.FileDescriptor; import java.io.IOException; import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.util.HashMap; import java.util.Map; +import java.util.UUID; /** * MediaExtractor facilitates extraction of demuxed, typically encoded, media data @@ -195,6 +198,38 @@ final public class MediaExtractor { public native final int getTrackCount(); /** + * Get the PSSH info if present. This returns a map of uuid-to-bytes, with the uuid specifying + * the crypto scheme, and the bytes being the data specific to that scheme. + * {@hide} + */ + public Map<UUID, byte[]> getPsshInfo() { + Map<UUID, byte[]> psshMap = null; + Map<String, Object> formatMap = getFileFormatNative(); + if (formatMap != null && formatMap.containsKey("pssh")) { + ByteBuffer rawpssh = (ByteBuffer) formatMap.get("pssh"); + rawpssh.order(ByteOrder.nativeOrder()); + rawpssh.rewind(); + formatMap.remove("pssh"); + // parse the flat pssh bytebuffer into something more manageable + psshMap = new HashMap<UUID, byte[]>(); + while (rawpssh.remaining() > 0) { + rawpssh.order(ByteOrder.BIG_ENDIAN); + long msb = rawpssh.getLong(); + long lsb = rawpssh.getLong(); + UUID uuid = new UUID(msb, lsb); + rawpssh.order(ByteOrder.nativeOrder()); + int datalen = rawpssh.getInt(); + byte [] psshdata = new byte[datalen]; + rawpssh.get(psshdata); + psshMap.put(uuid, psshdata); + } + } + return psshMap; + } + + private native Map<String, Object> getFileFormatNative(); + + /** * Get the track format at the specified index. * More detail on the representation can be found at {@link android.media.MediaCodec} */ diff --git a/media/java/android/media/RemoteControlClient.java b/media/java/android/media/RemoteControlClient.java index e076ef0044d7..93bcf03bb463 100644 --- a/media/java/android/media/RemoteControlClient.java +++ b/media/java/android/media/RemoteControlClient.java @@ -683,9 +683,12 @@ public class RemoteControlClient /** * Called on the implementer to notify it that the playback head should be set at the given * position. If the position can be changed from its current value, the implementor of - * the interface should also update the playback position using + * the interface must also update the playback position using * {@link RemoteControlClient#setPlaybackState(int, long, int)} to reflect the actual new * position being used, regardless of whether it differs from the requested position. + * Failure to do so would cause the system to not know the new actual playback position, + * and user interface components would fail to show the user where playback resumed after + * the position was updated. * @param newPositionMs the new requested position in the current media, expressed in ms. */ void onPlaybackPositionUpdate(long newPositionMs); diff --git a/media/jni/Android.mk b/media/jni/Android.mk index 687306053a68..416a2a17d5bb 100644 --- a/media/jni/Android.mk +++ b/media/jni/Android.mk @@ -28,6 +28,7 @@ LOCAL_SHARED_LIBRARIES := \ libmedia \ libskia \ libui \ + liblog \ libcutils \ libgui \ libstagefright \ diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp index 3a42db25fd28..cd1d9ce85635 100644 --- a/media/jni/android_media_MediaCodec.cpp +++ b/media/jni/android_media_MediaCodec.cpp @@ -372,7 +372,7 @@ static jint throwExceptionAsNecessary( default: { - jniThrowException(env, "java/lang/IllegalStateException", NULL); + jniThrowException(env, "java/lang/IllegalStateException", msg); break; } } @@ -455,13 +455,13 @@ static void android_media_MediaCodec_start(JNIEnv *env, jobject thiz) { sp<JMediaCodec> codec = getMediaCodec(env, thiz); if (codec == NULL) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); + jniThrowException(env, "java/lang/IllegalStateException", "no codec found"); return; } status_t err = codec->start(); - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary(env, err, "start failed"); } static void android_media_MediaCodec_stop(JNIEnv *env, jobject thiz) { diff --git a/media/jni/android_media_MediaExtractor.cpp b/media/jni/android_media_MediaExtractor.cpp index 23949fac7ca9..1704d5c17bf2 100644 --- a/media/jni/android_media_MediaExtractor.cpp +++ b/media/jni/android_media_MediaExtractor.cpp @@ -162,6 +162,18 @@ status_t JMediaExtractor::getTrackFormat(size_t index, jobject *format) const { return ConvertMessageToMap(env, msg, format); } +status_t JMediaExtractor::getFileFormat(jobject *format) const { + sp<AMessage> msg; + status_t err; + if ((err = mImpl->getFileFormat(&msg)) != OK) { + return err; + } + + JNIEnv *env = AndroidRuntime::getJNIEnv(); + + return ConvertMessageToMap(env, msg, format); +} + status_t JMediaExtractor::selectTrack(size_t index) { return mImpl->selectTrack(index); } @@ -339,6 +351,26 @@ static jobject android_media_MediaExtractor_getTrackFormatNative( return format; } +static jobject android_media_MediaExtractor_getFileFormatNative( + JNIEnv *env, jobject thiz) { + sp<JMediaExtractor> extractor = getMediaExtractor(env, thiz); + + if (extractor == NULL) { + jniThrowException(env, "java/lang/IllegalStateException", NULL); + return NULL; + } + + jobject format; + status_t err = extractor->getFileFormat(&format); + + if (err != OK) { + jniThrowException(env, "java/lang/IllegalArgumentException", NULL); + return NULL; + } + + return format; +} + static void android_media_MediaExtractor_selectTrack( JNIEnv *env, jobject thiz, jint index) { sp<JMediaExtractor> extractor = getMediaExtractor(env, thiz); @@ -768,6 +800,9 @@ static JNINativeMethod gMethods[] = { { "getTrackCount", "()I", (void *)android_media_MediaExtractor_getTrackCount }, + { "getFileFormatNative", "()Ljava/util/Map;", + (void *)android_media_MediaExtractor_getFileFormatNative }, + { "getTrackFormatNative", "(I)Ljava/util/Map;", (void *)android_media_MediaExtractor_getTrackFormatNative }, diff --git a/media/jni/android_media_MediaExtractor.h b/media/jni/android_media_MediaExtractor.h index 03900db9dd98..ccbad8c695dc 100644 --- a/media/jni/android_media_MediaExtractor.h +++ b/media/jni/android_media_MediaExtractor.h @@ -45,6 +45,8 @@ struct JMediaExtractor : public RefBase { size_t countTracks() const; status_t getTrackFormat(size_t index, jobject *format) const; + status_t getFileFormat(jobject *format) const; + status_t selectTrack(size_t index); status_t unselectTrack(size_t index); diff --git a/media/jni/audioeffect/Android.mk b/media/jni/audioeffect/Android.mk index b5d8b7b21a46..3b1fb19fc01e 100644 --- a/media/jni/audioeffect/Android.mk +++ b/media/jni/audioeffect/Android.mk @@ -6,6 +6,7 @@ LOCAL_SRC_FILES:= \ android_media_Visualizer.cpp LOCAL_SHARED_LIBRARIES := \ + liblog \ libcutils \ libutils \ libandroid_runtime \ diff --git a/media/jni/mediaeditor/Android.mk b/media/jni/mediaeditor/Android.mk index 040d2abe530e..6be7fdd40b83 100644 --- a/media/jni/mediaeditor/Android.mk +++ b/media/jni/mediaeditor/Android.mk @@ -52,6 +52,7 @@ LOCAL_SHARED_LIBRARIES := \ libaudioutils \ libbinder \ libcutils \ + liblog \ libdl \ libgui \ libmedia \ diff --git a/media/jni/soundpool/Android.mk b/media/jni/soundpool/Android.mk index 9b11bfa92604..5835b9f92c67 100644 --- a/media/jni/soundpool/Android.mk +++ b/media/jni/soundpool/Android.mk @@ -5,6 +5,7 @@ LOCAL_SRC_FILES:= \ android_media_SoundPool.cpp LOCAL_SHARED_LIBRARIES := \ + liblog \ libcutils \ libutils \ libandroid_runtime \ diff --git a/media/libdrm/mobile1/Android.mk b/media/libdrm/mobile1/Android.mk index b07d91c58077..7356f469589b 100644 --- a/media/libdrm/mobile1/Android.mk +++ b/media/libdrm/mobile1/Android.mk @@ -44,6 +44,7 @@ LOCAL_CFLAGS := $(LOCAL_DRM_CFLAG) LOCAL_SHARED_LIBRARIES := \ libutils \ libcutils \ + liblog \ libcrypto LOCAL_MODULE := libdrm1 @@ -69,12 +70,13 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/include/parser \ $(JNI_H_INCLUDE) \ $(call include-path-for, system-core)/cutils - + LOCAL_SHARED_LIBRARIES := libdrm1 \ libnativehelper \ libutils \ - libcutils + libcutils \ + liblog LOCAL_MODULE := libdrm1_jni diff --git a/media/mca/filterfw/Android.mk b/media/mca/filterfw/Android.mk index 1d6979908c76..2a9448d60a9e 100644 --- a/media/mca/filterfw/Android.mk +++ b/media/mca/filterfw/Android.mk @@ -37,6 +37,7 @@ LOCAL_SHARED_LIBRARIES := libstlport \ libdl \ libcutils \ libutils \ + liblog \ libandroid \ libjnigraphics \ libmedia @@ -48,5 +49,3 @@ LOCAL_SHARED_LIBRARIES := libstlport \ LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) - - diff --git a/media/mca/filterpacks/Android.mk b/media/mca/filterpacks/Android.mk index 6166b1ebd2b2..6e54f604baa0 100644 --- a/media/mca/filterpacks/Android.mk +++ b/media/mca/filterpacks/Android.mk @@ -46,10 +46,8 @@ LOCAL_SRC_FILES += native/imageproc/brightness.c \ native/imageproc/invert.c \ native/imageproc/to_rgba.c -LOCAL_SHARED_LIBRARIES := libutils libfilterfw +LOCAL_SHARED_LIBRARIES := liblog libutils libfilterfw LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) - - diff --git a/media/tests/omxjpegdecoder/Android.mk b/media/tests/omxjpegdecoder/Android.mk index 9dcc7baad487..ad874c894fd1 100644 --- a/media/tests/omxjpegdecoder/Android.mk +++ b/media/tests/omxjpegdecoder/Android.mk @@ -29,6 +29,7 @@ LOCAL_SHARED_LIBRARIES := \ libstagefright_foundation \ libbinder \ libutils \ + liblog \ libjpeg LOCAL_C_INCLUDES := \ diff --git a/media/tests/players/Android.mk b/media/tests/players/Android.mk index c655ae6efeef..adf0d304617b 100644 --- a/media/tests/players/Android.mk +++ b/media/tests/players/Android.mk @@ -20,7 +20,8 @@ LOCAL_SRC_FILES:= invoke_mock_media_player.cpp LOCAL_SHARED_LIBRARIES:= \ libbinder \ - libutils + libutils \ + liblog LOCAL_MODULE:= invoke_mock_media_player LOCAL_MODULE_TAGS := tests eng diff --git a/native/android/Android.mk b/native/android/Android.mk index 00d11daade07..207cc4ba140e 100644 --- a/native/android/Android.mk +++ b/native/android/Android.mk @@ -17,6 +17,7 @@ LOCAL_SRC_FILES:= \ storage_manager.cpp LOCAL_SHARED_LIBRARIES := \ + liblog \ libcutils \ libandroidfw \ libutils \ diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java index 5a2e261fa3a4..daa5d1344a60 100644 --- a/opengl/java/android/opengl/GLSurfaceView.java +++ b/opengl/java/android/opengl/GLSurfaceView.java @@ -18,7 +18,6 @@ package android.opengl; import java.io.Writer; import java.lang.ref.WeakReference; -import java.util.ArrayList; import javax.microedition.khronos.egl.EGL10; import javax.microedition.khronos.egl.EGL11; @@ -30,10 +29,13 @@ import javax.microedition.khronos.opengles.GL; import javax.microedition.khronos.opengles.GL10; import android.content.Context; -import android.content.pm.ConfigurationInfo; -import android.os.SystemProperties; +import android.os.Handler; +import android.os.HandlerThread; +import android.os.Looper; +import android.os.Trace; import android.util.AttributeSet; import android.util.Log; +import android.view.Choreographer; import android.view.SurfaceHolder; import android.view.SurfaceView; @@ -164,11 +166,26 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback private final static String TAG = "GLSurfaceView"; private final static boolean LOG_ATTACH_DETACH = false; private final static boolean LOG_THREADS = false; - private final static boolean LOG_PAUSE_RESUME = false; private final static boolean LOG_SURFACE = false; private final static boolean LOG_RENDERER = false; private final static boolean LOG_RENDERER_DRAW_FRAME = false; private final static boolean LOG_EGL = false; + private final static boolean TRACE_ENABLED = false; + + private final WeakReference<GLSurfaceView> mThisWeakRef = + new WeakReference<GLSurfaceView>(this); + private GLThread mGLThread; + private Renderer mRenderer; + private boolean mDetached; + private EGLConfigChooser mEGLConfigChooser; + private EGLContextFactory mEGLContextFactory; + private EGLWindowSurfaceFactory mEGLWindowSurfaceFactory; + private GLWrapper mGLWrapper; + private int mDebugFlags; + private int mEGLContextClientVersion; + private boolean mPreserveEGLContextOnPause; + private int mUserRenderMode; + /** * The renderer only renders * when the surface is created, or when {@link #requestRender} is called. @@ -241,13 +258,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback // underlying surface is created and destroyed SurfaceHolder holder = getHolder(); holder.addCallback(this); - // setFormat is done by SurfaceView in SDK 2.3 and newer. Uncomment - // this statement if back-porting to 2.2 or older: - // holder.setFormat(PixelFormat.RGB_565); - // - // setType is not needed for SDK 2.0 or newer. Uncomment this - // statement if back-porting this code to older SDKs. - // holder.setType(SurfaceHolder.SURFACE_TYPE_GPU); + mUserRenderMode = RENDERMODE_CONTINUOUSLY; } /** @@ -346,15 +357,16 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback public void setRenderer(Renderer renderer) { checkRenderThreadState(); if (mEGLConfigChooser == null) { - mEGLConfigChooser = new SimpleEGLConfigChooser(true); + mEGLConfigChooser = new SimpleEGLConfigChooser(true, mEGLContextClientVersion); } if (mEGLContextFactory == null) { - mEGLContextFactory = new DefaultContextFactory(); + mEGLContextFactory = new DefaultContextFactory(mEGLContextClientVersion); } if (mEGLWindowSurfaceFactory == null) { mEGLWindowSurfaceFactory = new DefaultWindowSurfaceFactory(); } mRenderer = renderer; + mGLThread = new GLThread(mThisWeakRef); mGLThread.start(); } @@ -420,7 +432,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback * @param needDepth */ public void setEGLConfigChooser(boolean needDepth) { - setEGLConfigChooser(new SimpleEGLConfigChooser(needDepth)); + setEGLConfigChooser(new SimpleEGLConfigChooser(needDepth, mEGLContextClientVersion)); } /** @@ -439,7 +451,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback public void setEGLConfigChooser(int redSize, int greenSize, int blueSize, int alphaSize, int depthSize, int stencilSize) { setEGLConfigChooser(new ComponentSizeChooser(redSize, greenSize, - blueSize, alphaSize, depthSize, stencilSize)); + blueSize, alphaSize, depthSize, stencilSize, mEGLContextClientVersion)); } /** @@ -466,6 +478,13 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback * If * {@link #setEGLConfigChooser(EGLConfigChooser)} has been called, then the supplied * EGLConfigChooser is responsible for choosing an OpenGL ES 2.0-compatible config. + * + * This method must be called before: + * <ul> + * <li>{@link #setEGLConfigChooser(boolean)} + * <li>{@link #setEGLConfigChooser(int, int, int, int, int, int)} + * </ul> + * * @param version The EGLContext client version to choose. Use 2 for OpenGL ES 2.0 */ public void setEGLContextClientVersion(int version) { @@ -490,6 +509,14 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback * @see #RENDERMODE_WHEN_DIRTY */ public void setRenderMode(int renderMode) { + switch (renderMode) { + case RENDERMODE_WHEN_DIRTY: + case RENDERMODE_CONTINUOUSLY: + break; + default: + throw new IllegalArgumentException("renderMode"); + } + mUserRenderMode = renderMode; mGLThread.setRenderMode(renderMode); } @@ -501,7 +528,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback * @see #RENDERMODE_WHEN_DIRTY */ public int getRenderMode() { - return mGLThread.getRenderMode(); + return mUserRenderMode; } /** @@ -582,14 +609,8 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback Log.d(TAG, "onAttachedToWindow reattach =" + mDetached); } if (mDetached && (mRenderer != null)) { - int renderMode = RENDERMODE_CONTINUOUSLY; - if (mGLThread != null) { - renderMode = mGLThread.getRenderMode(); - } mGLThread = new GLThread(mThisWeakRef); - if (renderMode != RENDERMODE_CONTINUOUSLY) { - mGLThread.setRenderMode(renderMode); - } + mGLThread.setRenderMode(mUserRenderMode); mGLThread.start(); } mDetached = false; @@ -761,11 +782,15 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback void destroyContext(EGL10 egl, EGLDisplay display, EGLContext context); } - private class DefaultContextFactory implements EGLContextFactory { - private int EGL_CONTEXT_CLIENT_VERSION = 0x3098; + private static class DefaultContextFactory implements EGLContextFactory { + private final int mEGLContextClientVersion; + + public DefaultContextFactory(int version) { + mEGLContextClientVersion = version; + } public EGLContext createContext(EGL10 egl, EGLDisplay display, EGLConfig config) { - int[] attrib_list = {EGL_CONTEXT_CLIENT_VERSION, mEGLContextClientVersion, + int[] attrib_list = {EGL14.EGL_CONTEXT_CLIENT_VERSION, mEGLContextClientVersion, EGL10.EGL_NONE }; return egl.eglCreateContext(display, config, EGL10.EGL_NO_CONTEXT, @@ -775,9 +800,9 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback public void destroyContext(EGL10 egl, EGLDisplay display, EGLContext context) { if (!egl.eglDestroyContext(display, context)) { - Log.e("DefaultContextFactory", "display:" + display + " context: " + context); + Log.e(TAG, "display:" + display + " context: " + context); if (LOG_THREADS) { - Log.i("DefaultContextFactory", "tid=" + Thread.currentThread().getId()); + Log.d(TAG, "tid=" + Thread.currentThread().getId()); } EglHelper.throwEglException("eglDestroyContex", egl.eglGetError()); } @@ -807,8 +832,8 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback try { result = egl.eglCreateWindowSurface(display, config, nativeWindow, null); } catch (IllegalArgumentException e) { - // This exception indicates that the surface flinger surface - // is not valid. This can happen if the surface flinger surface has + // This exception indicates that the surfaceflinger surface + // is not valid. This can happen if the surfaceflinger surface has // been torn down, but the application has not yet been // notified via SurfaceHolder.Callback.surfaceDestroyed. // In theory the application should be notified first, @@ -844,10 +869,11 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback EGLConfig chooseConfig(EGL10 egl, EGLDisplay display); } - private abstract class BaseConfigChooser + private static abstract class BaseConfigChooser implements EGLConfigChooser { - public BaseConfigChooser(int[] configSpec) { - mConfigSpec = filterConfigSpec(configSpec); + + public BaseConfigChooser(int[] configSpec, int version) { + mConfigSpec = filterConfigSpec(configSpec, version); } public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display) { @@ -881,8 +907,8 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback protected int[] mConfigSpec; - private int[] filterConfigSpec(int[] configSpec) { - if (mEGLContextClientVersion != 2) { + private int[] filterConfigSpec(int[] configSpec, int version) { + if (version != 2) { return configSpec; } /* We know none of the subclasses define EGL_RENDERABLE_TYPE. @@ -892,7 +918,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback int[] newConfigSpec = new int[len + 2]; System.arraycopy(configSpec, 0, newConfigSpec, 0, len-1); newConfigSpec[len-1] = EGL10.EGL_RENDERABLE_TYPE; - newConfigSpec[len] = 4; /* EGL_OPENGL_ES2_BIT */ + newConfigSpec[len] = EGL14.EGL_OPENGL_ES2_BIT; newConfigSpec[len+1] = EGL10.EGL_NONE; return newConfigSpec; } @@ -902,9 +928,9 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback * Choose a configuration with exactly the specified r,g,b,a sizes, * and at least the specified depth and stencil sizes. */ - private class ComponentSizeChooser extends BaseConfigChooser { + private static class ComponentSizeChooser extends BaseConfigChooser { public ComponentSizeChooser(int redSize, int greenSize, int blueSize, - int alphaSize, int depthSize, int stencilSize) { + int alphaSize, int depthSize, int stencilSize, int version) { super(new int[] { EGL10.EGL_RED_SIZE, redSize, EGL10.EGL_GREEN_SIZE, greenSize, @@ -912,7 +938,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback EGL10.EGL_ALPHA_SIZE, alphaSize, EGL10.EGL_DEPTH_SIZE, depthSize, EGL10.EGL_STENCIL_SIZE, stencilSize, - EGL10.EGL_NONE}); + EGL10.EGL_NONE}, version); mValue = new int[1]; mRedSize = redSize; mGreenSize = greenSize; @@ -920,7 +946,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback mAlphaSize = alphaSize; mDepthSize = depthSize; mStencilSize = stencilSize; - } + } @Override public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display, @@ -931,14 +957,10 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback int s = findConfigAttrib(egl, display, config, EGL10.EGL_STENCIL_SIZE, 0); if ((d >= mDepthSize) && (s >= mStencilSize)) { - int r = findConfigAttrib(egl, display, config, - EGL10.EGL_RED_SIZE, 0); - int g = findConfigAttrib(egl, display, config, - EGL10.EGL_GREEN_SIZE, 0); - int b = findConfigAttrib(egl, display, config, - EGL10.EGL_BLUE_SIZE, 0); - int a = findConfigAttrib(egl, display, config, - EGL10.EGL_ALPHA_SIZE, 0); + int r = findConfigAttrib(egl, display, config, EGL10.EGL_RED_SIZE, 0); + int g = findConfigAttrib(egl, display, config, EGL10.EGL_GREEN_SIZE, 0); + int b = findConfigAttrib(egl, display, config, EGL10.EGL_BLUE_SIZE, 0); + int a = findConfigAttrib(egl, display, config, EGL10.EGL_ALPHA_SIZE, 0); if ((r == mRedSize) && (g == mGreenSize) && (b == mBlueSize) && (a == mAlphaSize)) { return config; @@ -965,16 +987,16 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback protected int mAlphaSize; protected int mDepthSize; protected int mStencilSize; - } + } /** * This class will choose a RGB_888 surface with * or without a depth buffer. * */ - private class SimpleEGLConfigChooser extends ComponentSizeChooser { - public SimpleEGLConfigChooser(boolean withDepthBuffer) { - super(8, 8, 8, 0, withDepthBuffer ? 16 : 0, 0); + private static class SimpleEGLConfigChooser extends ComponentSizeChooser { + public SimpleEGLConfigChooser(boolean withDepthBuffer, int version) { + super(8, 8, 8, 0, withDepthBuffer ? 16 : 0, 0, version); } } @@ -991,9 +1013,9 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback * Initialize EGL for a given configuration spec. * @param configSpec */ - public void start() { + public void initialize() { if (LOG_EGL) { - Log.w("EglHelper", "start() tid=" + Thread.currentThread().getId()); + Log.d(TAG, "initialize() tid=" + Thread.currentThread().getId()); } /* * Get an EGL instance @@ -1034,7 +1056,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback throwEglException("createContext"); } if (LOG_EGL) { - Log.w("EglHelper", "createContext " + mEglContext + " tid=" + Thread.currentThread().getId()); + Log.d(TAG, "createContext " + mEglContext + " tid=" + Thread.currentThread().getId()); } mEglSurface = null; @@ -1048,7 +1070,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback */ public boolean createSurface() { if (LOG_EGL) { - Log.w("EglHelper", "createSurface() tid=" + Thread.currentThread().getId()); + Log.d(TAG, "createSurface() tid=" + Thread.currentThread().getId()); } /* * Check preconditions. @@ -1083,7 +1105,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback if (mEglSurface == null || mEglSurface == EGL10.EGL_NO_SURFACE) { int error = mEgl.eglGetError(); if (error == EGL10.EGL_BAD_NATIVE_WINDOW) { - Log.e("EglHelper", "createWindowSurface returned EGL_BAD_NATIVE_WINDOW."); + Log.e(TAG, "createWindowSurface returned EGL_BAD_NATIVE_WINDOW."); } return false; } @@ -1097,8 +1119,9 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback * Could not make the context current, probably because the underlying * SurfaceView surface has been destroyed. */ - logEglErrorAsWarning("EGLHelper", "eglMakeCurrent", mEgl.eglGetError()); - return false; + logEglErrorAsWarning(TAG, "eglMakeCurrent", mEgl.eglGetError()); + // we fall-through to "true" here because we do have a + // valid EGLSurface at this point. } return true; @@ -1108,8 +1131,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback * Create a GL object for the current EGL context. * @return */ - GL createGL() { - + public GL createGL() { GL gl = mEglContext.getGL(); GLSurfaceView view = mGLSurfaceViewWeakRef.get(); if (view != null) { @@ -1145,7 +1167,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback public void destroySurface() { if (LOG_EGL) { - Log.w("EglHelper", "destroySurface() tid=" + Thread.currentThread().getId()); + Log.d(TAG, "destroySurface() tid=" + Thread.currentThread().getId()); } destroySurfaceImp(); } @@ -1163,9 +1185,9 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback } } - public void finish() { + public void terminate() { if (LOG_EGL) { - Log.w("EglHelper", "finish() tid=" + Thread.currentThread().getId()); + Log.d(TAG, "terminate() tid=" + Thread.currentThread().getId()); } if (mEglContext != null) { GLSurfaceView view = mGLSurfaceViewWeakRef.get(); @@ -1187,7 +1209,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback public static void throwEglException(String function, int error) { String message = formatEglError(function, error); if (LOG_THREADS) { - Log.e("EglHelper", "throwEglException tid=" + Thread.currentThread().getId() + " " + Log.e(TAG, "throwEglException tid=" + Thread.currentThread().getId() + " " + message); } throw new RuntimeException(message); @@ -1207,584 +1229,411 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback EGLSurface mEglSurface; EGLConfig mEglConfig; EGLContext mEglContext; - } /** * A generic GL Thread. Takes care of initializing EGL and GL. Delegates * to a Renderer instance to do the actual drawing. Can be configured to * render continuously or on request. - * - * All potentially blocking synchronization is done through the - * sGLThreadManager object. This avoids multiple-lock ordering issues. - * */ - static class GLThread extends Thread { - GLThread(WeakReference<GLSurfaceView> glSurfaceViewWeakRef) { - super(); + + static class GLThread extends HandlerThread { + // only accessed from GLThread + private GL10 mGLContext; + private int mWidth; + private int mHeight; + private boolean mSizeChanged; + // current render mode + private int mRenderMode; + // the EGLSurface exists but isn't working for some reason + private boolean mEglSurfaceIsBad; + // we have an EGLContext + private boolean mHaveEglContext; + // we have an EGLSurface + private boolean mHaveEglSurface; + // we have a Surface (i.e.: EGLNativeWindowType) + private boolean mHasSurface; + // activity is paused + private boolean mPaused; + + // constants + private EglHelper mEglHelper; + private Handler mGLHandler; + private Choreographer mChoreographer; + + /* + * Set once at thread construction time, nulled out when the parent view is garbage + * called. This weak reference allows the GLSurfaceView to be garbage collected while + * the GLThread is still alive. + */ + private final WeakReference<GLSurfaceView> mGLSurfaceViewWeakRef; + + private final Runnable mExecuteDrawAction = new Runnable() { + private int mTraceVsyncCounter = 0; + @Override + public void run() { + if (TRACE_ENABLED) { + Trace.traceCounter(Trace.TRACE_TAG_GRAPHICS, + "GLSurfaceView VSYNC counter", (mTraceVsyncCounter++) & 0xf); + } + executeDraw(); + } + }; + + public GLThread(WeakReference<GLSurfaceView> glSurfaceViewWeakRef) { + super("GLThread", android.os.Process.THREAD_PRIORITY_DISPLAY); + if (LOG_THREADS) { + Log.d(TAG, "*** Starting GLThread ***"); + } mWidth = 0; mHeight = 0; - mRequestRender = true; mRenderMode = RENDERMODE_CONTINUOUSLY; mGLSurfaceViewWeakRef = glSurfaceViewWeakRef; } + private void readyToRun() { + mChoreographer = Choreographer.getInstance(); + mEglHelper = new EglHelper(mGLSurfaceViewWeakRef); + } + @Override - public void run() { - setName("GLThread " + getId()); - if (LOG_THREADS) { - Log.i("GLThread", "starting tid=" + getId()); - } + public void start() { + super.start(); + // getLooper() blocks until the thread is running + Looper looper = getLooper(); + mGLHandler = new Handler(looper); + // don't return until the GLThread state has been initialized + mGLHandler.runWithScissors(new Runnable() { + @Override + public void run() { + readyToRun(); + } + }, 0); + } + @Override + public void run() { try { - guardedRun(); - } catch (InterruptedException e) { - // fall thru and exit normally + super.run(); } finally { - sGLThreadManager.threadExiting(this); + // by definition the GLThread is not running anymore here + stopEglContext(); + stopEglSurface(); } } - /* - * This private method should only be called inside a - * synchronized(sGLThreadManager) block. - */ - private void stopEglSurfaceLocked() { + // only call from the GLThread + private void stopEglSurface() { if (mHaveEglSurface) { + if (LOG_SURFACE) { + Log.d(TAG, "releasing EGL surface because paused tid=" + getId()); + } mHaveEglSurface = false; mEglHelper.destroySurface(); } } - /* - * This private method should only be called inside a - * synchronized(sGLThreadManager) block. - */ - private void stopEglContextLocked() { + // only call from the GLThread + private void stopEglContext() { if (mHaveEglContext) { - mEglHelper.finish(); + mEglHelper.terminate(); mHaveEglContext = false; - sGLThreadManager.releaseEglContextLocked(this); + if (LOG_SURFACE) { + Log.d(TAG, "releasing EGL context because paused tid=" + getId()); + } } } - private void guardedRun() throws InterruptedException { - mEglHelper = new EglHelper(mGLSurfaceViewWeakRef); - mHaveEglContext = false; - mHaveEglSurface = false; - try { - GL10 gl = null; - boolean createEglContext = false; - boolean createEglSurface = false; - boolean createGlInterface = false; - boolean lostEglContext = false; - boolean sizeChanged = false; - boolean wantRenderNotification = false; - boolean doRenderNotification = false; - boolean askedToReleaseEglContext = false; - int w = 0; - int h = 0; - Runnable event = null; - - while (true) { - synchronized (sGLThreadManager) { - while (true) { - if (mShouldExit) { - return; - } - - if (! mEventQueue.isEmpty()) { - event = mEventQueue.remove(0); - break; - } - - // Update the pause state. - boolean pausing = false; - if (mPaused != mRequestPaused) { - pausing = mRequestPaused; - mPaused = mRequestPaused; - sGLThreadManager.notifyAll(); - if (LOG_PAUSE_RESUME) { - Log.i("GLThread", "mPaused is now " + mPaused + " tid=" + getId()); - } - } - - // Do we need to give up the EGL context? - if (mShouldReleaseEglContext) { - if (LOG_SURFACE) { - Log.i("GLThread", "releasing EGL context because asked to tid=" + getId()); - } - stopEglSurfaceLocked(); - stopEglContextLocked(); - mShouldReleaseEglContext = false; - askedToReleaseEglContext = true; - } - - // Have we lost the EGL context? - if (lostEglContext) { - stopEglSurfaceLocked(); - stopEglContextLocked(); - lostEglContext = false; - } - // When pausing, release the EGL surface: - if (pausing && mHaveEglSurface) { - if (LOG_SURFACE) { - Log.i("GLThread", "releasing EGL surface because paused tid=" + getId()); - } - stopEglSurfaceLocked(); - } - - // When pausing, optionally release the EGL Context: - if (pausing && mHaveEglContext) { - GLSurfaceView view = mGLSurfaceViewWeakRef.get(); - boolean preserveEglContextOnPause = view == null ? - false : view.mPreserveEGLContextOnPause; - if (!preserveEglContextOnPause || sGLThreadManager.shouldReleaseEGLContextWhenPausing()) { - stopEglContextLocked(); - if (LOG_SURFACE) { - Log.i("GLThread", "releasing EGL context because paused tid=" + getId()); - } - } - } - - // When pausing, optionally terminate EGL: - if (pausing) { - if (sGLThreadManager.shouldTerminateEGLWhenPausing()) { - mEglHelper.finish(); - if (LOG_SURFACE) { - Log.i("GLThread", "terminating EGL because paused tid=" + getId()); - } - } - } - - // Have we lost the SurfaceView surface? - if ((! mHasSurface) && (! mWaitingForSurface)) { - if (LOG_SURFACE) { - Log.i("GLThread", "noticed surfaceView surface lost tid=" + getId()); - } - if (mHaveEglSurface) { - stopEglSurfaceLocked(); - } - mWaitingForSurface = true; - mSurfaceIsBad = false; - sGLThreadManager.notifyAll(); - } + private void updateState() { + final boolean wasAbleToDraw = isAbleToDraw(); + if (!isReadyToDraw()) { + return; + } - // Have we acquired the surface view surface? - if (mHasSurface && mWaitingForSurface) { - if (LOG_SURFACE) { - Log.i("GLThread", "noticed surfaceView surface acquired tid=" + getId()); - } - mWaitingForSurface = false; - sGLThreadManager.notifyAll(); - } + if (!mHaveEglSurface || mSizeChanged) { + // create EGL context if needed + boolean reportSurfaceCreated = false; + if (!mHaveEglContext) { + mEglHelper.initialize(); + mHaveEglContext = true; + reportSurfaceCreated = true; + } - if (doRenderNotification) { - if (LOG_SURFACE) { - Log.i("GLThread", "sending render notification tid=" + getId()); - } - wantRenderNotification = false; - doRenderNotification = false; - mRenderComplete = true; - sGLThreadManager.notifyAll(); - } + // get the GL interface for the active EGLContext + mGLContext = (GL10)mEglHelper.createGL(); - // Ready to draw? - if (readyToDraw()) { - - // If we don't have an EGL context, try to acquire one. - if (! mHaveEglContext) { - if (askedToReleaseEglContext) { - askedToReleaseEglContext = false; - } else if (sGLThreadManager.tryAcquireEglContextLocked(this)) { - try { - mEglHelper.start(); - } catch (RuntimeException t) { - sGLThreadManager.releaseEglContextLocked(this); - throw t; - } - mHaveEglContext = true; - createEglContext = true; - - sGLThreadManager.notifyAll(); - } - } - - if (mHaveEglContext && !mHaveEglSurface) { - mHaveEglSurface = true; - createEglSurface = true; - createGlInterface = true; - sizeChanged = true; - } - - if (mHaveEglSurface) { - if (mSizeChanged) { - sizeChanged = true; - w = mWidth; - h = mHeight; - wantRenderNotification = true; - if (LOG_SURFACE) { - Log.i("GLThread", - "noticing that we want render notification tid=" - + getId()); - } - - // Destroy and recreate the EGL surface. - createEglSurface = true; - - mSizeChanged = false; - } - mRequestRender = false; - sGLThreadManager.notifyAll(); - break; - } - } + // create EGL Surface + mHaveEglSurface = mEglHelper.createSurface(); + mEglSurfaceIsBad = !mHaveEglSurface; + mSizeChanged = false; - // By design, this is the only place in a GLThread thread where we wait(). - if (LOG_THREADS) { - Log.i("GLThread", "waiting tid=" + getId() - + " mHaveEglContext: " + mHaveEglContext - + " mHaveEglSurface: " + mHaveEglSurface - + " mFinishedCreatingEglSurface: " + mFinishedCreatingEglSurface - + " mPaused: " + mPaused - + " mHasSurface: " + mHasSurface - + " mSurfaceIsBad: " + mSurfaceIsBad - + " mWaitingForSurface: " + mWaitingForSurface - + " mWidth: " + mWidth - + " mHeight: " + mHeight - + " mRequestRender: " + mRequestRender - + " mRenderMode: " + mRenderMode); - } - sGLThreadManager.wait(); + // notify use of surface size change + GLSurfaceView view = mGLSurfaceViewWeakRef.get(); + if (view != null) { + if (reportSurfaceCreated) { + if (LOG_RENDERER) { + Log.d(TAG, "onSurfaceCreated"); } - } // end of synchronized(sGLThreadManager) - - if (event != null) { - event.run(); - event = null; - continue; + view.mRenderer.onSurfaceCreated(mGLContext, mEglHelper.mEglConfig); } - if (createEglSurface) { - if (LOG_SURFACE) { - Log.w("GLThread", "egl createSurface"); - } - if (mEglHelper.createSurface()) { - synchronized(sGLThreadManager) { - mFinishedCreatingEglSurface = true; - sGLThreadManager.notifyAll(); - } - } else { - synchronized(sGLThreadManager) { - mFinishedCreatingEglSurface = true; - mSurfaceIsBad = true; - sGLThreadManager.notifyAll(); - } - continue; - } - createEglSurface = false; + if (LOG_RENDERER) { + Log.d(TAG, "onSurfaceChanged(" + mWidth + ", " + mHeight + ")"); } + view.mRenderer.onSurfaceChanged(mGLContext, mWidth, mHeight); + } + } - if (createGlInterface) { - gl = (GL10) mEglHelper.createGL(); + // see if we should kick the rendering loop + if (!wasAbleToDraw && isAbleToDraw()) { + // we're now able to draw + if (mRenderMode == RENDERMODE_CONTINUOUSLY) { + requestRender(); + } + } - sGLThreadManager.checkGLDriver(gl); - createGlInterface = false; - } + // By design, this is the only place in a GLThread thread where we wait(). + if (LOG_THREADS) { + Log.d(TAG, "waiting tid=" + getId() + + " mHaveEglContext: " + mHaveEglContext + + " mHaveEglSurface: " + mHaveEglSurface + + " mPaused: " + mPaused + + " mHasSurface: " + mHasSurface + + " mSurfaceIsBad: " + mEglSurfaceIsBad + + " mWidth: " + mWidth + + " mHeight: " + mHeight + + " mRenderMode: " + mRenderMode); + } + } - if (createEglContext) { - if (LOG_RENDERER) { - Log.w("GLThread", "onSurfaceCreated"); - } - GLSurfaceView view = mGLSurfaceViewWeakRef.get(); - if (view != null) { - view.mRenderer.onSurfaceCreated(gl, mEglHelper.mEglConfig); - } - createEglContext = false; - } + private void executeDraw() { + if (TRACE_ENABLED) { + Trace.traceBegin(Trace.TRACE_TAG_GRAPHICS, "executeDraw"); + } - if (sizeChanged) { - if (LOG_RENDERER) { - Log.w("GLThread", "onSurfaceChanged(" + w + ", " + h + ")"); - } - GLSurfaceView view = mGLSurfaceViewWeakRef.get(); - if (view != null) { - view.mRenderer.onSurfaceChanged(gl, w, h); - } - sizeChanged = false; - } + if (isAbleToDraw()) { + if (mRenderMode == RENDERMODE_CONTINUOUSLY) { + requestRender(); + } - if (LOG_RENDERER_DRAW_FRAME) { - Log.w("GLThread", "onDrawFrame tid=" + getId()); - } - { - GLSurfaceView view = mGLSurfaceViewWeakRef.get(); - if (view != null) { - view.mRenderer.onDrawFrame(gl); - } - } + if (LOG_RENDERER_DRAW_FRAME) { + Log.d(TAG, "onDrawFrame tid=" + getId()); + } + + GLSurfaceView view = mGLSurfaceViewWeakRef.get(); + if (view != null) { + view.mRenderer.onDrawFrame(mGLContext); int swapError = mEglHelper.swap(); switch (swapError) { case EGL10.EGL_SUCCESS: break; case EGL11.EGL_CONTEXT_LOST: if (LOG_SURFACE) { - Log.i("GLThread", "egl context lost tid=" + getId()); + Log.d(TAG, "egl context lost tid=" + getId()); } - lostEglContext = true; + stopEglSurface(); + stopEglContext(); break; default: // Other errors typically mean that the current surface is bad, // probably because the SurfaceView surface has been destroyed, // but we haven't been notified yet. // Log the error to help developers understand why rendering stopped. - EglHelper.logEglErrorAsWarning("GLThread", "eglSwapBuffers", swapError); - - synchronized(sGLThreadManager) { - mSurfaceIsBad = true; - sGLThreadManager.notifyAll(); - } + EglHelper.logEglErrorAsWarning(TAG, "eglSwapBuffers", swapError); + mEglSurfaceIsBad = true; break; } - - if (wantRenderNotification) { - doRenderNotification = true; - } } + } - } finally { - /* - * clean-up everything... - */ - synchronized (sGLThreadManager) { - stopEglSurfaceLocked(); - stopEglContextLocked(); - } + if (TRACE_ENABLED) { + Trace.traceEnd(Trace.TRACE_TAG_GRAPHICS); } } - public boolean ableToDraw() { - return mHaveEglContext && mHaveEglSurface && readyToDraw(); + private boolean isAbleToDraw() { + return mHaveEglContext && mHaveEglSurface && isReadyToDraw(); } - private boolean readyToDraw() { - return (!mPaused) && mHasSurface && (!mSurfaceIsBad) - && (mWidth > 0) && (mHeight > 0) - && (mRequestRender || (mRenderMode == RENDERMODE_CONTINUOUSLY)); + private boolean isReadyToDraw() { + return (!mPaused) && mHasSurface && (!mEglSurfaceIsBad) + && (mWidth > 0) && (mHeight > 0); } - public void setRenderMode(int renderMode) { - if ( !((RENDERMODE_WHEN_DIRTY <= renderMode) && (renderMode <= RENDERMODE_CONTINUOUSLY)) ) { - throw new IllegalArgumentException("renderMode"); + private boolean isEglContextReleasedWhenPausing() { + GLSurfaceView view = mGLSurfaceViewWeakRef.get(); + return (view != null) ? !view.mPreserveEGLContextOnPause : false; + } + + public void queueEvent(Runnable r) { + if (r == null) { + throw new IllegalArgumentException("Runnable r must not be null"); } - synchronized(sGLThreadManager) { - mRenderMode = renderMode; - sGLThreadManager.notifyAll(); + mGLHandler.post(r); + } + + /* + * the call-backs below all run on the GLThread and implement state + * changes of the GLSurfaceView and Activity life cycle. + */ + + private void doSurfaceCreated() { + mHasSurface = true; + updateState(); + } + + private void doSurfaceDestroyed() { + if (mHasSurface) { + if (LOG_SURFACE) { + Log.d(TAG, "noticed surfaceView surface lost tid=" + getId()); + } + stopEglSurface(); } + mHasSurface = false; } - public int getRenderMode() { - synchronized(sGLThreadManager) { - return mRenderMode; + private void doPause() { + if (mPaused == false) { + mPaused = true; + stopEglSurface(); + // When pausing, optionally release the EGL Context: + if (mHaveEglContext && isEglContextReleasedWhenPausing()) { + stopEglContext(); + } } } - public void requestRender() { - synchronized(sGLThreadManager) { - mRequestRender = true; - sGLThreadManager.notifyAll(); + private void doResume() { + mPaused = false; + updateState(); + if (mRenderMode == RENDERMODE_WHEN_DIRTY) { + executeDraw(); } } + private void doWindowResize(final int width, final int height) { + // we were not drawing yet. Update the window size and + // state and attempt to draw a frame. + mSizeChanged = (mWidth != width || mHeight != height); + mWidth = width; + mHeight = height; + updateState(); + // we always (attempt to) draw a frame before returning + executeDraw(); + } + + private void doSetRenderMode(final int renderMode) { + mRenderMode = renderMode; + requestRender(); + } + + /* + * the call-backs below run on the main UI thread, they just + * wait while executing work on the GLThread. + */ + public void surfaceCreated() { - synchronized(sGLThreadManager) { - if (LOG_THREADS) { - Log.i("GLThread", "surfaceCreated tid=" + getId()); + mGLHandler.runWithScissors(new Runnable() { + @Override + public void run() { + doSurfaceCreated(); } - mHasSurface = true; - mFinishedCreatingEglSurface = false; - sGLThreadManager.notifyAll(); - while (mWaitingForSurface - && !mFinishedCreatingEglSurface - && !mExited) { - try { - sGLThreadManager.wait(); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } - } - } + }, 0); } public void surfaceDestroyed() { - synchronized(sGLThreadManager) { - if (LOG_THREADS) { - Log.i("GLThread", "surfaceDestroyed tid=" + getId()); + mGLHandler.runWithScissors(new Runnable() { + @Override + public void run() { + doSurfaceDestroyed(); } - mHasSurface = false; - sGLThreadManager.notifyAll(); - while((!mWaitingForSurface) && (!mExited)) { - try { - sGLThreadManager.wait(); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } - } - } + }, 0); } public void onPause() { - synchronized (sGLThreadManager) { - if (LOG_PAUSE_RESUME) { - Log.i("GLThread", "onPause tid=" + getId()); - } - mRequestPaused = true; - sGLThreadManager.notifyAll(); - while ((! mExited) && (! mPaused)) { - if (LOG_PAUSE_RESUME) { - Log.i("Main thread", "onPause waiting for mPaused."); - } - try { - sGLThreadManager.wait(); - } catch (InterruptedException ex) { - Thread.currentThread().interrupt(); - } + mGLHandler.runWithScissors(new Runnable() { + @Override + public void run() { + doPause(); } - } + }, 0); } public void onResume() { - synchronized (sGLThreadManager) { - if (LOG_PAUSE_RESUME) { - Log.i("GLThread", "onResume tid=" + getId()); - } - mRequestPaused = false; - mRequestRender = true; - mRenderComplete = false; - sGLThreadManager.notifyAll(); - while ((! mExited) && mPaused && (!mRenderComplete)) { - if (LOG_PAUSE_RESUME) { - Log.i("Main thread", "onResume waiting for !mPaused."); - } - try { - sGLThreadManager.wait(); - } catch (InterruptedException ex) { - Thread.currentThread().interrupt(); - } + mGLHandler.runWithScissors(new Runnable() { + @Override + public void run() { + doResume(); } - } + }, 0); } public void onWindowResize(int w, int h) { - synchronized (sGLThreadManager) { - mWidth = w; - mHeight = h; - mSizeChanged = true; - mRequestRender = true; - mRenderComplete = false; - sGLThreadManager.notifyAll(); - - // Wait for thread to react to resize and render a frame - while (! mExited && !mPaused && !mRenderComplete - && ableToDraw()) { - if (LOG_SURFACE) { - Log.i("Main thread", "onWindowResize waiting for render complete from tid=" + getId()); - } - try { - sGLThreadManager.wait(); - } catch (InterruptedException ex) { - Thread.currentThread().interrupt(); - } + final int width = w; + final int height = h; + mGLHandler.runWithScissors(new Runnable() { + @Override + public void run() { + doWindowResize(width, height); } - } + }, 0); } - public void requestExitAndWait() { - // don't call this from GLThread thread or it is a guaranteed - // deadlock! - synchronized(sGLThreadManager) { - mShouldExit = true; - sGLThreadManager.notifyAll(); - while (! mExited) { - try { - sGLThreadManager.wait(); - } catch (InterruptedException ex) { - Thread.currentThread().interrupt(); - } - } + /* + * the methods below can be called from any thread + */ + + public void requestRender() { + if (mRenderMode == RENDERMODE_CONTINUOUSLY) { + mChoreographer.postCallback(Choreographer.CALLBACK_ANIMATION, + mExecuteDrawAction, null); + } else { + /* + * in RENDERMODE_WHEN_DIRTY we schedule the draw callback + * immediately because the developer is manager her + * timing loop manually -- in particular she could be + * using the Choreographer already. + */ + mGLHandler.post(mExecuteDrawAction); } } - public void requestReleaseEglContextLocked() { - mShouldReleaseEglContext = true; - sGLThreadManager.notifyAll(); + public void setRenderMode(final int renderMode) { + mGLHandler.runWithScissors(new Runnable() { + @Override + public void run() { + doSetRenderMode(renderMode); + } + }, 0); } - /** - * Queue an "event" to be run on the GL rendering thread. - * @param r the runnable to be run on the GL rendering thread. - */ - public void queueEvent(Runnable r) { - if (r == null) { - throw new IllegalArgumentException("r must not be null"); - } - synchronized(sGLThreadManager) { - mEventQueue.add(r); - sGLThreadManager.notifyAll(); + public void requestExitAndWait() { + getLooper().quit(); + try { + this.join(); + } catch (InterruptedException e) { } } - - // Once the thread is started, all accesses to the following member - // variables are protected by the sGLThreadManager monitor - private boolean mShouldExit; - private boolean mExited; - private boolean mRequestPaused; - private boolean mPaused; - private boolean mHasSurface; - private boolean mSurfaceIsBad; - private boolean mWaitingForSurface; - private boolean mHaveEglContext; - private boolean mHaveEglSurface; - private boolean mFinishedCreatingEglSurface; - private boolean mShouldReleaseEglContext; - private int mWidth; - private int mHeight; - private int mRenderMode; - private boolean mRequestRender; - private boolean mRenderComplete; - private ArrayList<Runnable> mEventQueue = new ArrayList<Runnable>(); - private boolean mSizeChanged = true; - - // End of member variables protected by the sGLThreadManager monitor. - - private EglHelper mEglHelper; - - /** - * Set once at thread construction time, nulled out when the parent view is garbage - * called. This weak reference allows the GLSurfaceView to be garbage collected while - * the GLThread is still alive. - */ - private WeakReference<GLSurfaceView> mGLSurfaceViewWeakRef; - - } + } // class GLThread static class LogWriter extends Writer { - - @Override public void close() { + @Override + public void close() { flushBuilder(); } - @Override public void flush() { + @Override + public void flush() { flushBuilder(); } - @Override public void write(char[] buf, int offset, int count) { - for(int i = 0; i < count; i++) { + @Override + public void write(char[] buf, int offset, int count) { + for (int i = 0; i < count; i++) { char c = buf[offset + i]; - if ( c == '\n') { + if (c == '\n') { flushBuilder(); - } - else { + } else { mBuilder.append(c); } } @@ -1792,7 +1641,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback private void flushBuilder() { if (mBuilder.length() > 0) { - Log.v("GLSurfaceView", mBuilder.toString()); + Log.v(TAG, mBuilder.toString()); mBuilder.delete(0, mBuilder.length()); } } @@ -1800,141 +1649,10 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback private StringBuilder mBuilder = new StringBuilder(); } - private void checkRenderThreadState() { if (mGLThread != null) { throw new IllegalStateException( "setRenderer has already been called for this instance."); } } - - private static class GLThreadManager { - private static String TAG = "GLThreadManager"; - - public synchronized void threadExiting(GLThread thread) { - if (LOG_THREADS) { - Log.i("GLThread", "exiting tid=" + thread.getId()); - } - thread.mExited = true; - if (mEglOwner == thread) { - mEglOwner = null; - } - notifyAll(); - } - - /* - * Tries once to acquire the right to use an EGL - * context. Does not block. Requires that we are already - * in the sGLThreadManager monitor when this is called. - * - * @return true if the right to use an EGL context was acquired. - */ - public boolean tryAcquireEglContextLocked(GLThread thread) { - if (mEglOwner == thread || mEglOwner == null) { - mEglOwner = thread; - notifyAll(); - return true; - } - checkGLESVersion(); - if (mMultipleGLESContextsAllowed) { - return true; - } - // Notify the owning thread that it should release the context. - // TODO: implement a fairness policy. Currently - // if the owning thread is drawing continuously it will just - // reacquire the EGL context. - if (mEglOwner != null) { - mEglOwner.requestReleaseEglContextLocked(); - } - return false; - } - - /* - * Releases the EGL context. Requires that we are already in the - * sGLThreadManager monitor when this is called. - */ - public void releaseEglContextLocked(GLThread thread) { - if (mEglOwner == thread) { - mEglOwner = null; - } - notifyAll(); - } - - public synchronized boolean shouldReleaseEGLContextWhenPausing() { - // Release the EGL context when pausing even if - // the hardware supports multiple EGL contexts. - // Otherwise the device could run out of EGL contexts. - return mLimitedGLESContexts; - } - - public synchronized boolean shouldTerminateEGLWhenPausing() { - checkGLESVersion(); - return !mMultipleGLESContextsAllowed; - } - - public synchronized void checkGLDriver(GL10 gl) { - if (! mGLESDriverCheckComplete) { - checkGLESVersion(); - String renderer = gl.glGetString(GL10.GL_RENDERER); - if (mGLESVersion < kGLES_20) { - mMultipleGLESContextsAllowed = - ! renderer.startsWith(kMSM7K_RENDERER_PREFIX); - notifyAll(); - } - mLimitedGLESContexts = !mMultipleGLESContextsAllowed; - if (LOG_SURFACE) { - Log.w(TAG, "checkGLDriver renderer = \"" + renderer + "\" multipleContextsAllowed = " - + mMultipleGLESContextsAllowed - + " mLimitedGLESContexts = " + mLimitedGLESContexts); - } - mGLESDriverCheckComplete = true; - } - } - - private void checkGLESVersion() { - if (! mGLESVersionCheckComplete) { - mGLESVersion = SystemProperties.getInt( - "ro.opengles.version", - ConfigurationInfo.GL_ES_VERSION_UNDEFINED); - if (mGLESVersion >= kGLES_20) { - mMultipleGLESContextsAllowed = true; - } - if (LOG_SURFACE) { - Log.w(TAG, "checkGLESVersion mGLESVersion =" + - " " + mGLESVersion + " mMultipleGLESContextsAllowed = " + mMultipleGLESContextsAllowed); - } - mGLESVersionCheckComplete = true; - } - } - - /** - * This check was required for some pre-Android-3.0 hardware. Android 3.0 provides - * support for hardware-accelerated views, therefore multiple EGL contexts are - * supported on all Android 3.0+ EGL drivers. - */ - private boolean mGLESVersionCheckComplete; - private int mGLESVersion; - private boolean mGLESDriverCheckComplete; - private boolean mMultipleGLESContextsAllowed; - private boolean mLimitedGLESContexts; - private static final int kGLES_20 = 0x20000; - private static final String kMSM7K_RENDERER_PREFIX = - "Q3Dimension MSM7500 "; - private GLThread mEglOwner; - } - - private static final GLThreadManager sGLThreadManager = new GLThreadManager(); - - private final WeakReference<GLSurfaceView> mThisWeakRef = - new WeakReference<GLSurfaceView>(this); - private GLThread mGLThread; - private Renderer mRenderer; - private boolean mDetached; - private EGLConfigChooser mEGLConfigChooser; - private EGLContextFactory mEGLContextFactory; - private EGLWindowSurfaceFactory mEGLWindowSurfaceFactory; - private GLWrapper mGLWrapper; - private int mDebugFlags; - private int mEGLContextClientVersion; - private boolean mPreserveEGLContextOnPause; } diff --git a/packages/DefaultContainerService/jni/Android.mk b/packages/DefaultContainerService/jni/Android.mk index 79ff451a8f3e..ef4f6995011d 100644 --- a/packages/DefaultContainerService/jni/Android.mk +++ b/packages/DefaultContainerService/jni/Android.mk @@ -28,7 +28,8 @@ LOCAL_C_INCLUDES += \ LOCAL_SHARED_LIBRARIES := \ libnativehelper \ - libutils + libutils \ + liblog LOCAL_STATIC_LIBRARIES := \ libdiskusage @@ -36,4 +37,4 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_MODULE := libdefcontainer_jni LOCAL_MODULE_TAGS := optional -include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file +include $(BUILD_SHARED_LIBRARY) diff --git a/packages/SystemUI/src/com/android/systemui/UniverseBackground.java b/packages/SystemUI/src/com/android/systemui/UniverseBackground.java index 762875479360..f859880707cc 100644 --- a/packages/SystemUI/src/com/android/systemui/UniverseBackground.java +++ b/packages/SystemUI/src/com/android/systemui/UniverseBackground.java @@ -97,7 +97,7 @@ public class UniverseBackground extends FrameLayout { public UniverseBackground(Context context) { super(context); setBackgroundColor(0xff000000); - mSession = WindowManagerGlobal.getWindowSession(context.getMainLooper()); + mSession = WindowManagerGlobal.getWindowSession(); mContent = View.inflate(context, R.layout.universe, null); addView(mContent); mContent.findViewById(R.id.close).setOnClickListener(new View.OnClickListener() { diff --git a/packages/SystemUI/src/com/android/systemui/recent/FirstFrameAnimatorHelper.java b/packages/SystemUI/src/com/android/systemui/recent/FirstFrameAnimatorHelper.java new file mode 100644 index 000000000000..2fc7dfc452c8 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/recent/FirstFrameAnimatorHelper.java @@ -0,0 +1,129 @@ +/* + * Copyright (C) 2013 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.systemui.recent; + +import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; +import android.animation.ValueAnimator; +import android.animation.Animator.AnimatorListener; +import android.util.Log; +import android.view.ViewTreeObserver; +import android.view.View; +import android.view.ViewPropertyAnimator; + +/* + * This is a helper class that listens to updates from the corresponding animation. + * For the first two frames, it adjusts the current play time of the animation to + * prevent jank at the beginning of the animation + */ +public class FirstFrameAnimatorHelper implements ValueAnimator.AnimatorUpdateListener { + private static final boolean DEBUG = false; + private static final int MAX_DELAY = 1000; + private static final int IDEAL_FRAME_DURATION = 16; + private View mTarget; + private long mStartFrame; + private long mStartTime = -1; + private boolean mHandlingOnAnimationUpdate; + private boolean mAdjustedSecondFrameTime; + + private static ViewTreeObserver.OnDrawListener sGlobalDrawListener; + private static long sGlobalFrameCounter; + + public FirstFrameAnimatorHelper(ValueAnimator animator, View target) { + mTarget = target; + animator.addUpdateListener(this); + } + + public FirstFrameAnimatorHelper(ViewPropertyAnimator vpa, View target) { + mTarget = target; + vpa.setListener(new AnimatorListenerAdapter() { + public void onAnimationStart (Animator animation) { + final ValueAnimator va = (ValueAnimator) animation; + va.addUpdateListener(FirstFrameAnimatorHelper.this); + onAnimationUpdate(va); + } + }); + } + + public static void initializeDrawListener(View view) { + if (sGlobalDrawListener != null) { + view.getViewTreeObserver().removeOnDrawListener(sGlobalDrawListener); + } + sGlobalDrawListener = new ViewTreeObserver.OnDrawListener() { + private long mTime = System.currentTimeMillis(); + public void onDraw() { + sGlobalFrameCounter++; + if (DEBUG) { + long newTime = System.currentTimeMillis(); + Log.d("FirstFrameAnimatorHelper", "TICK " + (newTime - mTime)); + mTime = newTime; + } + } + }; + view.getViewTreeObserver().addOnDrawListener(sGlobalDrawListener); + } + + public void onAnimationUpdate(final ValueAnimator animation) { + final long currentTime = System.currentTimeMillis(); + if (mStartTime == -1) { + mStartFrame = sGlobalFrameCounter; + mStartTime = currentTime; + } + + if (!mHandlingOnAnimationUpdate) { + mHandlingOnAnimationUpdate = true; + long frameNum = sGlobalFrameCounter - mStartFrame; + // If we haven't drawn our first frame, reset the time to t = 0 + // (give up after MAX_DELAY ms of waiting though - might happen, for example, if we + // are no longer in the foreground and no frames are being rendered ever) + if (frameNum == 0 && currentTime < mStartTime + MAX_DELAY) { + // The first frame on animations doesn't always trigger an invalidate... + // force an invalidate here to make sure the animation continues to advance + mTarget.getRootView().invalidate(); + animation.setCurrentPlayTime(0); + + // For the second frame, if the first frame took more than 16ms, + // adjust the start time and pretend it took only 16ms anyway. This + // prevents a large jump in the animation due to an expensive first frame + } else if (frameNum == 1 && currentTime < mStartTime + MAX_DELAY && + !mAdjustedSecondFrameTime && + currentTime > mStartTime + IDEAL_FRAME_DURATION) { + animation.setCurrentPlayTime(IDEAL_FRAME_DURATION); + mAdjustedSecondFrameTime = true; + } else { + if (frameNum > 1) { + mTarget.post(new Runnable() { + public void run() { + animation.removeUpdateListener(FirstFrameAnimatorHelper.this); + } + }); + } + if (DEBUG) print(animation); + } + mHandlingOnAnimationUpdate = false; + } else { + if (DEBUG) print(animation); + } + } + + public void print(ValueAnimator animation) { + float flatFraction = animation.getCurrentPlayTime() / (float) animation.getDuration(); + Log.d("FirstFrameAnimatorHelper", sGlobalFrameCounter + + "(" + (sGlobalFrameCounter - mStartFrame) + ") " + mTarget + " dirty? " + + mTarget.isDirty() + " " + flatFraction + " " + this + " " + animation); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java index 9c2bca99deff..32759decb6e1 100644 --- a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java @@ -45,8 +45,7 @@ import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; -import android.view.ViewTreeObserver; -import android.view.ViewTreeObserver.OnGlobalLayoutListener; +import android.view.ViewPropertyAnimator; import android.view.accessibility.AccessibilityEvent; import android.view.animation.AnimationUtils; import android.view.animation.DecelerateInterpolator; @@ -195,50 +194,27 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener oldHolder.calloutLine.setTranslationY(0f); } } - mItemToAnimateInWhenWindowAnimationIsFinished = null; - - final ViewTreeObserver observer = getViewTreeObserver(); - final OnGlobalLayoutListener animateFirstIcon = new OnGlobalLayoutListener() { - public void onGlobalLayout() { - ViewHolder oldHolder = mItemToAnimateInWhenWindowAnimationIsFinished; - if (oldHolder != null) { - oldHolder.iconView.setAlpha(1f); - oldHolder.iconView.setTranslationX(0f); - oldHolder.iconView.setTranslationY(0f); - oldHolder.labelView.setAlpha(1f); - oldHolder.labelView.setTranslationX(0f); - oldHolder.labelView.setTranslationY(0f); - if (oldHolder.calloutLine != null) { - oldHolder.calloutLine.setAlpha(1f); - oldHolder.calloutLine.setTranslationX(0f); - oldHolder.calloutLine.setTranslationY(0f); - } - } - mItemToAnimateInWhenWindowAnimationIsFinished = holder; - int translation = -getResources().getDimensionPixelSize( - R.dimen.status_bar_recents_app_icon_translate_distance); - final Configuration config = getResources().getConfiguration(); - if (config.orientation == Configuration.ORIENTATION_PORTRAIT) { - if (getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) { - translation = -translation; - } - holder.iconView.setAlpha(0f); - holder.iconView.setTranslationX(translation); - holder.labelView.setAlpha(0f); - holder.labelView.setTranslationX(translation); - holder.calloutLine.setAlpha(0f); - holder.calloutLine.setTranslationX(translation); - } else { - holder.iconView.setAlpha(0f); - holder.iconView.setTranslationY(translation); - } - if (!mWaitingForWindowAnimation) { - animateInIconOfFirstTask(); - } - getViewTreeObserver().removeOnGlobalLayoutListener(this); + mItemToAnimateInWhenWindowAnimationIsFinished = holder; + int translation = -getResources().getDimensionPixelSize( + R.dimen.status_bar_recents_app_icon_translate_distance); + final Configuration config = getResources().getConfiguration(); + if (config.orientation == Configuration.ORIENTATION_PORTRAIT) { + if (getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) { + translation = -translation; } - }; - observer.addOnGlobalLayoutListener(animateFirstIcon); + holder.iconView.setAlpha(0f); + holder.iconView.setTranslationX(translation); + holder.labelView.setAlpha(0f); + holder.labelView.setTranslationX(translation); + holder.calloutLine.setAlpha(0f); + holder.calloutLine.setTranslationX(translation); + } else { + holder.iconView.setAlpha(0f); + holder.iconView.setTranslationY(translation); + } + if (!mWaitingForWindowAnimation) { + animateInIconOfFirstTask(); + } } } @@ -586,17 +562,20 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener !mRecentTasksLoader.isFirstScreenful()) { int timeSinceWindowAnimation = (int) (System.currentTimeMillis() - mWindowAnimationStartTime); - final int minStartDelay = 150; + final int minStartDelay = 125; final int startDelay = Math.max(0, Math.min( minStartDelay - timeSinceWindowAnimation, minStartDelay)); final int duration = 250; final ViewHolder holder = mItemToAnimateInWhenWindowAnimationIsFinished; final TimeInterpolator cubic = new DecelerateInterpolator(1.5f); + FirstFrameAnimatorHelper.initializeDrawListener(holder.iconView); for (View v : new View[] { holder.iconView, holder.labelView, holder.calloutLine }) { if (v != null) { - v.animate().translationX(0).translationY(0).alpha(1f).setStartDelay(startDelay) + ViewPropertyAnimator vpa = v.animate().translationX(0).translationY(0) + .alpha(1f).setStartDelay(startDelay) .setDuration(duration).setInterpolator(cubic); + FirstFrameAnimatorHelper h = new FirstFrameAnimatorHelper(vpa, v); } } mItemToAnimateInWhenWindowAnimationIsFinished = null; diff --git a/services/common_time/Android.mk b/services/common_time/Android.mk index 0606ab4e8eb6..75eb5281f692 100644 --- a/services/common_time/Android.mk +++ b/services/common_time/Android.mk @@ -27,7 +27,8 @@ endif LOCAL_SHARED_LIBRARIES := \ libbinder \ libcommon_time_client \ - libutils + libutils \ + liblog LOCAL_MODULE_TAGS := optional LOCAL_MODULE := common_time diff --git a/services/input/Android.mk b/services/input/Android.mk index 159800f4623d..5d913f378629 100644 --- a/services/input/Android.mk +++ b/services/input/Android.mk @@ -29,6 +29,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libcutils \ + liblog \ libandroidfw \ libutils \ libhardware \ diff --git a/services/input/EventHub.cpp b/services/input/EventHub.cpp index a2443e7b380e..376de960ab17 100644 --- a/services/input/EventHub.cpp +++ b/services/input/EventHub.cpp @@ -40,7 +40,6 @@ #include <androidfw/KeyCharacterMap.h> #include <androidfw/VirtualKeyMap.h> -#include <sha1.h> #include <string.h> #include <stdint.h> #include <dirent.h> @@ -49,6 +48,7 @@ #include <sys/epoll.h> #include <sys/ioctl.h> #include <sys/limits.h> +#include <sys/sha1.h> /* this macro is used to tell if "bit" is set in "array" * it selects a byte from the array, and does a boolean AND @@ -162,7 +162,8 @@ EventHub::Device::Device(int fd, int32_t id, const String8& path, next(NULL), fd(fd), id(id), path(path), identifier(identifier), classes(0), configuration(NULL), virtualKeyMap(NULL), - ffEffectPlaying(false), ffEffectId(-1) { + ffEffectPlaying(false), ffEffectId(-1), + timestampOverrideSec(0), timestampOverrideUsec(0) { memset(keyBitmask, 0, sizeof(keyBitmask)); memset(absBitmask, 0, sizeof(absBitmask)); memset(relBitmask, 0, sizeof(relBitmask)); @@ -766,12 +767,37 @@ size_t EventHub::getEvents(int timeoutMillis, RawEvent* buffer, size_t bufferSiz size_t count = size_t(readSize) / sizeof(struct input_event); for (size_t i = 0; i < count; i++) { - const struct input_event& iev = readBuffer[i]; - ALOGV("%s got: t0=%d, t1=%d, type=%d, code=%d, value=%d", + struct input_event& iev = readBuffer[i]; + ALOGV("%s got: time=%d.%06d, type=%d, code=%d, value=%d", device->path.string(), (int) iev.time.tv_sec, (int) iev.time.tv_usec, iev.type, iev.code, iev.value); + // Some input devices may have a better concept of the time + // when an input event was actually generated than the kernel + // which simply timestamps all events on entry to evdev. + // This is a custom Android extension of the input protocol + // mainly intended for use with uinput based device drivers. + if (iev.type == EV_MSC) { + if (iev.code == MSC_ANDROID_TIME_SEC) { + device->timestampOverrideSec = iev.value; + continue; + } else if (iev.code == MSC_ANDROID_TIME_USEC) { + device->timestampOverrideUsec = iev.value; + continue; + } + } + if (device->timestampOverrideSec || device->timestampOverrideUsec) { + iev.time.tv_sec = device->timestampOverrideSec; + iev.time.tv_usec = device->timestampOverrideUsec; + if (iev.type == EV_SYN && iev.code == SYN_REPORT) { + device->timestampOverrideSec = 0; + device->timestampOverrideUsec = 0; + } + ALOGV("applied override time %d.%06d", + int(iev.time.tv_sec), int(iev.time.tv_usec)); + } + #ifdef HAVE_POSIX_CLOCKS // Use the time specified in the event instead of the current time // so that downstream code can get more accurate estimates of @@ -829,8 +855,8 @@ size_t EventHub::getEvents(int timeoutMillis, RawEvent* buffer, size_t bufferSiz event->code = iev.code; event->value = iev.value; event += 1; + capacity -= 1; } - capacity -= count; if (capacity == 0) { // The result buffer is full. Reset the pending event index // so we will try to read the device again on the next iteration. diff --git a/services/input/EventHub.h b/services/input/EventHub.h index afc12ef1aa45..c93fc7a89c68 100644 --- a/services/input/EventHub.h +++ b/services/input/EventHub.h @@ -42,6 +42,20 @@ #define BTN_FIRST 0x100 // first button code #define BTN_LAST 0x15f // last button code +/* + * These constants are used privately in Android to pass raw timestamps + * through evdev from uinput device drivers because there is currently no + * other way to transfer this information. The evdev driver automatically + * timestamps all input events with the time they were posted and clobbers + * whatever information was passed in. + * + * For the purposes of this hack, the timestamp is specified in the + * CLOCK_MONOTONIC timebase and is split into two EV_MSC events specifying + * seconds and microseconds. + */ +#define MSC_ANDROID_TIME_SEC 0x6 +#define MSC_ANDROID_TIME_USEC 0x7 + namespace android { enum { @@ -329,6 +343,9 @@ private: bool ffEffectPlaying; int16_t ffEffectId; // initially -1 + int32_t timestampOverrideSec; + int32_t timestampOverrideUsec; + Device(int fd, int32_t id, const String8& path, const InputDeviceIdentifier& identifier); ~Device(); diff --git a/services/input/InputReader.cpp b/services/input/InputReader.cpp index 602afd4a8ad6..ab38ed20e315 100644 --- a/services/input/InputReader.cpp +++ b/services/input/InputReader.cpp @@ -2701,6 +2701,12 @@ void TouchInputMapper::dump(String8& dump) { mPointerYZoomScale); dump.appendFormat(INDENT4 "MaxSwipeWidth: %f\n", mPointerGestureMaxSwipeWidth); + } else if (mDeviceMode == DEVICE_MODE_NAVIGATION) { + dump.appendFormat(INDENT3 "Navigation Gesture Detector:\n"); + dump.appendFormat(INDENT4 "AssistStartY: %0.3f\n", + mNavigationAssistStartY); + dump.appendFormat(INDENT4 "AssistEndY: %0.3f\n", + mNavigationAssistEndY); } } @@ -2895,7 +2901,7 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) { } } else if (mParameters.deviceType == Parameters::DEVICE_TYPE_TOUCH_NAVIGATION) { mSource = AINPUT_SOURCE_TOUCH_NAVIGATION; - mDeviceMode = DEVICE_MODE_UNSCALED; + mDeviceMode = DEVICE_MODE_NAVIGATION; } else { mSource = AINPUT_SOURCE_TOUCHPAD; mDeviceMode = DEVICE_MODE_UNSCALED; @@ -3243,8 +3249,8 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) { break; } - // Compute pointer gesture detection parameters. if (mDeviceMode == DEVICE_MODE_POINTER) { + // Compute pointer gesture detection parameters. float rawDiagonal = hypotf(rawWidth, rawHeight); float displayDiagonal = hypotf(mSurfaceWidth, mSurfaceHeight); @@ -3269,10 +3275,14 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) { // translated into freeform gestures. mPointerGestureMaxSwipeWidth = mConfig.pointerGestureSwipeMaxWidthRatio * rawDiagonal; - } - // Abort current pointer usages because the state has changed. - abortPointerUsage(when, 0 /*policyFlags*/); + // Abort current pointer usages because the state has changed. + abortPointerUsage(when, 0 /*policyFlags*/); + } else if (mDeviceMode == DEVICE_MODE_NAVIGATION) { + // Compute navigation parameters. + mNavigationAssistStartY = mSurfaceHeight * 0.9f; + mNavigationAssistEndY = mSurfaceHeight * 0.5f; + } // Inform the dispatcher about the changes. *outResetNeeded = true; @@ -3611,6 +3621,7 @@ void TouchInputMapper::reset(nsecs_t when) { mPointerGesture.reset(); mPointerSimple.reset(); + mNavigation.reset(); if (mPointerController != NULL) { mPointerController->fade(PointerControllerInterface::TRANSITION_GRADUAL); @@ -3761,6 +3772,8 @@ void TouchInputMapper::sync(nsecs_t when) { mPointerController->setSpots(mCurrentCookedPointerData.pointerCoords, mCurrentCookedPointerData.idToIndex, mCurrentCookedPointerData.touchingIdBits); + } else if (mDeviceMode == DEVICE_MODE_NAVIGATION) { + dispatchNavigationAssist(when, policyFlags); } dispatchHoverExit(when, policyFlags); @@ -5482,6 +5495,44 @@ void TouchInputMapper::abortPointerSimple(nsecs_t when, uint32_t policyFlags) { dispatchPointerSimple(when, policyFlags, false, false); } +void TouchInputMapper::dispatchNavigationAssist(nsecs_t when, uint32_t policyFlags) { + if (mCurrentCookedPointerData.touchingIdBits.count() == 1) { + if (mLastCookedPointerData.touchingIdBits.isEmpty()) { + // First pointer down. + uint32_t id = mCurrentCookedPointerData.touchingIdBits.firstMarkedBit(); + const PointerCoords& coords = mCurrentCookedPointerData.pointerCoordsForId(id); + if (coords.getY() >= mNavigationAssistStartY) { + // Start tracking the possible assist swipe. + mNavigation.activeAssistId = id; + return; + } + } else if (mNavigation.activeAssistId >= 0 + && mCurrentCookedPointerData.touchingIdBits.hasBit(mNavigation.activeAssistId)) { + const PointerCoords& coords = mCurrentCookedPointerData.pointerCoordsForId( + mNavigation.activeAssistId); + if (coords.getY() > mNavigationAssistEndY) { + // Swipe is still in progress. + return; + } + + // Detected assist swipe. + int32_t metaState = mContext->getGlobalMetaState(); + NotifyKeyArgs downArgs(when, getDeviceId(), AINPUT_SOURCE_KEYBOARD, + policyFlags | POLICY_FLAG_VIRTUAL, + AKEY_EVENT_ACTION_DOWN, 0, AKEYCODE_ASSIST, 0, metaState, when); + getListener()->notifyKey(&downArgs); + + NotifyKeyArgs upArgs(when, getDeviceId(), AINPUT_SOURCE_KEYBOARD, + policyFlags | POLICY_FLAG_VIRTUAL, + AKEY_EVENT_ACTION_UP, 0, AKEYCODE_ASSIST, 0, metaState, when); + getListener()->notifyKey(&upArgs); + } + } + + // Cancel the assist swipe. + mNavigation.activeAssistId = -1; +} + void TouchInputMapper::dispatchMotion(nsecs_t when, uint32_t policyFlags, uint32_t source, int32_t action, int32_t flags, int32_t metaState, int32_t buttonState, int32_t edgeFlags, const PointerProperties* properties, const PointerCoords* coords, diff --git a/services/input/InputReader.h b/services/input/InputReader.h index 8a52c062a25a..312f19bc4ff3 100644 --- a/services/input/InputReader.h +++ b/services/input/InputReader.h @@ -791,6 +791,10 @@ struct CookedPointerData { void clear(); void copyFrom(const CookedPointerData& other); + inline const PointerCoords& pointerCoordsForId(uint32_t id) const { + return pointerCoords[idToIndex[id]]; + } + inline bool isHovering(uint32_t pointerIndex) { return hoveringIdBits.hasBit(pointerProperties[pointerIndex].id); } @@ -1180,6 +1184,7 @@ protected: DEVICE_MODE_DISABLED, // input is disabled DEVICE_MODE_DIRECT, // direct mapping (touchscreen) DEVICE_MODE_UNSCALED, // unscaled mapping (touchpad) + DEVICE_MODE_NAVIGATION, // unscaled mapping with assist gesture (touch navigation) DEVICE_MODE_POINTER, // pointer mapping (pointer) }; DeviceMode mDeviceMode; @@ -1432,6 +1437,10 @@ private: // The maximum swipe width. float mPointerGestureMaxSwipeWidth; + // The start and end Y thresholds for invoking the assist navigation swipe. + float mNavigationAssistStartY; + float mNavigationAssistEndY; + struct PointerDistanceHeapElement { uint32_t currentPointerIndex : 8; uint32_t lastPointerIndex : 8; @@ -1606,6 +1615,15 @@ private: } } mPointerSimple; + struct Navigation { + // The id of a pointer that is tracking a possible assist swipe. + int32_t activeAssistId; // -1 if none + + void reset() { + activeAssistId = -1; + } + } mNavigation; + // The pointer and scroll velocity controls. VelocityControl mPointerVelocityControl; VelocityControl mWheelXVelocityControl; @@ -1641,6 +1659,8 @@ private: bool down, bool hovering); void abortPointerSimple(nsecs_t when, uint32_t policyFlags); + void dispatchNavigationAssist(nsecs_t when, uint32_t policyFlags); + // Dispatches a motion event. // If the changedId is >= 0 and the action is POINTER_DOWN or POINTER_UP, the // method will take care of setting the index and transmuting the action to DOWN or UP diff --git a/services/input/tests/Android.mk b/services/input/tests/Android.mk index 8f8c34b4f38c..211e64b92619 100644 --- a/services/input/tests/Android.mk +++ b/services/input/tests/Android.mk @@ -9,6 +9,7 @@ test_src_files := \ shared_libraries := \ libcutils \ + liblog \ libandroidfw \ libutils \ libhardware \ diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 9e06db83a388..ffc36723eba2 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -321,12 +321,11 @@ public class ConnectivityService extends IConnectivityManager.Stub { // track the current default http proxy - tell the world if we get a new one (real change) private ProxyProperties mDefaultProxy = null; - private Object mDefaultProxyLock = new Object(); + private Object mProxyLock = new Object(); private boolean mDefaultProxyDisabled = false; // track the global proxy. private ProxyProperties mGlobalProxy = null; - private final Object mGlobalProxyLock = new Object(); private SettingsObserver mSettingsObserver; @@ -3039,14 +3038,15 @@ public class ConnectivityService extends IConnectivityManager.Stub { // so this API change wouldn't have a benifit. It also breaks the passing // of proxy info to all the JVMs. // enforceAccessPermission(); - synchronized (mDefaultProxyLock) { - return mDefaultProxyDisabled ? null : mDefaultProxy; + synchronized (mProxyLock) { + if (mGlobalProxy != null) return mGlobalProxy; + return (mDefaultProxyDisabled ? null : mDefaultProxy); } } public void setGlobalProxy(ProxyProperties proxyProperties) { enforceChangePermission(); - synchronized (mGlobalProxyLock) { + synchronized (mProxyLock) { if (proxyProperties == mGlobalProxy) return; if (proxyProperties != null && proxyProperties.equals(mGlobalProxy)) return; if (mGlobalProxy != null && mGlobalProxy.equals(proxyProperties)) return; @@ -3072,7 +3072,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { if (mGlobalProxy == null) { proxyProperties = mDefaultProxy; } - //sendProxyBroadcast(proxyProperties); + sendProxyBroadcast(proxyProperties); } private void loadGlobalProxy() { @@ -3083,7 +3083,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { Settings.Global.GLOBAL_HTTP_PROXY_EXCLUSION_LIST); if (!TextUtils.isEmpty(host)) { ProxyProperties proxyProperties = new ProxyProperties(host, port, exclList); - synchronized (mGlobalProxyLock) { + synchronized (mProxyLock) { mGlobalProxy = proxyProperties; } } @@ -3094,7 +3094,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { // so this API change wouldn't have a benifit. It also breaks the passing // of proxy info to all the JVMs. // enforceAccessPermission(); - synchronized (mGlobalProxyLock) { + synchronized (mProxyLock) { return mGlobalProxy; } } @@ -3103,11 +3103,12 @@ public class ConnectivityService extends IConnectivityManager.Stub { if (proxy != null && TextUtils.isEmpty(proxy.getHost())) { proxy = null; } - synchronized (mDefaultProxyLock) { + synchronized (mProxyLock) { if (mDefaultProxy != null && mDefaultProxy.equals(proxy)) return; - if (mDefaultProxy == proxy) return; + if (mDefaultProxy == proxy) return; // catches repeated nulls mDefaultProxy = proxy; + if (mGlobalProxy != null) return; if (!mDefaultProxyDisabled) { sendProxyBroadcast(proxy); } @@ -3350,10 +3351,10 @@ public class ConnectivityService extends IConnectivityManager.Stub { mDnsOverridden = true; } - // Temporarily disable the default proxy. - synchronized (mDefaultProxyLock) { + // Temporarily disable the default proxy (not global). + synchronized (mProxyLock) { mDefaultProxyDisabled = true; - if (mDefaultProxy != null) { + if (mGlobalProxy == null && mDefaultProxy != null) { sendProxyBroadcast(null); } } @@ -3368,9 +3369,9 @@ public class ConnectivityService extends IConnectivityManager.Stub { mHandler.sendEmptyMessage(EVENT_RESTORE_DNS); } } - synchronized (mDefaultProxyLock) { + synchronized (mProxyLock) { mDefaultProxyDisabled = false; - if (mDefaultProxy != null) { + if (mGlobalProxy == null && mDefaultProxy != null) { sendProxyBroadcast(mDefaultProxy); } } diff --git a/services/java/com/android/server/EventLogTags.logtags b/services/java/com/android/server/EventLogTags.logtags index 8bc2da26ae92..59577ad0662e 100644 --- a/services/java/com/android/server/EventLogTags.logtags +++ b/services/java/com/android/server/EventLogTags.logtags @@ -157,3 +157,8 @@ option java_package com.android.server # ConfigUpdateInstallReceiver.java # --------------------------- 51300 config_install_failed (dir|3) + +# --------------------------- +# IntentFirewall.java +# --------------------------- +51400 ifw_intent_matched (Intent Type|1|5),(Component Name|3),(Caller Uid|1|5),(Caller Pkg Count|1|1),(Caller Pkgs|3),(Action|3),(MIME Type|3),(URI|3),(Flags|1|5) diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 7710f136702d..cc7905c6cb54 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -3858,6 +3858,9 @@ public final class ActivityManagerService extends ActivityManagerNative if (app.userId != userId) { continue; } + if (appId >= 0 && UserHandle.getAppId(app.uid) != appId) { + continue; + } // Package has been specified, we want to hit all processes // that match it. We need to qualify this by the processes // that are running under the specified app and user ID. @@ -7733,6 +7736,18 @@ public final class ActivityManagerService extends ActivityManagerNative } @Override + public void killUid(int uid, String reason) { + if (Binder.getCallingUid() != Process.SYSTEM_UID) { + throw new SecurityException("killUid only available to the system"); + } + synchronized (this) { + killPackageProcessesLocked(null, UserHandle.getAppId(uid), UserHandle.getUserId(uid), + ProcessList.FOREGROUND_APP_ADJ-1, false, true, true, false, + reason != null ? reason : "kill uid"); + } + } + + @Override public boolean killProcessesBelowForeground(String reason) { if (Binder.getCallingUid() != Process.SYSTEM_UID) { throw new SecurityException("killProcessesBelowForeground() only available to system"); @@ -8350,13 +8365,13 @@ public final class ActivityManagerService extends ActivityManagerNative final String processName = app == null ? "system_server" : (r == null ? "unknown" : r.processName); - handleApplicationCrashInner(r, processName, crashInfo); + handleApplicationCrashInner("crash", r, processName, crashInfo); } /* Native crash reporting uses this inner version because it needs to be somewhat * decoupled from the AM-managed cleanup lifecycle */ - void handleApplicationCrashInner(ProcessRecord r, String processName, + void handleApplicationCrashInner(String eventType, ProcessRecord r, String processName, ApplicationErrorReport.CrashInfo crashInfo) { EventLog.writeEvent(EventLogTags.AM_CRASH, Binder.getCallingPid(), UserHandle.getUserId(Binder.getCallingUid()), processName, @@ -8366,7 +8381,7 @@ public final class ActivityManagerService extends ActivityManagerNative crashInfo.throwFileName, crashInfo.throwLineNumber); - addErrorToDropBox("crash", r, processName, null, null, null, null, null, crashInfo); + addErrorToDropBox(eventType, r, processName, null, null, null, null, null, crashInfo); crashApplication(r, crashInfo); } diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index 3d7da7bb70ec..3d2e912d69fa 100644 --- a/services/java/com/android/server/am/ActivityStack.java +++ b/services/java/com/android/server/am/ActivityStack.java @@ -2594,8 +2594,7 @@ final class ActivityStack { } boolean abort = !mService.mIntentFirewall.checkStartActivity(intent, - callerApp==null?null:callerApp.info, callingPackage, callingUid, callingPid, - resolvedType, aInfo); + callerApp==null?null:callerApp.info, callingUid, callingPid, resolvedType, aInfo); if (mMainStack) { if (mService.mController != null) { diff --git a/services/java/com/android/server/am/NativeCrashListener.java b/services/java/com/android/server/am/NativeCrashListener.java index e83433fd65e9..0688c50e863c 100644 --- a/services/java/com/android/server/am/NativeCrashListener.java +++ b/services/java/com/android/server/am/NativeCrashListener.java @@ -82,7 +82,7 @@ class NativeCrashListener extends Thread { ci.stackTrace = mCrashReport; if (DEBUG) Slog.v(TAG, "Calling handleApplicationCrash()"); - mAm.handleApplicationCrashInner(mApp, mApp.processName, ci); + mAm.handleApplicationCrashInner("native_crash", mApp, mApp.processName, ci); if (DEBUG) Slog.v(TAG, "<-- handleApplicationCrash() returned"); } catch (Exception e) { Slog.e(TAG, "Unable to report native crash", e); diff --git a/services/java/com/android/server/firewall/AndFilter.java b/services/java/com/android/server/firewall/AndFilter.java index cabf00b3b271..e4276d085196 100644 --- a/services/java/com/android/server/firewall/AndFilter.java +++ b/services/java/com/android/server/firewall/AndFilter.java @@ -26,11 +26,10 @@ import java.io.IOException; class AndFilter extends FilterList { @Override public boolean matches(IntentFirewall ifw, Intent intent, ApplicationInfo callerApp, - String callerPackage, int callerUid, int callerPid, String resolvedType, - ApplicationInfo resolvedApp) { + int callerUid, int callerPid, String resolvedType, ApplicationInfo resolvedApp) { for (int i=0; i<children.size(); i++) { - if (!children.get(i).matches(ifw, intent, callerApp, callerPackage, callerUid, - callerPid, resolvedType, resolvedApp)) { + if (!children.get(i).matches(ifw, intent, callerApp, callerUid, callerPid, resolvedType, + resolvedApp)) { return false; } } diff --git a/services/java/com/android/server/firewall/CategoryFilter.java b/services/java/com/android/server/firewall/CategoryFilter.java index d5e9fe843306..4938cb89bba9 100644 --- a/services/java/com/android/server/firewall/CategoryFilter.java +++ b/services/java/com/android/server/firewall/CategoryFilter.java @@ -34,7 +34,7 @@ class CategoryFilter implements Filter { } @Override - public boolean matches(IntentFirewall ifw, Intent intent, ApplicationInfo callerApp, String callerPackage, + public boolean matches(IntentFirewall ifw, Intent intent, ApplicationInfo callerApp, int callerUid, int callerPid, String resolvedType, ApplicationInfo resolvedApp) { Set<String> categories = intent.getCategories(); if (categories == null) { diff --git a/services/java/com/android/server/firewall/Filter.java b/services/java/com/android/server/firewall/Filter.java index 76394662572d..0e783e80316f 100644 --- a/services/java/com/android/server/firewall/Filter.java +++ b/services/java/com/android/server/firewall/Filter.java @@ -26,17 +26,14 @@ interface Filter { * @param ifw The IntentFirewall instance * @param intent The intent being started/bound/broadcast * @param callerApp An ApplicationInfo of an application in the caller's process. This may not - * be the specific app that is actually sending the intent. This also may be - * null, if the caller is the system process, or an unrecognized process (e.g. - * am start) - * @param callerPackage The package name of the component sending the intent. This value is -* provided by the caller and might be forged/faked. + * be the specific app that is actually sending the intent. This also may be + * null, if the caller is the system process, or an unrecognized process (e.g. + * am start) * @param callerUid * @param callerPid * @param resolvedType The resolved mime type of the intent * @param resolvedApp The application that contains the resolved component that the intent is */ boolean matches(IntentFirewall ifw, Intent intent, ApplicationInfo callerApp, - String callerPackage, int callerUid, int callerPid, String resolvedType, - ApplicationInfo resolvedApp); + int callerUid, int callerPid, String resolvedType, ApplicationInfo resolvedApp); } diff --git a/services/java/com/android/server/firewall/IntentFirewall.java b/services/java/com/android/server/firewall/IntentFirewall.java index 062183b1b090..08e6b4530a57 100644 --- a/services/java/com/android/server/firewall/IntentFirewall.java +++ b/services/java/com/android/server/firewall/IntentFirewall.java @@ -16,18 +16,21 @@ package com.android.server.firewall; +import android.app.AppGlobals; +import android.content.ComponentName; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; +import android.content.pm.IPackageManager; import android.content.pm.PackageManager; import android.os.Environment; -import android.os.ServiceManager; +import android.os.RemoteException; import android.util.Slog; import android.util.Xml; import com.android.internal.util.XmlUtils; +import com.android.server.EventLogTags; import com.android.server.IntentResolver; -import com.android.server.pm.PackageManagerService; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -46,11 +49,18 @@ public class IntentFirewall { private static final File RULES_FILE = new File(Environment.getSystemSecureDirectory(), "ifw/ifw.xml"); + private static final int LOG_PACKAGES_MAX_LENGTH = 150; + private static final int LOG_PACKAGES_SUFFICIENT_LENGTH = 125; + private static final String TAG_RULES = "rules"; private static final String TAG_ACTIVITY = "activity"; private static final String TAG_SERVICE = "service"; private static final String TAG_BROADCAST = "broadcast"; + private static final int TYPE_ACTIVITY = 0; + private static final int TYPE_SERVICE = 1; + private static final int TYPE_BROADCAST = 2; + private static final HashMap<String, FilterFactory> factoryMap; private final AMSInterface mAms; @@ -76,7 +86,6 @@ public class IntentFirewall { StringFilter.HOST, StringFilter.MIME_TYPE, StringFilter.PATH, - StringFilter.SENDER_PACKAGE, StringFilter.SSP, CategoryFilter.FACTORY, @@ -98,17 +107,16 @@ public class IntentFirewall { readRules(getRulesFile()); } - public boolean checkStartActivity(Intent intent, ApplicationInfo callerApp, - String callerPackage, int callerUid, int callerPid, String resolvedType, - ActivityInfo resolvedActivity) { + public boolean checkStartActivity(Intent intent, ApplicationInfo callerApp, int callerUid, + int callerPid, String resolvedType, ActivityInfo resolvedActivity) { List<Rule> matchingRules = mActivityResolver.queryIntent(intent, resolvedType, false, 0); boolean log = false; boolean block = false; for (int i=0; i< matchingRules.size(); i++) { Rule rule = matchingRules.get(i); - if (rule.matches(this, intent, callerApp, callerPackage, callerUid, callerPid, - resolvedType, resolvedActivity.applicationInfo)) { + if (rule.matches(this, intent, callerApp, callerUid, callerPid, resolvedType, + resolvedActivity.applicationInfo)) { block |= rule.getBlock(); log |= rule.getLog(); @@ -121,12 +129,81 @@ public class IntentFirewall { } if (log) { - // TODO: log info about intent to event log + logIntent(TYPE_ACTIVITY, intent, callerUid, resolvedType); } return !block; } + private static void logIntent(int intentType, Intent intent, int callerUid, + String resolvedType) { + // The component shouldn't be null, but let's double check just to be safe + ComponentName cn = intent.getComponent(); + String shortComponent = null; + if (cn != null) { + shortComponent = cn.flattenToShortString(); + } + + String callerPackages = null; + int callerPackageCount = 0; + IPackageManager pm = AppGlobals.getPackageManager(); + if (pm != null) { + try { + String[] callerPackagesArray = pm.getPackagesForUid(callerUid); + if (callerPackagesArray != null) { + callerPackageCount = callerPackagesArray.length; + callerPackages = joinPackages(callerPackagesArray); + } + } catch (RemoteException ex) { + Slog.e(TAG, "Remote exception while retrieving packages", ex); + } + } + + EventLogTags.writeIfwIntentMatched(intentType, shortComponent, callerUid, + callerPackageCount, callerPackages, intent.getAction(), resolvedType, + intent.getDataString(), intent.getFlags()); + } + + /** + * Joins a list of package names such that the resulting string is no more than + * LOG_PACKAGES_MAX_LENGTH. + * + * Only full package names will be added to the result, unless every package is longer than the + * limit, in which case one of the packages will be truncated and added. In this case, an + * additional '-' character will be added to the end of the string, to denote the truncation. + * + * If it encounters a package that won't fit in the remaining space, it will continue on to the + * next package, unless the total length of the built string so far is greater than + * LOG_PACKAGES_SUFFICIENT_LENGTH, in which case it will stop and return what it has. + */ + private static String joinPackages(String[] packages) { + boolean first = true; + StringBuilder sb = new StringBuilder(); + for (int i=0; i<packages.length; i++) { + String pkg = packages[i]; + + // + 1 length for the comma. This logic technically isn't correct for the first entry, + // but it's not critical. + if (sb.length() + pkg.length() + 1 < LOG_PACKAGES_MAX_LENGTH) { + if (!first) { + sb.append(','); + } else { + first = false; + } + sb.append(pkg); + } else if (sb.length() >= LOG_PACKAGES_SUFFICIENT_LENGTH) { + return sb.toString(); + } + } + if (sb.length() == 0 && packages.length > 0) { + String pkg = packages[0]; + // truncating from the end - the last part of the package name is more likely to be + // interesting/unique + return pkg.substring(pkg.length() - LOG_PACKAGES_MAX_LENGTH + 1) + '-'; + } + return null; + } + public static File getRulesFile() { return RULES_FILE; } @@ -313,7 +390,12 @@ public class IntentFirewall { } boolean signaturesMatch(int uid1, int uid2) { - PackageManagerService pm = (PackageManagerService)ServiceManager.getService("package"); - return pm.checkUidSignatures(uid1, uid2) == PackageManager.SIGNATURE_MATCH; + try { + IPackageManager pm = AppGlobals.getPackageManager(); + return pm.checkUidSignatures(uid1, uid2) == PackageManager.SIGNATURE_MATCH; + } catch (RemoteException ex) { + Slog.e(TAG, "Remote exception while checking signatures", ex); + return false; + } } } diff --git a/services/java/com/android/server/firewall/NotFilter.java b/services/java/com/android/server/firewall/NotFilter.java index 2ff108a1db8b..f0fc337c5be2 100644 --- a/services/java/com/android/server/firewall/NotFilter.java +++ b/services/java/com/android/server/firewall/NotFilter.java @@ -33,10 +33,9 @@ class NotFilter implements Filter { @Override public boolean matches(IntentFirewall ifw, Intent intent, ApplicationInfo callerApp, - String callerPackage, int callerUid, int callerPid, String resolvedType, - ApplicationInfo resolvedApp) { - return !mChild.matches(ifw, intent, callerApp, callerPackage, callerUid, callerPid, - resolvedType, resolvedApp); + int callerUid, int callerPid, String resolvedType, ApplicationInfo resolvedApp) { + return !mChild.matches(ifw, intent, callerApp, callerUid, callerPid, resolvedType, + resolvedApp); } public static final FilterFactory FACTORY = new FilterFactory("not") { diff --git a/services/java/com/android/server/firewall/OrFilter.java b/services/java/com/android/server/firewall/OrFilter.java index 1ed1c85ae1b0..72db31e2edf1 100644 --- a/services/java/com/android/server/firewall/OrFilter.java +++ b/services/java/com/android/server/firewall/OrFilter.java @@ -26,11 +26,10 @@ import java.io.IOException; class OrFilter extends FilterList { @Override public boolean matches(IntentFirewall ifw, Intent intent, ApplicationInfo callerApp, - String callerPackage, int callerUid, int callerPid, String resolvedType, - ApplicationInfo resolvedApp) { + int callerUid, int callerPid, String resolvedType, ApplicationInfo resolvedApp) { for (int i=0; i<children.size(); i++) { - if (children.get(i).matches(ifw, intent, callerApp, callerPackage, callerUid, callerPid, - resolvedType, resolvedApp)) { + if (children.get(i).matches(ifw, intent, callerApp, callerUid, callerPid, resolvedType, + resolvedApp)) { return true; } } diff --git a/services/java/com/android/server/firewall/PortFilter.java b/services/java/com/android/server/firewall/PortFilter.java index 2b2a19898785..fe7e085f0b5d 100644 --- a/services/java/com/android/server/firewall/PortFilter.java +++ b/services/java/com/android/server/firewall/PortFilter.java @@ -42,8 +42,7 @@ class PortFilter implements Filter { @Override public boolean matches(IntentFirewall ifw, Intent intent, ApplicationInfo callerApp, - String callerPackage, int callerUid, int callerPid, String resolvedType, - ApplicationInfo resolvedApp) { + int callerUid, int callerPid, String resolvedType, ApplicationInfo resolvedApp) { int port = -1; Uri uri = intent.getData(); if (uri != null) { diff --git a/services/java/com/android/server/firewall/SenderFilter.java b/services/java/com/android/server/firewall/SenderFilter.java index 0b790bd58ff9..58bdd7318c08 100644 --- a/services/java/com/android/server/firewall/SenderFilter.java +++ b/services/java/com/android/server/firewall/SenderFilter.java @@ -68,8 +68,7 @@ class SenderFilter { private static final Filter SIGNATURE = new Filter() { @Override public boolean matches(IntentFirewall ifw, Intent intent, ApplicationInfo callerApp, - String callerPackage, int callerUid, int callerPid, String resolvedType, - ApplicationInfo resolvedApp) { + int callerUid, int callerPid, String resolvedType, ApplicationInfo resolvedApp) { if (callerApp == null) { return false; } @@ -80,8 +79,7 @@ class SenderFilter { private static final Filter SYSTEM = new Filter() { @Override public boolean matches(IntentFirewall ifw, Intent intent, ApplicationInfo callerApp, - String callerPackage, int callerUid, int callerPid, String resolvedType, - ApplicationInfo resolvedApp) { + int callerUid, int callerPid, String resolvedType, ApplicationInfo resolvedApp) { if (callerApp == null) { // if callerApp is null, the caller is the system process return false; @@ -93,8 +91,7 @@ class SenderFilter { private static final Filter SYSTEM_OR_SIGNATURE = new Filter() { @Override public boolean matches(IntentFirewall ifw, Intent intent, ApplicationInfo callerApp, - String callerPackage, int callerUid, int callerPid, String resolvedType, - ApplicationInfo resolvedApp) { + int callerUid, int callerPid, String resolvedType, ApplicationInfo resolvedApp) { return isSystemApp(callerApp, callerUid, callerPid) || ifw.signaturesMatch(callerUid, resolvedApp.uid); } @@ -103,8 +100,7 @@ class SenderFilter { private static final Filter USER_ID = new Filter() { @Override public boolean matches(IntentFirewall ifw, Intent intent, ApplicationInfo callerApp, - String callerPackage, int callerUid, int callerPid, String resolvedType, - ApplicationInfo resolvedApp) { + int callerUid, int callerPid, String resolvedType, ApplicationInfo resolvedApp) { // This checks whether the caller is either the system process, or has the same user id // I.e. the same app, or an app that uses the same shared user id. // This is the same set of applications that would be able to access the component if diff --git a/services/java/com/android/server/firewall/SenderPermissionFilter.java b/services/java/com/android/server/firewall/SenderPermissionFilter.java index 02d8b15f36ec..310da20eebf5 100644 --- a/services/java/com/android/server/firewall/SenderPermissionFilter.java +++ b/services/java/com/android/server/firewall/SenderPermissionFilter.java @@ -34,8 +34,7 @@ class SenderPermissionFilter implements Filter { @Override public boolean matches(IntentFirewall ifw, Intent intent, ApplicationInfo callerApp, - String callerPackage, int callerUid, int callerPid, String resolvedType, - ApplicationInfo resolvedApp) { + int callerUid, int callerPid, String resolvedType, ApplicationInfo resolvedApp) { // We assume the component is exported here. If the component is not exported, then // ActivityManager would only resolve to this component for callers from the same uid. // In this case, it doesn't matter whether the component is exported or not. diff --git a/services/java/com/android/server/firewall/StringFilter.java b/services/java/com/android/server/firewall/StringFilter.java index de5a69fb8aaa..ed5d3f316083 100644 --- a/services/java/com/android/server/firewall/StringFilter.java +++ b/services/java/com/android/server/firewall/StringFilter.java @@ -119,10 +119,9 @@ abstract class StringFilter implements Filter { protected abstract boolean matchesValue(String value); @Override - public boolean matches(IntentFirewall ifw, Intent intent, ApplicationInfo callerApp, String callerPackage, + public boolean matches(IntentFirewall ifw, Intent intent, ApplicationInfo callerApp, int callerUid, int callerPid, String resolvedType, ApplicationInfo resolvedApp) { - String value = mValueProvider.getValue(intent, callerApp, callerPackage, resolvedType, - resolvedApp); + String value = mValueProvider.getValue(intent, callerApp, resolvedType, resolvedApp); return matchesValue(value); } @@ -137,7 +136,7 @@ abstract class StringFilter implements Filter { } public abstract String getValue(Intent intent, ApplicationInfo callerApp, - String callerPackage, String resolvedType, ApplicationInfo resolvedApp); + String resolvedType, ApplicationInfo resolvedApp); } private static class EqualsFilter extends StringFilter { @@ -231,8 +230,8 @@ abstract class StringFilter implements Filter { public static final ValueProvider COMPONENT = new ValueProvider("component") { @Override - public String getValue(Intent intent, ApplicationInfo callerApp, String callerPackage, - String resolvedType, ApplicationInfo resolvedApp) { + public String getValue(Intent intent, ApplicationInfo callerApp, String resolvedType, + ApplicationInfo resolvedApp) { ComponentName cn = intent.getComponent(); if (cn != null) { return cn.flattenToString(); @@ -243,8 +242,8 @@ abstract class StringFilter implements Filter { public static final ValueProvider COMPONENT_NAME = new ValueProvider("component-name") { @Override - public String getValue(Intent intent, ApplicationInfo callerApp, String callerPackage, - String resolvedType, ApplicationInfo resolvedApp) { + public String getValue(Intent intent, ApplicationInfo callerApp, String resolvedType, + ApplicationInfo resolvedApp) { ComponentName cn = intent.getComponent(); if (cn != null) { return cn.getClassName(); @@ -255,8 +254,8 @@ abstract class StringFilter implements Filter { public static final ValueProvider COMPONENT_PACKAGE = new ValueProvider("component-package") { @Override - public String getValue(Intent intent, ApplicationInfo callerApp, String callerPackage, - String resolvedType, ApplicationInfo resolvedApp) { + public String getValue(Intent intent, ApplicationInfo callerApp, String resolvedType, + ApplicationInfo resolvedApp) { ComponentName cn = intent.getComponent(); if (cn != null) { return cn.getPackageName(); @@ -265,28 +264,18 @@ abstract class StringFilter implements Filter { } }; - public static final ValueProvider SENDER_PACKAGE = new ValueProvider("sender-package") { - @Override - public String getValue(Intent intent, ApplicationInfo callerApp, String callerPackage, - String resolvedType, ApplicationInfo resolvedApp) { - // TODO: We can't trust this value, so maybe should check all packages in the caller process? - return callerPackage; - } - }; - - public static final FilterFactory ACTION = new ValueProvider("action") { @Override - public String getValue(Intent intent, ApplicationInfo callerApp, String callerPackage, - String resolvedType, ApplicationInfo resolvedApp) { + public String getValue(Intent intent, ApplicationInfo callerApp, String resolvedType, + ApplicationInfo resolvedApp) { return intent.getAction(); } }; public static final ValueProvider DATA = new ValueProvider("data") { @Override - public String getValue(Intent intent, ApplicationInfo callerApp, String callerPackage, - String resolvedType, ApplicationInfo resolvedApp) { + public String getValue(Intent intent, ApplicationInfo callerApp, String resolvedType, + ApplicationInfo resolvedApp) { Uri data = intent.getData(); if (data != null) { return data.toString(); @@ -297,16 +286,16 @@ abstract class StringFilter implements Filter { public static final ValueProvider MIME_TYPE = new ValueProvider("mime-type") { @Override - public String getValue(Intent intent, ApplicationInfo callerApp, String callerPackage, - String resolvedType, ApplicationInfo resolvedApp) { + public String getValue(Intent intent, ApplicationInfo callerApp, String resolvedType, + ApplicationInfo resolvedApp) { return resolvedType; } }; public static final ValueProvider SCHEME = new ValueProvider("scheme") { @Override - public String getValue(Intent intent, ApplicationInfo callerApp, String callerPackage, - String resolvedType, ApplicationInfo resolvedApp) { + public String getValue(Intent intent, ApplicationInfo callerApp, String resolvedType, + ApplicationInfo resolvedApp) { Uri data = intent.getData(); if (data != null) { return data.getScheme(); @@ -317,8 +306,8 @@ abstract class StringFilter implements Filter { public static final ValueProvider SSP = new ValueProvider("scheme-specific-part") { @Override - public String getValue(Intent intent, ApplicationInfo callerApp, String callerPackage, - String resolvedType, ApplicationInfo resolvedApp) { + public String getValue(Intent intent, ApplicationInfo callerApp, String resolvedType, + ApplicationInfo resolvedApp) { Uri data = intent.getData(); if (data != null) { return data.getSchemeSpecificPart(); @@ -329,8 +318,8 @@ abstract class StringFilter implements Filter { public static final ValueProvider HOST = new ValueProvider("host") { @Override - public String getValue(Intent intent, ApplicationInfo callerApp, String callerPackage, - String resolvedType, ApplicationInfo resolvedApp) { + public String getValue(Intent intent, ApplicationInfo callerApp, String resolvedType, + ApplicationInfo resolvedApp) { Uri data = intent.getData(); if (data != null) { return data.getHost(); @@ -341,8 +330,8 @@ abstract class StringFilter implements Filter { public static final ValueProvider PATH = new ValueProvider("path") { @Override - public String getValue(Intent intent, ApplicationInfo callerApp, String callerPackage, - String resolvedType, ApplicationInfo resolvedApp) { + public String getValue(Intent intent, ApplicationInfo callerApp, String resolvedType, + ApplicationInfo resolvedApp) { Uri data = intent.getData(); if (data != null) { return data.getPath(); diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index ca7bba21e9b2..cc9b78512468 100644 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -2308,6 +2308,8 @@ public class PackageManagerService extends IPackageManager.Stub { } public void revokePermission(String packageName, String permissionName) { + int changedAppId = -1; + synchronized (mPackages) { final PackageParser.Package pkg = mPackages.get(packageName); if (pkg == null) { @@ -2335,6 +2337,30 @@ public class PackageManagerService extends IPackageManager.Stub { gp.gids = removeInts(gp.gids, bp.gids); } mSettings.writeLPr(); + changedAppId = ps.appId; + } + } + + if (changedAppId >= 0) { + // We changed the perm on someone, kill its processes. + IActivityManager am = ActivityManagerNative.getDefault(); + if (am != null) { + final int callingUserId = UserHandle.getCallingUserId(); + final long ident = Binder.clearCallingIdentity(); + try { + //XXX we should only revoke for the calling user's app permissions, + // but for now we impact all users. + //am.killUid(UserHandle.getUid(callingUserId, changedAppId), + // "revoke " + permissionName); + int[] users = sUserManager.getUserIds(); + for (int user : users) { + am.killUid(UserHandle.getUid(user, changedAppId), + "revoke " + permissionName); + } + } catch (RemoteException e) { + } finally { + Binder.restoreCallingIdentity(ident); + } } } } @@ -8647,14 +8673,16 @@ public class PackageManagerService extends IPackageManager.Stub { mSettings.writeLPr(); } } - // A user ID was deleted here. Go through all users and remove it from - // KeyStore. - final int appId = outInfo.removedAppId; - if (appId != -1) { - final KeyStore keyStore = KeyStore.getInstance(); - if (keyStore != null) { - for (final int userId : sUserManager.getUserIds()) { - keyStore.clearUid(UserHandle.getUid(userId, appId)); + if (outInfo != null) { + // A user ID was deleted here. Go through all users and remove it + // from KeyStore. + final int appId = outInfo.removedAppId; + if (appId != -1) { + final KeyStore keyStore = KeyStore.getInstance(); + if (keyStore != null) { + for (final int userId : sUserManager.getUserIds()) { + keyStore.clearUid(UserHandle.getUid(userId, appId)); + } } } } @@ -10655,19 +10683,18 @@ public class PackageManagerService extends IPackageManager.Stub { || mSettings.mReadExternalStorageEnforced != enforced) { mSettings.mReadExternalStorageEnforced = enforced; mSettings.writeLPr(); - - // kill any non-foreground processes so we restart them and - // grant/revoke the GID. - final IActivityManager am = ActivityManagerNative.getDefault(); - if (am != null) { - final long token = Binder.clearCallingIdentity(); - try { - am.killProcessesBelowForeground("setPermissionEnforcement"); - } catch (RemoteException e) { - } finally { - Binder.restoreCallingIdentity(token); - } - } + } + } + // kill any non-foreground processes so we restart them and + // grant/revoke the GID. + final IActivityManager am = ActivityManagerNative.getDefault(); + if (am != null) { + final long token = Binder.clearCallingIdentity(); + try { + am.killProcessesBelowForeground("setPermissionEnforcement"); + } catch (RemoteException e) { + } finally { + Binder.restoreCallingIdentity(token); } } } else { diff --git a/services/java/com/android/server/wm/AppWindowAnimator.java b/services/java/com/android/server/wm/AppWindowAnimator.java index 297324b258fe..6293dc647df1 100644 --- a/services/java/com/android/server/wm/AppWindowAnimator.java +++ b/services/java/com/android/server/wm/AppWindowAnimator.java @@ -4,6 +4,7 @@ package com.android.server.wm; import android.graphics.Matrix; import android.util.Slog; +import android.util.TimeUtils; import android.view.Display; import android.view.Surface; import android.view.SurfaceControl; @@ -30,6 +31,11 @@ public class AppWindowAnimator { // Protect with mAnimator. boolean freezingScreen; + /** + * How long we last kept the screen frozen. + */ + int lastFreezeDuration; + // Offset to the window of all layers in the token, for use by // AppWindowToken animations. int animLayerAdjustment; @@ -287,6 +293,10 @@ public class AppWindowAnimator { pw.print(prefix); pw.print("freezingScreen="); pw.print(freezingScreen); pw.print(" allDrawn="); pw.print(allDrawn); pw.print(" animLayerAdjustment="); pw.println(animLayerAdjustment); + if (lastFreezeDuration != 0) { + pw.print(prefix); pw.print("lastFreezeDuration="); + TimeUtils.formatDuration(lastFreezeDuration, pw); pw.println(); + } if (animating || animation != null) { pw.print(prefix); pw.print("animating="); pw.println(animating); pw.print(prefix); pw.print("animation="); pw.println(animation); diff --git a/services/java/com/android/server/wm/WindowAnimator.java b/services/java/com/android/server/wm/WindowAnimator.java index 3964782baced..054a0759658a 100644 --- a/services/java/com/android/server/wm/WindowAnimator.java +++ b/services/java/com/android/server/wm/WindowAnimator.java @@ -70,6 +70,7 @@ public class WindowAnimator { int mAboveUniverseLayer = 0; int mBulkUpdateParams = 0; + Object mLastWindowFreezeSource; SparseArray<DisplayContentsAnimator> mDisplayContentsAnimators = new SparseArray<WindowAnimator.DisplayContentsAnimator>(); diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index af603fd72425..1d1fda5693f0 100644 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -43,6 +43,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; import android.app.AppOpsManager; +import android.util.TimeUtils; import android.view.IWindowId; import com.android.internal.app.IBatteryStats; import com.android.internal.policy.PolicyManager; @@ -464,6 +465,9 @@ public class WindowManagerService extends IWindowManager.Stub boolean mTraversalScheduled = false; boolean mDisplayFrozen = false; + long mDisplayFreezeTime = 0; + int mLastDisplayFreezeDuration = 0; + Object mLastFinishedFreezeSource = null; boolean mWaitingForConfig = false; boolean mWindowsFreezingScreen = false; boolean mClientFreezingScreen = false; @@ -582,6 +586,7 @@ public class WindowManagerService extends IWindowManager.Stub boolean mWallpaperForceHidingChanged = false; boolean mWallpaperMayChange = false; boolean mOrientationChangeComplete = true; + Object mLastWindowFreezeSource = null; private Session mHoldScreen = null; private boolean mObscured = false; boolean mDimming = false; @@ -3590,7 +3595,10 @@ public class WindowManagerService extends IWindowManager.Stub synchronized(mWindowMap) { mCurConfiguration = new Configuration(config); - mWaitingForConfig = false; + if (mWaitingForConfig) { + mWaitingForConfig = false; + mLastFinishedFreezeSource = "new-config"; + } performLayoutAndPlaceSurfacesLocked(); } } @@ -4209,6 +4217,7 @@ public class WindowManagerService extends IWindowManager.Stub w.mOrientationChanging = true; mInnerFields.mOrientationChangeComplete = false; } + w.mLastFreezeDuration = 0; unfrozeWindows = true; w.mDisplayContent.layoutNeeded = true; } @@ -4216,7 +4225,10 @@ public class WindowManagerService extends IWindowManager.Stub if (force || unfrozeWindows) { if (DEBUG_ORIENTATION) Slog.v(TAG, "No longer freezing: " + wtoken); wtoken.mAppAnimator.freezingScreen = false; + wtoken.mAppAnimator.lastFreezeDuration = (int)(SystemClock.elapsedRealtime() + - mDisplayFreezeTime); mAppsFreezingScreen--; + mLastFinishedFreezeSource = wtoken; } if (unfreezeSurfaceNow) { if (unfrozeWindows) { @@ -4242,6 +4254,7 @@ public class WindowManagerService extends IWindowManager.Stub if (!wtoken.hiddenRequested) { if (!wtoken.mAppAnimator.freezingScreen) { wtoken.mAppAnimator.freezingScreen = true; + wtoken.mAppAnimator.lastFreezeDuration = 0; mAppsFreezingScreen++; if (mAppsFreezingScreen == 1) { startFreezingDisplayLocked(false, 0, 0); @@ -4750,6 +4763,7 @@ public class WindowManagerService extends IWindowManager.Stub synchronized(mWindowMap) { if (mClientFreezingScreen) { mClientFreezingScreen = false; + mLastFinishedFreezeSource = "client"; final long origId = Binder.clearCallingIdentity(); try { stopFreezingDisplayLocked(); @@ -5742,6 +5756,7 @@ public class WindowManagerService extends IWindowManager.Stub w.mOrientationChanging = true; mInnerFields.mOrientationChangeComplete = false; } + w.mLastFreezeDuration = 0; } for (int i=mRotationWatchers.size()-1; i>=0; i--) { @@ -6240,6 +6255,7 @@ public class WindowManagerService extends IWindowManager.Stub if (config == null && mWaitingForConfig) { // Nothing changed but we are waiting for something... stop that! mWaitingForConfig = false; + mLastFinishedFreezeSource = "new-config"; performLayoutAndPlaceSurfacesLocked(); } return config; @@ -7036,6 +7052,8 @@ public class WindowManagerService extends IWindowManager.Stub WindowState w = windows.get(i); if (w.mOrientationChanging) { w.mOrientationChanging = false; + w.mLastFreezeDuration = (int)(SystemClock.elapsedRealtime() + - mDisplayFreezeTime); Slog.w(TAG, "Force clearing orientation change: " + w); } } @@ -7112,6 +7130,7 @@ public class WindowManagerService extends IWindowManager.Stub synchronized (mWindowMap) { if (mClientFreezingScreen) { mClientFreezingScreen = false; + mLastFinishedFreezeSource = "client-timeout"; stopFreezingDisplayLocked(); } } @@ -8029,6 +8048,7 @@ public class WindowManagerService extends IWindowManager.Stub if (DEBUG_ORIENTATION) Slog.v(TAG, "Changing surface while display frozen: " + w); w.mOrientationChanging = true; + w.mLastFreezeDuration = 0; mInnerFields.mOrientationChangeComplete = false; if (!mWindowsFreezingScreen) { mWindowsFreezingScreen = true; @@ -8417,6 +8437,8 @@ public class WindowManagerService extends IWindowManager.Stub "Orientation not waiting for draw in " + w + ", surface " + winAnimator.mSurfaceControl); w.mOrientationChanging = false; + w.mLastFreezeDuration = (int)(SystemClock.elapsedRealtime() + - mDisplayFreezeTime); } } } @@ -8930,6 +8952,8 @@ public class WindowManagerService extends IWindowManager.Stub winAnimator.mSurfaceResized = false; } catch (RemoteException e) { win.mOrientationChanging = false; + win.mLastFreezeDuration = (int)(SystemClock.elapsedRealtime() + - mDisplayFreezeTime); } mResizingWindows.remove(i); } @@ -8940,6 +8964,7 @@ public class WindowManagerService extends IWindowManager.Stub if (mInnerFields.mOrientationChangeComplete) { if (mWindowsFreezingScreen) { mWindowsFreezingScreen = false; + mLastFinishedFreezeSource = mInnerFields.mLastWindowFreezeSource; mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT); } stopFreezingDisplayLocked(); @@ -9226,6 +9251,7 @@ public class WindowManagerService extends IWindowManager.Stub mInnerFields.mOrientationChangeComplete = false; } else { mInnerFields.mOrientationChangeComplete = true; + mInnerFields.mLastWindowFreezeSource = mAnimator.mLastWindowFreezeSource; if (mWindowsFreezingScreen) { doRequest = true; } @@ -9498,6 +9524,8 @@ public class WindowManagerService extends IWindowManager.Stub mScreenFrozenLock.acquire(); mDisplayFrozen = true; + mDisplayFreezeTime = SystemClock.elapsedRealtime(); + mLastFinishedFreezeSource = null; mInputMonitor.freezeInputDispatchingLw(); @@ -9552,6 +9580,15 @@ public class WindowManagerService extends IWindowManager.Stub } mDisplayFrozen = false; + mLastDisplayFreezeDuration = (int)(SystemClock.elapsedRealtime() - mDisplayFreezeTime); + StringBuilder sb = new StringBuilder(128); + sb.append("Screen frozen for "); + TimeUtils.formatDuration(mLastDisplayFreezeDuration, sb); + if (mLastFinishedFreezeSource != null) { + sb.append(" due to "); + sb.append(mLastFinishedFreezeSource); + } + Slog.i(TAG, sb.toString()); mH.removeMessages(H.APP_FREEZE_TIMEOUT); mH.removeMessages(H.CLIENT_FREEZE_TIMEOUT); if (PROFILE_ORIENTATION) { @@ -10076,6 +10113,13 @@ public class WindowManagerService extends IWindowManager.Stub } pw.print(" mInTouchMode="); pw.print(mInTouchMode); pw.print(" mLayoutSeq="); pw.println(mLayoutSeq); + pw.print(" mLastDisplayFreezeDuration="); + TimeUtils.formatDuration(mLastDisplayFreezeDuration, pw); + if ( mLastFinishedFreezeSource != null) { + pw.print(" due to "); + pw.print(mLastFinishedFreezeSource); + } + pw.println(); if (dumpAll) { pw.print(" mSystemDecorRect="); pw.print(mSystemDecorRect.toShortString()); pw.print(" mSystemDecorLayer="); pw.print(mSystemDecorLayer); diff --git a/services/java/com/android/server/wm/WindowState.java b/services/java/com/android/server/wm/WindowState.java index 506fcecfa51b..ca060f4b1e23 100644 --- a/services/java/com/android/server/wm/WindowState.java +++ b/services/java/com/android/server/wm/WindowState.java @@ -26,6 +26,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; import android.app.AppOpsManager; import android.os.RemoteCallbackList; +import android.util.TimeUtils; import android.view.IWindowFocusObserver; import android.view.IWindowId; import com.android.server.input.InputWindowHandle; @@ -266,6 +267,11 @@ final class WindowState implements WindowManagerPolicy.WindowState { */ boolean mOrientationChanging; + /** + * How long we last kept the screen frozen. + */ + int mLastFreezeDuration; + /** Is this window now (or just being) removed? */ boolean mRemoved; @@ -1387,6 +1393,10 @@ final class WindowState implements WindowManagerPolicy.WindowState { pw.print(" mAppFreezing="); pw.print(mAppFreezing); pw.print(" mTurnOnScreen="); pw.println(mTurnOnScreen); } + if (mLastFreezeDuration != 0) { + pw.print(prefix); pw.print("mLastFreezeDuration="); + TimeUtils.formatDuration(mLastFreezeDuration, pw); pw.println(); + } if (mHScale != 1 || mVScale != 1) { pw.print(prefix); pw.print("mHScale="); pw.print(mHScale); pw.print(" mVScale="); pw.println(mVScale); diff --git a/services/java/com/android/server/wm/WindowStateAnimator.java b/services/java/com/android/server/wm/WindowStateAnimator.java index 3a9f7cb96e1b..452f76ddd023 100644 --- a/services/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/java/com/android/server/wm/WindowStateAnimator.java @@ -1307,6 +1307,7 @@ class WindowStateAnimator { if (w.mOrientationChanging) { if (!w.isDrawnLw()) { mAnimator.mBulkUpdateParams &= ~SET_ORIENTATION_CHANGE_COMPLETE; + mAnimator.mLastWindowFreezeSource = w; if (DEBUG_ORIENTATION) Slog.v(TAG, "Orientation continue waiting for draw in " + w); } else { diff --git a/services/jni/Android.mk b/services/jni/Android.mk index d097a9338a76..b313d486b704 100644 --- a/services/jni/Android.mk +++ b/services/jni/Android.mk @@ -32,6 +32,7 @@ LOCAL_SHARED_LIBRARIES := \ libandroid_runtime \ libandroidfw \ libcutils \ + liblog \ libhardware \ libhardware_legacy \ libnativehelper \ diff --git a/telephony/java/android/telephony/CellIdentityCdma.java b/telephony/java/android/telephony/CellIdentityCdma.java index 6e2a70d64856..31e01c03f3f2 100644 --- a/telephony/java/android/telephony/CellIdentityCdma.java +++ b/telephony/java/android/telephony/CellIdentityCdma.java @@ -162,13 +162,13 @@ public final class CellIdentityCdma implements Parcelable { @Override public String toString() { - StringBuilder sb = new StringBuilder("CdmaCellIdentitiy:"); - sb.append(super.toString()); + StringBuilder sb = new StringBuilder("CellIdentitiyCdma:{"); sb.append(" mNetworkId="); sb.append(mNetworkId); sb.append(" mSystemId="); sb.append(mSystemId); sb.append(" mBasestationId="); sb.append(mBasestationId); sb.append(" mLongitude="); sb.append(mLongitude); sb.append(" mLatitude="); sb.append(mLatitude); + sb.append("}"); return sb.toString(); } diff --git a/telephony/java/android/telephony/CellIdentityGsm.java b/telephony/java/android/telephony/CellIdentityGsm.java index bda96be22931..98113e737c8b 100644 --- a/telephony/java/android/telephony/CellIdentityGsm.java +++ b/telephony/java/android/telephony/CellIdentityGsm.java @@ -147,13 +147,13 @@ public final class CellIdentityGsm implements Parcelable { @Override public String toString() { - StringBuilder sb = new StringBuilder("GsmCellIdentitiy:"); - sb.append(super.toString()); + StringBuilder sb = new StringBuilder("CellIdentitiyGsm:{"); sb.append(" mMcc=").append(mMcc); - sb.append(" mMnc=").append(mMcc); + sb.append(" mMnc=").append(mMnc); sb.append(" mLac=").append(mLac); sb.append(" mCid=").append(mCid); sb.append(" mPsc=").append(mPsc); + sb.append("}"); return sb.toString(); } diff --git a/telephony/java/android/telephony/CellIdentityLte.java b/telephony/java/android/telephony/CellIdentityLte.java index f72d5836d054..86924bdb276e 100644 --- a/telephony/java/android/telephony/CellIdentityLte.java +++ b/telephony/java/android/telephony/CellIdentityLte.java @@ -142,13 +142,13 @@ public final class CellIdentityLte implements Parcelable { @Override public String toString() { - StringBuilder sb = new StringBuilder("LteCellIdentitiy:"); - sb.append(super.toString()); + StringBuilder sb = new StringBuilder("CellIdentitiyLte:{"); sb.append(" mMcc="); sb.append(mMcc); sb.append(" mMnc="); sb.append(mMnc); sb.append(" mCi="); sb.append(mCi); sb.append(" mPci="); sb.append(mPci); sb.append(" mTac="); sb.append(mTac); + sb.append("}"); return sb.toString(); } diff --git a/telephony/java/android/telephony/CellInfo.java b/telephony/java/android/telephony/CellInfo.java index f367f99192e2..fe3c68ba7c00 100644 --- a/telephony/java/android/telephony/CellInfo.java +++ b/telephony/java/android/telephony/CellInfo.java @@ -149,7 +149,7 @@ public abstract class CellInfo implements Parcelable { StringBuffer sb = new StringBuffer(); String timeStampType; - sb.append(" mRegistered=").append(mRegistered ? "YES" : "NO"); + sb.append("mRegistered=").append(mRegistered ? "YES" : "NO"); timeStampType = timeStampTypeToString(mTimeStampType); sb.append(" mTimeStampType=").append(timeStampType); sb.append(" mTimeStamp=").append(mTimeStamp).append("ns"); diff --git a/telephony/java/android/telephony/CellInfoCdma.java b/telephony/java/android/telephony/CellInfoCdma.java index a5d6e9ce8178..6f2f1f677859 100644 --- a/telephony/java/android/telephony/CellInfoCdma.java +++ b/telephony/java/android/telephony/CellInfoCdma.java @@ -87,10 +87,11 @@ public final class CellInfoCdma extends CellInfo implements Parcelable { public String toString() { StringBuffer sb = new StringBuffer(); - sb.append("CellInfoCdma:"); + sb.append("CellInfoCdma:{"); sb.append(super.toString()); - sb.append(", ").append(mCellIdentityCdma); - sb.append(", ").append(mCellSignalStrengthCdma); + sb.append(" ").append(mCellIdentityCdma); + sb.append(" ").append(mCellSignalStrengthCdma); + sb.append("}"); return sb.toString(); } diff --git a/telephony/java/android/telephony/CellInfoGsm.java b/telephony/java/android/telephony/CellInfoGsm.java index bf0eca8de867..1bedddb6b794 100644 --- a/telephony/java/android/telephony/CellInfoGsm.java +++ b/telephony/java/android/telephony/CellInfoGsm.java @@ -87,10 +87,11 @@ public final class CellInfoGsm extends CellInfo implements Parcelable { public String toString() { StringBuffer sb = new StringBuffer(); - sb.append("CellInfoGsm:"); + sb.append("CellInfoGsm:{"); sb.append(super.toString()); - sb.append(", ").append(mCellIdentityGsm); - sb.append(", ").append(mCellSignalStrengthGsm); + sb.append(" ").append(mCellIdentityGsm); + sb.append(" ").append(mCellSignalStrengthGsm); + sb.append("}"); return sb.toString(); } diff --git a/telephony/java/android/telephony/CellInfoLte.java b/telephony/java/android/telephony/CellInfoLte.java index d7a58b66e546..287c9f044a07 100644 --- a/telephony/java/android/telephony/CellInfoLte.java +++ b/telephony/java/android/telephony/CellInfoLte.java @@ -91,10 +91,11 @@ public final class CellInfoLte extends CellInfo implements Parcelable { public String toString() { StringBuffer sb = new StringBuffer(); - sb.append("CellInfoLte:"); + sb.append("CellInfoLte:{"); sb.append(super.toString()); - sb.append(", ").append(mCellIdentityLte); - sb.append(", ").append(mCellSignalStrengthLte); + sb.append(" ").append(mCellIdentityLte); + sb.append(" ").append(mCellSignalStrengthLte); + sb.append("}"); return sb.toString(); } diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 4aee902b7563..6400e6868394 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1341,7 +1341,8 @@ public class TelephonyManager { } /** - * Returns all observed cell information of the device. + * Returns all observed cell information of the device. This does + * not cause or change the rate of PhoneStateListner#onCellInfoChanged. * * @return List of CellInfo or null if info unavailable. * @@ -1357,4 +1358,24 @@ public class TelephonyManager { return null; } } + + /** + * Sets the minimum time in milli-seconds between {@link PhoneStateListener#onCellInfoChanged + * PhoneStateListener.onCellInfoChanged} will be invoked. + * + * The default, 0, means invoke onCellInfoChanged when any of the reported + * information changes. Setting the value to INT_MAX(0x7fffffff) means never issue + * A onCellInfoChanged. + * + * @param rateInMillis the rate + * + * @hide + */ + public void setCellInfoListRate(int rateInMillis) { + try { + getITelephony().setCellInfoListRate(rateInMillis); + } catch (RemoteException ex) { + } catch (NullPointerException ex) { + } + } } diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 1449ab13da06..b78f589b76ff 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -294,5 +294,10 @@ interface ITelephony { * Returns the all observed cell information of the device. */ List<CellInfo> getAllCellInfo(); + + /** + * Sets minimum time in milli-seconds between onCellInfoChanged + */ + void setCellInfoListRate(int rateInMillis); } diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java index 077ad688aaf0..9650b995252c 100644 --- a/telephony/java/com/android/internal/telephony/RILConstants.java +++ b/telephony/java/com/android/internal/telephony/RILConstants.java @@ -260,6 +260,8 @@ cat include/telephony/ril.h | \ int RIL_REQUEST_ACKNOWLEDGE_INCOMING_GSM_SMS_WITH_PDU = 106; int RIL_REQUEST_STK_SEND_ENVELOPE_WITH_STATUS = 107; int RIL_REQUEST_VOICE_RADIO_TECH = 108; + int RIL_REQUEST_GET_CELL_INFO_LIST = 109; + int RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE = 110; int RIL_UNSOL_RESPONSE_BASE = 1000; int RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED = 1000; int RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED = 1001; @@ -297,4 +299,5 @@ cat include/telephony/ril.h | \ int RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE = 1033; int RIL_UNSOL_RIL_CONNECTED = 1034; int RIL_UNSOL_VOICE_RADIO_TECH_CHANGED = 1035; + int RIL_UNSOL_CELL_INFO_LIST = 1036; } diff --git a/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibility.java b/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibility.java index 4d60c830048e..7ae0fb848da2 100644 --- a/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibility.java +++ b/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibility.java @@ -127,6 +127,10 @@ public class AppCompatibility extends InstrumentationTestCase { homeIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); Intent intent = mPackageManager.getLaunchIntentForPackage(packageName); + // Skip if the apk does not have a launch intent. + if (intent == null) { + return null; + } // We check for any Crash or ANR dialogs that are already up, and we ignore them. This is // so that we don't report crashes that were caused by prior apps (which those particular diff --git a/tests/ImfTest/src/com/android/imftest/samples/ButtonActivity.java b/tests/ImfTest/src/com/android/imftest/samples/ButtonActivity.java index 854a3f4edd62..dbaedf9f0af1 100644 --- a/tests/ImfTest/src/com/android/imftest/samples/ButtonActivity.java +++ b/tests/ImfTest/src/com/android/imftest/samples/ButtonActivity.java @@ -47,7 +47,7 @@ public class ButtonActivity extends Activity { public void onClick (View v) { - InputMethodManager imm = InputMethodManager.getInstance(instance); + InputMethodManager imm = InputMethodManager.getInstance(); if (mKeyboardIsActive) { imm.hideSoftInputFromInputMethod(v.getWindowToken(), 0); diff --git a/tests/ImfTest/tests/src/com/android/imftest/samples/ImfBaseTestCase.java b/tests/ImfTest/tests/src/com/android/imftest/samples/ImfBaseTestCase.java index bc77e049bfee..32f80a3ad2d5 100644 --- a/tests/ImfTest/tests/src/com/android/imftest/samples/ImfBaseTestCase.java +++ b/tests/ImfTest/tests/src/com/android/imftest/samples/ImfBaseTestCase.java @@ -66,7 +66,7 @@ public abstract class ImfBaseTestCase<T extends Activity> extends Instrumentatio mExpectAutoPop = (keyboardType == Configuration.KEYBOARD_NOKEYS || keyboardType == Configuration.KEYBOARD_UNDEFINED); - mImm = InputMethodManager.getInstance(mTargetActivity); + mImm = InputMethodManager.getInstance(); KeyguardManager keyguardManager = (KeyguardManager) getInstrumentation().getContext().getSystemService( diff --git a/tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java b/tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java index c7c8aa2e8031..9862116e376b 100644 --- a/tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java +++ b/tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java @@ -119,34 +119,34 @@ public class NotificationBuilderTest extends Activity public void onClick(View v) { switch (v.getId()) { case R.id.clear_1: - mNM.cancel(1); + cancelNotification(1); break; case R.id.clear_2: - mNM.cancel(2); + cancelNotification(2); break; case R.id.clear_3: - mNM.cancel(3); + cancelNotification(3); break; case R.id.clear_4: - mNM.cancel(4); + cancelNotification(4); break; case R.id.clear_5: - mNM.cancel(5); + cancelNotification(5); break; case R.id.clear_6: - mNM.cancel(6); + cancelNotification(6); break; case R.id.clear_7: - mNM.cancel(7); + cancelNotification(7); break; case R.id.clear_8: - mNM.cancel(8); + cancelNotification(8); break; case R.id.clear_9: - mNM.cancel(9); + cancelNotification(9); break; case R.id.clear_10: - mNM.cancel(10); + cancelNotification(10); break; case R.id.notify_1: sendNotification(1); @@ -203,6 +203,10 @@ public class NotificationBuilderTest extends Activity }, mStartDelay); } + private void cancelNotification(final int id) { + mNM.cancel(NOTIFY_TAG, id); + } + private static CharSequence subst(CharSequence in, char ch, CharSequence sub) { int i=0; SpannableStringBuilder edit = new SpannableStringBuilder(in); diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk index 5b8866901e03..9b1658ac6de9 100644 --- a/tools/aapt/Android.mk +++ b/tools/aapt/Android.mk @@ -39,14 +39,14 @@ LOCAL_C_INCLUDES += external/libpng LOCAL_C_INCLUDES += external/zlib LOCAL_C_INCLUDES += build/libs/host/include -#LOCAL_WHOLE_STATIC_LIBRARIES := LOCAL_STATIC_LIBRARIES := \ libhost \ libandroidfw \ libutils \ libcutils \ libexpat \ - libpng + libpng \ + liblog ifeq ($(HOST_OS),linux) LOCAL_LDLIBS += -lrt -ldl -lpthread diff --git a/tools/layoutlib/bridge/src/android/view/inputmethod/InputMethodManager_Accessor.java b/tools/layoutlib/bridge/src/android/view/inputmethod/InputMethodManager_Accessor.java index 7a6e52e4d65e..dc4f9c868185 100644 --- a/tools/layoutlib/bridge/src/android/view/inputmethod/InputMethodManager_Accessor.java +++ b/tools/layoutlib/bridge/src/android/view/inputmethod/InputMethodManager_Accessor.java @@ -22,6 +22,6 @@ package android.view.inputmethod; public class InputMethodManager_Accessor { public static void resetInstance() { - InputMethodManager.mInstance = null; + InputMethodManager.sInstance = null; } } diff --git a/tools/layoutlib/bridge/src/android/view/inputmethod/InputMethodManager_Delegate.java b/tools/layoutlib/bridge/src/android/view/inputmethod/InputMethodManager_Delegate.java index f0560401f219..7c98847a4cf3 100644 --- a/tools/layoutlib/bridge/src/android/view/inputmethod/InputMethodManager_Delegate.java +++ b/tools/layoutlib/bridge/src/android/view/inputmethod/InputMethodManager_Delegate.java @@ -35,28 +35,15 @@ public class InputMethodManager_Delegate { // ---- Overridden methods ---- @LayoutlibDelegate - /*package*/ static InputMethodManager getInstance(Looper mainLooper) { - synchronized (InputMethodManager.mInstanceSync) { - if (InputMethodManager.mInstance != null) { - return InputMethodManager.mInstance; + /*package*/ static InputMethodManager getInstance() { + synchronized (InputMethodManager.class) { + InputMethodManager imm = InputMethodManager.peekInstance(); + if (imm == null) { + imm = new InputMethodManager( + new BridgeIInputMethodManager(), Looper.getMainLooper()); + InputMethodManager.sInstance = imm; } - - InputMethodManager.mInstance = new InputMethodManager(new BridgeIInputMethodManager(), - mainLooper); - } - return InputMethodManager.mInstance; - } - - @LayoutlibDelegate - /*package*/ static InputMethodManager getInstance(Context context) { - synchronized (InputMethodManager.mInstanceSync) { - if (InputMethodManager.mInstance != null) { - return InputMethodManager.mInstance; - } - - InputMethodManager.mInstance = new InputMethodManager(new BridgeIInputMethodManager(), - Looper.myLooper()); + return imm; } - return InputMethodManager.mInstance; } } diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java index f109e3928b2b..cbefd3d27882 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java @@ -232,7 +232,7 @@ public abstract class RenderAction<T extends RenderParams> extends FrameworkReso sCurrentContext = mContext; // create an InputMethodManager - InputMethodManager.getInstance(Looper.myLooper()); + InputMethodManager.getInstance(); LayoutLog currentLog = mParams.getLog(); Bridge.setLog(currentLog); diff --git a/tools/obbtool/Android.mk b/tools/obbtool/Android.mk index dd57ae662ee9..ad8de6943043 100644 --- a/tools/obbtool/Android.mk +++ b/tools/obbtool/Android.mk @@ -20,7 +20,8 @@ LOCAL_CFLAGS := -Wall -Werror LOCAL_STATIC_LIBRARIES := \ libutils \ libandroidfw \ - libcutils + libcutils \ + liblog ifeq ($(HOST_OS),linux) LOCAL_LDLIBS += -ldl -lpthread diff --git a/tools/validatekeymaps/Android.mk b/tools/validatekeymaps/Android.mk index fce2e931125e..90fbc08e9a54 100644 --- a/tools/validatekeymaps/Android.mk +++ b/tools/validatekeymaps/Android.mk @@ -20,7 +20,8 @@ LOCAL_CFLAGS := -Wall -Werror LOCAL_STATIC_LIBRARIES := \ libandroidfw \ libutils \ - libcutils + libcutils \ + liblog ifeq ($(HOST_OS),linux) LOCAL_LDLIBS += -ldl -lpthread diff --git a/wifi/java/android/net/wifi/WifiConfigStore.java b/wifi/java/android/net/wifi/WifiConfigStore.java index 47f1fbfb5729..7b1a71f36a75 100644 --- a/wifi/java/android/net/wifi/WifiConfigStore.java +++ b/wifi/java/android/net/wifi/WifiConfigStore.java @@ -1196,7 +1196,7 @@ class WifiConfigStore { WifiConfiguration newConfig) { boolean ipChanged = false; boolean proxyChanged = false; - LinkProperties linkProperties = new LinkProperties(); + LinkProperties linkProperties = null; switch (newConfig.ipAssignment) { case STATIC: @@ -1262,10 +1262,10 @@ class WifiConfigStore { } if (!ipChanged) { - addIpSettingsFromConfig(linkProperties, currentConfig); + linkProperties = copyIpSettingsFromConfig(currentConfig); } else { currentConfig.ipAssignment = newConfig.ipAssignment; - addIpSettingsFromConfig(linkProperties, newConfig); + linkProperties = copyIpSettingsFromConfig(newConfig); log("IP config changed SSID = " + currentConfig.SSID + " linkProperties: " + linkProperties.toString()); } @@ -1291,8 +1291,9 @@ class WifiConfigStore { return new NetworkUpdateResult(ipChanged, proxyChanged); } - private void addIpSettingsFromConfig(LinkProperties linkProperties, - WifiConfiguration config) { + private LinkProperties copyIpSettingsFromConfig(WifiConfiguration config) { + LinkProperties linkProperties = new LinkProperties(); + linkProperties.setInterfaceName(config.linkProperties.getInterfaceName()); for (LinkAddress linkAddr : config.linkProperties.getLinkAddresses()) { linkProperties.addLinkAddress(linkAddr); } @@ -1302,6 +1303,7 @@ class WifiConfigStore { for (InetAddress dns : config.linkProperties.getDnses()) { linkProperties.addDns(dns); } + return linkProperties; } /** |
