diff options
42 files changed, 925 insertions, 469 deletions
diff --git a/api/16.txt b/api/16.txt index 25885fb8af54..c95de36e61c5 100644 --- a/api/16.txt +++ b/api/16.txt @@ -675,6 +675,7 @@ package android { field public static final int maxWidth = 16843039; // 0x101011f field public static final int measureAllChildren = 16843018; // 0x101010a field public static final int measureWithLargestChild = 16843476; // 0x10102d4 + field public static final int mediaRouteButtonStyle = 16843693; // 0x10103ad field public static final int menuCategory = 16843230; // 0x10101de field public static final int mimeType = 16842790; // 0x1010026 field public static final int minDate = 16843583; // 0x101033f @@ -1789,6 +1790,7 @@ package android { field public static final int Widget_DeviceDefault_Light_ListPopupWindow = 16974235; // 0x103019b field public static final int Widget_DeviceDefault_Light_ListView = 16974210; // 0x1030182 field public static final int Widget_DeviceDefault_Light_ListView_DropDown = 16974205; // 0x103017d + field public static final int Widget_DeviceDefault_Light_MediaRouteButton = 16974296; // 0x10301d8 field public static final int Widget_DeviceDefault_Light_PopupMenu = 16974236; // 0x103019c field public static final int Widget_DeviceDefault_Light_PopupWindow = 16974211; // 0x1030183 field public static final int Widget_DeviceDefault_Light_ProgressBar = 16974212; // 0x1030184 @@ -1814,6 +1816,7 @@ package android { field public static final int Widget_DeviceDefault_ListPopupWindow = 16974180; // 0x1030164 field public static final int Widget_DeviceDefault_ListView = 16974158; // 0x103014e field public static final int Widget_DeviceDefault_ListView_DropDown = 16974153; // 0x1030149 + field public static final int Widget_DeviceDefault_MediaRouteButton = 16974295; // 0x10301d7 field public static final int Widget_DeviceDefault_PopupMenu = 16974181; // 0x1030165 field public static final int Widget_DeviceDefault_PopupWindow = 16974159; // 0x103014f field public static final int Widget_DeviceDefault_ProgressBar = 16974160; // 0x1030150 @@ -1905,6 +1908,7 @@ package android { field public static final int Widget_Holo_Light_ListPopupWindow = 16974043; // 0x10300db field public static final int Widget_Holo_Light_ListView = 16974018; // 0x10300c2 field public static final int Widget_Holo_Light_ListView_DropDown = 16974013; // 0x10300bd + field public static final int Widget_Holo_Light_MediaRouteButton = 16974294; // 0x10301d6 field public static final int Widget_Holo_Light_PopupMenu = 16974044; // 0x10300dc field public static final int Widget_Holo_Light_PopupWindow = 16974019; // 0x10300c3 field public static final int Widget_Holo_Light_ProgressBar = 16974020; // 0x10300c4 @@ -1930,6 +1934,7 @@ package android { field public static final int Widget_Holo_ListPopupWindow = 16973997; // 0x10300ad field public static final int Widget_Holo_ListView = 16973975; // 0x1030097 field public static final int Widget_Holo_ListView_DropDown = 16973970; // 0x1030092 + field public static final int Widget_Holo_MediaRouteButton = 16974293; // 0x10301d5 field public static final int Widget_Holo_PopupMenu = 16973998; // 0x10300ae field public static final int Widget_Holo_PopupWindow = 16973976; // 0x1030098 field public static final int Widget_Holo_ProgressBar = 16973977; // 0x1030099 @@ -3671,6 +3676,20 @@ package android.app { method public android.view.Window startActivity(java.lang.String, android.content.Intent); } + public class MediaRouteActionProvider extends android.view.ActionProvider { + ctor public MediaRouteActionProvider(android.content.Context); + method public android.view.View onCreateActionView(); + method public void setRouteTypes(int); + } + + public class MediaRouteButton extends android.view.View { + ctor public MediaRouteButton(android.content.Context); + ctor public MediaRouteButton(android.content.Context, android.util.AttributeSet); + ctor public MediaRouteButton(android.content.Context, android.util.AttributeSet, int); + method public int getRouteTypes(); + method public void setRouteTypes(int); + } + public class NativeActivity extends android.app.Activity implements android.view.InputQueue.Callback android.view.SurfaceHolder.Callback2 android.view.ViewTreeObserver.OnGlobalLayoutListener { ctor public NativeActivity(); method public void onGlobalLayout(); @@ -5317,6 +5336,7 @@ package android.content { field public static final java.lang.String KEYGUARD_SERVICE = "keyguard"; field public static final java.lang.String LAYOUT_INFLATER_SERVICE = "layout_inflater"; field public static final java.lang.String LOCATION_SERVICE = "location"; + field public static final java.lang.String MEDIA_ROUTER_SERVICE = "media_router"; field public static final int MODE_APPEND = 32768; // 0x8000 field public static final int MODE_ENABLE_WRITE_AHEAD_LOGGING = 8; // 0x8 field public static final int MODE_MULTI_PROCESS = 4; // 0x4 @@ -11486,6 +11506,74 @@ package android.media { field public static final int DEFAULT = 0; // 0x0 } + public class MediaRouter { + method public void addCallback(int, android.media.MediaRouter.Callback); + method public void addUserRoute(android.media.MediaRouter.UserRouteInfo); + method public void clearUserRoutes(); + method public android.media.MediaRouter.RouteCategory createRouteCategory(java.lang.CharSequence, boolean); + method public android.media.MediaRouter.UserRouteInfo createUserRoute(android.media.MediaRouter.RouteCategory); + method public android.media.MediaRouter.RouteCategory getCategoryAt(int); + method public int getCategoryCount(); + method public android.media.MediaRouter.RouteInfo getRouteAt(int); + method public int getRouteCount(); + method public android.media.MediaRouter.RouteInfo getSelectedRoute(int); + method public void removeCallback(android.media.MediaRouter.Callback); + method public void removeUserRoute(android.media.MediaRouter.UserRouteInfo); + method public void selectRoute(int, android.media.MediaRouter.RouteInfo); + field public static final int ROUTE_TYPE_LIVE_AUDIO = 1; // 0x1 + field public static final int ROUTE_TYPE_USER = 8388608; // 0x800000 + } + + public static abstract interface MediaRouter.Callback { + method public abstract void onRouteAdded(android.media.MediaRouter, android.media.MediaRouter.RouteInfo); + method public abstract void onRouteChanged(android.media.MediaRouter, android.media.MediaRouter.RouteInfo); + method public abstract void onRouteGrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup, int); + method public abstract void onRouteRemoved(android.media.MediaRouter, android.media.MediaRouter.RouteInfo); + method public abstract void onRouteSelected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo); + method public abstract void onRouteUngrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup); + method public abstract void onRouteUnselected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo); + } + + public static class MediaRouter.RouteCategory { + method public java.lang.CharSequence getName(); + method public java.util.List<android.media.MediaRouter.RouteInfo> getRoutes(java.util.List<android.media.MediaRouter.RouteInfo>); + method public int getSupportedTypes(); + method public boolean isGroupable(); + } + + public static class MediaRouter.RouteGroup extends android.media.MediaRouter.RouteInfo { + method public void addRoute(android.media.MediaRouter.RouteInfo); + method public void addRoute(android.media.MediaRouter.RouteInfo, int); + method public android.media.MediaRouter.RouteInfo getRouteAt(int); + method public int getRouteCount(); + method public void removeRoute(android.media.MediaRouter.RouteInfo); + method public void removeRoute(int); + } + + public static class MediaRouter.RouteInfo { + method public android.media.MediaRouter.RouteCategory getCategory(); + method public android.media.MediaRouter.RouteGroup getGroup(); + method public java.lang.CharSequence getName(); + method public java.lang.CharSequence getStatus(); + method public int getSupportedTypes(); + } + + public static class MediaRouter.SimpleCallback implements android.media.MediaRouter.Callback { + ctor public MediaRouter.SimpleCallback(); + method public void onRouteAdded(android.media.MediaRouter, android.media.MediaRouter.RouteInfo); + method public void onRouteChanged(android.media.MediaRouter, android.media.MediaRouter.RouteInfo); + method public void onRouteGrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup, int); + method public void onRouteRemoved(android.media.MediaRouter, android.media.MediaRouter.RouteInfo); + method public void onRouteSelected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo); + method public void onRouteUngrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup); + method public void onRouteUnselected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo); + } + + public static class MediaRouter.UserRouteInfo extends android.media.MediaRouter.RouteInfo { + method public void setName(java.lang.CharSequence); + method public void setStatus(java.lang.CharSequence); + } + public class MediaScannerConnection implements android.content.ServiceConnection { ctor public MediaScannerConnection(android.content.Context, android.media.MediaScannerConnection.MediaScannerConnectionClient); method public void connect(); @@ -22710,7 +22798,8 @@ package android.view { public abstract class ActionProvider { ctor public ActionProvider(android.content.Context); method public boolean hasSubMenu(); - method public abstract android.view.View onCreateActionView(); + method public abstract deprecated android.view.View onCreateActionView(); + method public android.view.View onCreateActionView(android.view.MenuItem); method public boolean onPerformDefaultAction(); method public void onPrepareSubMenu(android.view.SubMenu); } diff --git a/api/current.txt b/api/current.txt index 3beaaa5fbd7f..55c9e285abfc 100644 --- a/api/current.txt +++ b/api/current.txt @@ -98,7 +98,6 @@ package android { field public static final java.lang.String RECORD_AUDIO = "android.permission.RECORD_AUDIO"; field public static final java.lang.String REORDER_TASKS = "android.permission.REORDER_TASKS"; field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES"; - field public static final java.lang.String ROUTE_MEDIA_OUTPUT = "android.permission.ROUTE_MEDIA_OUTPUT"; field public static final java.lang.String SEND_SMS = "android.permission.SEND_SMS"; field public static final java.lang.String SET_ACTIVITY_WATCHER = "android.permission.SET_ACTIVITY_WATCHER"; field public static final java.lang.String SET_ALARM = "com.android.alarm.permission.SET_ALARM"; @@ -3680,6 +3679,7 @@ package android.app { public class MediaRouteActionProvider extends android.view.ActionProvider { ctor public MediaRouteActionProvider(android.content.Context); method public android.view.View onCreateActionView(); + method public void setExtendedSettingsClickListener(android.view.View.OnClickListener); method public void setRouteTypes(int); } @@ -3688,6 +3688,7 @@ package android.app { ctor public MediaRouteButton(android.content.Context, android.util.AttributeSet); ctor public MediaRouteButton(android.content.Context, android.util.AttributeSet, int); method public int getRouteTypes(); + method public void setExtendedSettingsClickListener(android.view.View.OnClickListener); method public void setRouteTypes(int); } @@ -5337,6 +5338,7 @@ package android.content { field public static final java.lang.String KEYGUARD_SERVICE = "keyguard"; field public static final java.lang.String LAYOUT_INFLATER_SERVICE = "layout_inflater"; field public static final java.lang.String LOCATION_SERVICE = "location"; + field public static final java.lang.String MEDIA_ROUTER_SERVICE = "media_router"; field public static final int MODE_APPEND = 32768; // 0x8000 field public static final int MODE_ENABLE_WRITE_AHEAD_LOGGING = 8; // 0x8 field public static final int MODE_MULTI_PROCESS = 4; // 0x4 @@ -11512,7 +11514,6 @@ package android.media { method public void clearUserRoutes(); method public android.media.MediaRouter.RouteCategory createRouteCategory(java.lang.CharSequence, boolean); method public android.media.MediaRouter.UserRouteInfo createUserRoute(android.media.MediaRouter.RouteCategory); - method public static android.media.MediaRouter forApplication(android.content.Context); method public android.media.MediaRouter.RouteCategory getCategoryAt(int); method public int getCategoryCount(); method public android.media.MediaRouter.RouteInfo getRouteAt(int); @@ -11521,56 +11522,63 @@ package android.media { method public void removeCallback(android.media.MediaRouter.Callback); method public void removeUserRoute(android.media.MediaRouter.UserRouteInfo); method public void selectRoute(int, android.media.MediaRouter.RouteInfo); - method public void setSelectedRouteVolume(int, float); field public static final int ROUTE_TYPE_LIVE_AUDIO = 1; // 0x1 field public static final int ROUTE_TYPE_USER = 8388608; // 0x800000 } public static abstract interface MediaRouter.Callback { - method public abstract void onRouteAdded(int, android.media.MediaRouter.RouteInfo); - method public abstract void onRouteChanged(android.media.MediaRouter.RouteInfo); - method public abstract void onRouteRemoved(int, android.media.MediaRouter.RouteInfo); - method public abstract void onRouteSelected(int, android.media.MediaRouter.RouteInfo); - method public abstract void onRouteUnselected(int, android.media.MediaRouter.RouteInfo); - method public abstract void onVolumeChanged(int, float); + method public abstract void onRouteAdded(android.media.MediaRouter, android.media.MediaRouter.RouteInfo); + method public abstract void onRouteChanged(android.media.MediaRouter, android.media.MediaRouter.RouteInfo); + method public abstract void onRouteGrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup, int); + method public abstract void onRouteRemoved(android.media.MediaRouter, android.media.MediaRouter.RouteInfo); + method public abstract void onRouteSelected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo); + method public abstract void onRouteUngrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup); + method public abstract void onRouteUnselected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo); } - public class MediaRouter.RouteCategory { + public static class MediaRouter.RouteCategory { method public java.lang.CharSequence getName(); - method public android.media.MediaRouter.RouteInfo getRouteAt(int); - method public int getRouteCount(); + method public java.util.List<android.media.MediaRouter.RouteInfo> getRoutes(java.util.List<android.media.MediaRouter.RouteInfo>); method public int getSupportedTypes(); method public boolean isGroupable(); } - public class MediaRouter.RouteGroup extends android.media.MediaRouter.RouteInfo { + public static class MediaRouter.RouteGroup extends android.media.MediaRouter.RouteInfo { method public void addRoute(android.media.MediaRouter.RouteInfo); method public void addRoute(android.media.MediaRouter.RouteInfo, int); + method public android.media.MediaRouter.RouteInfo getRouteAt(int); + method public int getRouteCount(); method public void removeRoute(android.media.MediaRouter.RouteInfo); method public void removeRoute(int); + method public void setIconDrawable(android.graphics.drawable.Drawable); + method public void setIconResource(int); } - public class MediaRouter.RouteInfo { + public static class MediaRouter.RouteInfo { method public android.media.MediaRouter.RouteCategory getCategory(); method public android.media.MediaRouter.RouteGroup getGroup(); + method public android.graphics.drawable.Drawable getIconDrawable(); method public java.lang.CharSequence getName(); method public java.lang.CharSequence getStatus(); method public int getSupportedTypes(); - method public float getVolume(); } public static class MediaRouter.SimpleCallback implements android.media.MediaRouter.Callback { ctor public MediaRouter.SimpleCallback(); - method public void onRouteAdded(int, android.media.MediaRouter.RouteInfo); - method public void onRouteChanged(android.media.MediaRouter.RouteInfo); - method public void onRouteRemoved(int, android.media.MediaRouter.RouteInfo); - method public void onRouteSelected(int, android.media.MediaRouter.RouteInfo); - method public void onRouteUnselected(int, android.media.MediaRouter.RouteInfo); - method public void onVolumeChanged(int, float); - } - - public class MediaRouter.UserRouteInfo extends android.media.MediaRouter.RouteInfo { + method public void onRouteAdded(android.media.MediaRouter, android.media.MediaRouter.RouteInfo); + method public void onRouteChanged(android.media.MediaRouter, android.media.MediaRouter.RouteInfo); + method public void onRouteGrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup, int); + method public void onRouteRemoved(android.media.MediaRouter, android.media.MediaRouter.RouteInfo); + method public void onRouteSelected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo); + method public void onRouteUngrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup); + method public void onRouteUnselected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo); + } + + public static class MediaRouter.UserRouteInfo extends android.media.MediaRouter.RouteInfo { + method public void setIconDrawable(android.graphics.drawable.Drawable); + method public void setIconResource(int); method public void setName(java.lang.CharSequence); + method public void setRemoteControlClient(android.media.RemoteControlClient); method public void setStatus(java.lang.CharSequence); } diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index 1d5f20766c06..225be9c46535 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -160,7 +160,7 @@ status_t BootAnimation::initTexture(void* buffer, size_t len) codec->setDitherImage(false); if (codec) { codec->decode(&stream, &bitmap, - SkBitmap::kRGB_565_Config, + SkBitmap::kARGB_8888_Config, SkImageDecoder::kDecodePixels_Mode); delete codec; } diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 4c35a8c6f0d3..b902550d1455 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -55,6 +55,7 @@ import android.location.ICountryDetector; import android.location.ILocationManager; import android.location.LocationManager; import android.media.AudioManager; +import android.media.MediaRouter; import android.net.ConnectivityManager; import android.net.IConnectivityManager; import android.net.INetworkPolicyManager; @@ -288,6 +289,11 @@ class ContextImpl extends Context { return new AudioManager(ctx); }}); + registerService(MEDIA_ROUTER_SERVICE, new ServiceFetcher() { + public Object createService(ContextImpl ctx) { + return new MediaRouter(ctx); + }}); + registerService(CLIPBOARD_SERVICE, new ServiceFetcher() { public Object createService(ContextImpl ctx) { return new ClipboardManager(ctx.getOuterContext(), diff --git a/core/java/android/app/MediaRouteActionProvider.java b/core/java/android/app/MediaRouteActionProvider.java index 301b125794b2..5fe08ecdb545 100644 --- a/core/java/android/app/MediaRouteActionProvider.java +++ b/core/java/android/app/MediaRouteActionProvider.java @@ -33,11 +33,12 @@ public class MediaRouteActionProvider extends ActionProvider { private MediaRouteButton mView; private int mRouteTypes; private final RouterCallback mRouterCallback = new RouterCallback(); + private View.OnClickListener mExtendedSettingsListener; public MediaRouteActionProvider(Context context) { super(context); mContext = context; - mRouter = MediaRouter.forApplication(context); + mRouter = (MediaRouter) context.getSystemService(Context.MEDIA_ROUTER_SERVICE); // Start with live audio by default. // TODO Update this when new route types are added; segment by API level @@ -76,6 +77,7 @@ public class MediaRouteActionProvider extends ActionProvider { mView = new MediaRouteButton(mContext); mMenuItem.setVisible(mRouter.getRouteCount() > 1); mView.setRouteTypes(mRouteTypes); + mView.setExtendedSettingsClickListener(mExtendedSettingsListener); return mView; } @@ -85,14 +87,21 @@ public class MediaRouteActionProvider extends ActionProvider { return true; } + public void setExtendedSettingsClickListener(View.OnClickListener listener) { + mExtendedSettingsListener = listener; + if (mView != null) { + mView.setExtendedSettingsClickListener(listener); + } + } + private class RouterCallback extends MediaRouter.SimpleCallback { @Override - public void onRouteAdded(int type, RouteInfo info) { + public void onRouteAdded(MediaRouter router, RouteInfo info) { mMenuItem.setVisible(mRouter.getRouteCount() > 1); } @Override - public void onRouteRemoved(int type, RouteInfo info) { + public void onRouteRemoved(MediaRouter router, RouteInfo info) { mMenuItem.setVisible(mRouter.getRouteCount() > 1); } } diff --git a/core/java/android/app/MediaRouteButton.java b/core/java/android/app/MediaRouteButton.java index 3aabd5d0d561..385241ced8c4 100644 --- a/core/java/android/app/MediaRouteButton.java +++ b/core/java/android/app/MediaRouteButton.java @@ -43,6 +43,8 @@ public class MediaRouteButton extends View { private int mMinWidth; private int mMinHeight; + private OnClickListener mExtendedSettingsClickListener; + private static final int[] ACTIVATED_STATE_SET = { R.attr.state_activated }; @@ -58,7 +60,7 @@ public class MediaRouteButton extends View { public MediaRouteButton(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - mRouter = MediaRouter.forApplication(context); + mRouter = (MediaRouter)context.getSystemService(Context.MEDIA_ROUTER_SERVICE); TypedArray a = context.obtainStyledAttributes(attrs, com.android.internal.R.styleable.MediaRouteButton, defStyleAttr, 0); @@ -260,24 +262,29 @@ public class MediaRouteButton extends View { mRemoteIndicator.draw(canvas); } + public void setExtendedSettingsClickListener(OnClickListener listener) { + // TODO: if dialog is already open, propagate so that it updates live. + mExtendedSettingsClickListener = listener; + } + private class MediaRouteCallback extends MediaRouter.SimpleCallback { @Override - public void onRouteSelected(int type, RouteInfo info) { + public void onRouteSelected(MediaRouter router, int type, RouteInfo info) { updateRemoteIndicator(); } @Override - public void onRouteUnselected(int type, RouteInfo info) { + public void onRouteUnselected(MediaRouter router, int type, RouteInfo info) { updateRemoteIndicator(); } @Override - public void onRouteAdded(int type, RouteInfo info) { + public void onRouteAdded(MediaRouter router, RouteInfo info) { updateRouteCount(); } @Override - public void onRouteRemoved(int type, RouteInfo info) { + public void onRouteRemoved(MediaRouter router, RouteInfo info) { updateRouteCount(); } } diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 4c169d38fe5d..7588cdac50d9 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -1528,6 +1528,8 @@ public abstract class Context { * @see android.net.wifi.WifiManager * @see #AUDIO_SERVICE * @see android.media.AudioManager + * @see #MEDIA_ROUTER_SERVICE + * @see android.media.MediaRouter * @see #TELEPHONY_SERVICE * @see android.telephony.TelephonyManager * @see #INPUT_METHOD_SERVICE @@ -1778,7 +1780,6 @@ public abstract class Context { */ public static final String NSD_SERVICE = "servicediscovery"; - /** * Use with {@link #getSystemService} to retrieve a * {@link android.media.AudioManager} for handling management of volume, @@ -1791,6 +1792,16 @@ public abstract class Context { /** * Use with {@link #getSystemService} to retrieve a + * {@link android.media.MediaRouter} for controlling and managing + * routing of media. + * + * @see #getSystemService + * @see android.media.MediaRouter + */ + public static final String MEDIA_ROUTER_SERVICE = "media_router"; + + /** + * Use with {@link #getSystemService} to retrieve a * {@link android.telephony.TelephonyManager} for handling management the * telephony features of the device. * diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java index c453a5db42c7..12f16fd3fae4 100644 --- a/core/java/android/text/Layout.java +++ b/core/java/android/text/Layout.java @@ -456,6 +456,7 @@ public abstract class Layout { final int top = Math.max(dtop, 0); final int bottom = Math.min(getLineTop(getLineCount()), dbottom); + if (top >= bottom) return TextUtils.packRangeInLong(0, -1); return TextUtils.packRangeInLong(getLineForVertical(top), getLineForVertical(bottom)); } diff --git a/core/java/android/text/style/StyleSpan.java b/core/java/android/text/style/StyleSpan.java index deed73789ecb..8e6147c8f91b 100644 --- a/core/java/android/text/style/StyleSpan.java +++ b/core/java/android/text/style/StyleSpan.java @@ -98,7 +98,6 @@ public class StyleSpan extends MetricAffectingSpan implements ParcelableSpan { } int fake = want & ~tf.getStyle(); - fake |= tf.getStyle() & Typeface.BOLD; if ((fake & Typeface.BOLD) != 0) { paint.setFakeBoldText(true); diff --git a/core/java/android/text/style/TextAppearanceSpan.java b/core/java/android/text/style/TextAppearanceSpan.java index abd02cf41cae..ecbf4bc0522b 100644 --- a/core/java/android/text/style/TextAppearanceSpan.java +++ b/core/java/android/text/style/TextAppearanceSpan.java @@ -235,7 +235,6 @@ public class TextAppearanceSpan extends MetricAffectingSpan implements Parcelabl } int fake = style & ~tf.getStyle(); - fake |= tf.getStyle() & Typeface.BOLD; if ((fake & Typeface.BOLD) != 0) { ds.setFakeBoldText(true); diff --git a/core/java/android/text/style/TypefaceSpan.java b/core/java/android/text/style/TypefaceSpan.java index 3d74ed044047..f19406007111 100644 --- a/core/java/android/text/style/TypefaceSpan.java +++ b/core/java/android/text/style/TypefaceSpan.java @@ -82,7 +82,6 @@ public class TypefaceSpan extends MetricAffectingSpan implements ParcelableSpan Typeface tf = Typeface.create(family, oldStyle); int fake = oldStyle & ~tf.getStyle(); - fake |= tf.getStyle() & Typeface.BOLD; if ((fake & Typeface.BOLD) != 0) { paint.setFakeBoldText(true); diff --git a/core/java/android/view/Choreographer.java b/core/java/android/view/Choreographer.java index aaa081cf1f64..78dc86f4dd94 100644 --- a/core/java/android/view/Choreographer.java +++ b/core/java/android/view/Choreographer.java @@ -103,6 +103,11 @@ public final class Choreographer { private static final boolean USE_FRAME_TIME = SystemProperties.getBoolean( "debug.choreographer.frametime", true); + // Set a limit to warn about skipped frames. + // Skipped frames imply jank. + private static final int SKIPPED_FRAME_WARNING_LIMIT = SystemProperties.getInt( + "debug.choreographer.skipwarning", 30); + private static final long NANOS_PER_MS = 1000000; private static final int MSG_DO_FRAME = 0; @@ -486,13 +491,18 @@ public final class Choreographer { startNanos = System.nanoTime(); final long jitterNanos = startNanos - frameTimeNanos; if (jitterNanos >= mFrameIntervalNanos) { + final long skippedFrames = jitterNanos / mFrameIntervalNanos; + if (skippedFrames >= SKIPPED_FRAME_WARNING_LIMIT) { + Log.i(TAG, "Skipped " + skippedFrames + " frames! " + + "The application may be doing too much work on its main thread."); + } final long lastFrameOffset = jitterNanos % mFrameIntervalNanos; if (DEBUG) { Log.d(TAG, "Missed vsync by " + (jitterNanos * 0.000001f) + " ms " + "which is more than the frame interval of " + (mFrameIntervalNanos * 0.000001f) + " ms! " - + "Setting frame time to " + (lastFrameOffset * 0.000001f) - + " ms in the past."); + + "Skipping " + skippedFrames + " frames and setting frame " + + "time to " + (lastFrameOffset * 0.000001f) + " ms in the past."); } frameTimeNanos = startNanos - lastFrameOffset; } @@ -500,7 +510,7 @@ public final class Choreographer { if (frameTimeNanos < mLastFrameTimeNanos) { if (DEBUG) { Log.d(TAG, "Frame time appears to be going backwards. May be due to a " - + "previously skipped frame. Waiting for next vsync"); + + "previously skipped frame. Waiting for next vsync."); } scheduleVsyncLocked(); return; @@ -658,6 +668,7 @@ public final class Choreographer { private final class FrameDisplayEventReceiver extends DisplayEventReceiver implements Runnable { + private boolean mHavePendingVsync; private long mTimestampNanos; private int mFrame; @@ -672,6 +683,21 @@ public final class Choreographer { // the message queue. If there are no messages in the queue with timestamps // earlier than the frame time, then the vsync event will be processed immediately. // Otherwise, messages that predate the vsync event will be handled first. + long now = System.nanoTime(); + if (timestampNanos > now) { + Log.w(TAG, "Frame time is " + ((timestampNanos - now) * 0.000001f) + + " ms in the future! Check that graphics HAL is generating vsync " + + "timestamps using the correct timebase."); + timestampNanos = now; + } + + if (mHavePendingVsync) { + Log.w(TAG, "Already have a pending vsync event. There should only be " + + "one at a time."); + } else { + mHavePendingVsync = true; + } + mTimestampNanos = timestampNanos; mFrame = frame; Message msg = Message.obtain(mHandler, this); @@ -681,6 +707,7 @@ public final class Choreographer { @Override public void run() { + mHavePendingVsync = false; doFrame(mTimestampNanos, mFrame); } } diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 7eeb6d0c648f..cdc51d1bb40d 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -229,6 +229,7 @@ public final class ViewRootImpl implements ViewParent, boolean mWindowsAnimating; boolean mIsDrawing; int mLastSystemUiVisibility; + int mClientWindowLayoutFlags; // Pool of queued input events. private static final int MAX_QUEUED_INPUT_EVENT_POOL_SIZE = 10; @@ -485,6 +486,8 @@ public final class ViewRootImpl implements ViewParent, mFallbackEventHandler.setView(view); mWindowAttributes.copyFrom(attrs); attrs = mWindowAttributes; + // Keep track of the actual window flags supplied by the client. + mClientWindowLayoutFlags = attrs.flags; setAccessibilityFocusedHost(null); @@ -760,6 +763,8 @@ public final class ViewRootImpl implements ViewParent, void setLayoutParams(WindowManager.LayoutParams attrs, boolean newView) { synchronized (this) { int oldSoftInputMode = mWindowAttributes.softInputMode; + // Keep track of the actual window flags supplied by the client. + mClientWindowLayoutFlags = attrs.flags; // preserve compatible window flag if exists. int compatibleWindowFlag = mWindowAttributes.flags & WindowManager.LayoutParams.FLAG_COMPATIBLE_WINDOW; @@ -768,7 +773,9 @@ public final class ViewRootImpl implements ViewParent, attrs.subtreeSystemUiVisibility = mWindowAttributes.subtreeSystemUiVisibility; mWindowAttributesChangesFlag = mWindowAttributes.copyFrom(attrs); mWindowAttributes.flags |= compatibleWindowFlag; - + + applyKeepScreenOnFlag(mWindowAttributes); + if (newView) { mSoftInputMode = attrs.softInputMode; requestLayout(); @@ -1000,6 +1007,18 @@ public final class ViewRootImpl implements ViewParent, } } + private void applyKeepScreenOnFlag(WindowManager.LayoutParams params) { + // Update window's global keep screen on flag: if a view has requested + // that the screen be kept on, then it is always set; otherwise, it is + // set to whatever the client last requested for the global state. + if (mAttachInfo.mKeepScreenOn) { + params.flags |= WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON; + } else { + params.flags = (params.flags&~WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) + | (mClientWindowLayoutFlags&WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + } + } + private boolean collectViewAttributes() { final View.AttachInfo attachInfo = mAttachInfo; if (attachInfo.mRecomputeGlobalAttributes) { @@ -1017,9 +1036,7 @@ public final class ViewRootImpl implements ViewParent, || attachInfo.mSystemUiVisibility != oldVis || attachInfo.mHasSystemUiListeners != oldHasSystemUiListeners) { WindowManager.LayoutParams params = mWindowAttributes; - if (attachInfo.mKeepScreenOn) { - params.flags |= WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON; - } + applyKeepScreenOnFlag(params); params.subtreeSystemUiVisibility = attachInfo.mSystemUiVisibility; params.hasSystemUiListeners = attachInfo.mHasSystemUiListeners; mView.dispatchWindowSystemUiVisiblityChanged(attachInfo.mSystemUiVisibility); diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java index 39bc7c2fc1f3..471f259cc954 100644 --- a/core/java/android/widget/Switch.java +++ b/core/java/android/widget/Switch.java @@ -259,12 +259,10 @@ public class Switch extends CompoundButton { // now compute what (if any) algorithmic styling is needed int typefaceStyle = tf != null ? tf.getStyle() : 0; int need = style & ~typefaceStyle; - need |= typefaceStyle & Typeface.BOLD; mTextPaint.setFakeBoldText((need & Typeface.BOLD) != 0); mTextPaint.setTextSkewX((need & Typeface.ITALIC) != 0 ? -0.25f : 0); } else { - int typefaceStyle = tf != null ? tf.getStyle() : 0; - mTextPaint.setFakeBoldText((typefaceStyle & Typeface.BOLD) != 0); + mTextPaint.setFakeBoldText(false); mTextPaint.setTextSkewX(0); setSwitchTypeface(tf); } diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 464a527a6025..01617da73b9a 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -1237,12 +1237,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener // now compute what (if any) algorithmic styling is needed int typefaceStyle = tf != null ? tf.getStyle() : 0; int need = style & ~typefaceStyle; - need |= typefaceStyle & Typeface.BOLD; // keep bold in mTextPaint.setFakeBoldText((need & Typeface.BOLD) != 0); mTextPaint.setTextSkewX((need & Typeface.ITALIC) != 0 ? -0.25f : 0); } else { - int typefaceStyle = tf != null ? tf.getStyle() : 0; - mTextPaint.setFakeBoldText((typefaceStyle & Typeface.BOLD) != 0); + mTextPaint.setFakeBoldText(false); mTextPaint.setTextSkewX(0); setTypeface(tf); } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 969801851b91..6546fedc18e0 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -636,12 +636,6 @@ android:permissionGroup="android.permission-group.SYSTEM_TOOLS" android:protectionLevel="signature" /> - <!-- Allows an application to route media output to other devices. --> - <permission android:name="android.permission.ROUTE_MEDIA_OUTPUT" - android:permissionGroup="android.permission-group.SYSTEM_TOOLS" - android:label="@string/permlab_route_media_output" - android:description="@string/permdesc_route_media_output" /> - <!-- =========================================== --> <!-- Permissions associated with telephony state --> <!-- =========================================== --> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 6b56b5c2eb01..28a892dca145 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -209,7 +209,7 @@ <string name="permdesc_sendSmsNoConfirmation" msgid="402569800862935907">"Permite que la aplicación envíe mensajes SMS, lo que puede generar cargos inesperados. Las aplicaciones malintencionadas pueden causarte gastos imprevistos al enviar mensajes sin tu confirmación."</string> <string name="permlab_readSms" msgid="8745086572213270480">"leer tus mensajes de texto (SMS o MMS)"</string> <string name="permdesc_readSms" product="tablet" msgid="2467981548684735522">"Permite que la aplicación consulte los mensajes SMS almacenados en la tableta o en la tarjeta SIM. La aplicación puede utilizar este permiso para leer todos los mensajes SMS, independientemente de cuál sea su contenido o su nivel de confidencialidad."</string> - <string name="permdesc_readSms" product="default" msgid="3695967533457240550">"Permite que la aplicación consulte los mensajes SMS almacenados en el teléfono o en la tarjeta SIM. La aplicación puede utilizar este permiso para leer todos los mensajes SMS, independientemente de cuál sea su contenido o su nivel de confidencialidad."</string> + <string name="permdesc_readSms" product="default" msgid="3695967533457240550">"Permite que la aplicación consulte los mensajes SMS almacenados en el dispositivo o en la tarjeta SIM. La aplicación puede utilizar este permiso para leer todos los mensajes SMS, independientemente de cuál sea su contenido o su nivel de confidencialidad."</string> <string name="permlab_writeSms" msgid="3216950472636214774">"editar tus mensajes de texto (SMS o MMS)"</string> <string name="permdesc_writeSms" product="tablet" msgid="5160413947794501538">"Permite que la aplicación escriba en mensajes SMS almacenados en tu tableta o tarjeta SIM. Las aplicaciones maliciosas pueden eliminar tus mensajes."</string> <string name="permdesc_writeSms" product="default" msgid="7268668709052328567">"Permite que la aplicación escriba en mensajes SMS almacenados en tu dispositivo o tarjeta SIM. Las aplicaciones maliciosas pueden eliminar tus mensajes."</string> @@ -302,7 +302,7 @@ <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Permite que la aplicación solicite que la señal suministrada se envíe a todos los procesos persistentes."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"hacer que la aplicación se ejecute siempre"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Permite que la aplicación haga que algunas de sus partes se mantengan persistentes en la memoria. Esto puede limitar la memoria disponible para otras aplicaciones y ralentizar la tableta."</string> - <string name="permdesc_persistentActivity" product="default" msgid="4384760047508278272">"Permite que la aplicación haga que algunas de sus partes se mantengan persistentes en la memoria. Esto puede limitar la memoria disponible para otras aplicaciones y ralentizar el teléfono."</string> + <string name="permdesc_persistentActivity" product="default" msgid="4384760047508278272">"Permite que la aplicación haga que algunas de sus partes se mantengan persistentes en la memoria. Esto puede limitar la memoria disponible para otras aplicaciones y ralentizar el dispositivo."</string> <string name="permlab_deletePackages" msgid="184385129537705938">"eliminar aplicaciones"</string> <string name="permdesc_deletePackages" msgid="7411480275167205081">"Permite que la aplicación elimine paquetes de Android. Las aplicaciones maliciosas pueden utilizar este permiso para eliminar aplicaciones importantes."</string> <string name="permlab_clearAppUserData" msgid="274109191845842756">"eliminar datos de otras aplicaciones"</string> @@ -343,16 +343,16 @@ <string name="permdesc_receiveBootCompleted" product="default" msgid="513950589102617504">"Permite que la aplicación se inicie en cuanto el sistema haya finalizado la inicialización. Esto puede ocasionar que el dispositivo tarde más en inicializarse y que la aplicación ralentice el funcionamiento general del dispositivo al estar en ejecución constante."</string> <string name="permlab_broadcastSticky" msgid="7919126372606881614">"enviar emisiones pegajosas"</string> <string name="permdesc_broadcastSticky" product="tablet" msgid="7749760494399915651">"Permite que la aplicación envíe transmisiones persistentes que permanecen después de que finaliza la transmisión. Un uso excesivo podría ralentizar la tableta o hacer que funcione de manera inestable al forzarla a utilizar mucha memoria."</string> - <string name="permdesc_broadcastSticky" product="default" msgid="2825803764232445091">"Permite que la aplicación envíe transmisiones persistentes que permanecen después de que finaliza la transmisión. Un uso excesivo podría ralentizar el teléfono o hacer que funcione de manera inestable al forzarlo a utilizar mucha memoria."</string> + <string name="permdesc_broadcastSticky" product="default" msgid="2825803764232445091">"Permite que la aplicación envíe transmisiones persistentes que permanecen después de que finaliza la transmisión. Un uso excesivo podría ralentizar el dispositivo o hacer que funcione de manera inestable al forzarlo a utilizar mucha memoria."</string> <string name="permlab_readContacts" msgid="8348481131899886131">"leer tus contactos"</string> - <string name="permdesc_readContacts" product="tablet" msgid="5294866856941149639">"Permite que la aplicación consulte información sobre los contactos almacenados en la tableta, incluida la frecuencia con la que los has llamado, les has enviado un correo electrónico o te has puesto en contacto con ellos de otro modo. Las aplicaciones pueden utilizar este permiso para guardar los datos de los contactos, y las aplicaciones malintencionadas podrían compartirlos sin tu consentimiento."</string> - <string name="permdesc_readContacts" product="default" msgid="8440654152457300662">"Permite que la aplicación consulte información sobre contactos almacenados en el teléfono, incluida la frecuencia con la que los has llamado, les has enviado un correo electrónico o te has puesto en contacto con ellos de otro modo. Las aplicaciones pueden utilizar este permiso para guardar los datos de los contactos, y las aplicaciones malintencionadas podrían compartirlos sin tu consentimiento."</string> + <string name="permdesc_readContacts" product="tablet" msgid="5294866856941149639">"Permite que la aplicación consulte información sobre los contactos almacenados en la tableta, incluida la frecuencia con la que los has llamado, les has enviado correos o te has puesto en contacto con ellos de otro modo. Las aplicaciones pueden utilizar este permiso para guardar los datos de los contactos, y las aplicaciones malintencionadas podrían compartirlos sin tu consentimiento."</string> + <string name="permdesc_readContacts" product="default" msgid="8440654152457300662">"Permite que la aplicación consulte información sobre contactos almacenados en el dispositivo, incluida la frecuencia con la que los has llamado, les has enviado correos o te has puesto en contacto con ellos de otro modo. Las aplicaciones pueden utilizar este permiso para guardar los datos de los contactos, y las aplicaciones malintencionadas podrían compartirlos sin tu consentimiento."</string> <string name="permlab_writeContacts" msgid="5107492086416793544">"modificar tus contactos"</string> - <string name="permdesc_writeContacts" product="tablet" msgid="897243932521953602">"Permite que la aplicación modifique los datos de los contactos almacenados en la tableta, incluida la frecuencia con la que los has llamado, les has enviado un correo electrónico o te has puesto en contacto con ellos de otro modo. Las aplicaciones pueden utilizar este permiso para eliminar datos de contactos."</string> - <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Permite que la aplicación modifique los datos de los contactos almacenados en el teléfono, incluida la frecuencia con la que los has llamado, les has enviado un correo electrónico o te has puesto en contacto con ellos de otro modo. Las aplicaciones pueden utilizar este permiso para eliminar datos de contactos."</string> + <string name="permdesc_writeContacts" product="tablet" msgid="897243932521953602">"Permite que la aplicación modifique los datos de los contactos almacenados en la tableta, incluida la frecuencia con la que los has llamado, les has enviado correos o te has puesto en contacto con ellos de otro modo. Las aplicaciones pueden utilizar este permiso para eliminar datos de contactos."</string> + <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Permite que la aplicación modifique los datos de los contactos almacenados en el dispositivo, incluida la frecuencia con la que los has llamado, les has enviado correos o te has puesto en contacto con ellos de otro modo. Las aplicaciones pueden utilizar este permiso para eliminar datos de contactos."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"leer el registro de llamadas"</string> <string name="permdesc_readCallLog" product="tablet" msgid="3700645184870760285">"Permite que la aplicación consulte el registro de llamadas de la tableta, incluidos los datos sobre llamadas entrantes y salientes. Las aplicaciones pueden utilizar este permiso para guardar los datos del registro de llamadas, y las aplicaciones malintencionadas podrían compartirlos sin tu consentimiento."</string> - <string name="permdesc_readCallLog" product="default" msgid="5777725796813217244">"Permite que la aplicación consulte el registro de llamadas del teléfono, incluidos los datos sobre llamadas entrantes y salientes. Las aplicaciones pueden utilizar este permiso para guardar los datos del registro de llamadas, y las aplicaciones malintencionadas podrían compartirlos sin tu consentimiento."</string> + <string name="permdesc_readCallLog" product="default" msgid="5777725796813217244">"Permite que la aplicación consulte el registro de llamadas del dispositivo, incluidos los datos sobre llamadas entrantes y salientes. Las aplicaciones pueden utilizar este permiso para guardar los datos del registro de llamadas, y las aplicaciones malintencionadas podrían compartirlos sin tu consentimiento."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"escribir en el registro de llamadas"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Permite que la aplicación modifique el registro de llamadas de la tableta, incluidos los datos sobre llamadas entrantes y salientes. Las aplicaciones malintencionadas pueden usar este permiso para borrar o modificar el registro de llamadas."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Permite que la aplicación modifique el registro de llamadas del dispositivo, incluidos los datos sobre llamadas entrantes y salientes. Las aplicaciones malintencionadas pueden usar este permiso para borrar o modificar el registro de llamadas."</string> @@ -366,10 +366,10 @@ <string name="permdesc_writeSocialStream" product="default" msgid="3086557552204114849">"Permite que la aplicación muestre actualizaciones de las redes sociales de tus amigos. Ten cuidado al compartir información, ya que la aplicación puede generar mensajes que parezcan proceder de amigos. Nota: Este permiso no se puede utilizar en todas las redes sociales."</string> <string name="permlab_readCalendar" msgid="5972727560257612398">"Leer eventos de calendario e información confidencial"</string> <string name="permdesc_readCalendar" product="tablet" msgid="4216462049057658723">"Permite que la aplicación consulte todos los eventos de calendario almacenados en la tableta, incluidos los de amigos y compañeros de trabajo. La aplicación puede utilizar este permiso para compartir o guardar datos del calendario del usuario sin tener en cuenta si son privados o confidenciales."</string> - <string name="permdesc_readCalendar" product="default" msgid="7434548682470851583">"Permite que la aplicación consulte todos los eventos de calendario almacenados en el teléfono, incluidos los de amigos y compañeros de trabajo. La aplicación puede utilizar este permiso para compartir o guardar los datos del calendario sin tener en cuenta si son privados o confidenciales."</string> + <string name="permdesc_readCalendar" product="default" msgid="7434548682470851583">"Permite que la aplicación consulte todos los eventos de calendario almacenados en el dispositivo, incluidos los de amigos y compañeros de trabajo. La aplicación puede utilizar este permiso para compartir o guardar los datos del calendario sin tener en cuenta si son privados o confidenciales."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"Agregar o modificar los eventos de calendario y enviar un correo a los invitados sin que los propietarios lo sepan"</string> <string name="permdesc_writeCalendar" product="tablet" msgid="6679035520113668528">"Permite que la aplicación agregue, elimine y cambie eventos que se pueden modificar en la tableta, incluidos los de amigos o compañeros de trabajo. La aplicación puede utilizar este permiso para enviar mensajes que parezcan proceder de propietarios de un calendario o para modificar eventos sin el consentimiento de los propietarios."</string> - <string name="permdesc_writeCalendar" product="default" msgid="2324469496327249376">"Permite que la aplicación agregue, elimine y cambie eventos que se pueden modificar en el teléfono, incluidos los de amigos o compañeros de trabajo. La aplicación puede utilizar este permiso para enviar mensajes que parezcan proceder de propietarios de un calendario o para modificar los eventos sin el consentimiento de los propietarios."</string> + <string name="permdesc_writeCalendar" product="default" msgid="2324469496327249376">"Permite que la aplicación agregue, elimine y cambie eventos que se pueden modificar en el dispositivo, incluidos los de amigos o compañeros de trabajo. La aplicación puede utilizar este permiso para enviar mensajes que parezcan proceder de propietarios de un calendario o para modificar los eventos sin el consentimiento de los propietarios."</string> <string name="permlab_accessMockLocation" msgid="8688334974036823330">"crear fuentes de ubicación de prueba"</string> <string name="permdesc_accessMockLocation" msgid="5808711039482051824">"Permite crear fuentes de ubicación simuladas para hacer pruebas o instalar un nuevo proveedor de ubicación. Esto autoriza a la aplicación a sobrescribir la ubicación o el estado proporcionados por otras fuentes de ubicación, como los proveedores de ubicación o GPS."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"acceder a comandos adicionales del proveedor del lugar"</string> @@ -378,7 +378,7 @@ <string name="permdesc_installLocationProvider" msgid="9066146120470591509">"Permite crear fuentes de ubicación simuladas para hacer pruebas o instalar un nuevo proveedor de ubicación. Este permiso autoriza a la aplicación a sobrescribir la ubicación o el estado proporcionados por otras fuentes de ubicación, como los proveedores de ubicación o GPS."</string> <string name="permlab_accessFineLocation" msgid="5885550969882561436">"ubicación exacta (GPS)"</string> <string name="permdesc_accessFineLocation" product="tablet" msgid="8960597421469894181">"Permite acceder a fuentes de determinación de la ubicación exacta, como el sistema de posicionamiento global (GPS) de la tableta. Cuando los servicios de ubicación están disponibles y activados, este permiso permite que la aplicación determine tu ubicación exacta."</string> - <string name="permdesc_accessFineLocation" product="default" msgid="239268765496141815">"Permite acceder a fuentes de determinación de la ubicación exacta, como el sistema de posicionamiento global (GPS) del teléfono. Cuando los servicios de ubicación están disponibles y activados, este permiso permite que la aplicación determine tu ubicación exacta."</string> + <string name="permdesc_accessFineLocation" product="default" msgid="239268765496141815">"Permite acceder a fuentes de determinación de la ubicación exacta, como el sistema de posicionamiento global (GPS) del dispositivo. Cuando los servicios de ubicación están disponibles y activados, este permiso permite que la aplicación determine tu ubicación exacta."</string> <string name="permlab_accessCoarseLocation" msgid="7422827215441638984">"ubicación aproximada (basada en red)"</string> <string name="permdesc_accessCoarseLocation" msgid="5383798877137640762">"Permite acceder a la ubicación aproximada a través de proveedores de ubicación que utilizan fuentes de conexión como torres de telefonía móvil y redes Wi-Fi. Cuando estos servicios de ubicación están disponibles y activados, este permiso permite que la aplicación determine tu ubicación aproximada."</string> <string name="permlab_accessSurfaceFlinger" msgid="2363969641792388947">"acceder a SurfaceFlinger"</string> @@ -469,7 +469,7 @@ <string name="permdesc_accountManagerService" msgid="1948455552333615954">"Permite que la aplicación haga llamadas a los autenticadores de cuentas."</string> <string name="permlab_getAccounts" msgid="1086795467760122114">"buscar cuentas en el dispositivo"</string> <string name="permdesc_getAccounts" product="tablet" msgid="2741496534769660027">"Permite que la aplicación obtenga una lista de las cuentas reconocidas por la tableta, entre las que se pueden incluir las cuentas creadas por las aplicaciones que hayas instalado."</string> - <string name="permdesc_getAccounts" product="default" msgid="3448316822451807382">"Permite que la aplicación obtenga una lista de las cuentas reconocidas por el teléfono, entre las que se pueden incluir las cuentas creadas por las aplicaciones que hayas instalado."</string> + <string name="permdesc_getAccounts" product="default" msgid="3448316822451807382">"Permite que la aplicación obtenga una lista de las cuentas reconocidas por el dispositivo, entre las que se pueden incluir las cuentas creadas por las aplicaciones que hayas instalado."</string> <string name="permlab_authenticateAccounts" msgid="5265908481172736933">"crear cuentas y establecer contraseñas"</string> <string name="permdesc_authenticateAccounts" msgid="5472124296908977260">"Permite que la aplicación utilice las capacidades del autenticador de cuentas del administrador de cuentas, incluida la creación de cuentas y la obtención y configuración de sus contraseñas."</string> <string name="permlab_manageAccounts" msgid="4983126304757177305">"agregar o eliminar cuentas"</string> @@ -489,31 +489,31 @@ <string name="permlab_changeBackgroundDataSetting" msgid="1400666012671648741">"cambiar la configuración del uso de datos del fondo"</string> <string name="permdesc_changeBackgroundDataSetting" msgid="5347729578468744379">"Permite que la aplicación cambe la configuración de uso de los datos de referencia."</string> <string name="permlab_accessWifiState" msgid="5202012949247040011">"ver conexiones Wi-Fi"</string> - <string name="permdesc_accessWifiState" msgid="5002798077387803726">"Permite que la aplicación vea información sobre la conexión a redes Wi-Fi, por ejemplo, si la conexión Wi-Fi está habilitada y cuál es el nombre de los dispositivos Wi-Fi conectados."</string> + <string name="permdesc_accessWifiState" msgid="5002798077387803726">"Permite que la aplicación vea información sobre la conexión a redes Wi-Fi, por ejemplo, si la conexión Wi-Fi está activada y cuál es el nombre de los dispositivos Wi-Fi conectados."</string> <string name="permlab_changeWifiState" msgid="6550641188749128035">"conectarse y desconectarse de la red Wi-Fi"</string> <string name="permdesc_changeWifiState" msgid="7137950297386127533">"Permite que la aplicación se conecte a puntos de acceso Wi-Fi y se desconecte de ellos, y que realice modificaciones en la configuración de las redes Wi-Fi."</string> <string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"permitir recepción de multidifusión Wi-Fi"</string> - <string name="permdesc_changeWifiMulticastState" product="tablet" msgid="7969774021256336548">"Permite que la aplicación reciba paquetes enviados a todos los dispositivos de una red Wi-Fi que utilicen direcciones de multidifusión, no solo a la tableta. Utiliza más batería que el modo de no multidifusión."</string> - <string name="permdesc_changeWifiMulticastState" product="default" msgid="6851949706025349926">"Permite que la aplicación reciba paquetes enviados a todos los dispositivos de una red Wi-Fi que utilicen direcciones de multidifusión, no solo al teléfono. Utiliza más batería que el modo de no multidifusión."</string> + <string name="permdesc_changeWifiMulticastState" product="tablet" msgid="7969774021256336548">"Permite que la aplicación reciba paquetes enviados a todos los dispositivos de una red Wi-Fi que utilicen direcciones de multidifusión, no solo a la tableta. Utiliza más batería que el modo que no es de multidifusión."</string> + <string name="permdesc_changeWifiMulticastState" product="default" msgid="6851949706025349926">"Permite que la aplicación reciba paquetes enviados a todos los dispositivos de una red Wi-Fi que utilicen direcciones de multidifusión, no solo a tu dispositivo. Utiliza más batería que el modo que no es de multidifusión."</string> <string name="permlab_bluetoothAdmin" msgid="6006967373935926659">"acceder a la configuración de Bluetooth"</string> <string name="permdesc_bluetoothAdmin" product="tablet" msgid="6921177471748882137">"Permite que la aplicación configure la tableta Bluetooth local y descubra y se sincronice con dispositivos remotos."</string> <string name="permdesc_bluetoothAdmin" product="default" msgid="8931682159331542137">"Permite que la aplicación configure el dispositivo Bluetooth local y descubra y se sincronice con dispositivos remotos."</string> <string name="permlab_accessWimaxState" msgid="7436749103151096452">"Ver conexiones WiMAX"</string> - <string name="permdesc_accessWimaxState" msgid="6360102877261978887">"Permite que la aplicación determine si está habilitada la conexión WiMAX y que obtenga información sobre las redes WiMAX que están conectadas."</string> + <string name="permdesc_accessWimaxState" msgid="6360102877261978887">"Permite que la aplicación determine si está activada la conexión WiMAX y que obtenga información sobre las redes WiMAX que están conectadas."</string> <string name="permlab_changeWimaxState" msgid="2405042267131496579">"Cambiar el estado de WiMAX"</string> <string name="permdesc_changeWimaxState" product="tablet" msgid="3156456504084201805">"Permite que la aplicación conecte la tableta a una red WiMAX y que la desconecte de ella."</string> - <string name="permdesc_changeWimaxState" product="default" msgid="697025043004923798">"Permite que la aplicación conecte el teléfono a una red WiMAX y que lo desconecte de ella."</string> + <string name="permdesc_changeWimaxState" product="default" msgid="697025043004923798">"Permite que la aplicación conecte el dispositivo a una red WiMAX y que lo desconecte de ella."</string> <string name="permlab_bluetooth" msgid="6127769336339276828">"vincular con dispositivos Bluetooth"</string> <string name="permdesc_bluetooth" product="tablet" msgid="3480722181852438628">"Permite que la aplicación vea la configuración de Bluetooth de la tableta y que cree y acepte conexiones con los dispositivos sincronizados."</string> - <string name="permdesc_bluetooth" product="default" msgid="3207106324452312739">"Permite que la aplicación vea la configuración de Bluetooth del teléfono y que cree y acepte conexiones con los dispositivos sincronizados."</string> + <string name="permdesc_bluetooth" product="default" msgid="3207106324452312739">"Permite que la aplicación vea la configuración de Bluetooth del dispositivo y que cree y acepte conexiones con los dispositivos sincronizados."</string> <string name="permlab_nfc" msgid="4423351274757876953">"controlar la Transmisión de datos en proximidad"</string> <string name="permdesc_nfc" msgid="7120611819401789907">"Permite que la aplicación se comunique con lectores, tarjetas y etiquetas de Comunicación de campo cercano (NFC)."</string> <string name="permlab_disableKeyguard" msgid="3598496301486439258">"desactivar el bloqueo de pantalla"</string> - <string name="permdesc_disableKeyguard" msgid="6034203065077122992">"Permite que la aplicación inhabilite el bloqueo del teclado y cualquier protección con contraseña asociada. Por ejemplo, el teléfono puede inhabilitar el bloqueo del teclado cuando recibe una llamada telefónica y volver a habilitarlo cuando finaliza la llamada."</string> + <string name="permdesc_disableKeyguard" msgid="6034203065077122992">"Permite que la aplicación desactive el bloqueo del teclado y cualquier protección con contraseña asociada. Por ejemplo, el dispositivo puede desactivar el bloqueo del teclado cuando recibe una llamada telefónica y volver a activarlo cuando finaliza la llamada."</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"leer la configuración de sincronización"</string> <string name="permdesc_readSyncSettings" msgid="2706745674569678644">"Este permiso permite que la aplicación consulte la configuración de sincronización de una cuenta. Esto permite, por ejemplo, determinar si la aplicación Personas está sincronizada con una cuenta."</string> <string name="permlab_writeSyncSettings" msgid="5408694875793945314">"activar y desactivar la sincronización"</string> - <string name="permdesc_writeSyncSettings" msgid="8956262591306369868">"Permite que la aplicación modifique la configuración de sincronización de una cuenta. Este permiso se puede utilizar, por ejemplo, para habilitar la sincronización de la aplicación Personas con una cuenta."</string> + <string name="permdesc_writeSyncSettings" msgid="8956262591306369868">"Permite que la aplicación modifique la configuración de sincronización de una cuenta. Este permiso se puede utilizar, por ejemplo, para activar la sincronización de la aplicación Personas con una cuenta."</string> <string name="permlab_readSyncStats" msgid="7396577451360202448">"leer estadística de sincronización"</string> <string name="permdesc_readSyncStats" msgid="1510143761757606156">"Permite que la aplicación consulte las estadísticas de sincronización de una cuenta, por ejemplo, el historial de eventos sincronizados y la cantidad de datos sincronizados."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"leer canales suscritos"</string> @@ -787,7 +787,7 @@ <string name="permdesc_readHistoryBookmarks" msgid="8462378226600439658">"Permite que la aplicación consulte el historial de todas las URL visitadas por el navegador, y todos sus marcadores. Nota: Este permiso no puede ser utilizado por navegadores externos ni otras aplicaciones que tengan funciones de navegación por Internet."</string> <string name="permlab_writeHistoryBookmarks" msgid="3714785165273314490">"escribir marcadores web e historial"</string> <string name="permdesc_writeHistoryBookmarks" product="tablet" msgid="6825527469145760922">"Permite que la aplicación modifique el historial o los marcadores del navegador almacenados en la tableta. La aplicación puede utilizar este permiso para borrar o modificar datos del navegador. Nota: Este permiso no puede ser utilizado por navegadores externos ni otras aplicaciones que tengan funciones de navegación por Internet."</string> - <string name="permdesc_writeHistoryBookmarks" product="default" msgid="8497389531014185509">"Permite que la aplicación modifique el historial o los marcadores del navegador almacenados en el teléfono. La aplicación puede utilizar este permiso para borrar o modificar los datos del navegador. Nota: Este permiso no puede ser utilizado por navegadores externos ni otras aplicaciones que tengan funciones de navegación por Internet."</string> + <string name="permdesc_writeHistoryBookmarks" product="default" msgid="8497389531014185509">"Permite que la aplicación modifique el historial o los marcadores del navegador almacenados en el dispositivo. La aplicación puede utilizar este permiso para borrar o modificar los datos del navegador. Nota: Este permiso no puede ser utilizado por navegadores externos ni otras aplicaciones que tengan funciones de navegación por Internet."</string> <string name="permlab_setAlarm" msgid="1379294556362091814">"programar una alarma"</string> <string name="permdesc_setAlarm" msgid="316392039157473848">"Permite que la aplicación establezca una alarma en una aplicación de alarma instalada. Es posible que algunas aplicaciones de alarma no incluyan esta función."</string> <string name="permlab_addVoicemail" msgid="5525660026090959044">"agregar correo de voz"</string> @@ -1284,7 +1284,7 @@ <string name="activity_resolver_use_always" msgid="8017770747801494933">"Siempre"</string> <string name="activity_resolver_use_once" msgid="2404644797149173758">"Solo una vez"</string> <string name="default_audio_route_name" product="tablet" msgid="6890731863195399186">"Altavoces de la tableta"</string> - <string name="default_audio_route_name" product="default" msgid="4551396562363128432">"Altavoz del teléfono"</string> + <string name="default_audio_route_name" product="default" msgid="4551396562363128432">"Altavoz del dispositivo"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Auriculares"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Altavoces del conector"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Audio HDMI"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index 0373fc7264da..cc5c02a5cb28 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -1080,8 +1080,8 @@ <string name="extmedia_format_message" product="nosdcard" msgid="3934016853425761078">"همه فایلهای ذخیره شده در حافظه USB پاک خواهد شد. این عمل را نمیتوان برگرداند!"</string> <string name="extmedia_format_message" product="default" msgid="14131895027543830">"تمام اطلاعات روی کارت شما از بین میرود."</string> <string name="extmedia_format_button_format" msgid="4131064560127478695">"قالب"</string> - <string name="adb_active_notification_title" msgid="6729044778949189918">"رفع عیب USB متصل شد"</string> - <string name="adb_active_notification_message" msgid="1016654627626476142">"غیرفعال کردن اشکال زدایی USB را لمس کنید."</string> + <string name="adb_active_notification_title" msgid="6729044778949189918">"اتصال رفع عیب USB"</string> + <string name="adb_active_notification_message" msgid="1016654627626476142">"برای غیرفعال کردن اشکال زدایی USB لمس کنید."</string> <string name="select_input_method" msgid="4653387336791222978">"انتخاب روش ورودی"</string> <string name="configure_input_methods" msgid="9091652157722495116">"تنظیم روشهای ورودی"</string> <string name="use_physical_keyboard" msgid="6203112478095117625">"صفحه کلید فیزیکی"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index e5a096e36f14..88c679c5af43 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -196,9 +196,9 @@ <string name="permlab_processOutgoingCalls" msgid="3906007831192990946">"preusmjeravanje odlaznih poziva"</string> <string name="permdesc_processOutgoingCalls" msgid="5331318931937402040">"Aplikaciji omogućuje obradu odlaznih poziva i promjenu broja za biranje. Ta dozvola aplikaciji omogućuje nadziranje, preusmjeravanje ili sprječavanje odlaznih poziva."</string> <string name="permlab_receiveSms" msgid="8673471768947895082">"primanje tekstnih poruka (SMS)"</string> - <string name="permdesc_receiveSms" msgid="6424387754228766939">"Aplikaciji omogućuje primanje i obradu SMS poruka. To znači da aplikacija može nadzirati ili izbrisati poruke poslane na vaš uređaj a da vam ih ne prikaže."</string> + <string name="permdesc_receiveSms" msgid="6424387754228766939">"Aplikaciji omogućuje primanje i obradu SMS poruka. To znači da aplikacija može nadzirati ili izbrisati poruke poslane na vaš uređaj, a da vam ih ne prikaže."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"primanje tekstnih poruka (MMS)"</string> - <string name="permdesc_receiveMms" msgid="533019437263212260">"Aplikaciji omogućuje primanje i obradu MMS poruka. To znači da aplikacija može nadzirati ili izbrisati poruke poslane na vaš uređaj a da vam ih ne prikaže."</string> + <string name="permdesc_receiveMms" msgid="533019437263212260">"Aplikaciji omogućuje primanje i obradu MMS poruka. To znači da aplikacija može nadzirati ili izbrisati poruke poslane na vaš uređaj, a da vam ih ne prikaže."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"primanje hitnih odašiljanja"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Omogućuje aplikaciji primanje i obradu poruka hitnih odašiljanja. Ta je dozvola dostupna samo aplikacijama sustava."</string> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"čitaj poruke koje se emitiraju unutar mobilne mreže"</string> @@ -214,7 +214,7 @@ <string name="permdesc_writeSms" product="tablet" msgid="5160413947794501538">"Omogućuje aplikaciji pisanje u SMS poruke pohranjene na vašem tabletnom računalu ili SIM kartici. Zlonamjerne aplikacije mogu izbrisati vaše poruke."</string> <string name="permdesc_writeSms" product="default" msgid="7268668709052328567">"Omogućuje aplikaciji pisanje u SMS poruke pohranjene na telefonu ili SIM kartici. Zlonamjerne aplikacije mogu izbrisati vaše poruke."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"primanje tekstnih poruka (WAP)"</string> - <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Aplikaciji omogućuje primanje i obradu WAP poruka. Ta dozvola uključuje mogućnost nadziranja ili brisanja vama poslanih poruka a da vam ih ne prikaže."</string> + <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Aplikaciji omogućuje primanje i obradu WAP poruka. Ta dozvola uključuje mogućnost nadziranja ili brisanja vama poslanih poruka, a da vam ih ne prikaže."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"dohvaćanje pokrenutih aplikacija"</string> <string name="permdesc_getTasks" msgid="7454215995847658102">"Aplikaciji omogućuje dohvaćanje informacija o trenutačnim i nedavnim tekućim zadacima. To aplikaciji može omogućiti otkrivanje informacija o tome koje se aplikacije upotrebljavaju na uređaju."</string> <string name="permlab_getDetailedTasks" msgid="6229468674753529501">"dohvaćanje pojedinosti o pokrenutim aplikacijama"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 79fa856939fa..a3c421cab56b 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -388,9 +388,9 @@ <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"ubah setelan audio Anda"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Memungkinkan aplikasi mengubah setelan audio global, misalnya volume dan pengeras suara mana yang digunakan untuk keluaran."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"rekam audio"</string> - <string name="permdesc_recordAudio" msgid="4906839301087980680">"Memungkinkan aplikasi merekam audio dengan mikrofon. Izin ini memungkinkan aplikasi merekam audio kapan pun tanpa konfirmasi Anda."</string> + <string name="permdesc_recordAudio" msgid="4906839301087980680">"Memungkinkan aplikasi merekam audio dengan mikrofon. Izin ini memungkinkan aplikasi merekam audio kapan saja tanpa konfirmasi Anda."</string> <string name="permlab_camera" msgid="3616391919559751192">"ambil gambar dan video"</string> - <string name="permdesc_camera" msgid="8497216524735535009">"Memungkinkan aplikasi mengambil gambar dan video dengan kamera. Izin ini memungkinkan aplikasi menggunakan kamera setiap saat tanpa konfirmasi Anda."</string> + <string name="permdesc_camera" msgid="8497216524735535009">"Memungkinkan aplikasi mengambil gambar dan video dengan kamera. Izin ini memungkinkan aplikasi menggunakan kamera kapan saja tanpa konfirmasi Anda."</string> <string name="permlab_brick" product="tablet" msgid="2961292205764488304">"noaktifkan tablet secara permanen"</string> <string name="permlab_brick" product="default" msgid="8337817093326370537">"nonaktifkan ponsel secara permanen"</string> <string name="permdesc_brick" product="tablet" msgid="4334818808001699530">"Mengizinkan apl menonaktifkan seluruh tablet secara permanen. Ini sangat berbahaya."</string> @@ -501,8 +501,8 @@ <string name="permlab_accessWimaxState" msgid="7436749103151096452">"Lihat sambungan WiMAX"</string> <string name="permdesc_accessWimaxState" msgid="6360102877261978887">"Memungkinkan aplikasi menentukan apakah WiMAX diaktifkan dan informasi tentang jaringan WiMAX apa saja yang tersambung."</string> <string name="permlab_changeWimaxState" msgid="2405042267131496579">"Ubah status WiMAX"</string> - <string name="permdesc_changeWimaxState" product="tablet" msgid="3156456504084201805">"Memungkinkan aplikasi menyambung tablet ke dan memutus tablet dari jaringan WiMAX."</string> - <string name="permdesc_changeWimaxState" product="default" msgid="697025043004923798">"Memungkinkan aplikasi menyambung ke dan memutus ponsel dari jaringan WiMAX."</string> + <string name="permdesc_changeWimaxState" product="tablet" msgid="3156456504084201805">"Memungkinkan aplikasi menyambungkan tablet ke dan memutus tablet dari jaringan WiMAX."</string> + <string name="permdesc_changeWimaxState" product="default" msgid="697025043004923798">"Memungkinkan aplikasi menyambungkan ponsel ke dan memutus ponsel dari jaringan WiMAX."</string> <string name="permlab_bluetooth" msgid="6127769336339276828">"sandingkan dengan perangkat Bluetooth"</string> <string name="permdesc_bluetooth" product="tablet" msgid="3480722181852438628">"Memungkinkan aplikasi melihat konfigurasi Bluetooth di tablet, dan membuat serta menerima sambungan dengan perangkat yang disandingkan."</string> <string name="permdesc_bluetooth" product="default" msgid="3207106324452312739">"Memungkinkan aplikasi melihat konfigurasi Bluetooth di ponsel, dan membuat serta menerima sambungan dengan perangkat yang disandingkan."</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 2e88f0ad0830..e5b9288057aa 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -204,9 +204,9 @@ <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"läsa SMS-meddelanden"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Appen tillåts läsa SMS som skickas till din enhet. På vissa platser skickas SMS för att varna för nödsituationer. Skadliga appar kan påverka enhetens prestanda eller funktionalitet när du får ett meddelande om en nödsituation via SMS."</string> <string name="permlab_sendSms" msgid="5600830612147671529">"skicka SMS"</string> - <string name="permdesc_sendSms" msgid="7094729298204937667">"Tillåter att appen skickar SMS. Detta kan leda till ovänta avgifter. Skadliga appar kan skicka meddelanden utan ditt godkännande vilket kan kosta pengar."</string> + <string name="permdesc_sendSms" msgid="7094729298204937667">"Tillåter att appen skickar SMS. Detta kan leda till oväntade avgifter. Skadliga appar kan skicka meddelanden utan ditt godkännande vilket kan kosta pengar."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"skicka SMS utan bekräftelse"</string> - <string name="permdesc_sendSmsNoConfirmation" msgid="402569800862935907">"Tillåter att appen skickar SMS. Detta kan leda till ovänta avgifter. Skadliga appar kan skicka meddelanden utan ditt godkännande vilket kan kosta pengar."</string> + <string name="permdesc_sendSmsNoConfirmation" msgid="402569800862935907">"Tillåter att appen skickar SMS. Detta kan leda till oväntade avgifter. Skadliga appar kan skicka meddelanden utan ditt godkännande vilket kan kosta pengar."</string> <string name="permlab_readSms" msgid="8745086572213270480">"läsa dina textmeddelanden (SMS eller MMS)"</string> <string name="permdesc_readSms" product="tablet" msgid="2467981548684735522">"Tillåter att appen läser SMS som sparats på pekdatorn eller på SIM-kortet. Med den här behörigheten tillåts appen att läsa alla SMS oavsett innehåll eller sekretess."</string> <string name="permdesc_readSms" product="default" msgid="3695967533457240550">"Tillåter att appen läser SMS som sparats på mobilen eller på SIM-kortet. Med den här behörigheten tillåts appen att läsa alla SMS oavsett innehåll eller sekretess."</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index b83cb7fbd586..f4c6a665c972 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -459,7 +459,7 @@ <string name="permdesc_setWallpaperHints" msgid="8235784384223730091">"Uygulamaya, sistem duvar kağıdı için boyut ipuçlarını ayarlama izni verir."</string> <string name="permlab_masterClear" msgid="2315750423139697397">"sistemi fabrika değerlerine sıfırla"</string> <string name="permdesc_masterClear" msgid="3665380492633910226">"Uygulamaya, tüm verileri, yapılandırmayı ve yüklü uygulamaları silerek sistemi tamamen fabrika ayarlarına sıfırlama izni verir."</string> - <string name="permlab_setTime" msgid="2021614829591775646">"saati ayarla"</string> + <string name="permlab_setTime" msgid="2021614829591775646">"saati ayarlayın"</string> <string name="permdesc_setTime" product="tablet" msgid="1896341438151152881">"Uygulamaya, tablet saatini değiştirme izni verir."</string> <string name="permdesc_setTime" product="default" msgid="1855702730738020">"Uygulamaya, telefon saatini değiştirme izni verir."</string> <string name="permlab_setTimeZone" msgid="2945079801013077340">"saat dilimini ayarla"</string> @@ -1040,8 +1040,8 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM kart eklendi"</string> <string name="sim_added_message" msgid="6599945301141050216">"Mobil ağa erişmek için cihazınızı yeniden başlatın."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Yeniden başlat"</string> - <string name="time_picker_dialog_title" msgid="8349362623068819295">"Saati ayarla"</string> - <string name="date_picker_dialog_title" msgid="5879450659453782278">"Tarihi ayarla"</string> + <string name="time_picker_dialog_title" msgid="8349362623068819295">"Saati ayarlayın"</string> + <string name="date_picker_dialog_title" msgid="5879450659453782278">"Tarihi ayarlayın"</string> <string name="date_time_set" msgid="5777075614321087758">"Ayarla"</string> <string name="date_time_done" msgid="2507683751759308828">"Tamamlandı"</string> <string name="default_permission_group" msgid="2690160991405646128">"Varsayılan"</string> diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp index a0bf8e3c1118..0d6e62ac3db9 100644 --- a/libs/hwui/FontRenderer.cpp +++ b/libs/hwui/FontRenderer.cpp @@ -598,6 +598,7 @@ void FontRenderer::allocateTextureMemory(CacheTexture* cacheTexture) { glGenTextures(1, &cacheTexture->mTextureId); } + Caches::getInstance().activeTexture(0); glBindTexture(GL_TEXTURE_2D, cacheTexture->mTextureId); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); // Initialize texture dimensions @@ -826,6 +827,7 @@ void FontRenderer::checkTextureUpdate() { } } + caches.activeTexture(0); glBindTexture(GL_TEXTURE_2D, mCurrentCacheTexture->mTextureId); if (mLinearFiltering != mCurrentCacheTexture->mLinearFiltering) { const GLenum filtering = mLinearFiltering ? GL_LINEAR : GL_NEAREST; diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 0d857bfff351..c92bead45586 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -2422,6 +2422,7 @@ status_t OpenGLRenderer::drawText(const char* text, int bytesCount, int count, linearFilter = fabs(y - (int) y) > 0.0f || fabs(x - (int) x) > 0.0f; } + // The font renderer will always use texture unit 0 mCaches.activeTexture(0); setupDraw(); setupDrawDirtyRegionsDisabled(); @@ -2432,6 +2433,8 @@ status_t OpenGLRenderer::drawText(const char* text, int bytesCount, int count, setupDrawBlending(true, mode); setupDrawProgram(); setupDrawModelView(x, y, x, y, pureTranslate, true); + // See comment above; the font renderer must use texture unit 0 + // assert(mTextureUnit == 0) setupDrawTexture(fontRenderer.getTexture(linearFilter)); setupDrawPureColorUniforms(); setupDrawColorFilterUniforms(); diff --git a/media/java/android/media/IAudioService.aidl b/media/java/android/media/IAudioService.aidl index 133f30be5254..70fc62346e09 100644 --- a/media/java/android/media/IAudioService.aidl +++ b/media/java/android/media/IAudioService.aidl @@ -97,7 +97,7 @@ interface IAudioService { boolean isBluetoothScoOn(); - oneway void setBluetoothA2dpOn(boolean on); + void setBluetoothA2dpOn(boolean on); boolean isBluetoothA2dpOn(); diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java index 7e4ca6a17363..38fe3631886d 100644 --- a/media/java/android/media/MediaRouter.java +++ b/media/java/android/media/MediaRouter.java @@ -21,37 +21,76 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.content.res.Resources; +import android.graphics.drawable.Drawable; import android.os.Handler; import android.util.Log; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; /** * MediaRouter allows applications to control the routing of media channels * and streams from the current device to external speakers and destination devices. * - * <p>Media routes should only be modified on your application's main thread.</p> + * <p>A MediaRouter is retrieved through {@link Context#getSystemService(String) + * Context.getSystemService()} of a {@link Context#MEDIA_ROUTER_SERVICE + * Context.MEDIA_ROUTER_SERVICE}. + * + * <p>The media router API is not thread-safe; all interactions with it must be + * done from the main thread of the process.</p> */ public class MediaRouter { private static final String TAG = "MediaRouter"; - private Context mAppContext; - private AudioManager mAudioManager; - private Handler mHandler; - private final ArrayList<CallbackInfo> mCallbacks = new ArrayList<CallbackInfo>(); + static class Static { + final Resources mResources; + final AudioManager mAudioManager; + final Handler mHandler; + final ArrayList<CallbackInfo> mCallbacks = new ArrayList<CallbackInfo>(); + + final ArrayList<RouteInfo> mRoutes = new ArrayList<RouteInfo>(); + final ArrayList<RouteCategory> mCategories = new ArrayList<RouteCategory>(); + + final RouteCategory mSystemCategory; + final HeadphoneChangedBroadcastReceiver mHeadphoneChangedReceiver; + + RouteInfo mDefaultAudio; + RouteInfo mBluetoothA2dpRoute; - private final ArrayList<RouteInfo> mRoutes = new ArrayList<RouteInfo>(); - private final ArrayList<RouteCategory> mCategories = new ArrayList<RouteCategory>(); + RouteInfo mSelectedRoute; - private final RouteCategory mSystemCategory; - private RouteInfo mDefaultAudio; - private RouteInfo mBluetoothA2dpRoute; + Static(Context appContext) { + mResources = Resources.getSystem(); + mHandler = new Handler(appContext.getMainLooper()); + + mAudioManager = (AudioManager)appContext.getSystemService(Context.AUDIO_SERVICE); + + // XXX this doesn't deal with locale changes! + mSystemCategory = new RouteCategory(mResources.getText( + com.android.internal.R.string.default_audio_route_category_name), + ROUTE_TYPE_LIVE_AUDIO, false); + + final IntentFilter speakerFilter = new IntentFilter(Intent.ACTION_HEADSET_PLUG); + speakerFilter.addAction(Intent.ACTION_ANALOG_AUDIO_DOCK_PLUG); + speakerFilter.addAction(Intent.ACTION_DIGITAL_AUDIO_DOCK_PLUG); + speakerFilter.addAction(Intent.ACTION_HDMI_AUDIO_PLUG); + mHeadphoneChangedReceiver = new HeadphoneChangedBroadcastReceiver(); + appContext.registerReceiver(mHeadphoneChangedReceiver, speakerFilter); + } - private RouteInfo mSelectedRoute; + // Called after sStatic is initialized + void initDefaultRoutes() { + mDefaultAudio = new RouteInfo(mSystemCategory); + mDefaultAudio.mName = mResources.getText( + com.android.internal.R.string.default_audio_route_name); + mDefaultAudio.mSupportedTypes = ROUTE_TYPE_LIVE_AUDIO; + addRoute(mDefaultAudio); + } + } - // These get removed when an activity dies - final ArrayList<BroadcastReceiver> mRegisteredReceivers = new ArrayList<BroadcastReceiver>(); + static Static sStatic; /** * Route type flag for live audio. @@ -78,25 +117,6 @@ public class MediaRouter { // Maps application contexts static final HashMap<Context, MediaRouter> sRouters = new HashMap<Context, MediaRouter>(); - /** - * Return a MediaRouter for the application that the specified Context belongs to. - * The behavior or availability of media routing may depend on - * various parameters of the context. - * - * @param context Context for the desired router - * @return Router for the supplied Context - */ - public static MediaRouter forApplication(Context context) { - final Context appContext = context.getApplicationContext(); - if (!sRouters.containsKey(appContext)) { - final MediaRouter r = new MediaRouter(appContext); - sRouters.put(appContext, r); - return r; - } else { - return sRouters.get(appContext); - } - } - static String typesToString(int types) { final StringBuilder result = new StringBuilder(); if ((types & ROUTE_TYPE_LIVE_AUDIO) != 0) { @@ -108,63 +128,21 @@ public class MediaRouter { return result.toString(); } - private MediaRouter(Context context) { - mAppContext = context; - mHandler = new Handler(mAppContext.getMainLooper()); - - mAudioManager = (AudioManager) mAppContext.getSystemService(Context.AUDIO_SERVICE); - - mSystemCategory = new RouteCategory(mAppContext.getText( - com.android.internal.R.string.default_audio_route_category_name), - ROUTE_TYPE_LIVE_AUDIO, false); - - registerReceivers(); - - createDefaultRoutes(); - } - - private void registerReceivers() { - final BroadcastReceiver volumeReceiver = new VolumeChangedBroadcastReceiver(); - mAppContext.registerReceiver(volumeReceiver, - new IntentFilter(AudioManager.VOLUME_CHANGED_ACTION)); - mRegisteredReceivers.add(volumeReceiver); - - final IntentFilter speakerFilter = new IntentFilter(Intent.ACTION_HEADSET_PLUG); - speakerFilter.addAction(Intent.ACTION_ANALOG_AUDIO_DOCK_PLUG); - speakerFilter.addAction(Intent.ACTION_DIGITAL_AUDIO_DOCK_PLUG); - speakerFilter.addAction(Intent.ACTION_HDMI_AUDIO_PLUG); - final BroadcastReceiver plugReceiver = new HeadphoneChangedBroadcastReceiver(); - mAppContext.registerReceiver(plugReceiver, speakerFilter); - mRegisteredReceivers.add(plugReceiver); - } - - void unregisterReceivers() { - final int count = mRegisteredReceivers.size(); - for (int i = 0; i < count; i++) { - final BroadcastReceiver r = mRegisteredReceivers.get(i); - mAppContext.unregisterReceiver(r); - } - mRegisteredReceivers.clear(); - } - - private void createDefaultRoutes() { - mDefaultAudio = new RouteInfo(mSystemCategory); - mDefaultAudio.mName = mAppContext.getText( - com.android.internal.R.string.default_audio_route_name); - mDefaultAudio.mSupportedTypes = ROUTE_TYPE_LIVE_AUDIO; - final int maxMusicVolume = mAudioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC); - if (maxMusicVolume > 0) { - mDefaultAudio.mVolume = - mAudioManager.getStreamVolume(AudioManager.STREAM_MUSIC) / maxMusicVolume; + /** @hide */ + public MediaRouter(Context context) { + synchronized (Static.class) { + if (sStatic == null) { + sStatic = new Static(context.getApplicationContext()); + sStatic.initDefaultRoutes(); + } } - addRoute(mDefaultAudio); } /** * @hide for use by framework routing UI */ public RouteInfo getSystemAudioRoute() { - return mDefaultAudio; + return sStatic.mDefaultAudio; } /** @@ -174,30 +152,15 @@ public class MediaRouter { * @return the selected route */ public RouteInfo getSelectedRoute(int type) { - return mSelectedRoute; - } - - void onHeadphonesPlugged(boolean headphonesPresent, String headphonesName) { - mDefaultAudio.mName = headphonesPresent ? headphonesName : mAppContext.getText( - com.android.internal.R.string.default_audio_route_name); - dispatchRouteChanged(mDefaultAudio); + return sStatic.mSelectedRoute; } - /** - * Set volume for the specified selected route types. - * - * @param types Volume will be set for these route types - * @param volume Volume to set in the range 0.f (inaudible) to 1.f (full volume). - */ - public void setSelectedRouteVolume(int types, float volume) { - if ((types & ROUTE_TYPE_LIVE_AUDIO) != 0 && mSelectedRoute == mDefaultAudio) { - final int index = mAudioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC); - mAudioManager.setStreamVolume(AudioManager.STREAM_MUSIC, index, 0); - } - if ((types & ROUTE_TYPE_USER) != 0 && mSelectedRoute instanceof UserRouteInfo) { - mSelectedRoute.mVolume = volume; - dispatchVolumeChanged(ROUTE_TYPE_USER, volume); - } + static void onHeadphonesPlugged(boolean headphonesPresent, String headphonesName) { + sStatic.mDefaultAudio.mName = headphonesPresent + ? headphonesName + : sStatic.mResources.getText( + com.android.internal.R.string.default_audio_route_name); + dispatchRouteChanged(sStatic.mDefaultAudio); } /** @@ -209,15 +172,15 @@ public class MediaRouter { * @param cb Callback to add */ public void addCallback(int types, Callback cb) { - final int count = mCallbacks.size(); + final int count = sStatic.mCallbacks.size(); for (int i = 0; i < count; i++) { - final CallbackInfo info = mCallbacks.get(i); + final CallbackInfo info = sStatic.mCallbacks.get(i); if (info.cb == cb) { info.type &= types; return; } } - mCallbacks.add(new CallbackInfo(cb, types)); + sStatic.mCallbacks.add(new CallbackInfo(cb, types, this)); } /** @@ -226,24 +189,36 @@ public class MediaRouter { * @param cb Callback to remove */ public void removeCallback(Callback cb) { - final int count = mCallbacks.size(); + final int count = sStatic.mCallbacks.size(); for (int i = 0; i < count; i++) { - if (mCallbacks.get(i).cb == cb) { - mCallbacks.remove(i); + if (sStatic.mCallbacks.get(i).cb == cb) { + sStatic.mCallbacks.remove(i); return; } } Log.w(TAG, "removeCallback(" + cb + "): callback not registered"); } + /** + * Select the specified route to use for output of the given media types. + * + * @param types type flags indicating which types this route should be used for. + * The route must support at least a subset. + * @param route Route to select + */ public void selectRoute(int types, RouteInfo route) { - if (mSelectedRoute == route) return; + selectRouteStatic(types, route); + } + + static void selectRouteStatic(int types, RouteInfo route) { + if (sStatic.mSelectedRoute == route) return; - if (mSelectedRoute != null) { + if (sStatic.mSelectedRoute != null) { // TODO filter types properly - dispatchRouteUnselected(types & mSelectedRoute.getSupportedTypes(), mSelectedRoute); + dispatchRouteUnselected(types & sStatic.mSelectedRoute.getSupportedTypes(), + sStatic.mSelectedRoute); } - mSelectedRoute = route; + sStatic.mSelectedRoute = route; if (route != null) { // TODO filter types properly dispatchRouteSelected(types & route.getSupportedTypes(), route); @@ -262,22 +237,30 @@ public class MediaRouter { addRoute(info); } - void addRoute(RouteInfo info) { + static void addRoute(RouteInfo info) { final RouteCategory cat = info.getCategory(); - if (!mCategories.contains(cat)) { - mCategories.add(cat); + if (!sStatic.mCategories.contains(cat)) { + sStatic.mCategories.add(cat); } - if (info.getCategory().isGroupable() && !(info instanceof RouteGroup)) { + final boolean onlyRoute = sStatic.mRoutes.isEmpty(); + if (cat.isGroupable() && !(info instanceof RouteGroup)) { // Enforce that any added route in a groupable category must be in a group. final RouteGroup group = new RouteGroup(info.getCategory()); + sStatic.mRoutes.add(group); + dispatchRouteAdded(group); + + final int at = group.getRouteCount(); group.addRoute(info); + dispatchRouteGrouped(info, group, at); + info = group; + } else { + sStatic.mRoutes.add(info); + dispatchRouteAdded(info); } - final boolean onlyRoute = mRoutes.isEmpty(); - mRoutes.add(info); - dispatchRouteAdded(info); + if (onlyRoute) { - selectRoute(info.getSupportedTypes(), info); + selectRouteStatic(info.getSupportedTypes(), info); } } @@ -297,8 +280,8 @@ public class MediaRouter { * @see #removeUserRoute(UserRouteInfo) */ public void clearUserRoutes() { - for (int i = 0; i < mRoutes.size(); i++) { - final RouteInfo info = mRoutes.get(i); + for (int i = 0; i < sStatic.mRoutes.size(); i++) { + final RouteInfo info = sStatic.mRoutes.get(i); if (info instanceof UserRouteInfo) { removeRouteAt(i); i--; @@ -306,40 +289,40 @@ public class MediaRouter { } } - void removeRoute(RouteInfo info) { - if (mRoutes.remove(info)) { + static void removeRoute(RouteInfo info) { + if (sStatic.mRoutes.remove(info)) { final RouteCategory removingCat = info.getCategory(); - final int count = mRoutes.size(); + final int count = sStatic.mRoutes.size(); boolean found = false; for (int i = 0; i < count; i++) { - final RouteCategory cat = mRoutes.get(i).getCategory(); + final RouteCategory cat = sStatic.mRoutes.get(i).getCategory(); if (removingCat == cat) { found = true; break; } } if (!found) { - mCategories.remove(removingCat); + sStatic.mCategories.remove(removingCat); } dispatchRouteRemoved(info); } } void removeRouteAt(int routeIndex) { - if (routeIndex >= 0 && routeIndex < mRoutes.size()) { - final RouteInfo info = mRoutes.remove(routeIndex); + if (routeIndex >= 0 && routeIndex < sStatic.mRoutes.size()) { + final RouteInfo info = sStatic.mRoutes.remove(routeIndex); final RouteCategory removingCat = info.getCategory(); - final int count = mRoutes.size(); + final int count = sStatic.mRoutes.size(); boolean found = false; for (int i = 0; i < count; i++) { - final RouteCategory cat = mRoutes.get(i).getCategory(); + final RouteCategory cat = sStatic.mRoutes.get(i).getCategory(); if (removingCat == cat) { found = true; break; } } if (!found) { - mCategories.remove(removingCat); + sStatic.mCategories.remove(removingCat); } dispatchRouteRemoved(info); } @@ -352,7 +335,7 @@ public class MediaRouter { * @return the number of unique categories represented by this MediaRouter's known routes */ public int getCategoryCount() { - return mCategories.size(); + return sStatic.mCategories.size(); } /** @@ -363,7 +346,7 @@ public class MediaRouter { * @return the category at index */ public RouteCategory getCategoryAt(int index) { - return mCategories.get(index); + return sStatic.mCategories.get(index); } /** @@ -373,7 +356,7 @@ public class MediaRouter { * @return the number of routes tracked by this router */ public int getRouteCount() { - return mRoutes.size(); + return sStatic.mRoutes.size(); } /** @@ -383,7 +366,15 @@ public class MediaRouter { * @return the route at index */ public RouteInfo getRouteAt(int index) { - return mRoutes.get(index); + return sStatic.mRoutes.get(index); + } + + static int getRouteCountStatic() { + return sStatic.mRoutes.size(); + } + + static RouteInfo getRouteAtStatic(int index) { + return sStatic.mRoutes.get(index); } /** @@ -411,96 +402,105 @@ public class MediaRouter { return new RouteCategory(name, ROUTE_TYPE_USER, isGroupable); } - void updateRoute(final RouteInfo info) { + static void updateRoute(final RouteInfo info) { dispatchRouteChanged(info); } - void dispatchRouteSelected(int type, RouteInfo info) { - final int count = mCallbacks.size(); + static void dispatchRouteSelected(int type, RouteInfo info) { + final int count = sStatic.mCallbacks.size(); for (int i = 0; i < count; i++) { - final CallbackInfo cbi = mCallbacks.get(i); + final CallbackInfo cbi = sStatic.mCallbacks.get(i); if ((cbi.type & type) != 0) { - cbi.cb.onRouteSelected(type, info); + cbi.cb.onRouteSelected(cbi.router, type, info); } } } - void dispatchRouteUnselected(int type, RouteInfo info) { - final int count = mCallbacks.size(); + static void dispatchRouteUnselected(int type, RouteInfo info) { + final int count = sStatic.mCallbacks.size(); for (int i = 0; i < count; i++) { - final CallbackInfo cbi = mCallbacks.get(i); + final CallbackInfo cbi = sStatic.mCallbacks.get(i); if ((cbi.type & type) != 0) { - cbi.cb.onRouteUnselected(type, info); + cbi.cb.onRouteUnselected(cbi.router, type, info); } } } - void dispatchRouteChanged(RouteInfo info) { - final int count = mCallbacks.size(); + static void dispatchRouteChanged(RouteInfo info) { + final int count = sStatic.mCallbacks.size(); for (int i = 0; i < count; i++) { - final CallbackInfo cbi = mCallbacks.get(i); + final CallbackInfo cbi = sStatic.mCallbacks.get(i); if ((cbi.type & info.mSupportedTypes) != 0) { - cbi.cb.onRouteChanged(info); + cbi.cb.onRouteChanged(cbi.router, info); } } } - void dispatchRouteAdded(RouteInfo info) { - final int count = mCallbacks.size(); + static void dispatchRouteAdded(RouteInfo info) { + final int count = sStatic.mCallbacks.size(); for (int i = 0; i < count; i++) { - final CallbackInfo cbi = mCallbacks.get(i); + final CallbackInfo cbi = sStatic.mCallbacks.get(i); if ((cbi.type & info.mSupportedTypes) != 0) { - cbi.cb.onRouteAdded(info.mSupportedTypes, info); + cbi.cb.onRouteAdded(cbi.router, info); } } } - void dispatchRouteRemoved(RouteInfo info) { - final int count = mCallbacks.size(); + static void dispatchRouteRemoved(RouteInfo info) { + final int count = sStatic.mCallbacks.size(); for (int i = 0; i < count; i++) { - final CallbackInfo cbi = mCallbacks.get(i); + final CallbackInfo cbi = sStatic.mCallbacks.get(i); if ((cbi.type & info.mSupportedTypes) != 0) { - cbi.cb.onRouteRemoved(info.mSupportedTypes, info); + cbi.cb.onRouteRemoved(cbi.router, info); } } } - void dispatchVolumeChanged(int type, float volume) { - final int count = mCallbacks.size(); + static void dispatchRouteGrouped(RouteInfo info, RouteGroup group, int index) { + final int count = sStatic.mCallbacks.size(); for (int i = 0; i < count; i++) { - final CallbackInfo cbi = mCallbacks.get(i); - if ((cbi.type & type) != 0) { - cbi.cb.onVolumeChanged(type, volume); + final CallbackInfo cbi = sStatic.mCallbacks.get(i); + if ((cbi.type & group.mSupportedTypes) != 0) { + cbi.cb.onRouteGrouped(cbi.router, info, group, index); } } } - void onA2dpDeviceConnected() { - final RouteInfo info = new RouteInfo(mSystemCategory); + static void dispatchRouteUngrouped(RouteInfo info, RouteGroup group) { + final int count = sStatic.mCallbacks.size(); + for (int i = 0; i < count; i++) { + final CallbackInfo cbi = sStatic.mCallbacks.get(i); + if ((cbi.type & group.mSupportedTypes) != 0) { + cbi.cb.onRouteUngrouped(cbi.router, info, group); + } + } + } + + static void onA2dpDeviceConnected() { + final RouteInfo info = new RouteInfo(sStatic.mSystemCategory); info.mName = "Bluetooth"; // TODO Fetch the real name of the device - mBluetoothA2dpRoute = info; - addRoute(mBluetoothA2dpRoute); + sStatic.mBluetoothA2dpRoute = info; + addRoute(sStatic.mBluetoothA2dpRoute); } - void onA2dpDeviceDisconnected() { - removeRoute(mBluetoothA2dpRoute); - mBluetoothA2dpRoute = null; + static void onA2dpDeviceDisconnected() { + removeRoute(sStatic.mBluetoothA2dpRoute); + sStatic.mBluetoothA2dpRoute = null; } /** * Information about a media route. */ - public class RouteInfo { + public static class RouteInfo { CharSequence mName; private CharSequence mStatus; int mSupportedTypes; RouteGroup mGroup; final RouteCategory mCategory; - float mVolume; + Drawable mIcon; RouteInfo(RouteCategory category) { mCategory = category; - category.mRoutes.add(this); } /** @@ -541,10 +541,13 @@ public class MediaRouter { } /** - * @return This route's current volume setting. + * Get the icon representing this route. + * This icon will be used in picker UIs if available. + * + * @return the icon representing this route or null if no icon is available */ - public float getVolume() { - return mVolume; + public Drawable getIconDrawable() { + return mIcon; } void setStatusInt(CharSequence status) { @@ -576,7 +579,8 @@ public class MediaRouter { * * @see MediaRouter.RouteInfo */ - public class UserRouteInfo extends RouteInfo { + public static class UserRouteInfo extends RouteInfo { + RemoteControlClient mRcc; UserRouteInfo(RouteCategory category) { super(category); @@ -600,12 +604,46 @@ public class MediaRouter { public void setStatus(CharSequence status) { setStatusInt(status); } + + /** + * Set the RemoteControlClient responsible for reporting playback info for this + * user route. + * + * <p>If this route manages remote playback, the data exposed by this + * RemoteControlClient will be used to reflect and update information + * such as route volume info in related UIs.</p> + * + * @param rcc RemoteControlClient associated with this route + */ + public void setRemoteControlClient(RemoteControlClient rcc) { + mRcc = rcc; + } + + /** + * Set an icon that will be used to represent this route. + * The system may use this icon in picker UIs or similar. + * + * @param icon icon drawable to use to represent this route + */ + public void setIconDrawable(Drawable icon) { + mIcon = icon; + } + + /** + * Set an icon that will be used to represent this route. + * The system may use this icon in picker UIs or similar. + * + * @param resId Resource ID of an icon drawable to use to represent this route + */ + public void setIconResource(int resId) { + setIconDrawable(sStatic.mResources.getDrawable(resId)); + } } /** * Information about a route that consists of multiple other routes in a group. */ - public class RouteGroup extends RouteInfo { + public static class RouteGroup extends RouteInfo { final ArrayList<RouteInfo> mRoutes = new ArrayList<RouteInfo>(); private boolean mUpdateName; @@ -634,8 +672,10 @@ public class MediaRouter { "(Route category=" + route.getCategory() + " group category=" + mCategory + ")"); } + final int at = mRoutes.size(); mRoutes.add(route); mUpdateName = true; + dispatchRouteGrouped(route, this, at); routeUpdated(); } @@ -657,6 +697,7 @@ public class MediaRouter { } mRoutes.add(insertAt, route); mUpdateName = true; + dispatchRouteGrouped(route, this, insertAt); routeUpdated(); } @@ -672,6 +713,7 @@ public class MediaRouter { } mRoutes.remove(route); mUpdateName = true; + dispatchRouteUngrouped(route, this); routeUpdated(); } @@ -681,11 +723,49 @@ public class MediaRouter { * @param index index of the route to remove */ public void removeRoute(int index) { - mRoutes.remove(index); + RouteInfo route = mRoutes.remove(index); mUpdateName = true; + dispatchRouteUngrouped(route, this); routeUpdated(); } + /** + * @return The number of routes in this group + */ + public int getRouteCount() { + return mRoutes.size(); + } + + /** + * Return the route in this group at the specified index + * + * @param index Index to fetch + * @return The route at index + */ + public RouteInfo getRouteAt(int index) { + return mRoutes.get(index); + } + + /** + * Set an icon that will be used to represent this group. + * The system may use this icon in picker UIs or similar. + * + * @param icon icon drawable to use to represent this group + */ + public void setIconDrawable(Drawable icon) { + mIcon = icon; + } + + /** + * Set an icon that will be used to represent this group. + * The system may use this icon in picker UIs or similar. + * + * @param resId Resource ID of an icon drawable to use to represent this group + */ + public void setIconResource(int resId) { + setIconDrawable(sStatic.mResources.getDrawable(resId)); + } + void memberNameChanged(RouteInfo info, CharSequence name) { mUpdateName = true; routeUpdated(); @@ -711,8 +791,7 @@ public class MediaRouter { /** * Definition of a category of routes. All routes belong to a category. */ - public class RouteCategory { - final ArrayList<RouteInfo> mRoutes = new ArrayList<RouteInfo>(); + public static class RouteCategory { CharSequence mName; int mTypes; final boolean mGroupable; @@ -731,20 +810,33 @@ public class MediaRouter { } /** - * @return the number of routes in this category - */ - public int getRouteCount() { - return mRoutes.size(); - } - - /** - * Return a route from this category + * Return the current list of routes in this category that have been added + * to the MediaRouter. + * + * <p>This list will not include routes that are nested within RouteGroups. + * A RouteGroup is treated as a single route within its category.</p> * - * @param index Index from [0-getRouteCount) - * @return the route at the given index + * @param out a List to fill with the routes in this category. If this parameter is + * non-null, it will be cleared, filled with the current routes with this + * category, and returned. If this parameter is null, a new List will be + * allocated to report the category's current routes. + * @return A list with the routes in this category that have been added to the MediaRouter. */ - public RouteInfo getRouteAt(int index) { - return mRoutes.get(index); + public List<RouteInfo> getRoutes(List<RouteInfo> out) { + if (out == null) { + out = new ArrayList<RouteInfo>(); + } else { + out.clear(); + } + + final int count = getRouteCountStatic(); + for (int i = 0; i < count; i++) { + final RouteInfo route = getRouteAtStatic(i); + if (route.mCategory == this) { + out.add(route); + } + } + return out; } /** @@ -758,7 +850,7 @@ public class MediaRouter { * Return whether or not this category supports grouping. * * <p>If this method returns true, all routes obtained from this category - * via calls to {@link #getRouteAt(int)} will be {@link MediaRouter.RouteGroup}s. + * via calls to {@link #getRouteAt(int)} will be {@link MediaRouter.RouteGroup}s.</p> * * @return true if this category supports */ @@ -768,17 +860,19 @@ public class MediaRouter { public String toString() { return "RouteCategory{ name=" + mName + " types=" + typesToString(mTypes) + - " groupable=" + mGroupable + " routes=" + mRoutes.size() + " }"; + " groupable=" + mGroupable + " routes=" + sStatic.mRoutes.size() + " }"; } } static class CallbackInfo { public int type; - public Callback cb; + public final Callback cb; + public final MediaRouter router; - public CallbackInfo(Callback cb, int type) { + public CallbackInfo(Callback cb, int type, MediaRouter router) { this.cb = cb; this.type = type; + this.router = router; } } @@ -797,43 +891,37 @@ public class MediaRouter { * Called when the supplied route becomes selected as the active route * for the given route type. * + * @param router the MediaRouter reporting the event * @param type Type flag set indicating the routes that have been selected * @param info Route that has been selected for the given route types */ - public void onRouteSelected(int type, RouteInfo info); + public void onRouteSelected(MediaRouter router, int type, RouteInfo info); /** * Called when the supplied route becomes unselected as the active route * for the given route type. * + * @param router the MediaRouter reporting the event * @param type Type flag set indicating the routes that have been unselected * @param info Route that has been unselected for the given route types */ - public void onRouteUnselected(int type, RouteInfo info); - - /** - * Called when the volume is changed for the specified route types. - * - * @param type Type flags indicating which volume type was changed - * @param volume New volume value in the range 0 (inaudible) to 1 (full) - */ - public void onVolumeChanged(int type, float volume); + public void onRouteUnselected(MediaRouter router, int type, RouteInfo info); /** * Called when a route for the specified type was added. * - * @param type Type flags indicating which types the added route supports + * @param router the MediaRouter reporting the event * @param info Route that has become available for use */ - public void onRouteAdded(int type, RouteInfo info); + public void onRouteAdded(MediaRouter router, RouteInfo info); /** * Called when a route for the specified type was removed. * - * @param type Type flags indicating which types the removed route supported + * @param router the MediaRouter reporting the event * @param info Route that has been removed from availability */ - public void onRouteRemoved(int type, RouteInfo info); + public void onRouteRemoved(MediaRouter router, RouteInfo info); /** * Called when an aspect of the indicated route has changed. @@ -841,9 +929,29 @@ public class MediaRouter { * <p>This will not indicate that the types supported by this route have * changed, only that cosmetic info such as name or status have been updated.</p> * + * @param router the MediaRouter reporting the event * @param info The route that was changed */ - public void onRouteChanged(RouteInfo info); + public void onRouteChanged(MediaRouter router, RouteInfo info); + + /** + * Called when a route is added to a group. + * + * @param router the MediaRouter reporting the event + * @param info The route that was added + * @param group The group the route was added to + * @param index The route index within group that info was added at + */ + public void onRouteGrouped(MediaRouter router, RouteInfo info, RouteGroup group, int index); + + /** + * Called when a route is removed from a group. + * + * @param router the MediaRouter reporting the event + * @param info The route that was removed + * @param group The group the route was removed from + */ + public void onRouteUngrouped(MediaRouter router, RouteInfo info, RouteGroup group); } /** @@ -854,51 +962,34 @@ public class MediaRouter { public static class SimpleCallback implements Callback { @Override - public void onRouteSelected(int type, RouteInfo info) { - + public void onRouteSelected(MediaRouter router, int type, RouteInfo info) { } @Override - public void onRouteUnselected(int type, RouteInfo info) { - + public void onRouteUnselected(MediaRouter router, int type, RouteInfo info) { } @Override - public void onVolumeChanged(int type, float volume) { - + public void onRouteAdded(MediaRouter router, RouteInfo info) { } @Override - public void onRouteAdded(int type, RouteInfo info) { - + public void onRouteRemoved(MediaRouter router, RouteInfo info) { } @Override - public void onRouteRemoved(int type, RouteInfo info) { - + public void onRouteChanged(MediaRouter router, RouteInfo info) { } @Override - public void onRouteChanged(RouteInfo info) { - + public void onRouteGrouped(MediaRouter router, RouteInfo info, RouteGroup group, + int index) { } - } - - class VolumeChangedBroadcastReceiver extends BroadcastReceiver { @Override - public void onReceive(Context context, Intent intent) { - final String action = intent.getAction(); - if (AudioManager.VOLUME_CHANGED_ACTION.equals(action) && - AudioManager.STREAM_MUSIC == intent.getIntExtra( - AudioManager.EXTRA_VOLUME_STREAM_TYPE, -1)) { - final int maxVol = mAudioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC); - final int volExtra = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_VALUE, 0); - final float volume = (float) volExtra / maxVol; - mDefaultAudio.mVolume = volume; - dispatchVolumeChanged(ROUTE_TYPE_LIVE_AUDIO, volume); - } + public void onRouteUngrouped(MediaRouter router, RouteInfo info, RouteGroup group) { } + } class BtChangedBroadcastReceiver extends BroadcastReceiver { @@ -917,24 +1008,24 @@ public class MediaRouter { } } - class HeadphoneChangedBroadcastReceiver extends BroadcastReceiver { + static class HeadphoneChangedBroadcastReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { final String action = intent.getAction(); if (Intent.ACTION_HEADSET_PLUG.equals(action)) { final boolean plugged = intent.getIntExtra("state", 0) != 0; - final String name = mAppContext.getString( + final String name = sStatic.mResources.getString( com.android.internal.R.string.default_audio_route_name_headphones); onHeadphonesPlugged(plugged, name); } else if (Intent.ACTION_ANALOG_AUDIO_DOCK_PLUG.equals(action) || Intent.ACTION_DIGITAL_AUDIO_DOCK_PLUG.equals(action)) { final boolean plugged = intent.getIntExtra("state", 0) != 0; - final String name = mAppContext.getString( + final String name = sStatic.mResources.getString( com.android.internal.R.string.default_audio_route_name_dock_speakers); onHeadphonesPlugged(plugged, name); } else if (Intent.ACTION_HDMI_AUDIO_PLUG.equals(action)) { final boolean plugged = intent.getIntExtra("state", 0) != 0; - final String name = mAppContext.getString( + final String name = sStatic.mResources.getString( com.android.internal.R.string.default_audio_route_name_hdmi); onHeadphonesPlugged(plugged, name); } diff --git a/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml b/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml index 8a211172ddea..00e3e27ccb8e 100644 --- a/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml +++ b/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml @@ -26,7 +26,11 @@ android:layout_width="match_parent" systemui:recentItemLayout="@layout/status_bar_recent_item" > - + <View + android:id="@+id/recents_transition_background" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:visibility="invisible" /> <FrameLayout android:id="@+id/recents_bg_protect" android:background="@drawable/status_bar_recents_background" diff --git a/packages/SystemUI/res/layout-port/status_bar_recent_panel.xml b/packages/SystemUI/res/layout-port/status_bar_recent_panel.xml index 1d29c5a41fdf..a7e5db19ef51 100644 --- a/packages/SystemUI/res/layout-port/status_bar_recent_panel.xml +++ b/packages/SystemUI/res/layout-port/status_bar_recent_panel.xml @@ -26,7 +26,11 @@ android:layout_width="match_parent" systemui:recentItemLayout="@layout/status_bar_recent_item" > - + <View + android:id="@+id/recents_transition_background" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:visibility="invisible" /> <FrameLayout android:id="@+id/recents_bg_protect" android:background="@drawable/status_bar_recents_background" diff --git a/packages/SystemUI/res/layout/system_bar_recent_panel.xml b/packages/SystemUI/res/layout/system_bar_recent_panel.xml index d5745c835831..127551d09f6b 100644 --- a/packages/SystemUI/res/layout/system_bar_recent_panel.xml +++ b/packages/SystemUI/res/layout/system_bar_recent_panel.xml @@ -28,7 +28,11 @@ android:clipChildren="false" systemui:recentItemLayout="@layout/system_bar_recent_item" > - + <View + android:id="@+id/recents_transition_background" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:visibility="invisible" /> <FrameLayout android:id="@+id/recents_bg_protect" android:background="@drawable/recents_bg_protect_tile" @@ -38,7 +42,6 @@ android:layout_marginBottom="@*android:dimen/system_bar_height" android:clipToPadding="false" android:clipChildren="false"> - <ImageView android:id="@+id/recents_transition_placeholder_icon" android:layout_width="wrap_content" diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 3ed63edf5819..f40ffd4e23ed 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -87,6 +87,8 @@ <dimen name="fling_collapse_min_velocity">200dp</dimen> <!-- Cap on contribution of x dimension of gesture to overall velocity --> <dimen name="fling_gesture_max_x_velocity">200dp</dimen> + <!-- Cap on overall resulting fling speed (s^-1) --> + <dimen name="fling_gesture_max_output_velocity">3000dp</dimen> <!-- Minimum fraction of the display a gesture must travel, at any velocity, to qualify as a collapse request --> diff --git a/packages/SystemUI/src/com/android/systemui/recent/Choreographer.java b/packages/SystemUI/src/com/android/systemui/recent/Choreographer.java index ccdf038b1d3e..296b64030f19 100644 --- a/packages/SystemUI/src/com/android/systemui/recent/Choreographer.java +++ b/packages/SystemUI/src/com/android/systemui/recent/Choreographer.java @@ -20,15 +20,19 @@ import android.animation.Animator; import android.animation.AnimatorSet; import android.animation.AnimatorSet.Builder; import android.animation.ObjectAnimator; +import android.content.res.Resources; +import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.util.Slog; import android.view.View; import android.view.ViewRootImpl; +import com.android.systemui.R; + /* package */ class Choreographer implements Animator.AnimatorListener { // should group this into a multi-property animation private static final int OPEN_DURATION = 136; - private static final int CLOSE_DURATION = 130; + private static final int CLOSE_DURATION = 230; private static final int SCRIM_DURATION = 400; private static final String TAG = RecentsPanelView.TAG; private static final boolean DEBUG = RecentsPanelView.DEBUG; @@ -81,7 +85,7 @@ import android.view.ViewRootImpl; mContentView.getAlpha(), appearing ? 1.0f : 0.0f); fadeAnim.setInterpolator(appearing ? new android.view.animation.AccelerateInterpolator(1.0f) - : new android.view.animation.DecelerateInterpolator(1.0f)); + : new android.view.animation.AccelerateInterpolator(2.5f)); fadeAnim.setDuration(appearing ? OPEN_DURATION : CLOSE_DURATION); Animator noRecentAppsFadeAnim = null; @@ -110,6 +114,20 @@ import android.view.ViewRootImpl; bgAnim.setDuration(appearing ? SCRIM_DURATION : CLOSE_DURATION); builder.with(bgAnim); } + } else { + final Resources res = mRootView.getResources(); + boolean isTablet = res.getBoolean(R.bool.config_recents_interface_for_tablets); + if (!isTablet) { + View recentsTransitionBackground = + mRootView.findViewById(R.id.recents_transition_background); + recentsTransitionBackground.setVisibility(View.VISIBLE); + Drawable bgDrawable = new ColorDrawable(0xFF000000); + recentsTransitionBackground.setBackground(bgDrawable); + Animator bgAnim = ObjectAnimator.ofInt(bgDrawable, "alpha", 0, 255); + bgAnim.setDuration(CLOSE_DURATION); + bgAnim.setInterpolator(new android.view.animation.AccelerateInterpolator(1f)); + builder.with(bgAnim); + } } mContentAnim.addListener(this); if (mListener != null) { @@ -139,6 +157,10 @@ import android.view.ViewRootImpl; if (mScrimView.getBackground() != null) { mScrimView.getBackground().setAlpha(appearing ? 255 : 0); } + View recentsTransitionBackground = + mRootView.findViewById(R.id.recents_transition_background); + recentsTransitionBackground.setVisibility(View.INVISIBLE); + mRootView.requestLayout(); } public void setPanelHeight(int h) { diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java index 34cd3977dc0f..bec9aa200a9f 100644 --- a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java @@ -34,11 +34,13 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.RemoteException; +import android.os.ServiceManager; import android.provider.Settings; import android.util.AttributeSet; import android.util.Log; import android.view.Display; import android.view.KeyEvent; +import android.view.IWindowManager; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.MotionEvent; @@ -86,7 +88,8 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener OnRecentsPanelVisibilityChangedListener mVisibilityChangedListener; ImageView mPlaceholderThumbnail; - boolean mHideWindowAfterPlaceholderThumbnailIsHidden; + View mTransitionBg; + boolean mHideRecentsAfterThumbnailScaleUpStarted; private RecentTasksLoader mRecentTasksLoader; private ArrayList<TaskDescription> mRecentTaskDescriptions; @@ -97,6 +100,7 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener private boolean mFitThumbnailToXY; private int mRecentItemLayoutId; private boolean mFirstScreenful = true; + private boolean mHighEndGfx; public static interface OnRecentsPanelVisibilityChangedListener { public void onRecentsPanelVisibilityChanged(boolean visible); @@ -248,7 +252,7 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener @Override public boolean onKeyUp(int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_BACK && !event.isCanceled()) { - show(false, true); + show(false, false); return true; } return super.onKeyUp(keyCode, event); @@ -305,10 +309,6 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener ArrayList<TaskDescription> recentTaskDescriptions, boolean firstScreenful) { sendCloseSystemWindows(mContext, BaseStatusBar.SYSTEM_DIALOG_REASON_RECENT_APPS); - // For now, disable animations. We may want to re-enable in the future - if (show) { - animate = false; - } if (show) { // Need to update list of recent apps before we set visibility so this view's // content description is updated before it gets focus for TalkBack mode @@ -318,6 +318,7 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener // quit early boolean noApps = !mFirstScreenful && (mRecentTaskDescriptions.size() == 0); if (mRecentsNoApps != null) { + mRecentsNoApps.setAlpha(1f); mRecentsNoApps.setVisibility(noApps ? View.VISIBLE : View.INVISIBLE); } else { if (noApps) { @@ -339,7 +340,6 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener mRecentTasksDirty = true; mWaitingToShow = false; mReadyToShow = false; - mRecentsNoApps.setVisibility(View.INVISIBLE); } if (animate) { if (mShowing != show) { @@ -488,7 +488,8 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener if (mRecentsScrim != null) { Display d = ((WindowManager)mContext.getSystemService(Context.WINDOW_SERVICE)) .getDefaultDisplay(); - if (!ActivityManager.isHighEndGfx(d)) { + mHighEndGfx = ActivityManager.isHighEndGfx(d); + if (!mHighEndGfx) { mRecentsScrim.setBackground(null); } else if (mRecentsScrim.getBackground() instanceof BitmapDrawable) { // In order to save space, we make the background texture repeat in the Y direction @@ -704,22 +705,57 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener setContentDescription(recentAppsAccessibilityDescription); } + + boolean mThumbnailScaleUpStarted; public void handleOnClick(View view) { ViewHolder holder = (ViewHolder)view.getTag(); TaskDescription ad = holder.taskDescription; final Context context = view.getContext(); final ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); - holder.thumbnailViewImage.setDrawingCacheEnabled(true); - Bitmap bm = holder.thumbnailViewImage.getDrawingCache(); - mPlaceholderThumbnail = (ImageView) findViewById(R.id.recents_transition_placeholder_icon); + Bitmap bm = holder.thumbnailViewImageBitmap; + boolean usingDrawingCache; + if (bm.getWidth() == holder.thumbnailViewImage.getWidth() && + bm.getHeight() == holder.thumbnailViewImage.getHeight()) { + usingDrawingCache = false; + } else { + holder.thumbnailViewImage.setDrawingCacheEnabled(true); + bm = holder.thumbnailViewImage.getDrawingCache(); + usingDrawingCache = true; + } + + if (mPlaceholderThumbnail == null) { + mPlaceholderThumbnail = + (ImageView) findViewById(R.id.recents_transition_placeholder_icon); + } + if (mTransitionBg == null) { + mTransitionBg = (View) findViewById(R.id.recents_transition_background); + + IWindowManager wm = IWindowManager.Stub.asInterface( + ServiceManager.getService(Context.WINDOW_SERVICE)); + try { + if (!wm.hasSystemNavBar()) { + FrameLayout.LayoutParams lp = + (FrameLayout.LayoutParams) mTransitionBg.getLayoutParams(); + int statusBarHeight = getResources(). + getDimensionPixelSize(com.android.internal.R.dimen.status_bar_height); + lp.setMargins(0, statusBarHeight, 0, 0); + mTransitionBg.setLayoutParams(lp); + } + } catch (RemoteException e) { + Log.w(TAG, "Failing checking whether status bar is visible", e); + } + } final ImageView placeholderThumbnail = mPlaceholderThumbnail; - mHideWindowAfterPlaceholderThumbnailIsHidden = false; + mHideRecentsAfterThumbnailScaleUpStarted = false; placeholderThumbnail.setVisibility(VISIBLE); - Bitmap b2 = bm.copy(bm.getConfig(), true); - placeholderThumbnail.setImageBitmap(b2); - + if (!usingDrawingCache) { + placeholderThumbnail.setImageBitmap(bm); + } else { + Bitmap b2 = bm.copy(bm.getConfig(), true); + placeholderThumbnail.setImageBitmap(b2); + } Rect r = new Rect(); holder.thumbnailViewImage.getGlobalVisibleRect(r); @@ -728,13 +764,16 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener show(false, true); + mThumbnailScaleUpStarted = false; ActivityOptions opts = ActivityOptions.makeDelayedThumbnailScaleUpAnimation( holder.thumbnailViewImage, bm, 0, 0, new ActivityOptions.OnAnimationStartedListener() { @Override public void onAnimationStarted() { - mPlaceholderThumbnail = null; - placeholderThumbnail.setVisibility(INVISIBLE); - if (mHideWindowAfterPlaceholderThumbnailIsHidden) { + mThumbnailScaleUpStarted = true; + if (!mHighEndGfx) { + mPlaceholderThumbnail.setVisibility(INVISIBLE); + } + if (mHideRecentsAfterThumbnailScaleUpStarted) { hideWindow(); } } @@ -751,15 +790,19 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener if (DEBUG) Log.v(TAG, "Starting activity " + intent); context.startActivity(intent, opts.toBundle()); } - holder.thumbnailViewImage.setDrawingCacheEnabled(false); + if (!usingDrawingCache) { + holder.thumbnailViewImage.setDrawingCacheEnabled(false); + } } public void hideWindow() { - if (mPlaceholderThumbnail != null) { - mHideWindowAfterPlaceholderThumbnailIsHidden = true; + if (!mThumbnailScaleUpStarted) { + mHideRecentsAfterThumbnailScaleUpStarted = true; } else { setVisibility(GONE); - mHideWindowAfterPlaceholderThumbnailIsHidden = false; + mTransitionBg.setVisibility(INVISIBLE); + mPlaceholderThumbnail.setVisibility(INVISIBLE); + mHideRecentsAfterThumbnailScaleUpStarted = false; } } diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java index d387515451e3..e8029852aa06 100644 --- a/packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java +++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java @@ -76,9 +76,6 @@ public class RecentsVerticalScrollView extends ScrollView } private void addToRecycledViews(View v) { - if (mRecycledViews.contains(v)) { - throw new RuntimeException("Child was already recycled"); - } if (mRecycledViews.size() < mNumItemsInOneScreenful) { mRecycledViews.add(v); } @@ -105,9 +102,6 @@ public class RecentsVerticalScrollView extends ScrollView old = recycledViews.next(); recycledViews.remove(); old.setVisibility(VISIBLE); - if (old.getParent() != null) { - throw new RuntimeException("Recycled child has parent (i: " + i + ", recycled i: " + mRecycledViews.size()); - } } final View view = mAdapter.getView(i, old, mLinearLayout); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index cf2690bbcf33..750c6dc0ba1b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -440,13 +440,13 @@ public abstract class BaseStatusBar extends SystemUI implements case MSG_OPEN_RECENTS_PANEL: if (DEBUG) Slog.d(TAG, "opening recents panel"); if (mRecentsPanel != null) { - mRecentsPanel.show(true, true); + mRecentsPanel.show(true, false); } break; case MSG_CLOSE_RECENTS_PANEL: if (DEBUG) Slog.d(TAG, "closing recents panel"); if (mRecentsPanel != null && mRecentsPanel.isShowing()) { - mRecentsPanel.show(false, true); + mRecentsPanel.show(false, false); } break; case MSG_PRELOAD_RECENT_APPS: diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CarrierLabel.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CarrierLabel.java index d8441f2b1df3..491fad11fad6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CarrierLabel.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CarrierLabel.java @@ -21,6 +21,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.provider.Telephony; +import android.text.TextUtils; import android.util.AttributeSet; import android.util.Slog; import android.view.View; @@ -91,24 +92,20 @@ public class CarrierLabel extends TextView { Slog.d("CarrierLabel", "updateNetworkName showSpn=" + showSpn + " spn=" + spn + " showPlmn=" + showPlmn + " plmn=" + plmn); } - StringBuilder str = new StringBuilder(); - boolean something = false; - if (showPlmn && plmn != null) { - str.append(plmn); - something = true; - } - if (showSpn && spn != null) { - if (something) { - str.append('\n'); - } - str.append(spn); - something = true; - } - if (something) { - setText(str.toString()); + final String str; + // match logic in KeyguardStatusViewManager + final boolean plmnValid = showPlmn && !TextUtils.isEmpty(plmn); + final boolean spnValid = showSpn && !TextUtils.isEmpty(spn); + if (plmnValid && spnValid) { + str = plmn + "|" + spn; + } else if (plmnValid) { + str = plmn; + } else if (spnValid) { + str = spn; } else { - setText(com.android.internal.R.string.lockscreen_carrier_default); + str = ""; } + setText(str); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index fc56dd1eab7a..56de506c3380 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -134,6 +134,9 @@ public class PhoneStatusBar extends BaseStatusBar { private float mExpandAccelPx; // classic value: 2000px/s/s private float mCollapseAccelPx; // classic value: 2000px/s/s (will be negated to collapse "up") + private float mFlingGestureMaxOutputVelocityPx; // how fast can it really go? (should be a little + // faster than mSelfCollapseVelocityPx) + PhoneStatusBarPolicy mIconPolicy; // These are no longer handled by the policy, because we need custom strategies for them @@ -165,6 +168,7 @@ public class PhoneStatusBar extends BaseStatusBar { ScrollView mScrollView; View mExpandedContents; int mNotificationPanelMarginBottomPx, mNotificationPanelMarginLeftPx; + final Rect mNotificationPanelBackgroundPadding = new Rect(); int mNotificationPanelGravity; int mNotificationPanelMinHeight; @@ -267,6 +271,13 @@ public class PhoneStatusBar extends BaseStatusBar { } }; + private final Runnable mPerformSelfExpandFling = new Runnable() { + @Override + public void run() { + performFling(0, mSelfExpandVelocityPx, true); + } + }; + private final Runnable mPerformFling = new Runnable() { @Override public void run() { @@ -392,12 +403,13 @@ public class PhoneStatusBar extends BaseStatusBar { mTickerView = mStatusBarView.findViewById(R.id.ticker); mPile = (NotificationRowLayout)mStatusBarWindow.findViewById(R.id.latestItems); + mPile.setLayoutTransitionsEnabled(false); mPile.setLongPressListener(getNotificationLongClicker()); if (SHOW_CARRIER_LABEL) { mPile.setOnSizeChangedListener(new OnSizeChangedListener() { @Override public void onSizeChanged(View view, int w, int h, int oldw, int oldh) { - updateCarrierLabelVisibility(); + updateCarrierLabelVisibility(false); } }); } @@ -443,12 +455,14 @@ public class PhoneStatusBar extends BaseStatusBar { mNetworkController.addSignalCluster(signalCluster); signalCluster.setNetworkController(mNetworkController); - - // for wifi-only devices, we show SSID; otherwise, we show PLMN - if (mNetworkController.hasMobileDataFeature()) { - mNetworkController.addMobileLabelView(mCarrierLabel); - } else { - mNetworkController.addWifiLabelView(mCarrierLabel); + + if (SHOW_CARRIER_LABEL) { + // for wifi-only devices, we show SSID; otherwise, we show PLMN + if (mNetworkController.hasMobileDataFeature()) { + mNetworkController.addMobileLabelView(mCarrierLabel); + } else { + mNetworkController.addWifiLabelView(mCarrierLabel); + } } // final ImageView wimaxRSSI = @@ -889,7 +903,7 @@ public class PhoneStatusBar extends BaseStatusBar { } } - protected void updateCarrierLabelVisibility() { + protected void updateCarrierLabelVisibility(boolean force) { if (!SHOW_CARRIER_LABEL) return; // The idea here is to only show the carrier label when there is enough room to see it, // i.e. when there aren't enough notifications to fill the panel. @@ -901,7 +915,7 @@ public class PhoneStatusBar extends BaseStatusBar { final boolean makeVisible = mPile.getHeight() < (mScrollView.getHeight() - mCarrierLabelHeight); - if (mCarrierLabelVisible != makeVisible) { + if (force || mCarrierLabelVisible != makeVisible) { mCarrierLabelVisible = makeVisible; if (DEBUG) { Slog.d(TAG, "making carrier label " + (makeVisible?"visible":"invisible")); @@ -986,7 +1000,7 @@ public class PhoneStatusBar extends BaseStatusBar { .start(); } - updateCarrierLabelVisibility(); + updateCarrierLabelVisibility(false); } public void showClock(boolean show) { @@ -1159,9 +1173,10 @@ public class PhoneStatusBar extends BaseStatusBar { } mExpandedVisible = true; + mPile.setLayoutTransitionsEnabled(true); makeSlippery(mNavigationBarView, true); - updateCarrierLabelVisibility(); + updateCarrierLabelVisibility(true); updateExpandedViewPos(EXPANDED_LEAVE_ALONE); @@ -1206,7 +1221,7 @@ public class PhoneStatusBar extends BaseStatusBar { } prepareTracking(0, true); - performFling(0, mSelfExpandVelocityPx, true); + mHandler.post(mPerformSelfExpandFling); } public void animateCollapse() { @@ -1279,6 +1294,7 @@ public class PhoneStatusBar extends BaseStatusBar { return; } mExpandedVisible = false; + mPile.setLayoutTransitionsEnabled(false); visibilityChanged(false); makeSlippery(mNavigationBarView, false); @@ -1521,12 +1537,15 @@ public class PhoneStatusBar extends BaseStatusBar { mViewDelta = statusBarSize - y; } else { mCloseView.getLocationOnScreen(mAbsPos); - mViewDelta = mAbsPos[1] + statusBarSize + getCloseViewHeight() - y; // XXX: not closeViewHeight, but paddingBottom from the 9patch + mViewDelta = mAbsPos[1] + + getCloseViewHeight() // XXX: not closeViewHeight, but paddingBottom from the 9patch + + mNotificationPanelBackgroundPadding.top + + mNotificationPanelBackgroundPadding.bottom + - y; } if ((!mExpanded && y < hitSize) || // @@ add taps outside the panel if it's not full-screen (mExpanded && y > (getExpandedViewMaxHeight()-hitSize))) { - // We drop events at the edge of the screen to make the windowshade come // down by accident less, especially when pushing open a device with a keyboard // that rotates (like g1 and droid) @@ -1562,6 +1581,9 @@ public class PhoneStatusBar extends BaseStatusBar { } float vel = (float)Math.hypot(yVel, xVel); + if (vel > mFlingGestureMaxOutputVelocityPx) { + vel = mFlingGestureMaxOutputVelocityPx; + } if (negative) { vel = -vel; } @@ -2039,7 +2061,7 @@ public class PhoneStatusBar extends BaseStatusBar { mStatusBarWindow.setBackgroundColor(color); } - updateCarrierLabelVisibility(); + updateCarrierLabelVisibility(false); } void updateDisplaySize() { @@ -2266,6 +2288,8 @@ public class PhoneStatusBar extends BaseStatusBar { mFlingGestureMaxXVelocityPx = res.getDimension(R.dimen.fling_gesture_max_x_velocity); + mFlingGestureMaxOutputVelocityPx = res.getDimension(R.dimen.fling_gesture_max_output_velocity); + mNotificationPanelMarginBottomPx = (int) res.getDimension(R.dimen.notification_panel_margin_bottom); mNotificationPanelMarginLeftPx @@ -2274,10 +2298,12 @@ public class PhoneStatusBar extends BaseStatusBar { if (mNotificationPanelGravity <= 0) { mNotificationPanelGravity = Gravity.CENTER_VERTICAL | Gravity.TOP; } + getNinePatchPadding(res.getDrawable(R.drawable.notification_panel_bg), mNotificationPanelBackgroundPadding); final int notificationPanelDecorationHeight = res.getDimensionPixelSize(R.dimen.notification_panel_padding_top) + res.getDimensionPixelSize(R.dimen.notification_panel_header_height) - + getNinePatchPadding(res.getDrawable(R.drawable.notification_panel_bg)).bottom; + + mNotificationPanelBackgroundPadding.top + + mNotificationPanelBackgroundPadding.bottom; mNotificationPanelMinHeight = notificationPanelDecorationHeight + res.getDimensionPixelSize(R.dimen.close_handle_underlap); @@ -2287,13 +2313,11 @@ public class PhoneStatusBar extends BaseStatusBar { if (false) Slog.v(TAG, "updateResources"); } - private static Rect getNinePatchPadding(Drawable d) { - Rect padding = new Rect(); + private static void getNinePatchPadding(Drawable d, Rect outPadding) { if (d instanceof NinePatchDrawable) { NinePatchDrawable ninePatch = (NinePatchDrawable) d; - ninePatch.getPadding(padding); + ninePatch.getPadding(outPadding); } - return padding; } // diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NotificationRowLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NotificationRowLayout.java index 42db8cf476a2..61e5ab63d6e8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NotificationRowLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NotificationRowLayout.java @@ -68,6 +68,8 @@ public class NotificationRowLayout // animation is done boolean mRemoveViews = true; + private LayoutTransition mRealLayoutTransition; + public NotificationRowLayout(Context context, AttributeSet attrs) { this(context, attrs, 0); } @@ -75,7 +77,8 @@ public class NotificationRowLayout public NotificationRowLayout(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); - setLayoutTransition(new LayoutTransition()); + mRealLayoutTransition = new LayoutTransition(); + setLayoutTransitionsEnabled(true); setOrientation(LinearLayout.VERTICAL); @@ -121,9 +124,9 @@ public class NotificationRowLayout private void logLayoutTransition() { Log.v(TAG, "layout " + - (getLayoutTransition().isChangingLayout() ? "is " : "is not ") + + (mRealLayoutTransition.isChangingLayout() ? "is " : "is not ") + "in transition and animations " + - (getLayoutTransition().isRunning() ? "are " : "are not ") + + (mRealLayoutTransition.isRunning() ? "are " : "are not ") + "running."); } @@ -225,6 +228,18 @@ public class NotificationRowLayout mRemoveViews = removeViews; } + // Suppress layout transitions for a little while. + public void setLayoutTransitionsEnabled(boolean b) { + if (b) { + setLayoutTransition(mRealLayoutTransition); + } else { + if (mRealLayoutTransition.isRunning()) { + mRealLayoutTransition.cancel(); + } + setLayoutTransition(null); + } + } + public void dismissRowAnimated(View child) { dismissRowAnimated(child, 0); } diff --git a/services/input/InputDispatcher.cpp b/services/input/InputDispatcher.cpp index c8e11c221843..7e1a80cecdd1 100644 --- a/services/input/InputDispatcher.cpp +++ b/services/input/InputDispatcher.cpp @@ -56,6 +56,8 @@ #define INDENT " " #define INDENT2 " " +#define INDENT3 " " +#define INDENT4 " " namespace android { @@ -78,6 +80,9 @@ const nsecs_t STALE_EVENT_TIMEOUT = 10000 * 1000000LL; // 10sec // queue of waiting unfinished events, then ANRs will similarly be delayed by one second. const nsecs_t STREAM_AHEAD_EVENT_TIMEOUT = 500 * 1000000LL; // 0.5sec +// Log a warning when an event takes longer than this to process, even if an ANR does not occur. +const nsecs_t SLOW_EVENT_PROCESSING_WARNING_TIMEOUT = 2000 * 1000000LL; // 2sec + static inline nsecs_t now() { return systemTime(SYSTEM_TIME_MONOTONIC); @@ -897,11 +902,11 @@ int32_t InputDispatcher::handleTargetsNotReadyLocked(nsecs_t currentTime, const EventEntry* entry, const sp<InputApplicationHandle>& applicationHandle, const sp<InputWindowHandle>& windowHandle, - nsecs_t* nextWakeupTime) { + nsecs_t* nextWakeupTime, const char* reason) { if (applicationHandle == NULL && windowHandle == NULL) { if (mInputTargetWaitCause != INPUT_TARGET_WAIT_CAUSE_SYSTEM_NOT_READY) { #if DEBUG_FOCUS - ALOGD("Waiting for system to become ready for input."); + ALOGD("Waiting for system to become ready for input. Reason: %s", reason); #endif mInputTargetWaitCause = INPUT_TARGET_WAIT_CAUSE_SYSTEM_NOT_READY; mInputTargetWaitStartTime = currentTime; @@ -912,8 +917,9 @@ int32_t InputDispatcher::handleTargetsNotReadyLocked(nsecs_t currentTime, } else { if (mInputTargetWaitCause != INPUT_TARGET_WAIT_CAUSE_APPLICATION_NOT_READY) { #if DEBUG_FOCUS - ALOGD("Waiting for application to become ready for input: %s", - getApplicationWindowLabelLocked(applicationHandle, windowHandle).string()); + ALOGD("Waiting for application to become ready for input: %s. Reason: %s", + getApplicationWindowLabelLocked(applicationHandle, windowHandle).string(), + reason); #endif nsecs_t timeout; if (windowHandle != NULL) { @@ -946,7 +952,7 @@ int32_t InputDispatcher::handleTargetsNotReadyLocked(nsecs_t currentTime, if (currentTime >= mInputTargetWaitTimeoutTime) { onANRLocked(currentTime, applicationHandle, windowHandle, - entry->eventTime, mInputTargetWaitStartTime); + entry->eventTime, mInputTargetWaitStartTime, reason); // Force poll loop to wake up immediately on next iteration once we get the // ANR response back from the policy. @@ -1017,13 +1023,11 @@ int32_t InputDispatcher::findFocusedWindowTargetsLocked(nsecs_t currentTime, // then drop the event. if (mFocusedWindowHandle == NULL) { if (mFocusedApplicationHandle != NULL) { -#if DEBUG_FOCUS - ALOGD("Waiting because there is no focused window but there is a " - "focused application that may eventually add a window: %s.", - getApplicationWindowLabelLocked(mFocusedApplicationHandle, NULL).string()); -#endif injectionResult = handleTargetsNotReadyLocked(currentTime, entry, - mFocusedApplicationHandle, NULL, nextWakeupTime); + mFocusedApplicationHandle, NULL, nextWakeupTime, + "Waiting because no window has focus but there is a " + "focused application that may eventually add a window " + "when it finishes starting up."); goto Unresponsive; } @@ -1040,21 +1044,18 @@ int32_t InputDispatcher::findFocusedWindowTargetsLocked(nsecs_t currentTime, // If the currently focused window is paused then keep waiting. if (mFocusedWindowHandle->getInfo()->paused) { -#if DEBUG_FOCUS - ALOGD("Waiting because focused window is paused."); -#endif injectionResult = handleTargetsNotReadyLocked(currentTime, entry, - mFocusedApplicationHandle, mFocusedWindowHandle, nextWakeupTime); + mFocusedApplicationHandle, mFocusedWindowHandle, nextWakeupTime, + "Waiting because the focused window is paused."); goto Unresponsive; } // If the currently focused window is still working on previous events then keep waiting. if (!isWindowReadyForMoreInputLocked(currentTime, mFocusedWindowHandle, entry)) { -#if DEBUG_FOCUS - ALOGD("Waiting because focused window still processing previous input."); -#endif injectionResult = handleTargetsNotReadyLocked(currentTime, entry, - mFocusedApplicationHandle, mFocusedWindowHandle, nextWakeupTime); + mFocusedApplicationHandle, mFocusedWindowHandle, nextWakeupTime, + "Waiting because the focused window has not finished " + "processing the input events that were previously delivered to it."); goto Unresponsive; } @@ -1210,11 +1211,9 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime, // it is invisible) then wait for it. Any other focused window may in // fact be in ANR state. if (topErrorWindowHandle != NULL && newTouchedWindowHandle != topErrorWindowHandle) { -#if DEBUG_FOCUS - ALOGD("Waiting because system error window is pending."); -#endif injectionResult = handleTargetsNotReadyLocked(currentTime, entry, - NULL, NULL, nextWakeupTime); + NULL, NULL, nextWakeupTime, + "Waiting because a system error window is about to be displayed."); injectionPermission = INJECTION_PERMISSION_UNKNOWN; goto Unresponsive; } @@ -1241,14 +1240,11 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime, // but not yet put up a window and the user is starting to get impatient. if (maskedAction == AMOTION_EVENT_ACTION_DOWN && mFocusedApplicationHandle != NULL) { -#if DEBUG_FOCUS - ALOGD("Waiting because there is no touched window but there is a " - "focused application that may eventually add a new window: %s.", - getApplicationWindowLabelLocked( - mFocusedApplicationHandle, NULL).string()); -#endif injectionResult = handleTargetsNotReadyLocked(currentTime, entry, - mFocusedApplicationHandle, NULL, nextWakeupTime); + mFocusedApplicationHandle, NULL, nextWakeupTime, + "Waiting because there is no touchable window that can " + "handle the event but there is focused application that may " + "eventually add a new window when it finishes starting up."); goto Unresponsive; } @@ -1412,21 +1408,18 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime, if (touchedWindow.targetFlags & InputTarget::FLAG_FOREGROUND) { // If the touched window is paused then keep waiting. if (touchedWindow.windowHandle->getInfo()->paused) { -#if DEBUG_FOCUS - ALOGD("Waiting because touched window is paused."); -#endif injectionResult = handleTargetsNotReadyLocked(currentTime, entry, - NULL, touchedWindow.windowHandle, nextWakeupTime); + NULL, touchedWindow.windowHandle, nextWakeupTime, + "Waiting because the touched window is paused."); goto Unresponsive; } // If the touched window is still working on previous events then keep waiting. if (!isWindowReadyForMoreInputLocked(currentTime, touchedWindow.windowHandle, entry)) { -#if DEBUG_FOCUS - ALOGD("Waiting because touched window still processing previous input."); -#endif injectionResult = handleTargetsNotReadyLocked(currentTime, entry, - NULL, touchedWindow.windowHandle, nextWakeupTime); + NULL, touchedWindow.windowHandle, nextWakeupTime, + "Waiting because the touched window has not finished " + "processing the input events that were previously delivered to it."); goto Unresponsive; } } @@ -1897,6 +1890,7 @@ void InputDispatcher::startDispatchCycleLocked(nsecs_t currentTime, while (connection->status == Connection::STATUS_NORMAL && !connection->outboundQueue.isEmpty()) { DispatchEntry* dispatchEntry = connection->outboundQueue.head; + dispatchEntry->deliveryTime = currentTime; // Publish the event. status_t status; @@ -3099,7 +3093,65 @@ void InputDispatcher::dumpDispatchStateLocked(String8& dump) { dump.append(INDENT "MonitoringChannels: <none>\n"); } - dump.appendFormat(INDENT "InboundQueue: length=%u\n", mInboundQueue.count()); + nsecs_t currentTime = now(); + + if (!mInboundQueue.isEmpty()) { + dump.appendFormat(INDENT "InboundQueue: length=%u\n", mInboundQueue.count()); + for (EventEntry* entry = mInboundQueue.head; entry; entry = entry->next) { + dump.append(INDENT2); + entry->appendDescription(dump); + dump.appendFormat(", age=%01.1fms\n", + (currentTime - entry->eventTime) * 0.000001f); + } + } else { + dump.append(INDENT "InboundQueue: <empty>\n"); + } + + if (!mConnectionsByFd.isEmpty()) { + dump.append(INDENT "Connections:\n"); + for (size_t i = 0; i < mConnectionsByFd.size(); i++) { + const sp<Connection>& connection = mConnectionsByFd.valueAt(i); + dump.appendFormat(INDENT2 "%d: channelName='%s', windowName='%s', " + "status=%s, monitor=%s, inputPublisherBlocked=%s\n", + i, connection->getInputChannelName(), connection->getWindowName(), + connection->getStatusLabel(), toString(connection->monitor), + toString(connection->inputPublisherBlocked)); + + if (!connection->outboundQueue.isEmpty()) { + dump.appendFormat(INDENT3 "OutboundQueue: length=%u\n", + connection->outboundQueue.count()); + for (DispatchEntry* entry = connection->outboundQueue.head; entry; + entry = entry->next) { + dump.append(INDENT4); + entry->eventEntry->appendDescription(dump); + dump.appendFormat(", targetFlags=0x%08x, resolvedAction=%d, age=%01.1fms\n", + entry->targetFlags, entry->resolvedAction, + (currentTime - entry->eventEntry->eventTime) * 0.000001f); + } + } else { + dump.append(INDENT3 "OutboundQueue: <empty>\n"); + } + + if (!connection->waitQueue.isEmpty()) { + dump.appendFormat(INDENT3 "WaitQueue: length=%u\n", + connection->waitQueue.count()); + for (DispatchEntry* entry = connection->waitQueue.head; entry; + entry = entry->next) { + dump.append(INDENT4); + entry->eventEntry->appendDescription(dump); + dump.appendFormat(", targetFlags=0x%08x, resolvedAction=%d, " + "age=%01.1fms, wait=%01.1fms\n", + entry->targetFlags, entry->resolvedAction, + (currentTime - entry->eventEntry->eventTime) * 0.000001f, + (currentTime - entry->deliveryTime) * 0.000001f); + } + } else { + dump.append(INDENT3 "WaitQueue: <empty>\n"); + } + } + } else { + dump.append(INDENT "Connections: <none>\n"); + } if (isAppSwitchPendingLocked()) { dump.appendFormat(INDENT "AppSwitch: pending, due in %01.1fms\n", @@ -3214,6 +3266,7 @@ void InputDispatcher::onDispatchCycleFinishedLocked( CommandEntry* commandEntry = postCommandLocked( & InputDispatcher::doDispatchCycleFinishedLockedInterruptible); commandEntry->connection = connection; + commandEntry->eventTime = currentTime; commandEntry->seq = seq; commandEntry->handled = handled; } @@ -3231,12 +3284,12 @@ void InputDispatcher::onDispatchCycleBrokenLocked( void InputDispatcher::onANRLocked( nsecs_t currentTime, const sp<InputApplicationHandle>& applicationHandle, const sp<InputWindowHandle>& windowHandle, - nsecs_t eventTime, nsecs_t waitStartTime) { + nsecs_t eventTime, nsecs_t waitStartTime, const char* reason) { ALOGI("Application is not responding: %s. " - "%01.1fms since event, %01.1fms since wait started", + "It has been %01.1fms since event, %01.1fms since wait started. Reason: %s", getApplicationWindowLabelLocked(applicationHandle, windowHandle).string(), (currentTime - eventTime) / 1000000.0, - (currentTime - waitStartTime) / 1000000.0); + (currentTime - waitStartTime) / 1000000.0, reason); CommandEntry* commandEntry = postCommandLocked( & InputDispatcher::doNotifyANRLockedInterruptible); @@ -3308,12 +3361,22 @@ void InputDispatcher::doInterceptKeyBeforeDispatchingLockedInterruptible( void InputDispatcher::doDispatchCycleFinishedLockedInterruptible( CommandEntry* commandEntry) { sp<Connection> connection = commandEntry->connection; + nsecs_t finishTime = commandEntry->eventTime; uint32_t seq = commandEntry->seq; bool handled = commandEntry->handled; // Handle post-event policy actions. DispatchEntry* dispatchEntry = connection->findWaitQueueEntry(seq); if (dispatchEntry) { + nsecs_t eventDuration = finishTime - dispatchEntry->deliveryTime; + if (eventDuration > SLOW_EVENT_PROCESSING_WARNING_TIMEOUT) { + String8 msg; + msg.appendFormat("Window '%s' spent %01.1fms processing the last input event: ", + connection->getWindowName(), eventDuration * 0.000001f); + dispatchEntry->eventEntry->appendDescription(msg); + ALOGI("%s", msg.string()); + } + bool restartEvent; if (dispatchEntry->eventEntry->type == EventEntry::TYPE_KEY) { KeyEntry* keyEntry = static_cast<KeyEntry*>(dispatchEntry->eventEntry); @@ -3656,6 +3719,10 @@ InputDispatcher::ConfigurationChangedEntry::ConfigurationChangedEntry(nsecs_t ev InputDispatcher::ConfigurationChangedEntry::~ConfigurationChangedEntry() { } +void InputDispatcher::ConfigurationChangedEntry::appendDescription(String8& msg) const { + msg.append("ConfigurationChangedEvent()"); +} + // --- InputDispatcher::DeviceResetEntry --- @@ -3667,6 +3734,10 @@ InputDispatcher::DeviceResetEntry::DeviceResetEntry(nsecs_t eventTime, int32_t d InputDispatcher::DeviceResetEntry::~DeviceResetEntry() { } +void InputDispatcher::DeviceResetEntry::appendDescription(String8& msg) const { + msg.appendFormat("DeviceResetEvent(deviceId=%d)", deviceId); +} + // --- InputDispatcher::KeyEntry --- @@ -3685,6 +3756,11 @@ InputDispatcher::KeyEntry::KeyEntry(nsecs_t eventTime, InputDispatcher::KeyEntry::~KeyEntry() { } +void InputDispatcher::KeyEntry::appendDescription(String8& msg) const { + msg.appendFormat("KeyEvent(action=%d, deviceId=%d, source=0x%08x)", + action, deviceId, source); +} + void InputDispatcher::KeyEntry::recycle() { releaseInjectionState(); @@ -3718,6 +3794,11 @@ InputDispatcher::MotionEntry::MotionEntry(nsecs_t eventTime, InputDispatcher::MotionEntry::~MotionEntry() { } +void InputDispatcher::MotionEntry::appendDescription(String8& msg) const { + msg.appendFormat("MotionEvent(action=%d, deviceId=%d, source=0x%08x)", + action, deviceId, source); +} + // --- InputDispatcher::DispatchEntry --- @@ -3728,7 +3809,7 @@ InputDispatcher::DispatchEntry::DispatchEntry(EventEntry* eventEntry, seq(nextSeq()), eventEntry(eventEntry), targetFlags(targetFlags), xOffset(xOffset), yOffset(yOffset), scaleFactor(scaleFactor), - resolvedAction(0), resolvedFlags(0) { + deliveryTime(0), resolvedAction(0), resolvedFlags(0) { eventEntry->refCount += 1; } diff --git a/services/input/InputDispatcher.h b/services/input/InputDispatcher.h index 06b8d648eca7..c5b8cd72e88b 100644 --- a/services/input/InputDispatcher.h +++ b/services/input/InputDispatcher.h @@ -440,6 +440,8 @@ private: void release(); + virtual void appendDescription(String8& msg) const = 0; + protected: EventEntry(int32_t type, nsecs_t eventTime, uint32_t policyFlags); virtual ~EventEntry(); @@ -448,6 +450,7 @@ private: struct ConfigurationChangedEntry : EventEntry { ConfigurationChangedEntry(nsecs_t eventTime); + virtual void appendDescription(String8& msg) const; protected: virtual ~ConfigurationChangedEntry(); @@ -457,6 +460,7 @@ private: int32_t deviceId; DeviceResetEntry(nsecs_t eventTime, int32_t deviceId); + virtual void appendDescription(String8& msg) const; protected: virtual ~DeviceResetEntry(); @@ -488,6 +492,7 @@ private: int32_t deviceId, uint32_t source, uint32_t policyFlags, int32_t action, int32_t flags, int32_t keyCode, int32_t scanCode, int32_t metaState, int32_t repeatCount, nsecs_t downTime); + virtual void appendDescription(String8& msg) const; void recycle(); protected: @@ -516,6 +521,7 @@ private: float xPrecision, float yPrecision, nsecs_t downTime, uint32_t pointerCount, const PointerProperties* pointerProperties, const PointerCoords* pointerCoords); + virtual void appendDescription(String8& msg) const; protected: virtual ~MotionEntry(); @@ -530,6 +536,7 @@ private: float xOffset; float yOffset; float scaleFactor; + nsecs_t deliveryTime; // time when the event was actually delivered // Set to the resolved action and flags when the event is enqueued. int32_t resolvedAction; @@ -978,7 +985,7 @@ private: int32_t handleTargetsNotReadyLocked(nsecs_t currentTime, const EventEntry* entry, const sp<InputApplicationHandle>& applicationHandle, const sp<InputWindowHandle>& windowHandle, - nsecs_t* nextWakeupTime); + nsecs_t* nextWakeupTime, const char* reason); void resumeAfterTargetsNotReadyTimeoutLocked(nsecs_t newTimeout, const sp<InputChannel>& inputChannel); nsecs_t getTimeSpentWaitingForApplicationLocked(nsecs_t currentTime); @@ -1056,7 +1063,7 @@ private: void onANRLocked( nsecs_t currentTime, const sp<InputApplicationHandle>& applicationHandle, const sp<InputWindowHandle>& windowHandle, - nsecs_t eventTime, nsecs_t waitStartTime); + nsecs_t eventTime, nsecs_t waitStartTime, const char* reason); // Outbound policy interactions. void doNotifyConfigurationChangedInterruptible(CommandEntry* commandEntry); diff --git a/services/java/com/android/server/wm/WindowAnimator.java b/services/java/com/android/server/wm/WindowAnimator.java index b5cf20135bc3..efed0a4a3721 100644 --- a/services/java/com/android/server/wm/WindowAnimator.java +++ b/services/java/com/android/server/wm/WindowAnimator.java @@ -496,15 +496,7 @@ public class WindowAnimator { final int N = mWinAnimators.size(); for (int i = 0; i < N; i++) { - final WindowStateAnimator winAnimator = mWinAnimators.get(i); - if (winAnimator.mWin.mIsWallpaper && mService.mWallpaperTarget == null) { - if (!winAnimator.mWin.mWallpaperVisible && !winAnimator.mLastHidden) { - // Wallpaper is no longer visible and there is no wp target => hide it. - winAnimator.hide(); - } - continue; - } - winAnimator.prepareSurfaceLocked(true); + mWinAnimators.get(i).prepareSurfaceLocked(true); } if (mDimParams != null) { diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index ba4df96b2bb4..28c8b06bd4cc 100755 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -127,6 +127,7 @@ import android.view.animation.AlphaAnimation; import android.view.animation.Animation; import android.view.animation.AnimationSet; import android.view.animation.AnimationUtils; +import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; import android.view.animation.ScaleAnimation; @@ -280,6 +281,8 @@ public class WindowManagerService extends IWindowManager.Stub private static final int ALLOW_DISABLE_UNKNOWN = -1; // check with DevicePolicyManager private int mAllowDisableKeyguard = ALLOW_DISABLE_UNKNOWN; // sync'd by mKeyguardTokenWatcher + private static final float THUMBNAIL_ANIMATION_DECELERATE_FACTOR = 1.5f; + final TokenWatcher mKeyguardTokenWatcher = new TokenWatcher( new Handler(), "WindowManagerService.mKeyguardTokenWatcher") { @Override @@ -3183,7 +3186,7 @@ public class WindowManagerService extends IWindowManager.Stub // it is the standard duration for that. Otherwise we use the longer // task transition duration. int duration; - int delayDuration = delayed ? 200 : 0; + int delayDuration = delayed ? 270 : 0; switch (transit) { case WindowManagerPolicy.TRANSIT_ACTIVITY_OPEN: case WindowManagerPolicy.TRANSIT_ACTIVITY_CLOSE: @@ -3191,7 +3194,7 @@ public class WindowManagerService extends IWindowManager.Stub com.android.internal.R.integer.config_shortAnimTime); break; default: - duration = delayed ? 200 : 300; + duration = delayed ? 250 : 300; break; } if (thumb) { @@ -3206,6 +3209,8 @@ public class WindowManagerService extends IWindowManager.Stub AnimationSet set = new AnimationSet(true); Animation alpha = new AlphaAnimation(1, 0); scale.setDuration(duration); + scale.setInterpolator( + new DecelerateInterpolator(THUMBNAIL_ANIMATION_DECELERATE_FACTOR)); set.addAnimation(scale); alpha.setDuration(duration); set.addAnimation(alpha); @@ -3222,6 +3227,8 @@ public class WindowManagerService extends IWindowManager.Stub computePivot(mNextAppTransitionStartX, scaleW), computePivot(mNextAppTransitionStartY, scaleH)); scale.setDuration(duration); + scale.setInterpolator( + new DecelerateInterpolator(THUMBNAIL_ANIMATION_DECELERATE_FACTOR)); scale.setFillBefore(true); if (delayDuration > 0) { scale.setStartOffset(delayDuration); diff --git a/services/java/com/android/server/wm/WindowStateAnimator.java b/services/java/com/android/server/wm/WindowStateAnimator.java index d140aca9204a..bdacb6e23dac 100644 --- a/services/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/java/com/android/server/wm/WindowStateAnimator.java @@ -1063,7 +1063,10 @@ class WindowStateAnimator { setSurfaceBoundaries(recoveringMemory); - if (w.mAttachedHidden || !w.isReadyForDisplay()) { + if (mWin.mIsWallpaper && !mWin.mWallpaperVisible) { + // Wallpaper is no longer visible and there is no wp target => hide it. + hide(); + } else if (w.mAttachedHidden || !w.isReadyForDisplay()) { hide(); mAnimator.hideWallpapersLocked(w); |