diff options
617 files changed, 15798 insertions, 3389 deletions
diff --git a/Android.mk b/Android.mk index 3b2d32d3f32f..a98b1c2eaef7 100644 --- a/Android.mk +++ b/Android.mk @@ -61,6 +61,7 @@ LOCAL_SRC_FILES := $(filter-out \ LOCAL_SRC_FILES += \ core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl \ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ + core/java/android/accessibilityservice/IAccessibilityServiceClientCallback.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \ core/java/android/accounts/IAccountAuthenticator.aidl \ diff --git a/api/current.txt b/api/current.txt index 6d8e9a099fef..b4a1eaee68e0 100644 --- a/api/current.txt +++ b/api/current.txt @@ -294,6 +294,7 @@ package android { field public static final int cacheColorHint = 16843009; // 0x1010101 field public static final int calendarViewShown = 16843596; // 0x101034c field public static final int calendarViewStyle = 16843613; // 0x101035d + field public static final int canHandleGestures = 16843699; // 0x10103b3 field public static final int canRetrieveWindowContent = 16843653; // 0x1010385 field public static final int candidatesTextStyleSpans = 16843312; // 0x1010230 field public static final deprecated int capitalize = 16843113; // 0x1010169 @@ -1997,7 +1998,7 @@ package android.accessibilityservice { method public final android.accessibilityservice.AccessibilityServiceInfo getServiceInfo(); method public abstract void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent); method public final android.os.IBinder onBind(android.content.Intent); - method protected void onGesture(int); + method protected boolean onGesture(int); method public abstract void onInterrupt(); method protected void onServiceConnected(); method public final boolean performGlobalAction(int); @@ -2020,6 +2021,8 @@ package android.accessibilityservice { field public static final int GESTURE_SWIPE_UP_AND_DOWN = 7; // 0x7 field public static final int GESTURE_SWIPE_UP_AND_LEFT = 15; // 0xf field public static final int GESTURE_SWIPE_UP_AND_RIGHT = 16; // 0x10 + field public static final int GESTURE_TWO_FINGER_LONG_PRESS = 20; // 0x14 + field public static final int GESTURE_TWO_FINGER_TAP = 19; // 0x13 field public static final int GLOBAL_ACTION_BACK = 1; // 0x1 field public static final int GLOBAL_ACTION_HOME = 2; // 0x2 field public static final int GLOBAL_ACTION_NOTIFICATIONS = 4; // 0x4 @@ -2033,6 +2036,7 @@ package android.accessibilityservice { method public int describeContents(); method public static java.lang.String feedbackTypeToString(int); method public static java.lang.String flagToString(int); + method public boolean getCanHandleGestures(); method public boolean getCanRetrieveWindowContent(); method public deprecated java.lang.String getDescription(); method public java.lang.String getId(); @@ -4069,10 +4073,12 @@ package android.app { method public void setWallpaperOffsetSteps(float, float); method public void setWallpaperOffsets(android.os.IBinder, float, float); method public void suggestDesiredDimensions(int, int); + field public static final java.lang.String ACTION_CHANGE_LIVE_WALLPAPER = "android.service.wallpaper.CHANGE_LIVE_WALLPAPER"; field public static final java.lang.String ACTION_LIVE_WALLPAPER_CHOOSER = "android.service.wallpaper.LIVE_WALLPAPER_CHOOSER"; field public static final java.lang.String COMMAND_DROP = "android.home.drop"; field public static final java.lang.String COMMAND_SECONDARY_TAP = "android.wallpaper.secondaryTap"; field public static final java.lang.String COMMAND_TAP = "android.wallpaper.tap"; + field public static final java.lang.String EXTRA_LIVE_WALLPAPER_COMPONENT = "android.service.wallpaper.extra.LIVE_WALLPAPER_COMPONENT"; field public static final java.lang.String WALLPAPER_PREVIEW_META_DATA = "android.wallpaper.preview"; } @@ -4301,10 +4307,13 @@ package android.appwidget { method protected void prepareView(android.view.View); method public void setAppWidget(int, android.appwidget.AppWidgetProviderInfo); method public void updateAppWidget(android.widget.RemoteViews); + method public void updateAppWidgetExtras(android.os.Bundle); + method public void updateAppWidgetSize(android.os.Bundle, int, int, int, int); } public class AppWidgetManager { method public void bindAppWidgetId(int, android.content.ComponentName); + method public android.os.Bundle getAppWidgetExtras(int); method public int[] getAppWidgetIds(android.content.ComponentName); method public android.appwidget.AppWidgetProviderInfo getAppWidgetInfo(int); method public java.util.List<android.appwidget.AppWidgetProviderInfo> getInstalledProviders(); @@ -4316,14 +4325,21 @@ package android.appwidget { method public void updateAppWidget(int[], android.widget.RemoteViews); method public void updateAppWidget(int, android.widget.RemoteViews); method public void updateAppWidget(android.content.ComponentName, android.widget.RemoteViews); + method public void updateAppWidgetExtras(int, android.os.Bundle); field public static final java.lang.String ACTION_APPWIDGET_CONFIGURE = "android.appwidget.action.APPWIDGET_CONFIGURE"; field public static final java.lang.String ACTION_APPWIDGET_DELETED = "android.appwidget.action.APPWIDGET_DELETED"; field public static final java.lang.String ACTION_APPWIDGET_DISABLED = "android.appwidget.action.APPWIDGET_DISABLED"; field public static final java.lang.String ACTION_APPWIDGET_ENABLED = "android.appwidget.action.APPWIDGET_ENABLED"; + field public static final java.lang.String ACTION_APPWIDGET_EXTRAS_CHANGED = "android.appwidget.action.APPWIDGET_UPDATE_EXTRAS"; field public static final java.lang.String ACTION_APPWIDGET_PICK = "android.appwidget.action.APPWIDGET_PICK"; field public static final java.lang.String ACTION_APPWIDGET_UPDATE = "android.appwidget.action.APPWIDGET_UPDATE"; + field public static final java.lang.String EXTRA_APPWIDGET_EXTRAS = "appWidgetExtras"; field public static final java.lang.String EXTRA_APPWIDGET_ID = "appWidgetId"; field public static final java.lang.String EXTRA_APPWIDGET_IDS = "appWidgetIds"; + field public static final java.lang.String EXTRA_APPWIDGET_MAX_HEIGHT = "appWidgetMaxHeight"; + field public static final java.lang.String EXTRA_APPWIDGET_MAX_WIDTH = "appWidgetMaxWidth"; + field public static final java.lang.String EXTRA_APPWIDGET_MIN_HEIGHT = "appWidgetMinHeight"; + field public static final java.lang.String EXTRA_APPWIDGET_MIN_WIDTH = "appWidgetMinWidth"; field public static final java.lang.String EXTRA_CUSTOM_EXTRAS = "customExtras"; field public static final java.lang.String EXTRA_CUSTOM_INFO = "customInfo"; field public static final int INVALID_APPWIDGET_ID = 0; // 0x0 @@ -4332,6 +4348,7 @@ package android.appwidget { public class AppWidgetProvider extends android.content.BroadcastReceiver { ctor public AppWidgetProvider(); + method public void onAppWidgetExtrasChanged(android.content.Context, android.appwidget.AppWidgetManager, int, android.os.Bundle); method public void onDeleted(android.content.Context, int[]); method public void onDisabled(android.content.Context); method public void onEnabled(android.content.Context); @@ -10973,8 +10990,8 @@ package android.media { method public java.nio.ByteBuffer[] getInputBuffers(); method public java.nio.ByteBuffer[] getOutputBuffers(); method public final java.util.Map<java.lang.String, java.lang.Object> getOutputFormat(); - method public final void queueInputBuffer(int, int, int, long, int); - method public final void queueSecureInputBuffer(int, int, android.media.MediaCodec.CryptoInfo, long, int); + method public final void queueInputBuffer(int, int, int, long, int) throws android.media.MediaCodec.CryptoException; + method public final void queueSecureInputBuffer(int, int, android.media.MediaCodec.CryptoInfo, long, int) throws android.media.MediaCodec.CryptoException; method public final void release(); method public final void releaseOutputBuffer(int, boolean); method public final void start(); @@ -10999,6 +11016,11 @@ package android.media { field public int size; } + public static final class MediaCodec.CryptoException extends java.lang.RuntimeException { + ctor public MediaCodec.CryptoException(int, java.lang.String); + method public int getErrorCode(); + } + public static final class MediaCodec.CryptoInfo { ctor public MediaCodec.CryptoInfo(); method public void set(int, int[], int[], byte[], byte[], int); @@ -11041,11 +11063,13 @@ package android.media { ctor public MediaExtractor(); method public boolean advance(); method public int countTracks(); + method public long getCachedDuration(); method public boolean getSampleCryptoInfo(android.media.MediaCodec.CryptoInfo); method public int getSampleFlags(); method public long getSampleTime(); method public int getSampleTrackIndex(); method public java.util.Map<java.lang.String, java.lang.Object> getTrackFormat(int); + method public boolean hasCacheReachedEndOfStream(); method public int readSampleData(java.nio.ByteBuffer, int); method public final void release(); method public void seekTo(long); @@ -13076,6 +13100,7 @@ package android.net.wifi.p2p { field public static final java.lang.String EXTRA_WIFI_P2P_DEVICE = "wifiP2pDevice"; field public static final java.lang.String EXTRA_WIFI_P2P_INFO = "wifiP2pInfo"; field public static final java.lang.String EXTRA_WIFI_STATE = "wifi_p2p_state"; + field public static final int NO_SERVICE_REQUESTS = 3; // 0x3 field public static final int P2P_UNSUPPORTED = 1; // 0x1 field public static final java.lang.String WIFI_P2P_CONNECTION_CHANGED_ACTION = "android.net.wifi.p2p.CONNECTION_STATE_CHANGE"; field public static final java.lang.String WIFI_P2P_DISCOVERY_CHANGED_ACTION = "android.net.wifi.p2p.DISCOVERY_STATE_CHANGE"; @@ -16315,9 +16340,11 @@ package android.provider { public final class CalendarContract { field public static final java.lang.String ACCOUNT_TYPE_LOCAL = "LOCAL"; field public static final java.lang.String ACTION_EVENT_REMINDER = "android.intent.action.EVENT_REMINDER"; + field public static final java.lang.String ACTION_HANDLE_CUSTOM_EVENT = "android.provider.calendar.action.HANDLE_CUSTOM_EVENT"; field public static final java.lang.String AUTHORITY = "com.android.calendar"; field public static final java.lang.String CALLER_IS_SYNCADAPTER = "caller_is_syncadapter"; field public static final android.net.Uri CONTENT_URI; + field public static final java.lang.String EXTRA_CUSTOM_APP_URI = "customAppUri"; field public static final java.lang.String EXTRA_EVENT_ALL_DAY = "allDay"; field public static final java.lang.String EXTRA_EVENT_BEGIN_TIME = "beginTime"; field public static final java.lang.String EXTRA_EVENT_END_TIME = "endTime"; @@ -16479,6 +16506,8 @@ package android.provider { field public static final int AVAILABILITY_TENTATIVE = 2; // 0x2 field public static final java.lang.String CALENDAR_ID = "calendar_id"; field public static final java.lang.String CAN_INVITE_OTHERS = "canInviteOthers"; + field public static final java.lang.String CUSTOM_APP_PACKAGE = "customAppPackage"; + field public static final java.lang.String CUSTOM_APP_URI = "customAppUri"; field public static final java.lang.String DESCRIPTION = "description"; field public static final java.lang.String DISPLAY_COLOR = "displayColor"; field public static final java.lang.String DTEND = "dtend"; @@ -18315,104 +18344,95 @@ package android.provider { package android.renderscript { - public class Allocation extends android.renderscript.BaseObj { - method public void copy1DRangeFrom(int, int, int[]); - method public void copy1DRangeFrom(int, int, short[]); - method public void copy1DRangeFrom(int, int, byte[]); - method public void copy1DRangeFrom(int, int, float[]); - method public void copy1DRangeFrom(int, int, android.renderscript.Allocation, int); - method public void copy1DRangeFromUnchecked(int, int, int[]); - method public void copy1DRangeFromUnchecked(int, int, short[]); - method public void copy1DRangeFromUnchecked(int, int, byte[]); - method public void copy1DRangeFromUnchecked(int, int, float[]); - method public void copy2DRangeFrom(int, int, int, int, byte[]); - method public void copy2DRangeFrom(int, int, int, int, short[]); - method public void copy2DRangeFrom(int, int, int, int, int[]); - method public void copy2DRangeFrom(int, int, int, int, float[]); - method public void copy2DRangeFrom(int, int, int, int, android.renderscript.Allocation, int, int); - method public void copy2DRangeFrom(int, int, android.graphics.Bitmap); - method public void copyFrom(android.renderscript.BaseObj[]); - method public void copyFrom(int[]); - method public void copyFrom(short[]); - method public void copyFrom(byte[]); - method public void copyFrom(float[]); - method public void copyFrom(android.graphics.Bitmap); - method public void copyFromUnchecked(int[]); - method public void copyFromUnchecked(short[]); - method public void copyFromUnchecked(byte[]); - method public void copyFromUnchecked(float[]); - method public void copyTo(android.graphics.Bitmap); - method public void copyTo(byte[]); - method public void copyTo(short[]); - method public void copyTo(int[]); - method public void copyTo(float[]); - method public static android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int); - method public static android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap); - method public static android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int); - method public static android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap); - method public static android.renderscript.Allocation createFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int); - method public static android.renderscript.Allocation createFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap); - method public static android.renderscript.Allocation createFromBitmapResource(android.renderscript.RenderScript, android.content.res.Resources, int, android.renderscript.Allocation.MipmapControl, int); - method public static android.renderscript.Allocation createFromBitmapResource(android.renderscript.RenderScript, android.content.res.Resources, int); - method public static android.renderscript.Allocation createFromString(android.renderscript.RenderScript, java.lang.String, int); - method public static android.renderscript.Allocation createSized(android.renderscript.RenderScript, android.renderscript.Element, int, int); - method public static android.renderscript.Allocation createSized(android.renderscript.RenderScript, android.renderscript.Element, int); - method public static android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, android.renderscript.Allocation.MipmapControl, int); - method public static android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, int); - method public static android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type); - method public void generateMipmaps(); - method public int getBytesSize(); - method public android.renderscript.Element getElement(); - method public android.view.Surface getSurface(); - method public android.renderscript.Type getType(); - method public int getUsage(); - method public void ioReceive(); - method public void ioSend(); - method public synchronized void resize(int); - method public void setFromFieldPacker(int, android.renderscript.FieldPacker); - method public void setFromFieldPacker(int, int, android.renderscript.FieldPacker); - method public void setSurface(android.view.Surface); - method public void syncAll(int); - field public static final int USAGE_GRAPHICS_CONSTANTS = 8; // 0x8 - field public static final int USAGE_GRAPHICS_RENDER_TARGET = 16; // 0x10 - field public static final int USAGE_GRAPHICS_TEXTURE = 2; // 0x2 - field public static final int USAGE_GRAPHICS_VERTEX = 4; // 0x4 - field public static final int USAGE_IO_INPUT = 32; // 0x20 - field public static final int USAGE_IO_OUTPUT = 64; // 0x40 - field public static final int USAGE_SCRIPT = 1; // 0x1 - } - - public static final class Allocation.MipmapControl extends java.lang.Enum { + public deprecated class Allocation extends android.renderscript.BaseObj { + method public deprecated void copy1DRangeFrom(int, int, int[]); + method public deprecated void copy1DRangeFrom(int, int, short[]); + method public deprecated void copy1DRangeFrom(int, int, byte[]); + method public deprecated void copy1DRangeFrom(int, int, float[]); + method public deprecated void copy1DRangeFrom(int, int, android.renderscript.Allocation, int); + method public deprecated void copy1DRangeFromUnchecked(int, int, int[]); + method public deprecated void copy1DRangeFromUnchecked(int, int, short[]); + method public deprecated void copy1DRangeFromUnchecked(int, int, byte[]); + method public deprecated void copy1DRangeFromUnchecked(int, int, float[]); + method public deprecated void copy2DRangeFrom(int, int, int, int, byte[]); + method public deprecated void copy2DRangeFrom(int, int, int, int, short[]); + method public deprecated void copy2DRangeFrom(int, int, int, int, int[]); + method public deprecated void copy2DRangeFrom(int, int, int, int, float[]); + method public deprecated void copy2DRangeFrom(int, int, int, int, android.renderscript.Allocation, int, int); + method public deprecated void copy2DRangeFrom(int, int, android.graphics.Bitmap); + method public deprecated void copyFrom(android.renderscript.BaseObj[]); + method public deprecated void copyFrom(int[]); + method public deprecated void copyFrom(short[]); + method public deprecated void copyFrom(byte[]); + method public deprecated void copyFrom(float[]); + method public deprecated void copyFrom(android.graphics.Bitmap); + method public deprecated void copyFromUnchecked(int[]); + method public deprecated void copyFromUnchecked(short[]); + method public deprecated void copyFromUnchecked(byte[]); + method public deprecated void copyFromUnchecked(float[]); + method public deprecated void copyTo(android.graphics.Bitmap); + method public deprecated void copyTo(byte[]); + method public deprecated void copyTo(short[]); + method public deprecated void copyTo(int[]); + method public deprecated void copyTo(float[]); + method public static deprecated android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int); + method public static deprecated android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap); + method public static deprecated android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int); + method public static deprecated android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap); + method public static deprecated android.renderscript.Allocation createFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int); + method public static deprecated android.renderscript.Allocation createFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap); + method public static deprecated android.renderscript.Allocation createFromBitmapResource(android.renderscript.RenderScript, android.content.res.Resources, int, android.renderscript.Allocation.MipmapControl, int); + method public static deprecated android.renderscript.Allocation createFromBitmapResource(android.renderscript.RenderScript, android.content.res.Resources, int); + method public static deprecated android.renderscript.Allocation createFromString(android.renderscript.RenderScript, java.lang.String, int); + method public static deprecated android.renderscript.Allocation createSized(android.renderscript.RenderScript, android.renderscript.Element, int, int); + method public static deprecated android.renderscript.Allocation createSized(android.renderscript.RenderScript, android.renderscript.Element, int); + method public static deprecated android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, android.renderscript.Allocation.MipmapControl, int); + method public static deprecated android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, int); + method public static deprecated android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type); + method public deprecated void generateMipmaps(); + method public deprecated android.renderscript.Type getType(); + method public deprecated synchronized void resize(int); + method public deprecated void setFromFieldPacker(int, android.renderscript.FieldPacker); + method public deprecated void setFromFieldPacker(int, int, android.renderscript.FieldPacker); + method public deprecated void syncAll(int); + field public static final deprecated int USAGE_GRAPHICS_CONSTANTS = 8; // 0x8 + field public static final deprecated int USAGE_GRAPHICS_RENDER_TARGET = 16; // 0x10 + field public static final deprecated int USAGE_GRAPHICS_TEXTURE = 2; // 0x2 + field public static final deprecated int USAGE_GRAPHICS_VERTEX = 4; // 0x4 + field public static final deprecated int USAGE_SCRIPT = 1; // 0x1 + } + + public static final deprecated class Allocation.MipmapControl extends java.lang.Enum { method public static android.renderscript.Allocation.MipmapControl valueOf(java.lang.String); method public static final android.renderscript.Allocation.MipmapControl[] values(); - enum_constant public static final android.renderscript.Allocation.MipmapControl MIPMAP_FULL; - enum_constant public static final android.renderscript.Allocation.MipmapControl MIPMAP_NONE; - enum_constant public static final android.renderscript.Allocation.MipmapControl MIPMAP_ON_SYNC_TO_TEXTURE; + enum_constant public static final deprecated android.renderscript.Allocation.MipmapControl MIPMAP_FULL; + enum_constant public static final deprecated android.renderscript.Allocation.MipmapControl MIPMAP_NONE; + enum_constant public static final deprecated android.renderscript.Allocation.MipmapControl MIPMAP_ON_SYNC_TO_TEXTURE; } - public class AllocationAdapter extends android.renderscript.Allocation { - method public static android.renderscript.AllocationAdapter create1D(android.renderscript.RenderScript, android.renderscript.Allocation); - method public static android.renderscript.AllocationAdapter create2D(android.renderscript.RenderScript, android.renderscript.Allocation); - method public void setFace(android.renderscript.Type.CubemapFace); - method public void setLOD(int); - method public void setY(int); - method public void setZ(int); + public deprecated class AllocationAdapter extends android.renderscript.Allocation { + method public static deprecated android.renderscript.AllocationAdapter create1D(android.renderscript.RenderScript, android.renderscript.Allocation); + method public static deprecated android.renderscript.AllocationAdapter create2D(android.renderscript.RenderScript, android.renderscript.Allocation); + method public deprecated void setFace(android.renderscript.Type.CubemapFace); + method public deprecated void setLOD(int); + method public deprecated void setY(int); + method public deprecated void setZ(int); } - public class BaseObj { - method public synchronized void destroy(); - method public java.lang.String getName(); - method public void setName(java.lang.String); + public deprecated class BaseObj { + method public deprecated synchronized void destroy(); + method public deprecated java.lang.String getName(); + method public deprecated void setName(java.lang.String); } - public class Byte2 { + public deprecated class Byte2 { ctor public Byte2(); ctor public Byte2(byte, byte); field public byte x; field public byte y; } - public class Byte3 { + public deprecated class Byte3 { ctor public Byte3(); ctor public Byte3(byte, byte, byte); field public byte x; @@ -18420,7 +18440,7 @@ package android.renderscript { field public byte z; } - public class Byte4 { + public deprecated class Byte4 { ctor public Byte4(); ctor public Byte4(byte, byte, byte, byte); field public byte w; @@ -18429,14 +18449,14 @@ package android.renderscript { field public byte z; } - public class Double2 { + public deprecated class Double2 { ctor public Double2(); ctor public Double2(double, double); field public double x; field public double y; } - public class Double3 { + public deprecated class Double3 { ctor public Double3(); ctor public Double3(double, double, double); field public double x; @@ -18444,7 +18464,7 @@ package android.renderscript { field public double z; } - public class Double4 { + public deprecated class Double4 { ctor public Double4(); ctor public Double4(double, double, double, double); field public double w; @@ -18453,92 +18473,82 @@ package android.renderscript { field public double z; } - public class Element extends android.renderscript.BaseObj { - method public static android.renderscript.Element ALLOCATION(android.renderscript.RenderScript); - method public static android.renderscript.Element A_8(android.renderscript.RenderScript); - method public static android.renderscript.Element BOOLEAN(android.renderscript.RenderScript); - method public static android.renderscript.Element ELEMENT(android.renderscript.RenderScript); - method public static android.renderscript.Element F32(android.renderscript.RenderScript); - method public static android.renderscript.Element F32_2(android.renderscript.RenderScript); - method public static android.renderscript.Element F32_3(android.renderscript.RenderScript); - method public static android.renderscript.Element F32_4(android.renderscript.RenderScript); - method public static android.renderscript.Element F64(android.renderscript.RenderScript); - method public static android.renderscript.Element F64_2(android.renderscript.RenderScript); - method public static android.renderscript.Element F64_3(android.renderscript.RenderScript); - method public static android.renderscript.Element F64_4(android.renderscript.RenderScript); - method public static android.renderscript.Element FONT(android.renderscript.RenderScript); - method public static android.renderscript.Element I16(android.renderscript.RenderScript); - method public static android.renderscript.Element I16_2(android.renderscript.RenderScript); - method public static android.renderscript.Element I16_3(android.renderscript.RenderScript); - method public static android.renderscript.Element I16_4(android.renderscript.RenderScript); - method public static android.renderscript.Element I32(android.renderscript.RenderScript); - method public static android.renderscript.Element I32_2(android.renderscript.RenderScript); - method public static android.renderscript.Element I32_3(android.renderscript.RenderScript); - method public static android.renderscript.Element I32_4(android.renderscript.RenderScript); - method public static android.renderscript.Element I64(android.renderscript.RenderScript); - method public static android.renderscript.Element I64_2(android.renderscript.RenderScript); - method public static android.renderscript.Element I64_3(android.renderscript.RenderScript); - method public static android.renderscript.Element I64_4(android.renderscript.RenderScript); - method public static android.renderscript.Element I8(android.renderscript.RenderScript); - method public static android.renderscript.Element I8_2(android.renderscript.RenderScript); - method public static android.renderscript.Element I8_3(android.renderscript.RenderScript); - method public static android.renderscript.Element I8_4(android.renderscript.RenderScript); - method public static android.renderscript.Element MATRIX4X4(android.renderscript.RenderScript); - method public static android.renderscript.Element MATRIX_2X2(android.renderscript.RenderScript); - method public static android.renderscript.Element MATRIX_3X3(android.renderscript.RenderScript); - method public static android.renderscript.Element MATRIX_4X4(android.renderscript.RenderScript); - method public static android.renderscript.Element MESH(android.renderscript.RenderScript); - method public static android.renderscript.Element PROGRAM_FRAGMENT(android.renderscript.RenderScript); - method public static android.renderscript.Element PROGRAM_RASTER(android.renderscript.RenderScript); - method public static android.renderscript.Element PROGRAM_STORE(android.renderscript.RenderScript); - method public static android.renderscript.Element PROGRAM_VERTEX(android.renderscript.RenderScript); - method public static android.renderscript.Element RGBA_4444(android.renderscript.RenderScript); - method public static android.renderscript.Element RGBA_5551(android.renderscript.RenderScript); - method public static android.renderscript.Element RGBA_8888(android.renderscript.RenderScript); - method public static android.renderscript.Element RGB_565(android.renderscript.RenderScript); - method public static android.renderscript.Element RGB_888(android.renderscript.RenderScript); - method public static android.renderscript.Element SAMPLER(android.renderscript.RenderScript); - method public static android.renderscript.Element SCRIPT(android.renderscript.RenderScript); - method public static android.renderscript.Element TYPE(android.renderscript.RenderScript); - method public static android.renderscript.Element U16(android.renderscript.RenderScript); - method public static android.renderscript.Element U16_2(android.renderscript.RenderScript); - method public static android.renderscript.Element U16_3(android.renderscript.RenderScript); - method public static android.renderscript.Element U16_4(android.renderscript.RenderScript); - method public static android.renderscript.Element U32(android.renderscript.RenderScript); - method public static android.renderscript.Element U32_2(android.renderscript.RenderScript); - method public static android.renderscript.Element U32_3(android.renderscript.RenderScript); - method public static android.renderscript.Element U32_4(android.renderscript.RenderScript); - method public static android.renderscript.Element U64(android.renderscript.RenderScript); - method public static android.renderscript.Element U64_2(android.renderscript.RenderScript); - method public static android.renderscript.Element U64_3(android.renderscript.RenderScript); - method public static android.renderscript.Element U64_4(android.renderscript.RenderScript); - method public static android.renderscript.Element U8(android.renderscript.RenderScript); - method public static android.renderscript.Element U8_2(android.renderscript.RenderScript); - method public static android.renderscript.Element U8_3(android.renderscript.RenderScript); - method public static android.renderscript.Element U8_4(android.renderscript.RenderScript); - method public static android.renderscript.Element createPixel(android.renderscript.RenderScript, android.renderscript.Element.DataType, android.renderscript.Element.DataKind); - method public static android.renderscript.Element createVector(android.renderscript.RenderScript, android.renderscript.Element.DataType, int); - method public int getBytesSize(); - method public android.renderscript.Element.DataKind getDataKind(); - method public android.renderscript.Element.DataType getDataType(); - method public android.renderscript.Element getSubElement(int); - method public int getSubElementArraySize(int); - method public int getSubElementCount(); - method public java.lang.String getSubElementName(int); - method public int getSubElementOffsetBytes(int); - method public int getVectorSize(); - method public boolean isCompatible(android.renderscript.Element); - method public boolean isComplex(); - } - - public static class Element.Builder { - ctor public Element.Builder(android.renderscript.RenderScript); - method public android.renderscript.Element.Builder add(android.renderscript.Element, java.lang.String, int); - method public android.renderscript.Element.Builder add(android.renderscript.Element, java.lang.String); - method public android.renderscript.Element create(); - } - - public static final class Element.DataKind extends java.lang.Enum { + public deprecated class Element extends android.renderscript.BaseObj { + method public static deprecated android.renderscript.Element ALLOCATION(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element A_8(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element BOOLEAN(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element ELEMENT(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element F32(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element F32_2(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element F32_3(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element F32_4(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element F64(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element F64_2(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element F64_3(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element F64_4(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element I16(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element I16_2(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element I16_3(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element I16_4(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element I32(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element I32_2(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element I32_3(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element I32_4(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element I64(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element I64_2(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element I64_3(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element I64_4(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element I8(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element I8_2(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element I8_3(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element I8_4(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element MATRIX4X4(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element MATRIX_2X2(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element MATRIX_3X3(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element MATRIX_4X4(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element MESH(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element PROGRAM_FRAGMENT(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element PROGRAM_RASTER(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element PROGRAM_STORE(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element PROGRAM_VERTEX(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element RGBA_4444(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element RGBA_5551(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element RGBA_8888(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element RGB_565(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element RGB_888(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element SAMPLER(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element SCRIPT(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element TYPE(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element U16(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element U16_2(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element U16_3(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element U16_4(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element U32(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element U32_2(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element U32_3(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element U32_4(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element U64(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element U64_2(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element U64_3(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element U64_4(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element U8(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element U8_2(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element U8_3(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element U8_4(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Element createPixel(android.renderscript.RenderScript, android.renderscript.Element.DataType, android.renderscript.Element.DataKind); + method public static deprecated android.renderscript.Element createVector(android.renderscript.RenderScript, android.renderscript.Element.DataType, int); + method public deprecated boolean isCompatible(android.renderscript.Element); + method public deprecated boolean isComplex(); + } + + public static deprecated class Element.Builder { + ctor public deprecated Element.Builder(android.renderscript.RenderScript); + method public deprecated android.renderscript.Element.Builder add(android.renderscript.Element, java.lang.String, int); + method public deprecated android.renderscript.Element.Builder add(android.renderscript.Element, java.lang.String); + method public deprecated android.renderscript.Element create(); + } + + public static final deprecated class Element.DataKind extends java.lang.Enum { method public static android.renderscript.Element.DataKind valueOf(java.lang.String); method public static final android.renderscript.Element.DataKind[] values(); enum_constant public static final android.renderscript.Element.DataKind PIXEL_A; @@ -18550,7 +18560,7 @@ package android.renderscript { enum_constant public static final android.renderscript.Element.DataKind USER; } - public static final class Element.DataType extends java.lang.Enum { + public static final deprecated class Element.DataType extends java.lang.Enum { method public static android.renderscript.Element.DataType valueOf(java.lang.String); method public static final android.renderscript.Element.DataType[] values(); enum_constant public static final android.renderscript.Element.DataType BOOLEAN; @@ -18559,10 +18569,8 @@ package android.renderscript { enum_constant public static final android.renderscript.Element.DataType MATRIX_2X2; enum_constant public static final android.renderscript.Element.DataType MATRIX_3X3; enum_constant public static final android.renderscript.Element.DataType MATRIX_4X4; - enum_constant public static final android.renderscript.Element.DataType NONE; enum_constant public static final android.renderscript.Element.DataType RS_ALLOCATION; enum_constant public static final android.renderscript.Element.DataType RS_ELEMENT; - enum_constant public static final android.renderscript.Element.DataType RS_FONT; enum_constant public static final android.renderscript.Element.DataType RS_MESH; enum_constant public static final android.renderscript.Element.DataType RS_PROGRAM_FRAGMENT; enum_constant public static final android.renderscript.Element.DataType RS_PROGRAM_RASTER; @@ -18584,7 +18592,7 @@ package android.renderscript { enum_constant public static final android.renderscript.Element.DataType UNSIGNED_8; } - public class FieldPacker { + public deprecated class FieldPacker { ctor public FieldPacker(int); method public void addBoolean(boolean); method public void addF32(float); @@ -18638,37 +18646,37 @@ package android.renderscript { method public void skip(int); } - public class FileA3D extends android.renderscript.BaseObj { - method public static android.renderscript.FileA3D createFromAsset(android.renderscript.RenderScript, android.content.res.AssetManager, java.lang.String); - method public static android.renderscript.FileA3D createFromFile(android.renderscript.RenderScript, java.lang.String); - method public static android.renderscript.FileA3D createFromFile(android.renderscript.RenderScript, java.io.File); - method public static android.renderscript.FileA3D createFromResource(android.renderscript.RenderScript, android.content.res.Resources, int); - method public android.renderscript.FileA3D.IndexEntry getIndexEntry(int); - method public int getIndexEntryCount(); + public deprecated class FileA3D extends android.renderscript.BaseObj { + method public static deprecated android.renderscript.FileA3D createFromAsset(android.renderscript.RenderScript, android.content.res.AssetManager, java.lang.String); + method public static deprecated android.renderscript.FileA3D createFromFile(android.renderscript.RenderScript, java.lang.String); + method public static deprecated android.renderscript.FileA3D createFromFile(android.renderscript.RenderScript, java.io.File); + method public static deprecated android.renderscript.FileA3D createFromResource(android.renderscript.RenderScript, android.content.res.Resources, int); + method public deprecated android.renderscript.FileA3D.IndexEntry getIndexEntry(int); + method public deprecated int getIndexEntryCount(); } - public static final class FileA3D.EntryType extends java.lang.Enum { + public static final deprecated class FileA3D.EntryType extends java.lang.Enum { method public static android.renderscript.FileA3D.EntryType valueOf(java.lang.String); method public static final android.renderscript.FileA3D.EntryType[] values(); - enum_constant public static final android.renderscript.FileA3D.EntryType MESH; - enum_constant public static final android.renderscript.FileA3D.EntryType UNKNOWN; + enum_constant public static final deprecated android.renderscript.FileA3D.EntryType MESH; + enum_constant public static final deprecated android.renderscript.FileA3D.EntryType UNKNOWN; } - public static class FileA3D.IndexEntry { - method public android.renderscript.FileA3D.EntryType getEntryType(); - method public android.renderscript.Mesh getMesh(); - method public java.lang.String getName(); - method public android.renderscript.BaseObj getObject(); + public static deprecated class FileA3D.IndexEntry { + method public deprecated android.renderscript.FileA3D.EntryType getEntryType(); + method public deprecated android.renderscript.Mesh getMesh(); + method public deprecated java.lang.String getName(); + method public deprecated android.renderscript.BaseObj getObject(); } - public class Float2 { + public deprecated class Float2 { ctor public Float2(); ctor public Float2(float, float); field public float x; field public float y; } - public class Float3 { + public deprecated class Float3 { ctor public Float3(); ctor public Float3(float, float, float); field public float x; @@ -18676,7 +18684,7 @@ package android.renderscript { field public float z; } - public class Float4 { + public deprecated class Float4 { ctor public Float4(); ctor public Float4(float, float, float, float); field public float w; @@ -18685,31 +18693,31 @@ package android.renderscript { field public float z; } - public class Font extends android.renderscript.BaseObj { - method public static android.renderscript.Font create(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, android.renderscript.Font.Style, float); - method public static android.renderscript.Font createFromAsset(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, float); - method public static android.renderscript.Font createFromFile(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, float); - method public static android.renderscript.Font createFromFile(android.renderscript.RenderScript, android.content.res.Resources, java.io.File, float); - method public static android.renderscript.Font createFromResource(android.renderscript.RenderScript, android.content.res.Resources, int, float); + public deprecated class Font extends android.renderscript.BaseObj { + method public static deprecated android.renderscript.Font create(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, android.renderscript.Font.Style, float); + method public static deprecated android.renderscript.Font createFromAsset(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, float); + method public static deprecated android.renderscript.Font createFromFile(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, float); + method public static deprecated android.renderscript.Font createFromFile(android.renderscript.RenderScript, android.content.res.Resources, java.io.File, float); + method public static deprecated android.renderscript.Font createFromResource(android.renderscript.RenderScript, android.content.res.Resources, int, float); } - public static final class Font.Style extends java.lang.Enum { + public static final deprecated class Font.Style extends java.lang.Enum { method public static android.renderscript.Font.Style valueOf(java.lang.String); method public static final android.renderscript.Font.Style[] values(); - enum_constant public static final android.renderscript.Font.Style BOLD; - enum_constant public static final android.renderscript.Font.Style BOLD_ITALIC; - enum_constant public static final android.renderscript.Font.Style ITALIC; - enum_constant public static final android.renderscript.Font.Style NORMAL; + enum_constant public static final deprecated android.renderscript.Font.Style BOLD; + enum_constant public static final deprecated android.renderscript.Font.Style BOLD_ITALIC; + enum_constant public static final deprecated android.renderscript.Font.Style ITALIC; + enum_constant public static final deprecated android.renderscript.Font.Style NORMAL; } - public class Int2 { + public deprecated class Int2 { ctor public Int2(); ctor public Int2(int, int); field public int x; field public int y; } - public class Int3 { + public deprecated class Int3 { ctor public Int3(); ctor public Int3(int, int, int); field public int x; @@ -18717,7 +18725,7 @@ package android.renderscript { field public int z; } - public class Int4 { + public deprecated class Int4 { ctor public Int4(); ctor public Int4(int, int, int, int); field public int w; @@ -18726,14 +18734,14 @@ package android.renderscript { field public int z; } - public class Long2 { + public deprecated class Long2 { ctor public Long2(); ctor public Long2(long, long); field public long x; field public long y; } - public class Long3 { + public deprecated class Long3 { ctor public Long3(); ctor public Long3(long, long, long); field public long x; @@ -18741,7 +18749,7 @@ package android.renderscript { field public long z; } - public class Long4 { + public deprecated class Long4 { ctor public Long4(); ctor public Long4(long, long, long, long); field public long w; @@ -18750,384 +18758,365 @@ package android.renderscript { field public long z; } - public class Matrix2f { - ctor public Matrix2f(); - ctor public Matrix2f(float[]); - method public float get(int, int); - method public float[] getArray(); - method public void load(android.renderscript.Matrix2f); - method public void loadIdentity(); - method public void loadMultiply(android.renderscript.Matrix2f, android.renderscript.Matrix2f); - method public void loadRotate(float); - method public void loadScale(float, float); - method public void multiply(android.renderscript.Matrix2f); - method public void rotate(float); - method public void scale(float, float); - method public void set(int, int, float); - method public void transpose(); - } - - public class Matrix3f { - ctor public Matrix3f(); - ctor public Matrix3f(float[]); - method public float get(int, int); - method public float[] getArray(); - method public void load(android.renderscript.Matrix3f); - method public void loadIdentity(); - method public void loadMultiply(android.renderscript.Matrix3f, android.renderscript.Matrix3f); - method public void loadRotate(float, float, float, float); - method public void loadRotate(float); - method public void loadScale(float, float); - method public void loadScale(float, float, float); - method public void loadTranslate(float, float); - method public void multiply(android.renderscript.Matrix3f); - method public void rotate(float, float, float, float); - method public void rotate(float); - method public void scale(float, float); - method public void scale(float, float, float); - method public void set(int, int, float); - method public void translate(float, float); - method public void transpose(); - } - - public class Matrix4f { - ctor public Matrix4f(); - ctor public Matrix4f(float[]); - method public float get(int, int); - method public float[] getArray(); - method public boolean inverse(); - method public boolean inverseTranspose(); - method public void load(android.renderscript.Matrix4f); - method public void loadFrustum(float, float, float, float, float, float); - method public void loadIdentity(); - method public void loadMultiply(android.renderscript.Matrix4f, android.renderscript.Matrix4f); - method public void loadOrtho(float, float, float, float, float, float); - method public void loadOrthoWindow(int, int); - method public void loadPerspective(float, float, float, float); - method public void loadProjectionNormalized(int, int); - method public void loadRotate(float, float, float, float); - method public void loadScale(float, float, float); - method public void loadTranslate(float, float, float); - method public void multiply(android.renderscript.Matrix4f); - method public void rotate(float, float, float, float); - method public void scale(float, float, float); - method public void set(int, int, float); - method public void translate(float, float, float); - method public void transpose(); - } - - public class Mesh extends android.renderscript.BaseObj { - method public android.renderscript.Allocation getIndexSetAllocation(int); - method public android.renderscript.Mesh.Primitive getPrimitive(int); - method public int getPrimitiveCount(); - method public android.renderscript.Allocation getVertexAllocation(int); - method public int getVertexAllocationCount(); - } - - public static class Mesh.AllocationBuilder { - ctor public Mesh.AllocationBuilder(android.renderscript.RenderScript); - method public android.renderscript.Mesh.AllocationBuilder addIndexSetAllocation(android.renderscript.Allocation, android.renderscript.Mesh.Primitive); - method public android.renderscript.Mesh.AllocationBuilder addIndexSetType(android.renderscript.Mesh.Primitive); - method public android.renderscript.Mesh.AllocationBuilder addVertexAllocation(android.renderscript.Allocation) throws java.lang.IllegalStateException; - method public android.renderscript.Mesh create(); - method public int getCurrentIndexSetIndex(); - method public int getCurrentVertexTypeIndex(); - } - - public static class Mesh.Builder { - ctor public Mesh.Builder(android.renderscript.RenderScript, int); - method public android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Type, android.renderscript.Mesh.Primitive); - method public android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Mesh.Primitive); - method public android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Element, int, android.renderscript.Mesh.Primitive); - method public android.renderscript.Mesh.Builder addVertexType(android.renderscript.Type) throws java.lang.IllegalStateException; - method public android.renderscript.Mesh.Builder addVertexType(android.renderscript.Element, int) throws java.lang.IllegalStateException; - method public android.renderscript.Mesh create(); - method public int getCurrentIndexSetIndex(); - method public int getCurrentVertexTypeIndex(); - } - - public static final class Mesh.Primitive extends java.lang.Enum { + public deprecated class Matrix2f { + ctor public deprecated Matrix2f(); + ctor public deprecated Matrix2f(float[]); + method public deprecated float get(int, int); + method public deprecated float[] getArray(); + method public deprecated void load(android.renderscript.Matrix2f); + method public deprecated void loadIdentity(); + method public deprecated void loadMultiply(android.renderscript.Matrix2f, android.renderscript.Matrix2f); + method public deprecated void loadRotate(float); + method public deprecated void loadScale(float, float); + method public deprecated void multiply(android.renderscript.Matrix2f); + method public deprecated void rotate(float); + method public deprecated void scale(float, float); + method public deprecated void set(int, int, float); + method public deprecated void transpose(); + } + + public deprecated class Matrix3f { + ctor public deprecated Matrix3f(); + ctor public deprecated Matrix3f(float[]); + method public deprecated float get(int, int); + method public deprecated float[] getArray(); + method public deprecated void load(android.renderscript.Matrix3f); + method public deprecated void loadIdentity(); + method public deprecated void loadMultiply(android.renderscript.Matrix3f, android.renderscript.Matrix3f); + method public deprecated void loadRotate(float, float, float, float); + method public deprecated void loadRotate(float); + method public deprecated void loadScale(float, float); + method public deprecated void loadScale(float, float, float); + method public deprecated void loadTranslate(float, float); + method public deprecated void multiply(android.renderscript.Matrix3f); + method public deprecated void rotate(float, float, float, float); + method public deprecated void rotate(float); + method public deprecated void scale(float, float); + method public deprecated void scale(float, float, float); + method public deprecated void set(int, int, float); + method public deprecated void translate(float, float); + method public deprecated void transpose(); + } + + public deprecated class Matrix4f { + ctor public deprecated Matrix4f(); + ctor public deprecated Matrix4f(float[]); + method public deprecated float get(int, int); + method public deprecated float[] getArray(); + method public deprecated boolean inverse(); + method public deprecated boolean inverseTranspose(); + method public deprecated void load(android.renderscript.Matrix4f); + method public deprecated void loadFrustum(float, float, float, float, float, float); + method public deprecated void loadIdentity(); + method public deprecated void loadMultiply(android.renderscript.Matrix4f, android.renderscript.Matrix4f); + method public deprecated void loadOrtho(float, float, float, float, float, float); + method public deprecated void loadOrthoWindow(int, int); + method public deprecated void loadPerspective(float, float, float, float); + method public deprecated void loadProjectionNormalized(int, int); + method public deprecated void loadRotate(float, float, float, float); + method public deprecated void loadScale(float, float, float); + method public deprecated void loadTranslate(float, float, float); + method public deprecated void multiply(android.renderscript.Matrix4f); + method public deprecated void rotate(float, float, float, float); + method public deprecated void scale(float, float, float); + method public deprecated void set(int, int, float); + method public deprecated void translate(float, float, float); + method public deprecated void transpose(); + } + + public deprecated class Mesh extends android.renderscript.BaseObj { + method public deprecated android.renderscript.Allocation getIndexSetAllocation(int); + method public deprecated android.renderscript.Mesh.Primitive getPrimitive(int); + method public deprecated int getPrimitiveCount(); + method public deprecated android.renderscript.Allocation getVertexAllocation(int); + method public deprecated int getVertexAllocationCount(); + } + + public static deprecated class Mesh.AllocationBuilder { + ctor public deprecated Mesh.AllocationBuilder(android.renderscript.RenderScript); + method public deprecated android.renderscript.Mesh.AllocationBuilder addIndexSetAllocation(android.renderscript.Allocation, android.renderscript.Mesh.Primitive); + method public deprecated android.renderscript.Mesh.AllocationBuilder addIndexSetType(android.renderscript.Mesh.Primitive); + method public deprecated android.renderscript.Mesh.AllocationBuilder addVertexAllocation(android.renderscript.Allocation) throws java.lang.IllegalStateException; + method public deprecated android.renderscript.Mesh create(); + method public deprecated int getCurrentIndexSetIndex(); + method public deprecated int getCurrentVertexTypeIndex(); + } + + public static deprecated class Mesh.Builder { + ctor public deprecated Mesh.Builder(android.renderscript.RenderScript, int); + method public deprecated android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Type, android.renderscript.Mesh.Primitive); + method public deprecated android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Mesh.Primitive); + method public deprecated android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Element, int, android.renderscript.Mesh.Primitive); + method public deprecated android.renderscript.Mesh.Builder addVertexType(android.renderscript.Type) throws java.lang.IllegalStateException; + method public deprecated android.renderscript.Mesh.Builder addVertexType(android.renderscript.Element, int) throws java.lang.IllegalStateException; + method public deprecated android.renderscript.Mesh create(); + method public deprecated int getCurrentIndexSetIndex(); + method public deprecated int getCurrentVertexTypeIndex(); + } + + public static final deprecated class Mesh.Primitive extends java.lang.Enum { method public static android.renderscript.Mesh.Primitive valueOf(java.lang.String); method public static final android.renderscript.Mesh.Primitive[] values(); - enum_constant public static final android.renderscript.Mesh.Primitive LINE; - enum_constant public static final android.renderscript.Mesh.Primitive LINE_STRIP; - enum_constant public static final android.renderscript.Mesh.Primitive POINT; - enum_constant public static final android.renderscript.Mesh.Primitive TRIANGLE; - enum_constant public static final android.renderscript.Mesh.Primitive TRIANGLE_FAN; - enum_constant public static final android.renderscript.Mesh.Primitive TRIANGLE_STRIP; - } - - public static class Mesh.TriangleMeshBuilder { - ctor public Mesh.TriangleMeshBuilder(android.renderscript.RenderScript, int, int); - method public android.renderscript.Mesh.TriangleMeshBuilder addTriangle(int, int, int); - method public android.renderscript.Mesh.TriangleMeshBuilder addVertex(float, float); - method public android.renderscript.Mesh.TriangleMeshBuilder addVertex(float, float, float); - method public android.renderscript.Mesh create(boolean); - method public android.renderscript.Mesh.TriangleMeshBuilder setColor(float, float, float, float); - method public android.renderscript.Mesh.TriangleMeshBuilder setNormal(float, float, float); - method public android.renderscript.Mesh.TriangleMeshBuilder setTexture(float, float); - field public static final int COLOR = 1; // 0x1 - field public static final int NORMAL = 2; // 0x2 - field public static final int TEXTURE_0 = 256; // 0x100 - } - - public class Program extends android.renderscript.BaseObj { - method public void bindConstants(android.renderscript.Allocation, int); - method public void bindSampler(android.renderscript.Sampler, int) throws java.lang.IllegalArgumentException; - method public void bindTexture(android.renderscript.Allocation, int) throws java.lang.IllegalArgumentException; - method public android.renderscript.Type getConstant(int); - method public int getConstantCount(); - method public int getTextureCount(); - method public java.lang.String getTextureName(int); - method public android.renderscript.Program.TextureType getTextureType(int); + enum_constant public static final deprecated android.renderscript.Mesh.Primitive LINE; + enum_constant public static final deprecated android.renderscript.Mesh.Primitive LINE_STRIP; + enum_constant public static final deprecated android.renderscript.Mesh.Primitive POINT; + enum_constant public static final deprecated android.renderscript.Mesh.Primitive TRIANGLE; + enum_constant public static final deprecated android.renderscript.Mesh.Primitive TRIANGLE_FAN; + enum_constant public static final deprecated android.renderscript.Mesh.Primitive TRIANGLE_STRIP; + } + + public static deprecated class Mesh.TriangleMeshBuilder { + ctor public deprecated Mesh.TriangleMeshBuilder(android.renderscript.RenderScript, int, int); + method public deprecated android.renderscript.Mesh.TriangleMeshBuilder addTriangle(int, int, int); + method public deprecated android.renderscript.Mesh.TriangleMeshBuilder addVertex(float, float); + method public deprecated android.renderscript.Mesh.TriangleMeshBuilder addVertex(float, float, float); + method public deprecated android.renderscript.Mesh create(boolean); + method public deprecated android.renderscript.Mesh.TriangleMeshBuilder setColor(float, float, float, float); + method public deprecated android.renderscript.Mesh.TriangleMeshBuilder setNormal(float, float, float); + method public deprecated android.renderscript.Mesh.TriangleMeshBuilder setTexture(float, float); + field public static final deprecated int COLOR = 1; // 0x1 + field public static final deprecated int NORMAL = 2; // 0x2 + field public static final deprecated int TEXTURE_0 = 256; // 0x100 + } + + public deprecated class Program extends android.renderscript.BaseObj { + method public deprecated void bindConstants(android.renderscript.Allocation, int); + method public deprecated void bindSampler(android.renderscript.Sampler, int) throws java.lang.IllegalArgumentException; + method public deprecated void bindTexture(android.renderscript.Allocation, int) throws java.lang.IllegalArgumentException; } public static class Program.BaseProgramBuilder { - ctor protected Program.BaseProgramBuilder(android.renderscript.RenderScript); - method public android.renderscript.Program.BaseProgramBuilder addConstant(android.renderscript.Type) throws java.lang.IllegalStateException; - method public android.renderscript.Program.BaseProgramBuilder addTexture(android.renderscript.Program.TextureType) throws java.lang.IllegalArgumentException; - method public android.renderscript.Program.BaseProgramBuilder addTexture(android.renderscript.Program.TextureType, java.lang.String) throws java.lang.IllegalArgumentException; - method public int getCurrentConstantIndex(); - method public int getCurrentTextureIndex(); - method protected void initProgram(android.renderscript.Program); - method public android.renderscript.Program.BaseProgramBuilder setShader(java.lang.String); - method public android.renderscript.Program.BaseProgramBuilder setShader(android.content.res.Resources, int); - } - - public static final class Program.TextureType extends java.lang.Enum { + ctor protected deprecated Program.BaseProgramBuilder(android.renderscript.RenderScript); + method public deprecated android.renderscript.Program.BaseProgramBuilder addConstant(android.renderscript.Type) throws java.lang.IllegalStateException; + method public deprecated android.renderscript.Program.BaseProgramBuilder addTexture(android.renderscript.Program.TextureType) throws java.lang.IllegalArgumentException; + method public deprecated int getCurrentConstantIndex(); + method public deprecated int getCurrentTextureIndex(); + method protected deprecated void initProgram(android.renderscript.Program); + method public deprecated android.renderscript.Program.BaseProgramBuilder setShader(java.lang.String); + method public deprecated android.renderscript.Program.BaseProgramBuilder setShader(android.content.res.Resources, int); + } + + public static final deprecated class Program.TextureType extends java.lang.Enum { method public static android.renderscript.Program.TextureType valueOf(java.lang.String); method public static final android.renderscript.Program.TextureType[] values(); - enum_constant public static final android.renderscript.Program.TextureType TEXTURE_2D; - enum_constant public static final android.renderscript.Program.TextureType TEXTURE_CUBE; + enum_constant public static final deprecated android.renderscript.Program.TextureType TEXTURE_2D; + enum_constant public static final deprecated android.renderscript.Program.TextureType TEXTURE_CUBE; } - public class ProgramFragment extends android.renderscript.Program { + public deprecated class ProgramFragment extends android.renderscript.Program { } public static class ProgramFragment.Builder extends android.renderscript.Program.BaseProgramBuilder { - ctor public ProgramFragment.Builder(android.renderscript.RenderScript); - method public android.renderscript.ProgramFragment create(); + ctor public deprecated ProgramFragment.Builder(android.renderscript.RenderScript); + method public deprecated android.renderscript.ProgramFragment create(); } - public class ProgramFragmentFixedFunction extends android.renderscript.ProgramFragment { + public deprecated class ProgramFragmentFixedFunction extends android.renderscript.ProgramFragment { } public static class ProgramFragmentFixedFunction.Builder { - ctor public ProgramFragmentFixedFunction.Builder(android.renderscript.RenderScript); - method public android.renderscript.ProgramFragmentFixedFunction create(); - method public android.renderscript.ProgramFragmentFixedFunction.Builder setPointSpriteTexCoordinateReplacement(boolean); - method public android.renderscript.ProgramFragmentFixedFunction.Builder setTexture(android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode, android.renderscript.ProgramFragmentFixedFunction.Builder.Format, int) throws java.lang.IllegalArgumentException; - method public android.renderscript.ProgramFragmentFixedFunction.Builder setVaryingColor(boolean); - field public static final int MAX_TEXTURE = 2; // 0x2 + ctor public deprecated ProgramFragmentFixedFunction.Builder(android.renderscript.RenderScript); + method public deprecated android.renderscript.ProgramFragmentFixedFunction create(); + method public deprecated android.renderscript.ProgramFragmentFixedFunction.Builder setPointSpriteTexCoordinateReplacement(boolean); + method public deprecated android.renderscript.ProgramFragmentFixedFunction.Builder setTexture(android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode, android.renderscript.ProgramFragmentFixedFunction.Builder.Format, int) throws java.lang.IllegalArgumentException; + method public deprecated android.renderscript.ProgramFragmentFixedFunction.Builder setVaryingColor(boolean); + field public static final deprecated int MAX_TEXTURE = 2; // 0x2 } - public static final class ProgramFragmentFixedFunction.Builder.EnvMode extends java.lang.Enum { + public static final deprecated class ProgramFragmentFixedFunction.Builder.EnvMode extends java.lang.Enum { method public static android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode valueOf(java.lang.String); method public static final android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode[] values(); - enum_constant public static final android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode DECAL; - enum_constant public static final android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode MODULATE; - enum_constant public static final android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode REPLACE; + enum_constant public static final deprecated android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode DECAL; + enum_constant public static final deprecated android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode MODULATE; + enum_constant public static final deprecated android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode REPLACE; } - public static final class ProgramFragmentFixedFunction.Builder.Format extends java.lang.Enum { + public static final deprecated class ProgramFragmentFixedFunction.Builder.Format extends java.lang.Enum { method public static android.renderscript.ProgramFragmentFixedFunction.Builder.Format valueOf(java.lang.String); method public static final android.renderscript.ProgramFragmentFixedFunction.Builder.Format[] values(); - enum_constant public static final android.renderscript.ProgramFragmentFixedFunction.Builder.Format ALPHA; - enum_constant public static final android.renderscript.ProgramFragmentFixedFunction.Builder.Format LUMINANCE_ALPHA; - enum_constant public static final android.renderscript.ProgramFragmentFixedFunction.Builder.Format RGB; - enum_constant public static final android.renderscript.ProgramFragmentFixedFunction.Builder.Format RGBA; + enum_constant public static final deprecated android.renderscript.ProgramFragmentFixedFunction.Builder.Format ALPHA; + enum_constant public static final deprecated android.renderscript.ProgramFragmentFixedFunction.Builder.Format LUMINANCE_ALPHA; + enum_constant public static final deprecated android.renderscript.ProgramFragmentFixedFunction.Builder.Format RGB; + enum_constant public static final deprecated android.renderscript.ProgramFragmentFixedFunction.Builder.Format RGBA; } - public class ProgramRaster extends android.renderscript.BaseObj { - method public static android.renderscript.ProgramRaster CULL_BACK(android.renderscript.RenderScript); - method public static android.renderscript.ProgramRaster CULL_FRONT(android.renderscript.RenderScript); - method public static android.renderscript.ProgramRaster CULL_NONE(android.renderscript.RenderScript); - method public android.renderscript.ProgramRaster.CullMode getCullMode(); - method public boolean isPointSpriteEnabled(); + public deprecated class ProgramRaster extends android.renderscript.BaseObj { + method public static deprecated android.renderscript.ProgramRaster CULL_BACK(android.renderscript.RenderScript); + method public static deprecated android.renderscript.ProgramRaster CULL_FRONT(android.renderscript.RenderScript); + method public static deprecated android.renderscript.ProgramRaster CULL_NONE(android.renderscript.RenderScript); } - public static class ProgramRaster.Builder { - ctor public ProgramRaster.Builder(android.renderscript.RenderScript); - method public android.renderscript.ProgramRaster create(); - method public android.renderscript.ProgramRaster.Builder setCullMode(android.renderscript.ProgramRaster.CullMode); - method public android.renderscript.ProgramRaster.Builder setPointSpriteEnabled(boolean); + public static deprecated class ProgramRaster.Builder { + ctor public deprecated ProgramRaster.Builder(android.renderscript.RenderScript); + method public deprecated android.renderscript.ProgramRaster create(); + method public deprecated android.renderscript.ProgramRaster.Builder setCullMode(android.renderscript.ProgramRaster.CullMode); + method public deprecated android.renderscript.ProgramRaster.Builder setPointSpriteEnabled(boolean); } - public static final class ProgramRaster.CullMode extends java.lang.Enum { + public static final deprecated class ProgramRaster.CullMode extends java.lang.Enum { method public static android.renderscript.ProgramRaster.CullMode valueOf(java.lang.String); method public static final android.renderscript.ProgramRaster.CullMode[] values(); - enum_constant public static final android.renderscript.ProgramRaster.CullMode BACK; - enum_constant public static final android.renderscript.ProgramRaster.CullMode FRONT; - enum_constant public static final android.renderscript.ProgramRaster.CullMode NONE; - } - - public class ProgramStore extends android.renderscript.BaseObj { - method public static android.renderscript.ProgramStore BLEND_ALPHA_DEPTH_NONE(android.renderscript.RenderScript); - method public static android.renderscript.ProgramStore BLEND_ALPHA_DEPTH_TEST(android.renderscript.RenderScript); - method public static android.renderscript.ProgramStore BLEND_NONE_DEPTH_NONE(android.renderscript.RenderScript); - method public static android.renderscript.ProgramStore BLEND_NONE_DEPTH_TEST(android.renderscript.RenderScript); - method public android.renderscript.ProgramStore.BlendDstFunc getBlendDstFunc(); - method public android.renderscript.ProgramStore.BlendSrcFunc getBlendSrcFunc(); - method public android.renderscript.ProgramStore.DepthFunc getDepthFunc(); - method public boolean isColorMaskAlphaEnabled(); - method public boolean isColorMaskBlueEnabled(); - method public boolean isColorMaskGreenEnabled(); - method public boolean isColorMaskRedEnabled(); - method public boolean isDepthMaskEnabled(); - method public boolean isDitherEnabled(); - } - - public static final class ProgramStore.BlendDstFunc extends java.lang.Enum { + enum_constant public static final deprecated android.renderscript.ProgramRaster.CullMode BACK; + enum_constant public static final deprecated android.renderscript.ProgramRaster.CullMode FRONT; + enum_constant public static final deprecated android.renderscript.ProgramRaster.CullMode NONE; + } + + public deprecated class ProgramStore extends android.renderscript.BaseObj { + method public static deprecated android.renderscript.ProgramStore BLEND_ALPHA_DEPTH_NONE(android.renderscript.RenderScript); + method public static deprecated android.renderscript.ProgramStore BLEND_ALPHA_DEPTH_TEST(android.renderscript.RenderScript); + method public static deprecated android.renderscript.ProgramStore BLEND_NONE_DEPTH_NONE(android.renderscript.RenderScript); + method public static deprecated android.renderscript.ProgramStore BLEND_NONE_DEPTH_TEST(android.renderscript.RenderScript); + } + + public static final deprecated class ProgramStore.BlendDstFunc extends java.lang.Enum { method public static android.renderscript.ProgramStore.BlendDstFunc valueOf(java.lang.String); method public static final android.renderscript.ProgramStore.BlendDstFunc[] values(); - enum_constant public static final android.renderscript.ProgramStore.BlendDstFunc DST_ALPHA; - enum_constant public static final android.renderscript.ProgramStore.BlendDstFunc ONE; - enum_constant public static final android.renderscript.ProgramStore.BlendDstFunc ONE_MINUS_DST_ALPHA; - enum_constant public static final android.renderscript.ProgramStore.BlendDstFunc ONE_MINUS_SRC_ALPHA; - enum_constant public static final android.renderscript.ProgramStore.BlendDstFunc ONE_MINUS_SRC_COLOR; - enum_constant public static final android.renderscript.ProgramStore.BlendDstFunc SRC_ALPHA; - enum_constant public static final android.renderscript.ProgramStore.BlendDstFunc SRC_COLOR; - enum_constant public static final android.renderscript.ProgramStore.BlendDstFunc ZERO; + enum_constant public static final deprecated android.renderscript.ProgramStore.BlendDstFunc DST_ALPHA; + enum_constant public static final deprecated android.renderscript.ProgramStore.BlendDstFunc ONE; + enum_constant public static final deprecated android.renderscript.ProgramStore.BlendDstFunc ONE_MINUS_DST_ALPHA; + enum_constant public static final deprecated android.renderscript.ProgramStore.BlendDstFunc ONE_MINUS_SRC_ALPHA; + enum_constant public static final deprecated android.renderscript.ProgramStore.BlendDstFunc ONE_MINUS_SRC_COLOR; + enum_constant public static final deprecated android.renderscript.ProgramStore.BlendDstFunc SRC_ALPHA; + enum_constant public static final deprecated android.renderscript.ProgramStore.BlendDstFunc SRC_COLOR; + enum_constant public static final deprecated android.renderscript.ProgramStore.BlendDstFunc ZERO; } - public static final class ProgramStore.BlendSrcFunc extends java.lang.Enum { + public static final deprecated class ProgramStore.BlendSrcFunc extends java.lang.Enum { method public static android.renderscript.ProgramStore.BlendSrcFunc valueOf(java.lang.String); method public static final android.renderscript.ProgramStore.BlendSrcFunc[] values(); - enum_constant public static final android.renderscript.ProgramStore.BlendSrcFunc DST_ALPHA; - enum_constant public static final android.renderscript.ProgramStore.BlendSrcFunc DST_COLOR; - enum_constant public static final android.renderscript.ProgramStore.BlendSrcFunc ONE; - enum_constant public static final android.renderscript.ProgramStore.BlendSrcFunc ONE_MINUS_DST_ALPHA; - enum_constant public static final android.renderscript.ProgramStore.BlendSrcFunc ONE_MINUS_DST_COLOR; - enum_constant public static final android.renderscript.ProgramStore.BlendSrcFunc ONE_MINUS_SRC_ALPHA; - enum_constant public static final android.renderscript.ProgramStore.BlendSrcFunc SRC_ALPHA; - enum_constant public static final android.renderscript.ProgramStore.BlendSrcFunc SRC_ALPHA_SATURATE; - enum_constant public static final android.renderscript.ProgramStore.BlendSrcFunc ZERO; - } - - public static class ProgramStore.Builder { + enum_constant public static final deprecated android.renderscript.ProgramStore.BlendSrcFunc DST_ALPHA; + enum_constant public static final deprecated android.renderscript.ProgramStore.BlendSrcFunc DST_COLOR; + enum_constant public static final deprecated android.renderscript.ProgramStore.BlendSrcFunc ONE; + enum_constant public static final deprecated android.renderscript.ProgramStore.BlendSrcFunc ONE_MINUS_DST_ALPHA; + enum_constant public static final deprecated android.renderscript.ProgramStore.BlendSrcFunc ONE_MINUS_DST_COLOR; + enum_constant public static final deprecated android.renderscript.ProgramStore.BlendSrcFunc ONE_MINUS_SRC_ALPHA; + enum_constant public static final deprecated android.renderscript.ProgramStore.BlendSrcFunc SRC_ALPHA; + enum_constant public static final deprecated android.renderscript.ProgramStore.BlendSrcFunc SRC_ALPHA_SATURATE; + enum_constant public static final deprecated android.renderscript.ProgramStore.BlendSrcFunc ZERO; + } + + public static deprecated class ProgramStore.Builder { ctor public ProgramStore.Builder(android.renderscript.RenderScript); - method public android.renderscript.ProgramStore create(); - method public android.renderscript.ProgramStore.Builder setBlendFunc(android.renderscript.ProgramStore.BlendSrcFunc, android.renderscript.ProgramStore.BlendDstFunc); - method public android.renderscript.ProgramStore.Builder setColorMaskEnabled(boolean, boolean, boolean, boolean); - method public android.renderscript.ProgramStore.Builder setDepthFunc(android.renderscript.ProgramStore.DepthFunc); - method public android.renderscript.ProgramStore.Builder setDepthMaskEnabled(boolean); - method public android.renderscript.ProgramStore.Builder setDitherEnabled(boolean); + method public deprecated android.renderscript.ProgramStore create(); + method public deprecated android.renderscript.ProgramStore.Builder setBlendFunc(android.renderscript.ProgramStore.BlendSrcFunc, android.renderscript.ProgramStore.BlendDstFunc); + method public deprecated android.renderscript.ProgramStore.Builder setColorMaskEnabled(boolean, boolean, boolean, boolean); + method public deprecated android.renderscript.ProgramStore.Builder setDepthFunc(android.renderscript.ProgramStore.DepthFunc); + method public deprecated android.renderscript.ProgramStore.Builder setDepthMaskEnabled(boolean); + method public deprecated android.renderscript.ProgramStore.Builder setDitherEnabled(boolean); } - public static final class ProgramStore.DepthFunc extends java.lang.Enum { + public static final deprecated class ProgramStore.DepthFunc extends java.lang.Enum { method public static android.renderscript.ProgramStore.DepthFunc valueOf(java.lang.String); method public static final android.renderscript.ProgramStore.DepthFunc[] values(); - enum_constant public static final android.renderscript.ProgramStore.DepthFunc ALWAYS; - enum_constant public static final android.renderscript.ProgramStore.DepthFunc EQUAL; - enum_constant public static final android.renderscript.ProgramStore.DepthFunc GREATER; - enum_constant public static final android.renderscript.ProgramStore.DepthFunc GREATER_OR_EQUAL; - enum_constant public static final android.renderscript.ProgramStore.DepthFunc LESS; - enum_constant public static final android.renderscript.ProgramStore.DepthFunc LESS_OR_EQUAL; - enum_constant public static final android.renderscript.ProgramStore.DepthFunc NOT_EQUAL; + enum_constant public static final deprecated android.renderscript.ProgramStore.DepthFunc ALWAYS; + enum_constant public static final deprecated android.renderscript.ProgramStore.DepthFunc EQUAL; + enum_constant public static final deprecated android.renderscript.ProgramStore.DepthFunc GREATER; + enum_constant public static final deprecated android.renderscript.ProgramStore.DepthFunc GREATER_OR_EQUAL; + enum_constant public static final deprecated android.renderscript.ProgramStore.DepthFunc LESS; + enum_constant public static final deprecated android.renderscript.ProgramStore.DepthFunc LESS_OR_EQUAL; + enum_constant public static final deprecated android.renderscript.ProgramStore.DepthFunc NOT_EQUAL; } - public class ProgramVertex extends android.renderscript.Program { - method public android.renderscript.Element getInput(int); - method public int getInputCount(); + public deprecated class ProgramVertex extends android.renderscript.Program { } - public static class ProgramVertex.Builder extends android.renderscript.Program.BaseProgramBuilder { - ctor public ProgramVertex.Builder(android.renderscript.RenderScript); - method public android.renderscript.ProgramVertex.Builder addInput(android.renderscript.Element) throws java.lang.IllegalStateException; - method public android.renderscript.ProgramVertex create(); + public static deprecated class ProgramVertex.Builder extends android.renderscript.Program.BaseProgramBuilder { + ctor public deprecated ProgramVertex.Builder(android.renderscript.RenderScript); + method public deprecated android.renderscript.ProgramVertex.Builder addInput(android.renderscript.Element) throws java.lang.IllegalStateException; + method public deprecated android.renderscript.ProgramVertex create(); } - public class ProgramVertexFixedFunction extends android.renderscript.ProgramVertex { - method public void bindConstants(android.renderscript.ProgramVertexFixedFunction.Constants); + public deprecated class ProgramVertexFixedFunction extends android.renderscript.ProgramVertex { + method public deprecated void bindConstants(android.renderscript.ProgramVertexFixedFunction.Constants); } public static class ProgramVertexFixedFunction.Builder { - ctor public ProgramVertexFixedFunction.Builder(android.renderscript.RenderScript); - method public android.renderscript.ProgramVertexFixedFunction create(); - method public android.renderscript.ProgramVertexFixedFunction.Builder setTextureMatrixEnable(boolean); + ctor public deprecated ProgramVertexFixedFunction.Builder(android.renderscript.RenderScript); + method public deprecated android.renderscript.ProgramVertexFixedFunction create(); + method public deprecated android.renderscript.ProgramVertexFixedFunction.Builder setTextureMatrixEnable(boolean); } - public static class ProgramVertexFixedFunction.Constants { - ctor public ProgramVertexFixedFunction.Constants(android.renderscript.RenderScript); - method public void destroy(); - method public void setModelview(android.renderscript.Matrix4f); - method public void setProjection(android.renderscript.Matrix4f); - method public void setTexture(android.renderscript.Matrix4f); + public static deprecated class ProgramVertexFixedFunction.Constants { + ctor public deprecated ProgramVertexFixedFunction.Constants(android.renderscript.RenderScript); + method public deprecated void destroy(); + method public deprecated void setModelview(android.renderscript.Matrix4f); + method public deprecated void setProjection(android.renderscript.Matrix4f); + method public deprecated void setTexture(android.renderscript.Matrix4f); } - public class RSDriverException extends android.renderscript.RSRuntimeException { + public deprecated class RSDriverException extends android.renderscript.RSRuntimeException { ctor public RSDriverException(java.lang.String); } - public class RSIllegalArgumentException extends android.renderscript.RSRuntimeException { - ctor public RSIllegalArgumentException(java.lang.String); + public deprecated class RSIllegalArgumentException extends android.renderscript.RSRuntimeException { + ctor public deprecated RSIllegalArgumentException(java.lang.String); } - public class RSInvalidStateException extends android.renderscript.RSRuntimeException { - ctor public RSInvalidStateException(java.lang.String); + public deprecated class RSInvalidStateException extends android.renderscript.RSRuntimeException { + ctor public deprecated RSInvalidStateException(java.lang.String); } - public class RSRuntimeException extends java.lang.RuntimeException { - ctor public RSRuntimeException(java.lang.String); + public deprecated class RSRuntimeException extends java.lang.RuntimeException { + ctor public deprecated RSRuntimeException(java.lang.String); } - public class RSSurfaceView extends android.view.SurfaceView implements android.view.SurfaceHolder.Callback { - ctor public RSSurfaceView(android.content.Context); - ctor public RSSurfaceView(android.content.Context, android.util.AttributeSet); + public deprecated class RSSurfaceView extends android.view.SurfaceView implements android.view.SurfaceHolder.Callback { + ctor public deprecated RSSurfaceView(android.content.Context); + ctor public deprecated RSSurfaceView(android.content.Context, android.util.AttributeSet); method public android.renderscript.RenderScriptGL createRenderScriptGL(android.renderscript.RenderScriptGL.SurfaceConfig); method public void destroyRenderScriptGL(); method public android.renderscript.RenderScriptGL getRenderScriptGL(); - method public void pause(); - method public void resume(); + method public deprecated void pause(); + method public deprecated void resume(); method public void setRenderScriptGL(android.renderscript.RenderScriptGL); - method public void surfaceChanged(android.view.SurfaceHolder, int, int, int); - method public void surfaceCreated(android.view.SurfaceHolder); - method public void surfaceDestroyed(android.view.SurfaceHolder); + method public deprecated void surfaceChanged(android.view.SurfaceHolder, int, int, int); + method public deprecated void surfaceCreated(android.view.SurfaceHolder); + method public deprecated void surfaceDestroyed(android.view.SurfaceHolder); } - public class RSTextureView extends android.view.TextureView implements android.view.TextureView.SurfaceTextureListener { - ctor public RSTextureView(android.content.Context); - ctor public RSTextureView(android.content.Context, android.util.AttributeSet); - method public android.renderscript.RenderScriptGL createRenderScriptGL(android.renderscript.RenderScriptGL.SurfaceConfig); - method public void destroyRenderScriptGL(); - method public android.renderscript.RenderScriptGL getRenderScriptGL(); + public deprecated class RSTextureView extends android.view.TextureView implements android.view.TextureView.SurfaceTextureListener { + ctor public deprecated RSTextureView(android.content.Context); + ctor public deprecated RSTextureView(android.content.Context, android.util.AttributeSet); + method public deprecated android.renderscript.RenderScriptGL createRenderScriptGL(android.renderscript.RenderScriptGL.SurfaceConfig); + method public deprecated void destroyRenderScriptGL(); + method public deprecated android.renderscript.RenderScriptGL getRenderScriptGL(); method public void onSurfaceTextureAvailable(android.graphics.SurfaceTexture, int, int); method public boolean onSurfaceTextureDestroyed(android.graphics.SurfaceTexture); method public void onSurfaceTextureSizeChanged(android.graphics.SurfaceTexture, int, int); method public void onSurfaceTextureUpdated(android.graphics.SurfaceTexture); - method public void pause(); - method public void resume(); - method public void setRenderScriptGL(android.renderscript.RenderScriptGL); + method public deprecated void pause(); + method public deprecated void resume(); + method public deprecated void setRenderScriptGL(android.renderscript.RenderScriptGL); } - public class RenderScript { - method public void contextDump(); - method public static android.renderscript.RenderScript create(android.content.Context); - method public void destroy(); - method public void finish(); - method public final android.content.Context getApplicationContext(); + public deprecated class RenderScript { + method public deprecated void contextDump(); + method public static deprecated android.renderscript.RenderScript create(android.content.Context); + method public deprecated void destroy(); + method public deprecated void finish(); + method public final deprecated android.content.Context getApplicationContext(); method public android.renderscript.RenderScript.RSErrorHandler getErrorHandler(); method public android.renderscript.RenderScript.RSMessageHandler getMessageHandler(); method public void setErrorHandler(android.renderscript.RenderScript.RSErrorHandler); method public void setMessageHandler(android.renderscript.RenderScript.RSMessageHandler); - method public void setPriority(android.renderscript.RenderScript.Priority); + method public deprecated void setPriority(android.renderscript.RenderScript.Priority); } - public static final class RenderScript.Priority extends java.lang.Enum { + public static final deprecated class RenderScript.Priority extends java.lang.Enum { method public static android.renderscript.RenderScript.Priority valueOf(java.lang.String); method public static final android.renderscript.RenderScript.Priority[] values(); enum_constant public static final android.renderscript.RenderScript.Priority LOW; enum_constant public static final android.renderscript.RenderScript.Priority NORMAL; } - public static class RenderScript.RSErrorHandler implements java.lang.Runnable { + public static deprecated class RenderScript.RSErrorHandler implements java.lang.Runnable { ctor public RenderScript.RSErrorHandler(); method public void run(); field protected java.lang.String mErrorMessage; field protected int mErrorNum; } - public static class RenderScript.RSMessageHandler implements java.lang.Runnable { + public static deprecated class RenderScript.RSMessageHandler implements java.lang.Runnable { ctor public RenderScript.RSMessageHandler(); method public void run(); field protected int[] mData; @@ -19135,45 +19124,40 @@ package android.renderscript { field protected int mLength; } - public class RenderScriptGL extends android.renderscript.RenderScript { - ctor public RenderScriptGL(android.content.Context, android.renderscript.RenderScriptGL.SurfaceConfig); - method public void bindProgramFragment(android.renderscript.ProgramFragment); - method public void bindProgramRaster(android.renderscript.ProgramRaster); - method public void bindProgramStore(android.renderscript.ProgramStore); - method public void bindProgramVertex(android.renderscript.ProgramVertex); - method public void bindRootScript(android.renderscript.Script); - method public int getHeight(); - method public int getWidth(); - method public void pause(); - method public void resume(); - method public void setSurface(android.view.SurfaceHolder, int, int); - method public void setSurfaceTexture(android.graphics.SurfaceTexture, int, int); + public deprecated class RenderScriptGL extends android.renderscript.RenderScript { + ctor public deprecated RenderScriptGL(android.content.Context, android.renderscript.RenderScriptGL.SurfaceConfig); + method public deprecated void bindProgramFragment(android.renderscript.ProgramFragment); + method public deprecated void bindProgramRaster(android.renderscript.ProgramRaster); + method public deprecated void bindProgramStore(android.renderscript.ProgramStore); + method public deprecated void bindProgramVertex(android.renderscript.ProgramVertex); + method public deprecated void bindRootScript(android.renderscript.Script); + method public deprecated int getHeight(); + method public deprecated int getWidth(); + method public deprecated void pause(); + method public deprecated void resume(); + method public deprecated void setSurface(android.view.SurfaceHolder, int, int); + method public deprecated void setSurfaceTexture(android.graphics.SurfaceTexture, int, int); } - public static class RenderScriptGL.SurfaceConfig { + public static deprecated class RenderScriptGL.SurfaceConfig { ctor public RenderScriptGL.SurfaceConfig(); ctor public RenderScriptGL.SurfaceConfig(android.renderscript.RenderScriptGL.SurfaceConfig); - method public void setAlpha(int, int); - method public void setColor(int, int); - method public void setDepth(int, int); - method public void setSamples(int, int, float); - } - - public class Sampler extends android.renderscript.BaseObj { - method public static android.renderscript.Sampler CLAMP_LINEAR(android.renderscript.RenderScript); - method public static android.renderscript.Sampler CLAMP_LINEAR_MIP_LINEAR(android.renderscript.RenderScript); - method public static android.renderscript.Sampler CLAMP_NEAREST(android.renderscript.RenderScript); - method public static android.renderscript.Sampler WRAP_LINEAR(android.renderscript.RenderScript); - method public static android.renderscript.Sampler WRAP_LINEAR_MIP_LINEAR(android.renderscript.RenderScript); - method public static android.renderscript.Sampler WRAP_NEAREST(android.renderscript.RenderScript); - method public float getAnisotropy(); - method public android.renderscript.Sampler.Value getMagnification(); - method public android.renderscript.Sampler.Value getMinification(); - method public android.renderscript.Sampler.Value getWrapS(); - method public android.renderscript.Sampler.Value getWrapT(); - } - - public static class Sampler.Builder { + method public deprecated void setAlpha(int, int); + method public deprecated void setColor(int, int); + method public deprecated void setDepth(int, int); + method public deprecated void setSamples(int, int, float); + } + + public deprecated class Sampler extends android.renderscript.BaseObj { + method public static deprecated android.renderscript.Sampler CLAMP_LINEAR(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Sampler CLAMP_LINEAR_MIP_LINEAR(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Sampler CLAMP_NEAREST(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Sampler WRAP_LINEAR(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Sampler WRAP_LINEAR_MIP_LINEAR(android.renderscript.RenderScript); + method public static deprecated android.renderscript.Sampler WRAP_NEAREST(android.renderscript.RenderScript); + } + + public static deprecated class Sampler.Builder { ctor public Sampler.Builder(android.renderscript.RenderScript); method public android.renderscript.Sampler create(); method public void setAnisotropy(float); @@ -19183,30 +19167,30 @@ package android.renderscript { method public void setWrapT(android.renderscript.Sampler.Value); } - public static final class Sampler.Value extends java.lang.Enum { + public static final deprecated class Sampler.Value extends java.lang.Enum { method public static android.renderscript.Sampler.Value valueOf(java.lang.String); method public static final android.renderscript.Sampler.Value[] values(); - enum_constant public static final android.renderscript.Sampler.Value CLAMP; - enum_constant public static final android.renderscript.Sampler.Value LINEAR; - enum_constant public static final android.renderscript.Sampler.Value LINEAR_MIP_LINEAR; - enum_constant public static final android.renderscript.Sampler.Value LINEAR_MIP_NEAREST; - enum_constant public static final android.renderscript.Sampler.Value NEAREST; - enum_constant public static final android.renderscript.Sampler.Value WRAP; - } - - public class Script extends android.renderscript.BaseObj { - method public void bindAllocation(android.renderscript.Allocation, int); - method protected void forEach(int, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.FieldPacker); - method protected void invoke(int); - method protected void invoke(int, android.renderscript.FieldPacker); - method public void setTimeZone(java.lang.String); - method public void setVar(int, float); - method public void setVar(int, double); - method public void setVar(int, int); - method public void setVar(int, long); - method public void setVar(int, boolean); - method public void setVar(int, android.renderscript.BaseObj); - method public void setVar(int, android.renderscript.FieldPacker); + enum_constant public static final deprecated android.renderscript.Sampler.Value CLAMP; + enum_constant public static final deprecated android.renderscript.Sampler.Value LINEAR; + enum_constant public static final deprecated android.renderscript.Sampler.Value LINEAR_MIP_LINEAR; + enum_constant public static final deprecated android.renderscript.Sampler.Value LINEAR_MIP_NEAREST; + enum_constant public static final deprecated android.renderscript.Sampler.Value NEAREST; + enum_constant public static final deprecated android.renderscript.Sampler.Value WRAP; + } + + public deprecated class Script extends android.renderscript.BaseObj { + method public deprecated void bindAllocation(android.renderscript.Allocation, int); + method protected deprecated void forEach(int, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.FieldPacker); + method protected deprecated void invoke(int); + method protected deprecated void invoke(int, android.renderscript.FieldPacker); + method public deprecated void setTimeZone(java.lang.String); + method public deprecated void setVar(int, float); + method public deprecated void setVar(int, double); + method public deprecated void setVar(int, int); + method public deprecated void setVar(int, long); + method public deprecated void setVar(int, boolean); + method public deprecated void setVar(int, android.renderscript.BaseObj); + method public deprecated void setVar(int, android.renderscript.FieldPacker); } public static class Script.Builder { @@ -19224,19 +19208,19 @@ package android.renderscript { field protected android.renderscript.Element mElement; } - public class ScriptC extends android.renderscript.Script { - ctor protected ScriptC(int, android.renderscript.RenderScript); - ctor protected ScriptC(android.renderscript.RenderScript, android.content.res.Resources, int); + public deprecated class ScriptC extends android.renderscript.Script { + ctor protected deprecated ScriptC(int, android.renderscript.RenderScript); + ctor protected deprecated ScriptC(android.renderscript.RenderScript, android.content.res.Resources, int); } - public class Short2 { + public deprecated class Short2 { ctor public Short2(); ctor public Short2(short, short); field public short x; field public short y; } - public class Short3 { + public deprecated class Short3 { ctor public Short3(); ctor public Short3(short, short, short); field public short x; @@ -19244,7 +19228,7 @@ package android.renderscript { field public short z; } - public class Short4 { + public deprecated class Short4 { ctor public Short4(); ctor public Short4(short, short, short, short); field public short w; @@ -19253,22 +19237,22 @@ package android.renderscript { field public short z; } - public class Type extends android.renderscript.BaseObj { - method public int getCount(); - method public android.renderscript.Element getElement(); - method public int getX(); - method public int getY(); - method public int getZ(); - method public boolean hasFaces(); - method public boolean hasMipmaps(); + public deprecated class Type extends android.renderscript.BaseObj { + method public deprecated int getCount(); + method public deprecated android.renderscript.Element getElement(); + method public deprecated int getX(); + method public deprecated int getY(); + method public deprecated int getZ(); + method public deprecated boolean hasFaces(); + method public deprecated boolean hasMipmaps(); } - public static class Type.Builder { - ctor public Type.Builder(android.renderscript.RenderScript, android.renderscript.Element); - method public android.renderscript.Type create(); + public static deprecated class Type.Builder { + ctor public deprecated Type.Builder(android.renderscript.RenderScript, android.renderscript.Element); + method public deprecated android.renderscript.Type create(); method public android.renderscript.Type.Builder setFaces(boolean); method public android.renderscript.Type.Builder setMipmaps(boolean); - method public android.renderscript.Type.Builder setX(int); + method public deprecated android.renderscript.Type.Builder setX(int); method public android.renderscript.Type.Builder setY(int); } @@ -22537,6 +22521,7 @@ package android.view { } public class Display { + method public void getCurrentSizeRange(android.graphics.Point, android.graphics.Point); method public int getDisplayId(); method public deprecated int getHeight(); method public void getMetrics(android.util.DisplayMetrics); @@ -22733,6 +22718,7 @@ package android.view { method public int describeContents(); method public final android.view.InputDevice getDevice(); method public abstract int getDeviceId(); + method public abstract long getEventTime(); method public abstract int getSource(); field public static final android.os.Parcelable.Creator CREATOR; } @@ -23943,7 +23929,7 @@ package android.view { method public void onWindowSystemUiVisibilityChanged(int); method protected void onWindowVisibilityChanged(int); method protected boolean overScrollBy(int, int, int, int, int, int, int, int, boolean); - method public boolean performAccessibilityAction(int); + method public boolean performAccessibilityAction(int, android.os.Bundle); method public boolean performClick(); method public boolean performHapticFeedback(int); method public boolean performHapticFeedback(int, int); @@ -24095,7 +24081,9 @@ package android.view { field public static final int ACCESSIBILITY_FOCUS_FORWARD = 4098; // 0x1002 field public static final int ACCESSIBILITY_FOCUS_IN = 4100; // 0x1004 field public static final int ACCESSIBILITY_FOCUS_LEFT = 4113; // 0x1011 + field public static final int ACCESSIBILITY_FOCUS_NEXT = 4112; // 0x1010 field public static final int ACCESSIBILITY_FOCUS_OUT = 4104; // 0x1008 + field public static final int ACCESSIBILITY_FOCUS_PREVIOUS = 4128; // 0x1020 field public static final int ACCESSIBILITY_FOCUS_RIGHT = 4162; // 0x1042 field public static final int ACCESSIBILITY_FOCUS_UP = 4129; // 0x1021 field public static final android.util.Property ALPHA; @@ -25012,6 +25000,7 @@ package android.view.accessibility { method public int getChildCount(); method public java.lang.CharSequence getClassName(); method public java.lang.CharSequence getContentDescription(); + method public java.lang.CharSequence[] getGranularities(); method public java.lang.CharSequence getPackageName(); method public android.view.accessibility.AccessibilityNodeInfo getParent(); method public java.lang.CharSequence getText(); @@ -25032,6 +25021,7 @@ package android.view.accessibility { method public static android.view.accessibility.AccessibilityNodeInfo obtain(); method public static android.view.accessibility.AccessibilityNodeInfo obtain(android.view.accessibility.AccessibilityNodeInfo); method public boolean performAction(int); + method public boolean performAction(int, android.os.Bundle); method public void recycle(); method public void setAccessibilityFocused(boolean); method public void setBoundsInParent(android.graphics.Rect); @@ -25044,6 +25034,7 @@ package android.view.accessibility { method public void setEnabled(boolean); method public void setFocusable(boolean); method public void setFocused(boolean); + method public void setGranularities(java.lang.CharSequence[]); method public void setLongClickable(boolean); method public void setPackageName(java.lang.CharSequence); method public void setParent(android.view.View); @@ -25056,12 +25047,15 @@ package android.view.accessibility { method public void setText(java.lang.CharSequence); method public void writeToParcel(android.os.Parcel, int); field public static final int ACTION_ACCESSIBILITY_FOCUS = 64; // 0x40 + field public static final java.lang.String ACTION_ARGUMENT_GRANULARITY = "ACTION_ARGUMENT_GRANULARITY"; field public static final int ACTION_CLEAR_ACCESSIBILITY_FOCUS = 128; // 0x80 field public static final int ACTION_CLEAR_FOCUS = 2; // 0x2 field public static final int ACTION_CLEAR_SELECTION = 8; // 0x8 field public static final int ACTION_CLICK = 16; // 0x10 field public static final int ACTION_FOCUS = 1; // 0x1 field public static final int ACTION_LONG_CLICK = 32; // 0x20 + field public static final int ACTION_NEXT_AT_GRANULARITY = 256; // 0x100 + field public static final int ACTION_PREVIOUS_AT_GRANULARITY = 512; // 0x200 field public static final int ACTION_SELECT = 4; // 0x4 field public static final android.os.Parcelable.Creator CREATOR; field public static final int FOCUS_ACCESSIBILITY = 2; // 0x2 @@ -25074,7 +25068,7 @@ package android.view.accessibility { method public android.view.accessibility.AccessibilityNodeInfo createAccessibilityNodeInfo(int); method public android.view.accessibility.AccessibilityNodeInfo findAccessibilitiyFocus(int); method public java.util.List<android.view.accessibility.AccessibilityNodeInfo> findAccessibilityNodeInfosByText(java.lang.String, int); - method public boolean performAccessibilityAction(int, int); + method public boolean performAction(int, int, android.os.Bundle); } public class AccessibilityRecord { @@ -26022,10 +26016,12 @@ package android.webkit { method public void setMimeType(java.lang.String); } - public class WebSettings { + public abstract class WebSettings { method public boolean enableSmoothTransition(); method public boolean getAllowContentAccess(); method public boolean getAllowFileAccess(); + method public abstract boolean getAllowFileAccessFromFileURLs(); + method public abstract boolean getAllowUniversalAccessFromFileURLs(); method public synchronized boolean getBlockNetworkImage(); method public synchronized boolean getBlockNetworkLoads(); method public boolean getBuiltInZoomControls(); @@ -26067,6 +26063,8 @@ package android.webkit { method public synchronized java.lang.String getUserAgentString(); method public void setAllowContentAccess(boolean); method public void setAllowFileAccess(boolean); + method public abstract void setAllowFileAccessFromFileURLs(boolean); + method public abstract void setAllowUniversalAccessFromFileURLs(boolean); method public synchronized void setAppCacheEnabled(boolean); method public synchronized void setAppCacheMaxSize(long); method public synchronized void setAppCachePath(java.lang.String); diff --git a/cmds/am/src/com/android/commands/am/Am.java b/cmds/am/src/com/android/commands/am/Am.java index 53a0186a5e0d..8cd89003fd02 100644 --- a/cmds/am/src/com/android/commands/am/Am.java +++ b/cmds/am/src/com/android/commands/am/Am.java @@ -194,6 +194,12 @@ public class Am { String key = nextArgRequired(); String value = nextArgRequired(); intent.putExtra(key, Uri.parse(value)); + } else if (opt.equals("--ecn")) { + String key = nextArgRequired(); + String value = nextArgRequired(); + ComponentName cn = ComponentName.unflattenFromString(value); + if (cn == null) throw new IllegalArgumentException("Bad component name: " + value); + intent.putExtra(key, cn); } else if (opt.equals("--eia")) { String key = nextArgRequired(); String value = nextArgRequired(); @@ -1366,6 +1372,7 @@ public class Am { " [--el <EXTRA_KEY> <EXTRA_LONG_VALUE> ...]\n" + " [--ef <EXTRA_KEY> <EXTRA_FLOAT_VALUE> ...]\n" + " [--eu <EXTRA_KEY> <EXTRA_URI_VALUE> ...]\n" + + " [--ecn <EXTRA_KEY> <EXTRA_COMPONENT_NAME_VALUE>]\n" + " [--eia <EXTRA_KEY> <EXTRA_INT_VALUE>[,<EXTRA_INT_VALUE...]]\n" + " [--ela <EXTRA_KEY> <EXTRA_LONG_VALUE>[,<EXTRA_LONG_VALUE...]]\n" + " [--efa <EXTRA_KEY> <EXTRA_FLOAT_VALUE>[,<EXTRA_FLOAT_VALUE...]]\n" + diff --git a/core/java/android/accessibilityservice/AccessibilityService.java b/core/java/android/accessibilityservice/AccessibilityService.java index 4e340c01ebb1..c858e3ca233c 100644 --- a/core/java/android/accessibilityservice/AccessibilityService.java +++ b/core/java/android/accessibilityservice/AccessibilityService.java @@ -19,22 +19,17 @@ package android.accessibilityservice; import android.app.Service; import android.content.Context; import android.content.Intent; -import android.content.res.Configuration; import android.os.IBinder; import android.os.Looper; import android.os.Message; import android.os.RemoteException; -import android.util.LocaleUtil; import android.util.Log; -import android.view.View; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityInteractionClient; import android.view.accessibility.AccessibilityNodeInfo; import com.android.internal.os.HandlerCaller; -import java.util.Locale; - /** * An accessibility service runs in the background and receives callbacks by the system * when {@link AccessibilityEvent}s are fired. Such events denote some state transition @@ -299,6 +294,16 @@ public abstract class AccessibilityService extends Service { public static final int GESTURE_SWIPE_DOWN_AND_RIGHT = 18; /** + * The user has performed a two finger tap gesture on the touch screen. + */ + public static final int GESTURE_TWO_FINGER_TAP = 19; + + /** + * The user has performed a two finger long press gesture on the touch screen. + */ + public static final int GESTURE_TWO_FINGER_LONG_PRESS = 20; + + /** * The {@link Intent} that must be declared as handled by the service. */ public static final String SERVICE_INTERFACE = @@ -342,8 +347,6 @@ public abstract class AccessibilityService extends Service { */ public static final int GLOBAL_ACTION_NOTIFICATIONS = 4; - private static final int UNDEFINED = -1; - private static final String LOG_TAG = "AccessibilityService"; interface Callbacks { @@ -351,15 +354,13 @@ public abstract class AccessibilityService extends Service { public void onInterrupt(); public void onServiceConnected(); public void onSetConnectionId(int connectionId); - public void onGesture(int gestureId); + public boolean onGesture(int gestureId); } private int mConnectionId; private AccessibilityServiceInfo mInfo; - private int mLayoutDirection; - /** * Callback for {@link android.view.accessibility.AccessibilityEvent}s. * @@ -386,95 +387,43 @@ public abstract class AccessibilityService extends Service { /** * Called by the system when the user performs a specific gesture on the - * touch screen. + * touch screen. If the gesture is not handled in this callback the system + * may provide default handing. Therefore, one should return true from this + * function if overriding of default behavior is desired. + * + * <strong>Note:</strong> To receive gestures an accessibility service + * must declare that it can handle such by specifying the + * <code><{@link android.R.styleable#AccessibilityService_canHandleGestures + * canHandleGestures}></code> attribute. * * @param gestureId The unique id of the performed gesture. * + * @return Whether the gesture was handled. + * * @see #GESTURE_SWIPE_UP - * @see #GESTURE_SWIPE_DOWN - * @see #GESTURE_SWIPE_LEFT - * @see #GESTURE_SWIPE_RIGHT + * @see #GESTURE_SWIPE_UP_AND_LEFT * @see #GESTURE_SWIPE_UP_AND_DOWN + * @see #GESTURE_SWIPE_UP_AND_RIGHT + * @see #GESTURE_SWIPE_DOWN + * @see #GESTURE_SWIPE_DOWN_AND_LEFT * @see #GESTURE_SWIPE_DOWN_AND_UP + * @see #GESTURE_SWIPE_DOWN_AND_RIGHT + * @see #GESTURE_SWIPE_LEFT + * @see #GESTURE_SWIPE_LEFT_AND_UP * @see #GESTURE_SWIPE_LEFT_AND_RIGHT + * @see #GESTURE_SWIPE_LEFT_AND_DOWN + * @see #GESTURE_SWIPE_RIGHT + * @see #GESTURE_SWIPE_RIGHT_AND_UP * @see #GESTURE_SWIPE_RIGHT_AND_LEFT + * @see #GESTURE_SWIPE_RIGHT_AND_DOWN * @see #GESTURE_CLOCKWISE_CIRCLE * @see #GESTURE_COUNTER_CLOCKWISE_CIRCLE + * @see #GESTURE_TWO_FINGER_TAP + * @see #GESTURE_TWO_FINGER_LONG_PRESS */ - protected void onGesture(int gestureId) { + protected boolean onGesture(int gestureId) { // TODO: Describe the default gesture processing in the javaDoc once it is finalized. - - // Global actions. - switch (gestureId) { - case GESTURE_SWIPE_DOWN_AND_LEFT: { - performGlobalAction(GLOBAL_ACTION_BACK); - } return; - case GESTURE_SWIPE_DOWN_AND_RIGHT: { - performGlobalAction(GLOBAL_ACTION_HOME); - } return; - case GESTURE_SWIPE_UP_AND_LEFT: { - performGlobalAction(GLOBAL_ACTION_RECENTS); - } return; - case GESTURE_SWIPE_UP_AND_RIGHT: { - performGlobalAction(GLOBAL_ACTION_NOTIFICATIONS); - } return; - } - - // Cache the id to avoid locking - final int connectionId = mConnectionId; - if (connectionId == UNDEFINED) { - throw new IllegalStateException("AccessibilityService not connected." - + " Did you receive a call of onServiceConnected()?"); - } - AccessibilityNodeInfo root = getRootInActiveWindow(); - if (root == null) { - return; - } - - AccessibilityNodeInfo current = root.findFocus(AccessibilityNodeInfo.FOCUS_ACCESSIBILITY); - if (current == null) { - current = root; - } - - // Local actions. - AccessibilityNodeInfo next = null; - switch (gestureId) { - case GESTURE_SWIPE_UP: { - next = current.focusSearch(View.ACCESSIBILITY_FOCUS_OUT); - } break; - case GESTURE_SWIPE_DOWN: { - next = current.focusSearch(View.ACCESSIBILITY_FOCUS_IN); - } break; - case GESTURE_SWIPE_LEFT: { - if (mLayoutDirection == View.LAYOUT_DIRECTION_LTR) { - next = current.focusSearch(View.ACCESSIBILITY_FOCUS_BACKWARD); - } else { // LAYOUT_DIRECTION_RTL - next = current.focusSearch(View.ACCESSIBILITY_FOCUS_FORWARD); - } - } break; - case GESTURE_SWIPE_RIGHT: { - if (mLayoutDirection == View.LAYOUT_DIRECTION_LTR) { - next = current.focusSearch(View.ACCESSIBILITY_FOCUS_FORWARD); - } else { // LAYOUT_DIRECTION_RTL - next = current.focusSearch(View.ACCESSIBILITY_FOCUS_BACKWARD); - } - } break; - case GESTURE_SWIPE_UP_AND_DOWN: { - next = current.focusSearch(View.ACCESSIBILITY_FOCUS_UP); - } break; - case GESTURE_SWIPE_DOWN_AND_UP: { - next = current.focusSearch(View.ACCESSIBILITY_FOCUS_DOWN); - } break; - case GESTURE_SWIPE_LEFT_AND_RIGHT: { - next = current.focusSearch(View.ACCESSIBILITY_FOCUS_LEFT); - } break; - case GESTURE_SWIPE_RIGHT_AND_LEFT: { - next = current.focusSearch(View.ACCESSIBILITY_FOCUS_RIGHT); - } break; - } - if (next != null && !next.equals(current)) { - next.performAction(AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS); - } + return false; } /** @@ -484,10 +433,7 @@ public abstract class AccessibilityService extends Service { * @return The root node if this service can retrieve window content. */ public AccessibilityNodeInfo getRootInActiveWindow() { - return AccessibilityInteractionClient.getInstance() - .findAccessibilityNodeInfoByAccessibilityId(mConnectionId, - AccessibilityNodeInfo.ACTIVE_WINDOW_ID, AccessibilityNodeInfo.ROOT_NODE_ID, - AccessibilityNodeInfo.FLAG_PREFETCH_DESCENDANTS); + return AccessibilityInteractionClient.getInstance().getRootInActiveWindow(mConnectionId); } /** @@ -509,7 +455,7 @@ public abstract class AccessibilityService extends Service { AccessibilityInteractionClient.getInstance().getConnection(mConnectionId); if (connection != null) { try { - return connection.perfromGlobalAction(action); + return connection.performGlobalAction(action); } catch (RemoteException re) { Log.w(LOG_TAG, "Error while calling performGlobalAction", re); } @@ -572,18 +518,6 @@ public abstract class AccessibilityService extends Service { } } - @Override - public void onCreate() { - Locale locale = getResources().getConfiguration().locale; - mLayoutDirection = LocaleUtil.getLayoutDirectionFromLocale(locale); - } - - @Override - public void onConfigurationChanged(Configuration configuration) { - super.onConfigurationChanged(configuration); - mLayoutDirection = LocaleUtil.getLayoutDirectionFromLocale(configuration.locale); - } - /** * Implement to return the implementation of the internal accessibility * service interface. @@ -612,8 +546,8 @@ public abstract class AccessibilityService extends Service { } @Override - public void onGesture(int gestureId) { - AccessibilityService.this.onGesture(gestureId); + public boolean onGesture(int gestureId) { + return AccessibilityService.this.onGesture(gestureId); } }); } @@ -658,8 +592,10 @@ public abstract class AccessibilityService extends Service { mCaller.sendMessage(message); } - public void onGesture(int gestureId) { - Message message = mCaller.obtainMessageI(DO_ON_GESTURE, gestureId); + public void onGesture(int gestureId, IAccessibilityServiceClientCallback callback, + int interactionId) { + Message message = mCaller.obtainMessageIIO(DO_ON_GESTURE, gestureId, interactionId, + callback); mCaller.sendMessage(message); } @@ -692,7 +628,15 @@ public abstract class AccessibilityService extends Service { return; case DO_ON_GESTURE : final int gestureId = message.arg1; - mCallback.onGesture(gestureId); + final int interactionId = message.arg2; + IAccessibilityServiceClientCallback callback = + (IAccessibilityServiceClientCallback) message.obj; + final boolean handled = mCallback.onGesture(gestureId); + try { + callback.setGestureResult(gestureId, handled, interactionId); + } catch (RemoteException re) { + Log.e(LOG_TAG, "Error calling back with the gesture resut.", re); + } return; default : Log.w(LOG_TAG, "Unknown message type " + message.what); diff --git a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java index e77ed9ab9065..7e6786b16a12 100644 --- a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java +++ b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java @@ -224,6 +224,11 @@ public class AccessibilityServiceInfo implements Parcelable { private boolean mCanRetrieveWindowContent; /** + * Flag whether this accessibility service can handle gestures. + */ + private boolean mCanHandleGestures; + + /** * Resource id of the description of the accessibility service. */ private int mDescriptionResId; @@ -303,6 +308,8 @@ public class AccessibilityServiceInfo implements Parcelable { mCanRetrieveWindowContent = asAttributes.getBoolean( com.android.internal.R.styleable.AccessibilityService_canRetrieveWindowContent, false); + mCanHandleGestures = asAttributes.getBoolean( + com.android.internal.R.styleable.AccessibilityService_canHandleGestures, false); TypedValue peekedValue = asAttributes.peekValue( com.android.internal.R.styleable.AccessibilityService_description); if (peekedValue != null) { @@ -378,13 +385,25 @@ public class AccessibilityServiceInfo implements Parcelable { * <strong>Statically set from * {@link AccessibilityService#SERVICE_META_DATA meta-data}.</strong> * </p> - * @return True window content can be retrieved. + * @return True if window content can be retrieved. */ public boolean getCanRetrieveWindowContent() { return mCanRetrieveWindowContent; } /** + * Whether this service can handle gestures. + * <p> + * <strong>Statically set from + * {@link AccessibilityService#SERVICE_META_DATA meta-data}.</strong> + * </p> + * @return True if the service can handle gestures. + */ + public boolean getCanHandleGestures() { + return mCanHandleGestures; + } + + /** * Gets the non-localized description of the accessibility service. * <p> * <strong>Statically set from diff --git a/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl b/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl index 588728c9ce7f..0257aa463dfd 100644 --- a/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl +++ b/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl @@ -16,6 +16,7 @@ package android.accessibilityservice; +import android.accessibilityservice.IAccessibilityServiceClientCallback; import android.accessibilityservice.IAccessibilityServiceConnection; import android.view.accessibility.AccessibilityEvent; @@ -32,5 +33,5 @@ import android.view.accessibility.AccessibilityEvent; void onInterrupt(); - void onGesture(int gestureId); + void onGesture(int gesture, in IAccessibilityServiceClientCallback callback, int interactionId); } diff --git a/core/java/android/accessibilityservice/IAccessibilityServiceClientCallback.aidl b/core/java/android/accessibilityservice/IAccessibilityServiceClientCallback.aidl new file mode 100644 index 000000000000..90613981f012 --- /dev/null +++ b/core/java/android/accessibilityservice/IAccessibilityServiceClientCallback.aidl @@ -0,0 +1,30 @@ +/* +** Copyright 2012, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + +package android.accessibilityservice; + +import android.accessibilityservice.IAccessibilityServiceConnection; +import android.view.accessibility.AccessibilityEvent; + +/** + * Callback for IAccessibilityServiceClient. + * + * @hide + */ + oneway interface IAccessibilityServiceClientCallback { + + void setGestureResult(int gestureId, boolean handled, int interactionId); +} diff --git a/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl b/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl index 1bd53877356b..dd50f3c38104 100644 --- a/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl +++ b/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl @@ -16,6 +16,7 @@ package android.accessibilityservice; +import android.os.Bundle; import android.accessibilityservice.AccessibilityServiceInfo; import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.IAccessibilityInteractionConnectionCallback; @@ -147,14 +148,15 @@ interface IAccessibilityServiceConnection { * {@link android.view.accessibility.AccessibilityNodeInfo#ROOT_NODE_ID} * to start from the root. * @param action The action to perform. + * @param arguments Optional action arguments. * @param interactionId The id of the interaction for matching with the callback result. * @param callback Callback which to receive the result. * @param threadId The id of the calling thread. * @return Whether the action was performed. */ boolean performAccessibilityAction(int accessibilityWindowId, long accessibilityNodeId, - int action, int interactionId, IAccessibilityInteractionConnectionCallback callback, - long threadId); + int action, in Bundle arguments, int interactionId, + IAccessibilityInteractionConnectionCallback callback, long threadId); /** * @return The associated accessibility service info. @@ -167,5 +169,5 @@ interface IAccessibilityServiceConnection { * @param action The action to perform. * @return Whether the action was performed. */ - boolean perfromGlobalAction(int action); + boolean performGlobalAction(int action); } diff --git a/core/java/android/accessibilityservice/UiTestAutomationBridge.java b/core/java/android/accessibilityservice/UiTestAutomationBridge.java index c840bd659eaf..4d4bfeb26418 100644 --- a/core/java/android/accessibilityservice/UiTestAutomationBridge.java +++ b/core/java/android/accessibilityservice/UiTestAutomationBridge.java @@ -19,6 +19,7 @@ package android.accessibilityservice; import android.accessibilityservice.AccessibilityService.Callbacks; import android.accessibilityservice.AccessibilityService.IAccessibilityServiceClientWrapper; import android.content.Context; +import android.os.Bundle; import android.os.HandlerThread; import android.os.Looper; import android.os.RemoteException; @@ -177,8 +178,8 @@ public class UiTestAutomationBridge { } @Override - public void onGesture(int gestureId) { - /* do nothing */ + public boolean onGesture(int gestureId) { + return false; } }); @@ -444,10 +445,12 @@ public class UiTestAutomationBridge { * * @param accessibilityNodeId A unique node id (accessibility and virtual descendant id). * @param action The action to perform. + * @param arguments Optional action arguments. * @return Whether the action was performed. */ - public boolean performAccessibilityActionInActiveWindow(long accessibilityNodeId, int action) { - return performAccessibilityAction(ACTIVE_WINDOW_ID, accessibilityNodeId, action); + public boolean performAccessibilityActionInActiveWindow(long accessibilityNodeId, int action, + Bundle arguments) { + return performAccessibilityAction(ACTIVE_WINDOW_ID, accessibilityNodeId, action, arguments); } /** @@ -457,15 +460,16 @@ public class UiTestAutomationBridge { * {@link #ACTIVE_WINDOW_ID} to query the currently active window. * @param accessibilityNodeId A unique node id (accessibility and virtual descendant id). * @param action The action to perform. + * @param arguments Optional action arguments. * @return Whether the action was performed. */ public boolean performAccessibilityAction(int accessibilityWindowId, long accessibilityNodeId, - int action) { + int action, Bundle arguments) { // Cache the id to avoid locking final int connectionId = mConnectionId; ensureValidConnection(connectionId); return AccessibilityInteractionClient.getInstance().performAccessibilityAction(connectionId, - accessibilityWindowId, accessibilityNodeId, action); + accessibilityWindowId, accessibilityNodeId, action, arguments); } /** diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 8942135757f4..64a05a8ff8ae 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -1480,7 +1480,9 @@ class ContextImpl extends Context { public Context createPackageContext(String packageName, int flags) throws PackageManager.NameNotFoundException { if (packageName.equals("system") || packageName.equals("android")) { - return new ContextImpl(mMainThread.getSystemContext()); + final ContextImpl context = new ContextImpl(mMainThread.getSystemContext()); + context.mBasePackageName = mBasePackageName; + return context; } LoadedApk pi = diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index c057d66fb3bf..6f19934a1bf0 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -67,6 +67,23 @@ public class WallpaperManager { = "android.service.wallpaper.LIVE_WALLPAPER_CHOOSER"; /** + * Directly launch live wallpaper preview, allowing the user to immediately + * confirm to switch to a specific live wallpaper. You must specify + * {@link #EXTRA_LIVE_WALLPAPER_COMPONENT} with the ComponentName of + * a live wallpaper component that is to be shown. + */ + public static final String ACTION_CHANGE_LIVE_WALLPAPER + = "android.service.wallpaper.CHANGE_LIVE_WALLPAPER"; + + /** + * Extra in {@link #ACTION_CHANGE_LIVE_WALLPAPER} that specifies the + * ComponentName of a live wallpaper that should be shown as a preview, + * for the user to confirm. + */ + public static final String EXTRA_LIVE_WALLPAPER_COMPONENT + = "android.service.wallpaper.extra.LIVE_WALLPAPER_COMPONENT"; + + /** * Manifest entry for activities that respond to {@link Intent#ACTION_SET_WALLPAPER} * which allows them to provide a custom large icon associated with this action. */ diff --git a/core/java/android/appwidget/AppWidgetHostView.java b/core/java/android/appwidget/AppWidgetHostView.java index 61a9dce98d57..c1b8e7ce2521 100644 --- a/core/java/android/appwidget/AppWidgetHostView.java +++ b/core/java/android/appwidget/AppWidgetHostView.java @@ -28,6 +28,7 @@ import android.graphics.Color; import android.graphics.Paint; import android.graphics.Rect; import android.os.Build; +import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; import android.os.SystemClock; @@ -206,6 +207,45 @@ public class AppWidgetHostView extends FrameLayout { super.dispatchRestoreInstanceState(jail); } + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + int oldWidth = getMeasuredWidth(); + int oldHeight = getMeasuredHeight(); + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + int newWidth = getMeasuredWidth(); + int newHeight = getMeasuredHeight(); + + // TODO: this is just a hack for now -- we actually have the AppWidgetHost + // be responsible for updating the size of the widget. + if (oldWidth != newWidth || oldHeight != newHeight) { + final float density = mContext.getResources().getDisplayMetrics().density; + final int newWidthDips = (int) (newWidth / density); + final int newHeightDips = (int) (newHeight / density); + updateAppWidgetSize(null, newWidthDips, newHeightDips, newWidthDips, newHeightDips); + } + } + + /** + * Provide guidance about the size of this widget to the AppWidgetManager. This information + * gets embedded into the AppWidgetExtras and causes a callback to the AppWidgetProvider. + * + * @see AppWidgetProvider#onAppWidgetExtrasChanged(Context, AppWidgetManager, int, Bundle) + */ + public void updateAppWidgetSize(Bundle extras, int minWidth, int minHeight, int maxWidth, int maxHeight) { + if (extras == null) { + extras = new Bundle(); + } + extras.putInt(AppWidgetManager.EXTRA_APPWIDGET_MIN_WIDTH, minWidth); + extras.putInt(AppWidgetManager.EXTRA_APPWIDGET_MIN_HEIGHT, minHeight); + extras.putInt(AppWidgetManager.EXTRA_APPWIDGET_MAX_WIDTH, maxWidth); + extras.putInt(AppWidgetManager.EXTRA_APPWIDGET_MAX_HEIGHT, maxHeight); + updateAppWidgetExtras(extras); + } + + public void updateAppWidgetExtras(Bundle extras) { + AppWidgetManager.getInstance(mContext).updateAppWidgetExtras(mAppWidgetId, extras); + } + /** {@inheritDoc} */ @Override public LayoutParams generateLayoutParams(AttributeSet attrs) { diff --git a/core/java/android/appwidget/AppWidgetManager.java b/core/java/android/appwidget/AppWidgetManager.java index a7f77921c027..83ab81720e49 100644 --- a/core/java/android/appwidget/AppWidgetManager.java +++ b/core/java/android/appwidget/AppWidgetManager.java @@ -19,6 +19,7 @@ package android.appwidget; import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.os.Bundle; import android.os.IBinder; import android.os.RemoteException; import android.os.ServiceManager; @@ -109,6 +110,32 @@ public class AppWidgetManager { public static final String EXTRA_APPWIDGET_ID = "appWidgetId"; /** + * An bundle extra that contains the lower bound on the current width, in dips, of a widget instance. + */ + public static final String EXTRA_APPWIDGET_MIN_WIDTH = "appWidgetMinWidth"; + + /** + * An bundle extra that contains the lower bound on the current height, in dips, of a widget instance. + */ + public static final String EXTRA_APPWIDGET_MIN_HEIGHT = "appWidgetMinHeight"; + + /** + * An bundle extra that contains the upper bound on the current width, in dips, of a widget instance. + */ + public static final String EXTRA_APPWIDGET_MAX_WIDTH = "appWidgetMaxWidth"; + + /** + * An bundle extra that contains the upper bound on the current width, in dips, of a widget instance. + */ + public static final String EXTRA_APPWIDGET_MAX_HEIGHT = "appWidgetMaxHeight"; + + /** + * An intent extra which points to a bundle of extra information for a particular widget id. + * In particular this bundle can contain EXTRA_APPWIDGET_WIDTH and EXTRA_APPWIDGET_HEIGHT. + */ + public static final String EXTRA_APPWIDGET_EXTRAS = "appWidgetExtras"; + + /** * An intent extra that contains multiple appWidgetIds. * <p> * The value will be an int array that can be retrieved like this: @@ -161,6 +188,14 @@ public class AppWidgetManager { public static final String ACTION_APPWIDGET_UPDATE = "android.appwidget.action.APPWIDGET_UPDATE"; /** + * Sent when the custom extras for an AppWidget change. + * + * @see AppWidgetProvider#onAppWidgetExtrasChanged AppWidgetProvider#onAppWidgetExtrasChanged( + * Context context, AppWidgetManager appWidgetManager, int appWidgetId, Bundle newExtras) + */ + public static final String ACTION_APPWIDGET_EXTRAS_CHANGED = "android.appwidget.action.APPWIDGET_UPDATE_EXTRAS"; + + /** * Sent when an instance of an AppWidget is deleted from its host. * * @see AppWidgetProvider#onDeleted AppWidgetProvider.onDeleted(Context context, int[] appWidgetIds) @@ -252,6 +287,46 @@ public class AppWidgetManager { } /** + * Update the extras for a given widget instance. + * + * The extras can be used to embed additional information about this widget to be accessed + * by the associated widget's AppWidgetProvider. + * + * @see #getAppWidgetExtras(int) + * + * @param appWidgetId The AppWidget instances for which to set the RemoteViews. + * @param extras The extras to associate with this widget + */ + public void updateAppWidgetExtras(int appWidgetId, Bundle extras) { + try { + sService.updateAppWidgetExtras(appWidgetId, extras); + } + catch (RemoteException e) { + throw new RuntimeException("system server dead?", e); + } + } + + /** + * Get the extras associated with a given widget instance. + * + * The extras can be used to embed additional information about this widget to be accessed + * by the associated widget's AppWidgetProvider. + * + * @see #updateAppWidgetExtras(int, Bundle) + * + * @param appWidgetId The AppWidget instances for which to set the RemoteViews. + * @return The extras associated with the given widget instance. + */ + public Bundle getAppWidgetExtras(int appWidgetId) { + try { + return sService.getAppWidgetExtras(appWidgetId); + } + catch (RemoteException e) { + throw new RuntimeException("system server dead?", e); + } + } + + /** * Set the RemoteViews to use for the specified appWidgetId. * * Note that the RemoteViews parameter will be cached by the AppWidgetService, and hence should diff --git a/core/java/android/appwidget/AppWidgetProvider.java b/core/java/android/appwidget/AppWidgetProvider.java index 00a5f0c78d02..3cf40aeee167 100755 --- a/core/java/android/appwidget/AppWidgetProvider.java +++ b/core/java/android/appwidget/AppWidgetProvider.java @@ -74,6 +74,16 @@ public class AppWidgetProvider extends BroadcastReceiver { this.onDeleted(context, new int[] { appWidgetId }); } } + else if (AppWidgetManager.ACTION_APPWIDGET_EXTRAS_CHANGED.equals(action)) { + Bundle extras = intent.getExtras(); + if (extras != null && extras.containsKey(AppWidgetManager.EXTRA_APPWIDGET_ID) + && extras.containsKey(AppWidgetManager.EXTRA_APPWIDGET_EXTRAS)) { + int appWidgetId = extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID); + Bundle widgetExtras = extras.getBundle(AppWidgetManager.EXTRA_APPWIDGET_EXTRAS); + this.onAppWidgetExtrasChanged(context, AppWidgetManager.getInstance(context), + appWidgetId, widgetExtras); + } + } else if (AppWidgetManager.ACTION_APPWIDGET_ENABLED.equals(action)) { this.onEnabled(context); } @@ -82,7 +92,7 @@ public class AppWidgetProvider extends BroadcastReceiver { } } // END_INCLUDE(onReceive) - + /** * Called in response to the {@link AppWidgetManager#ACTION_APPWIDGET_UPDATE} broadcast when * this AppWidget provider is being asked to provide {@link android.widget.RemoteViews RemoteViews} @@ -102,7 +112,26 @@ public class AppWidgetProvider extends BroadcastReceiver { */ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { } - + + /** + * Called in response to the {@link AppWidgetManager#ACTION_APPWIDGET_EXTRAS_CHANGED} + * broadcast when this widget has been layed out at a new size. + * + * {@more} + * + * @param context The {@link android.content.Context Context} in which this receiver is + * running. + * @param appWidgetManager A {@link AppWidgetManager} object you can call {@link + * AppWidgetManager#updateAppWidget} on. + * @param appWidgetId The appWidgetId of the widget who's size changed. + * @param newExtras The appWidgetId of the widget who's size changed. + * + * @see AppWidgetManager#ACTION_APPWIDGET_EXTRAS_CHANGED + */ + public void onAppWidgetExtrasChanged(Context context, AppWidgetManager appWidgetManager, + int appWidgetId, Bundle newExtras) { + } + /** * Called in response to the {@link AppWidgetManager#ACTION_APPWIDGET_DELETED} broadcast when * one or more AppWidget instances have been deleted. Override this method to implement diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index 04af5f75ba7e..56e17354cca2 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -160,6 +160,18 @@ public final class BluetoothDevice implements Parcelable { "android.bluetooth.device.action.NAME_CHANGED"; /** + * Broadcast Action: Indicates the alias of a remote device has been + * changed. + * <p>Always contains the extra field {@link #EXTRA_DEVICE}. + * <p>Requires {@link android.Manifest.permission#BLUETOOTH} to receive. + * + * @hide + */ + @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) + public static final String ACTION_ALIAS_CHANGED = + "android.bluetooth.device.action.ALIAS_CHANGED"; + + /** * Broadcast Action: Indicates a change in the bond state of a remote * device. For example, if a device is bonded (paired). * <p>Always contains the extra fields {@link #EXTRA_DEVICE}, {@link diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 4fb710e60038..eb0a0c6f4732 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -2442,13 +2442,13 @@ public class Camera { } /** - * Sets the rotation angle in degrees relative to the orientation of - * the camera. This affects the pictures returned from JPEG {@link - * PictureCallback}. The camera driver may set orientation in the - * EXIF header without rotating the picture. Or the driver may rotate - * the picture and the EXIF thumbnail. If the Jpeg picture is rotated, - * the orientation in the EXIF header will be missing or 1 (row #0 is - * top and column #0 is left side). + * Sets the clockwise rotation angle in degrees relative to the + * orientation of the camera. This affects the pictures returned from + * JPEG {@link PictureCallback}. The camera driver may set orientation + * in the EXIF header without rotating the picture. Or the driver may + * rotate the picture and the EXIF thumbnail. If the Jpeg picture is + * rotated, the orientation in the EXIF header will be missing or 1 + * (row #0 is top and column #0 is left side). * * <p>If applications want to rotate the picture to match the orientation * of what users see, apps should use {@link diff --git a/core/java/android/hardware/input/InputManager.java b/core/java/android/hardware/input/InputManager.java index b39b823c9b6a..5ba18507666e 100755 --- a/core/java/android/hardware/input/InputManager.java +++ b/core/java/android/hardware/input/InputManager.java @@ -268,6 +268,8 @@ public final class InputManager { synchronized (mInputDevicesLock) { int index = findInputDeviceListenerLocked(listener); if (index >= 0) { + InputDeviceListenerDelegate d = mInputDeviceListeners.get(index); + d.removeCallbacksAndMessages(null); mInputDeviceListeners.remove(index); } } diff --git a/core/java/android/net/DhcpInfoInternal.java b/core/java/android/net/DhcpInfoInternal.java index 7ab804776247..c87c34b8b12a 100644 --- a/core/java/android/net/DhcpInfoInternal.java +++ b/core/java/android/net/DhcpInfoInternal.java @@ -142,6 +142,14 @@ public class DhcpInfoInternal { } } + /** + * Test if this DHCP lease includes vendor hint that network link is + * metered, and sensitive to heavy data transfers. + */ + public boolean hasMeteredHint() { + return "ANDROID_METERED".equals(vendorInfo); + } + public String toString() { String routeString = ""; for (RouteInfo route : mRoutes) routeString += route.toString() + " | "; diff --git a/core/java/android/nfc/INfcAdapter.aidl b/core/java/android/nfc/INfcAdapter.aidl index ddd00a4368b8..39810ba90739 100644 --- a/core/java/android/nfc/INfcAdapter.aidl +++ b/core/java/android/nfc/INfcAdapter.aidl @@ -34,7 +34,7 @@ interface INfcAdapter INfcAdapterExtras getNfcAdapterExtrasInterface(in String pkg); int getState(); - boolean disable(); + boolean disable(boolean saveState); boolean enable(); boolean enableNdefPush(); boolean disableNdefPush(); diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index 90f5beff489f..7bf9febae979 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -574,9 +574,10 @@ public final class NfcAdapter { * * @hide */ + public boolean disable() { try { - return sService.disable(); + return sService.disable(true); } catch (RemoteException e) { attemptDeadServiceRecovery(e); return false; diff --git a/core/java/android/provider/CalendarContract.java b/core/java/android/provider/CalendarContract.java index c4aa6911b50c..593762a61b1f 100644 --- a/core/java/android/provider/CalendarContract.java +++ b/core/java/android/provider/CalendarContract.java @@ -19,6 +19,7 @@ package android.provider; import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; +import android.app.Activity; import android.app.AlarmManager; import android.app.PendingIntent; import android.content.ContentProviderClient; @@ -98,6 +99,32 @@ public final class CalendarContract { public static final String ACTION_EVENT_REMINDER = "android.intent.action.EVENT_REMINDER"; /** + * Activity Action: Display the event to the user in the custom app as + * specified in {@link EventsColumns#CUSTOM_APP_PACKAGE}. The custom app + * will be started via {@link Activity#startActivityForResult(Intent, int)} + * and it should call {@link Activity#setResult(int)} with + * {@link Activity#RESULT_OK} or {@link Activity#RESULT_CANCELED} to + * acknowledge whether the action was handled or not. + * <p> + * Input: {@link Intent#getData} has the event URI. The extra + * {@link #EXTRA_EVENT_BEGIN_TIME} has the start time of the instance. The + * extra {@link #EXTRA_CUSTOM_APP_URI} will have the + * {@link EventsColumns#CUSTOM_APP_URI}. + * <p> + * Output: {@link Activity#RESULT_OK} if this was handled; otherwise + * {@link Activity#RESULT_CANCELED} + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_HANDLE_CUSTOM_EVENT = + "android.provider.calendar.action.HANDLE_CUSTOM_EVENT"; + + /** + * Intent Extras key: {@link EventsColumns#CUSTOM_APP_URI} for the event in + * the {@link #ACTION_HANDLE_CUSTOM_EVENT} intent + */ + public static final String EXTRA_CUSTOM_APP_URI = "customAppUri"; + + /** * Intent Extras key: The start time of an event or an instance of a * recurring event. (milliseconds since epoch) */ @@ -1176,6 +1203,22 @@ public final class CalendarContract { * <P>Type: INTEGER (boolean, readonly)</P> */ public static final String CAN_INVITE_OTHERS = "canInviteOthers"; + + /** + * The package name of the custom app that can provide a richer + * experience for the event. See the ACTION TYPE + * {@link CalendarContract#ACTION_HANDLE_CUSTOM_EVENT} for details. + * Column name. + * <P> Type: TEXT </P> + */ + public static final String CUSTOM_APP_PACKAGE = "customAppPackage"; + + /** + * The URI used by the custom app for the event. Column name. + * <P>Type: TEXT</P> + */ + public static final String CUSTOM_APP_URI = "customAppUri"; + } /** diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index 961215184170..19d8d5c9a509 100755 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -1816,6 +1816,181 @@ public final class Telephony { public static final String BEARER = "bearer"; } + /** + * Contains received SMS cell broadcast messages. + */ + public static final class CellBroadcasts implements BaseColumns { + + /** Not instantiable. */ + private CellBroadcasts() {} + + /** + * The content:// style URL for this table + */ + public static final Uri CONTENT_URI = + Uri.parse("content://cellbroadcasts"); + + /** + * Message geographical scope. + * <P>Type: INTEGER</P> + */ + public static final String GEOGRAPHICAL_SCOPE = "geo_scope"; + + /** + * Message serial number. + * <P>Type: INTEGER</P> + */ + public static final String SERIAL_NUMBER = "serial_number"; + + /** + * PLMN of broadcast sender. (SERIAL_NUMBER + PLMN + LAC + CID) uniquely identifies a + * broadcast for duplicate detection purposes. + * <P>Type: TEXT</P> + */ + public static final String PLMN = "plmn"; + + /** + * Location Area (GSM) or Service Area (UMTS) of broadcast sender. Unused for CDMA. + * Only included if Geographical Scope of message is not PLMN wide (01). + * <P>Type: INTEGER</P> + */ + public static final String LAC = "lac"; + + /** + * Cell ID of message sender (GSM/UMTS). Unused for CDMA. Only included when the + * Geographical Scope of message is cell wide (00 or 11). + * <P>Type: INTEGER</P> + */ + public static final String CID = "cid"; + + /** + * Message code (OBSOLETE: merged into SERIAL_NUMBER). + * <P>Type: INTEGER</P> + */ + public static final String V1_MESSAGE_CODE = "message_code"; + + /** + * Message identifier (OBSOLETE: renamed to SERVICE_CATEGORY). + * <P>Type: INTEGER</P> + */ + public static final String V1_MESSAGE_IDENTIFIER = "message_id"; + + /** + * Service category (GSM/UMTS message identifier, CDMA service category). + * <P>Type: INTEGER</P> + */ + public static final String SERVICE_CATEGORY = "service_category"; + + /** + * Message language code. + * <P>Type: TEXT</P> + */ + public static final String LANGUAGE_CODE = "language"; + + /** + * Message body. + * <P>Type: TEXT</P> + */ + public static final String MESSAGE_BODY = "body"; + + /** + * Message delivery time. + * <P>Type: INTEGER (long)</P> + */ + public static final String DELIVERY_TIME = "date"; + + /** + * Has the message been viewed? + * <P>Type: INTEGER (boolean)</P> + */ + public static final String MESSAGE_READ = "read"; + + /** + * Message format (3GPP or 3GPP2). + * <P>Type: INTEGER</P> + */ + public static final String MESSAGE_FORMAT = "format"; + + /** + * Message priority (including emergency). + * <P>Type: INTEGER</P> + */ + public static final String MESSAGE_PRIORITY = "priority"; + + /** + * ETWS warning type (ETWS alerts only). + * <P>Type: INTEGER</P> + */ + public static final String ETWS_WARNING_TYPE = "etws_warning_type"; + + /** + * CMAS message class (CMAS alerts only). + * <P>Type: INTEGER</P> + */ + public static final String CMAS_MESSAGE_CLASS = "cmas_message_class"; + + /** + * CMAS category (CMAS alerts only). + * <P>Type: INTEGER</P> + */ + public static final String CMAS_CATEGORY = "cmas_category"; + + /** + * CMAS response type (CMAS alerts only). + * <P>Type: INTEGER</P> + */ + public static final String CMAS_RESPONSE_TYPE = "cmas_response_type"; + + /** + * CMAS severity (CMAS alerts only). + * <P>Type: INTEGER</P> + */ + public static final String CMAS_SEVERITY = "cmas_severity"; + + /** + * CMAS urgency (CMAS alerts only). + * <P>Type: INTEGER</P> + */ + public static final String CMAS_URGENCY = "cmas_urgency"; + + /** + * CMAS certainty (CMAS alerts only). + * <P>Type: INTEGER</P> + */ + public static final String CMAS_CERTAINTY = "cmas_certainty"; + + /** + * The default sort order for this table + */ + public static final String DEFAULT_SORT_ORDER = DELIVERY_TIME + " DESC"; + + /** + * Query columns for instantiating {@link android.telephony.CellBroadcastMessage} objects. + */ + public static final String[] QUERY_COLUMNS = { + _ID, + GEOGRAPHICAL_SCOPE, + PLMN, + LAC, + CID, + SERIAL_NUMBER, + SERVICE_CATEGORY, + LANGUAGE_CODE, + MESSAGE_BODY, + DELIVERY_TIME, + MESSAGE_READ, + MESSAGE_FORMAT, + MESSAGE_PRIORITY, + ETWS_WARNING_TYPE, + CMAS_MESSAGE_CLASS, + CMAS_CATEGORY, + CMAS_RESPONSE_TYPE, + CMAS_SEVERITY, + CMAS_URGENCY, + CMAS_CERTAINTY + }; + } + public static final class Intents { private Intents() { // Not instantiable diff --git a/core/java/android/server/BluetoothEventLoop.java b/core/java/android/server/BluetoothEventLoop.java index a2038c932156..9c887a1a5492 100644 --- a/core/java/android/server/BluetoothEventLoop.java +++ b/core/java/android/server/BluetoothEventLoop.java @@ -405,6 +405,10 @@ class BluetoothEventLoop { mContext.sendBroadcast(intent, BLUETOOTH_PERM); } else if (name.equals("Alias")) { mBluetoothService.setRemoteDeviceProperty(address, name, propValues[1]); + Intent intent = new Intent(BluetoothDevice.ACTION_ALIAS_CHANGED); + intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device); + intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); + mContext.sendBroadcast(intent, BLUETOOTH_PERM); } else if (name.equals("Class")) { mBluetoothService.setRemoteDeviceProperty(address, name, propValues[1]); Intent intent = new Intent(BluetoothDevice.ACTION_CLASS_CHANGED); diff --git a/core/java/android/server/search/SearchManagerService.java b/core/java/android/server/search/SearchManagerService.java index d78bbbf38d11..c783e6a0b45b 100644 --- a/core/java/android/server/search/SearchManagerService.java +++ b/core/java/android/server/search/SearchManagerService.java @@ -69,7 +69,7 @@ public class SearchManagerService extends ISearchManager.Stub { private synchronized Searchables getSearchables() { if (mSearchables == null) { Log.i(TAG, "Building list of searchable activities"); - new MyPackageMonitor().register(mContext, true); + new MyPackageMonitor().register(mContext, null, true); mSearchables = new Searchables(mContext); mSearchables.buildSearchableList(); } diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index 7ce96c0e31bd..6917fb215365 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -140,6 +140,7 @@ public abstract class WallpaperService extends Service { boolean mIsCreating; boolean mDrawingAllowed; boolean mOffsetsChanged; + boolean mFixedSizeAllowed; int mWidth; int mHeight; int mFormat; @@ -211,7 +212,7 @@ public abstract class WallpaperService extends Service { @Override public void setFixedSize(int width, int height) { - if (Process.myUid() != Process.SYSTEM_UID) { + if (!mFixedSizeAllowed) { // Regular apps can't do this. It can only work for // certain designs of window animations, so you can't // rely on it. @@ -385,7 +386,12 @@ public abstract class WallpaperService extends Service { updateSurface(false, false, false); } } - + + /** {@hide} */ + public void setFixedSizeAllowed(boolean allowed) { + mFixedSizeAllowed = allowed; + } + /** * Called once to initialize the engine. After returning, the * engine's surface will be created by the framework. diff --git a/core/java/android/text/DynamicLayout.java b/core/java/android/text/DynamicLayout.java index ff5a4679c6d0..dc58ef27280e 100644 --- a/core/java/android/text/DynamicLayout.java +++ b/core/java/android/text/DynamicLayout.java @@ -117,7 +117,7 @@ public class DynamicLayout extends Layout mObjects = new PackedObjectVector<Directions>(1); - mBlockEnds = new int[] { 0 }; + mBlockEndLines = new int[] { 0 }; mBlockIndices = new int[] { INVALID_BLOCK_INDEX }; mNumberOfBlocks = 1; @@ -391,23 +391,23 @@ public class DynamicLayout extends Layout int firstBlock = -1; int lastBlock = -1; for (int i = 0; i < mNumberOfBlocks; i++) { - if (mBlockEnds[i] >= startLine) { + if (mBlockEndLines[i] >= startLine) { firstBlock = i; break; } } for (int i = firstBlock; i < mNumberOfBlocks; i++) { - if (mBlockEnds[i] >= endLine) { + if (mBlockEndLines[i] >= endLine) { lastBlock = i; break; } } - final int lastBlockEndLine = mBlockEnds[lastBlock]; + final int lastBlockEndLine = mBlockEndLines[lastBlock]; boolean createBlockBefore = startLine > (firstBlock == 0 ? 0 : - mBlockEnds[firstBlock - 1] + 1); + mBlockEndLines[firstBlock - 1] + 1); boolean createBlock = newLineCount > 0; - boolean createBlockAfter = endLine < mBlockEnds[lastBlock]; + boolean createBlockAfter = endLine < mBlockEndLines[lastBlock]; int numAddedBlocks = 0; if (createBlockBefore) numAddedBlocks++; @@ -419,27 +419,27 @@ public class DynamicLayout extends Layout if (newNumberOfBlocks == 0) { // Even when text is empty, there is actually one line and hence one block - mBlockEnds[0] = 0; + mBlockEndLines[0] = 0; mBlockIndices[0] = INVALID_BLOCK_INDEX; mNumberOfBlocks = 1; return; } - if (newNumberOfBlocks > mBlockEnds.length) { + if (newNumberOfBlocks > mBlockEndLines.length) { final int newSize = ArrayUtils.idealIntArraySize(newNumberOfBlocks); - int[] blockEnds = new int[newSize]; + int[] blockEndLines = new int[newSize]; int[] blockIndices = new int[newSize]; - System.arraycopy(mBlockEnds, 0, blockEnds, 0, firstBlock); + System.arraycopy(mBlockEndLines, 0, blockEndLines, 0, firstBlock); System.arraycopy(mBlockIndices, 0, blockIndices, 0, firstBlock); - System.arraycopy(mBlockEnds, lastBlock + 1, - blockEnds, firstBlock + numAddedBlocks, mNumberOfBlocks - lastBlock - 1); + System.arraycopy(mBlockEndLines, lastBlock + 1, + blockEndLines, firstBlock + numAddedBlocks, mNumberOfBlocks - lastBlock - 1); System.arraycopy(mBlockIndices, lastBlock + 1, blockIndices, firstBlock + numAddedBlocks, mNumberOfBlocks - lastBlock - 1); - mBlockEnds = blockEnds; + mBlockEndLines = blockEndLines; mBlockIndices = blockIndices; } else { - System.arraycopy(mBlockEnds, lastBlock + 1, - mBlockEnds, firstBlock + numAddedBlocks, mNumberOfBlocks - lastBlock - 1); + System.arraycopy(mBlockEndLines, lastBlock + 1, + mBlockEndLines, firstBlock + numAddedBlocks, mNumberOfBlocks - lastBlock - 1); System.arraycopy(mBlockIndices, lastBlock + 1, mBlockIndices, firstBlock + numAddedBlocks, mNumberOfBlocks - lastBlock - 1); } @@ -447,24 +447,24 @@ public class DynamicLayout extends Layout mNumberOfBlocks = newNumberOfBlocks; final int deltaLines = newLineCount - (endLine - startLine + 1); for (int i = firstBlock + numAddedBlocks; i < mNumberOfBlocks; i++) { - mBlockEnds[i] += deltaLines; + mBlockEndLines[i] += deltaLines; } int blockIndex = firstBlock; if (createBlockBefore) { - mBlockEnds[blockIndex] = startLine - 1; + mBlockEndLines[blockIndex] = startLine - 1; mBlockIndices[blockIndex] = INVALID_BLOCK_INDEX; blockIndex++; } if (createBlock) { - mBlockEnds[blockIndex] = startLine + newLineCount - 1; + mBlockEndLines[blockIndex] = startLine + newLineCount - 1; mBlockIndices[blockIndex] = INVALID_BLOCK_INDEX; blockIndex++; } if (createBlockAfter) { - mBlockEnds[blockIndex] = lastBlockEndLine + deltaLines; + mBlockEndLines[blockIndex] = lastBlockEndLine + deltaLines; mBlockIndices[blockIndex] = INVALID_BLOCK_INDEX; } } @@ -473,10 +473,10 @@ public class DynamicLayout extends Layout * This package private method is used for test purposes only * @hide */ - void setBlocksDataForTest(int[] blockEnds, int[] blockIndices, int numberOfBlocks) { - mBlockEnds = new int[blockEnds.length]; + void setBlocksDataForTest(int[] blockEndLines, int[] blockIndices, int numberOfBlocks) { + mBlockEndLines = new int[blockEndLines.length]; mBlockIndices = new int[blockIndices.length]; - System.arraycopy(blockEnds, 0, mBlockEnds, 0, blockEnds.length); + System.arraycopy(blockEndLines, 0, mBlockEndLines, 0, blockEndLines.length); System.arraycopy(blockIndices, 0, mBlockIndices, 0, blockIndices.length); mNumberOfBlocks = numberOfBlocks; } @@ -484,8 +484,8 @@ public class DynamicLayout extends Layout /** * @hide */ - public int[] getBlockEnds() { - return mBlockEnds; + public int[] getBlockEndLines() { + return mBlockEndLines; } /** @@ -633,8 +633,8 @@ public class DynamicLayout extends Layout * @hide */ public static final int INVALID_BLOCK_INDEX = -1; - // Stores the line numbers of the last line of each block - private int[] mBlockEnds; + // Stores the line numbers of the last line of each block (inclusive) + private int[] mBlockEndLines; // The indices of this block's display list in TextView's internal display list array or // INVALID_BLOCK_INDEX if this block has been invalidated during an edition private int[] mBlockIndices; diff --git a/core/java/android/view/AccessibilityInteractionController.java b/core/java/android/view/AccessibilityInteractionController.java index 54c62ee83a12..7d569adda0f8 100644 --- a/core/java/android/view/AccessibilityInteractionController.java +++ b/core/java/android/view/AccessibilityInteractionController.java @@ -18,6 +18,7 @@ package android.view; import static android.view.accessibility.AccessibilityNodeInfo.INCLUDE_NOT_IMPORTANT_VIEWS; +import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -58,9 +59,14 @@ final class AccessibilityInteractionController { private final AccessibilityNodePrefetcher mPrefetcher; + private final long mMyLooperThreadId; + + private final int mMyProcessId; + public AccessibilityInteractionController(ViewRootImpl viewRootImpl) { - // mView is never null - the caller has already checked. - Looper looper = viewRootImpl.mView.mContext.getMainLooper(); + Looper looper = viewRootImpl.mHandler.getLooper(); + mMyLooperThreadId = looper.getThread().getId(); + mMyProcessId = Process.myPid(); mHandler = new PrivateHandler(looper); mViewRootImpl = viewRootImpl; mPrefetcher = new AccessibilityNodePrefetcher(); @@ -137,8 +143,7 @@ final class AccessibilityInteractionController { // thread in this process, set the message as a static reference so // after this call completes the same thread but in the interrogating // client can handle the message to generate the result. - if (interrogatingPid == Process.myPid() - && interrogatingTid == Looper.getMainLooper().getThread().getId()) { + if (interrogatingPid == mMyProcessId && interrogatingTid == mMyLooperThreadId) { AccessibilityInteractionClient.getInstanceForThread( interrogatingTid).setSameThreadMessage(message); } else { @@ -169,7 +174,7 @@ final class AccessibilityInteractionController { } else { root = findViewByAccessibilityId(accessibilityViewId); } - if (root != null && isDisplayedOnScreen(root)) { + if (root != null && root.isDisplayedOnScreen()) { mPrefetcher.prefetchAccessibilityNodeInfos(root, virtualDescendantId, flags, infos); } } finally { @@ -199,8 +204,7 @@ final class AccessibilityInteractionController { // thread in this process, set the message as a static reference so // after this call completes the same thread but in the interrogating // client can handle the message to generate the result. - if (interrogatingPid == Process.myPid() - && interrogatingTid == Looper.getMainLooper().getThread().getId()) { + if (interrogatingPid == mMyProcessId && interrogatingTid == mMyLooperThreadId) { AccessibilityInteractionClient.getInstanceForThread( interrogatingTid).setSameThreadMessage(message); } else { @@ -232,7 +236,7 @@ final class AccessibilityInteractionController { } if (root != null) { View target = root.findViewById(viewId); - if (target != null && isDisplayedOnScreen(target)) { + if (target != null && target.isDisplayedOnScreen()) { info = target.createAccessibilityNodeInfo(); } } @@ -263,8 +267,7 @@ final class AccessibilityInteractionController { // thread in this process, set the message as a static reference so // after this call completes the same thread but in the interrogating // client can handle the message to generate the result. - if (interrogatingPid == Process.myPid() - && interrogatingTid == Looper.getMainLooper().getThread().getId()) { + if (interrogatingPid == mMyProcessId && interrogatingTid == mMyLooperThreadId) { AccessibilityInteractionClient.getInstanceForThread( interrogatingTid).setSameThreadMessage(message); } else { @@ -295,7 +298,7 @@ final class AccessibilityInteractionController { } else { root = mViewRootImpl.mView; } - if (root != null && isDisplayedOnScreen(root)) { + if (root != null && root.isDisplayedOnScreen()) { AccessibilityNodeProvider provider = root.getAccessibilityNodeProvider(); if (provider != null) { infos = provider.findAccessibilityNodeInfosByText(text, @@ -312,7 +315,7 @@ final class AccessibilityInteractionController { final int viewCount = foundViews.size(); for (int i = 0; i < viewCount; i++) { View foundView = foundViews.get(i); - if (isDisplayedOnScreen(foundView)) { + if (foundView.isDisplayedOnScreen()) { provider = foundView.getAccessibilityNodeProvider(); if (provider != null) { List<AccessibilityNodeInfo> infosFromProvider = @@ -356,8 +359,7 @@ final class AccessibilityInteractionController { // thread in this process, set the message as a static reference so // after this call completes the same thread but in the interrogating // client can handle the message to generate the result. - if (interogatingPid == Process.myPid() - && interrogatingTid == Looper.getMainLooper().getThread().getId()) { + if (interogatingPid == mMyProcessId && interrogatingTid == mMyLooperThreadId) { AccessibilityInteractionClient.getInstanceForThread( interrogatingTid).setSameThreadMessage(message); } else { @@ -388,7 +390,7 @@ final class AccessibilityInteractionController { } else { root = mViewRootImpl.mView; } - if (root != null && isDisplayedOnScreen(root)) { + if (root != null && root.isDisplayedOnScreen()) { switch (focusType) { case AccessibilityNodeInfo.FOCUS_ACCESSIBILITY: { View host = mViewRootImpl.mAccessibilityFocusedHost; @@ -409,7 +411,7 @@ final class AccessibilityInteractionController { case AccessibilityNodeInfo.FOCUS_INPUT: { // Input focus cannot go to virtual views. View target = root.findFocus(); - if (target != null && isDisplayedOnScreen(target)) { + if (target != null && target.isDisplayedOnScreen()) { focused = target.createAccessibilityNodeInfo(); } } break; @@ -444,8 +446,7 @@ final class AccessibilityInteractionController { // thread in this process, set the message as a static reference so // after this call completes the same thread but in the interrogating // client can handle the message to generate the result. - if (interogatingPid == Process.myPid() - && interrogatingTid == Looper.getMainLooper().getThread().getId()) { + if (interogatingPid == mMyProcessId && interrogatingTid == mMyLooperThreadId) { AccessibilityInteractionClient.getInstanceForThread( interrogatingTid).setSameThreadMessage(message); } else { @@ -476,7 +477,7 @@ final class AccessibilityInteractionController { } else { root = mViewRootImpl.mView; } - if (root != null && isDisplayedOnScreen(root)) { + if (root != null && root.isDisplayedOnScreen()) { if ((direction & View.FOCUS_ACCESSIBILITY) == View.FOCUS_ACCESSIBILITY) { AccessibilityNodeProvider provider = root.getAccessibilityNodeProvider(); if (provider != null) { @@ -514,8 +515,9 @@ final class AccessibilityInteractionController { } public void performAccessibilityActionClientThread(long accessibilityNodeId, int action, - int interactionId, IAccessibilityInteractionConnectionCallback callback, int flags, - int interogatingPid, long interrogatingTid) { + Bundle arguments, int interactionId, + IAccessibilityInteractionConnectionCallback callback, int flags, int interogatingPid, + long interrogatingTid) { Message message = mHandler.obtainMessage(); message.what = PrivateHandler.MSG_PERFORM_ACCESSIBILITY_ACTION; message.arg1 = flags; @@ -525,13 +527,13 @@ final class AccessibilityInteractionController { args.argi2 = action; args.argi3 = interactionId; args.arg1 = callback; + args.arg2 = arguments; message.obj = args; // If the interrogation is performed by the same thread as the main UI // thread in this process, set the message as a static reference so // after this call completes the same thread but in the interrogating // client can handle the message to generate the result. - if (interogatingPid == Process.myPid() - && interrogatingTid == Looper.getMainLooper().getThread().getId()) { + if (interogatingPid == mMyProcessId && interrogatingTid == mMyLooperThreadId) { AccessibilityInteractionClient.getInstanceForThread( interrogatingTid).setSameThreadMessage(message); } else { @@ -548,6 +550,7 @@ final class AccessibilityInteractionController { final int interactionId = args.argi3; final IAccessibilityInteractionConnectionCallback callback = (IAccessibilityInteractionConnectionCallback) args.arg1; + Bundle arguments = (Bundle) args.arg2; mPool.release(args); boolean succeeded = false; try { @@ -562,12 +565,13 @@ final class AccessibilityInteractionController { } else { target = mViewRootImpl.mView; } - if (target != null && isDisplayedOnScreen(target)) { + if (target != null && target.isDisplayedOnScreen()) { AccessibilityNodeProvider provider = target.getAccessibilityNodeProvider(); if (provider != null) { - succeeded = provider.performAccessibilityAction(action, virtualDescendantId); + succeeded = provider.performAction(virtualDescendantId, action, + arguments); } else if (virtualDescendantId == View.NO_ID) { - succeeded = target.performAccessibilityAction(action); + succeeded = target.performAccessibilityAction(action, arguments); } } } finally { @@ -586,31 +590,13 @@ final class AccessibilityInteractionController { return null; } View foundView = root.findViewByAccessibilityId(accessibilityId); - if (foundView != null && !isDisplayedOnScreen(foundView)) { + if (foundView != null && !foundView.isDisplayedOnScreen()) { return null; } return foundView; } /** - * Computes whether a view is visible on the screen. - * - * @param view The view to check. - * @return Whether the view is visible on the screen. - */ - private boolean isDisplayedOnScreen(View view) { - // The first two checks are made also made by isShown() which - // however traverses the tree up to the parent to catch that. - // Therefore, we do some fail fast check to minimize the up - // tree traversal. - return (view.mAttachInfo != null - && view.mAttachInfo.mWindowVisibility == View.VISIBLE - && view.getAlpha() > 0 - && view.isShown() - && view.getGlobalVisibleRect(mViewRootImpl.mTempRect)); - } - - /** * This class encapsulates a prefetching strategy for the accessibility APIs for * querying window content. It is responsible to prefetch a batch of * AccessibilityNodeInfos in addition to the one for a requested node. @@ -684,7 +670,7 @@ final class AccessibilityInteractionController { } View child = children.getChildAt(i); if (child.getAccessibilityViewId() != current.getAccessibilityViewId() - && isDisplayedOnScreen(child)) { + && child.isDisplayedOnScreen()) { AccessibilityNodeInfo info = null; AccessibilityNodeProvider provider = child.getAccessibilityNodeProvider(); if (provider == null) { @@ -718,7 +704,7 @@ final class AccessibilityInteractionController { return; } View child = children.getChildAt(i); - if ( isDisplayedOnScreen(child)) { + if (child.isDisplayedOnScreen()) { AccessibilityNodeProvider provider = child.getAccessibilityNodeProvider(); if (provider == null) { AccessibilityNodeInfo info = child.createAccessibilityNodeInfo(); diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java index ad2283ea9285..bda80162c657 100644 --- a/core/java/android/view/Display.java +++ b/core/java/android/view/Display.java @@ -143,6 +143,49 @@ public class Display { } /** + * Return the range of display sizes an application can expect to encounter + * under normal operation, as long as there is no physical change in screen + * size. This is basically the sizes you will see as the orientation + * changes, taking into account whatever screen decoration there is in + * each rotation. For example, the status bar is always at the top of the + * screen, so it will reduce the height both in landscape and portrait, and + * the smallest height returned here will be the smaller of the two. + * + * This is intended for applications to get an idea of the range of sizes + * they will encounter while going through device rotations, to provide a + * stable UI through rotation. The sizes here take into account all standard + * system decorations that reduce the size actually available to the + * application: the status bar, navigation bar, system bar, etc. It does + * <em>not</em> take into account more transient elements like an IME + * soft keyboard. + * + * @param outSmallestSize Filled in with the smallest width and height + * that the application will encounter, in pixels (not dp units). The x + * (width) dimension here directly corresponds to + * {@link android.content.res.Configuration#smallestScreenWidthDp + * Configuration.smallestScreenWidthDp}, except the value here is in raw + * screen pixels rather than dp units. Your application may of course + * still get smaller space yet if, for example, a soft keyboard is + * being displayed. + * @param outLargestSize Filled in with the largest width and height + * that the application will encounter, in pixels (not dp units). Your + * application may of course still get larger space than this if, + * for example, screen decorations like the status bar are being hidden. + */ + public void getCurrentSizeRange(Point outSmallestSize, Point outLargestSize) { + try { + IWindowManager wm = getWindowManager(); + wm.getCurrentSizeRange(outSmallestSize, outLargestSize); + } catch (RemoteException e) { + Slog.w("Display", "Unable to get display size range", e); + outSmallestSize.x = 0; + outSmallestSize.y = 0; + outLargestSize.x = 0; + outLargestSize.y = 0; + } + } + + /** * Return the maximum screen size dimension that will happen. This is * mostly for wallpapers. * @hide diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index b70d7b59c4fc..e1f01dbc0056 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -58,6 +58,7 @@ interface IWindowManager void getDisplaySize(out Point size); void getRealDisplaySize(out Point size); int getMaximumSizeDimension(); + void getCurrentSizeRange(out Point smallestSize, out Point largestSize); void setForcedDisplaySize(int longDimen, int shortDimen); void clearForcedDisplaySize(); diff --git a/core/java/android/view/InputDevice.java b/core/java/android/view/InputDevice.java index 4848a7accf72..85f435c76116 100755 --- a/core/java/android/view/InputDevice.java +++ b/core/java/android/view/InputDevice.java @@ -167,6 +167,19 @@ public final class InputDevice implements Parcelable { /** * The input source is a stylus pointing device. + * <p> + * Note that this bit merely indicates that an input device is capable of obtaining + * input from a stylus. To determine whether a given touch event was produced + * by a stylus, examine the tool type returned by {@link MotionEvent#getToolType(int)} + * for each individual pointer. + * </p><p> + * A single touch event may multiple pointers with different tool types, + * such as an event that has one pointer with tool type + * {@link MotionEvent#TOOL_TYPE_FINGER} and another pointer with tool type + * {@link MotionEvent#TOOL_TYPE_STYLUS}. So it is important to examine + * the tool type of each pointer, regardless of the source reported + * by {@link MotionEvent#getSource()}. + * </p> * * @see #SOURCE_CLASS_POINTER */ diff --git a/core/java/android/view/InputEvent.java b/core/java/android/view/InputEvent.java index 56024369d823..ef810a355749 100755 --- a/core/java/android/view/InputEvent.java +++ b/core/java/android/view/InputEvent.java @@ -159,8 +159,26 @@ public abstract class InputEvent implements Parcelable { public abstract void setTainted(boolean tainted); /** - * Returns the time (in ns) when this specific event was generated. + * Retrieve the time this event occurred, + * in the {@link android.os.SystemClock#uptimeMillis} time base. + * + * @return Returns the time this event occurred, + * in the {@link android.os.SystemClock#uptimeMillis} time base. + */ + public abstract long getEventTime(); + + /** + * Retrieve the time this event occurred, + * in the {@link android.os.SystemClock#uptimeMillis} time base but with + * nanosecond (instead of millisecond) precision. + * <p> * The value is in nanosecond precision but it may not have nanosecond accuracy. + * </p> + * + * @return Returns the time this event occurred, + * in the {@link android.os.SystemClock#uptimeMillis} time base but with + * nanosecond (instead of millisecond) precision. + * * @hide */ public abstract long getEventTimeNano(); diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index e4a4a7569dc8..ace7aa8b4d76 100755 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -2375,17 +2375,31 @@ public class KeyEvent extends InputEvent implements Parcelable { } /** - * Retrieve the time this event occurred, + * Retrieve the time this event occurred, * in the {@link android.os.SystemClock#uptimeMillis} time base. - * + * * @return Returns the time this event occurred, * in the {@link android.os.SystemClock#uptimeMillis} time base. */ + @Override public final long getEventTime() { return mEventTime; } - /** @hide */ + /** + * Retrieve the time this event occurred, + * in the {@link android.os.SystemClock#uptimeMillis} time base but with + * nanosecond (instead of millisecond) precision. + * <p> + * The value is in nanosecond precision but it may not have nanosecond accuracy. + * </p> + * + * @return Returns the time this event occurred, + * in the {@link android.os.SystemClock#uptimeMillis} time base but with + * nanosecond (instead of millisecond) precision. + * + * @hide + */ @Override public final long getEventTimeNano() { return mEventTime * 1000000L; diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java index e51ba3d403ec..78fa2d77b8fd 100644 --- a/core/java/android/view/MotionEvent.java +++ b/core/java/android/view/MotionEvent.java @@ -1781,18 +1781,32 @@ public final class MotionEvent extends InputEvent implements Parcelable { } /** - * Returns the time (in ms) when this specific event was generated. + * Retrieve the time this event occurred, + * in the {@link android.os.SystemClock#uptimeMillis} time base. + * + * @return Returns the time this event occurred, + * in the {@link android.os.SystemClock#uptimeMillis} time base. */ + @Override public final long getEventTime() { return nativeGetEventTimeNanos(mNativePtr, HISTORY_CURRENT) / NS_PER_MS; } /** - * Returns the time (in ns) when this specific event was generated. + * Retrieve the time this event occurred, + * in the {@link android.os.SystemClock#uptimeMillis} time base but with + * nanosecond precision. + * <p> * The value is in nanosecond precision but it may not have nanosecond accuracy. + * </p> + * + * @return Returns the time this event occurred, + * in the {@link android.os.SystemClock#uptimeMillis} time base but with + * nanosecond precision. * * @hide */ + @Override public final long getEventTimeNano() { return nativeGetEventTimeNanos(mNativePtr, HISTORY_CURRENT); } @@ -2234,10 +2248,16 @@ public final class MotionEvent extends InputEvent implements Parcelable { /** * Returns the time that a historical movement occurred between this event - * and the previous event. Only applies to ACTION_MOVE events. + * and the previous event, in the {@link android.os.SystemClock#uptimeMillis} time base. + * <p> + * This only applies to ACTION_MOVE events. + * </p> * * @param pos Which historical value to return; must be less than * {@link #getHistorySize} + * @return Returns the time that a historical movement occurred between this + * event and the previous event, + * in the {@link android.os.SystemClock#uptimeMillis} time base. * * @see #getHistorySize * @see #getEventTime @@ -2247,6 +2267,32 @@ public final class MotionEvent extends InputEvent implements Parcelable { } /** + * Returns the time that a historical movement occurred between this event + * and the previous event, in the {@link android.os.SystemClock#uptimeMillis} time base + * but with nanosecond (instead of millisecond) precision. + * <p> + * This only applies to ACTION_MOVE events. + * </p><p> + * The value is in nanosecond precision but it may not have nanosecond accuracy. + * </p> + * + * @param pos Which historical value to return; must be less than + * {@link #getHistorySize} + * @return Returns the time that a historical movement occurred between this + * event and the previous event, + * in the {@link android.os.SystemClock#uptimeMillis} time base but with + * nanosecond (instead of millisecond) precision. + * + * @see #getHistorySize + * @see #getEventTime + * + * @hide + */ + public final long getHistoricalEventTimeNano(int pos) { + return nativeGetEventTimeNanos(mNativePtr, pos); + } + + /** * {@link #getHistoricalX(int, int)} for the first pointer index (may be an * arbitrary pointer identifier). * diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 537c4743d472..a299141f7475 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -39,6 +39,7 @@ import android.graphics.Region; import android.graphics.Shader; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; +import android.os.Bundle; import android.os.Handler; import android.os.IBinder; import android.os.Parcel; @@ -1044,12 +1045,12 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal public static final int ACCESSIBILITY_FOCUS_DOWN = FOCUS_DOWN | FOCUS_ACCESSIBILITY; /** - * Use with {@link #focusSearch(int)}. Move acessibility focus to the next view. + * Use with {@link #focusSearch(int)}. Move acessibility focus forward. */ public static final int ACCESSIBILITY_FOCUS_FORWARD = FOCUS_FORWARD | FOCUS_ACCESSIBILITY; /** - * Use with {@link #focusSearch(int)}. Move acessibility focus to the previous view. + * Use with {@link #focusSearch(int)}. Move acessibility focus backward. */ public static final int ACCESSIBILITY_FOCUS_BACKWARD = FOCUS_BACKWARD | FOCUS_ACCESSIBILITY; @@ -1064,6 +1065,16 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal public static final int ACCESSIBILITY_FOCUS_OUT = 0x00000008 | FOCUS_ACCESSIBILITY; /** + * Use with {@link #focusSearch(int)}. Move acessibility focus to the next view. + */ + public static final int ACCESSIBILITY_FOCUS_NEXT = 0x00000010 | FOCUS_ACCESSIBILITY; + + /** + * Use with {@link #focusSearch(int)}. Move acessibility focus to the previous view. + */ + public static final int ACCESSIBILITY_FOCUS_PREVIOUS = 0x00000020 | FOCUS_ACCESSIBILITY; + + /** * Bits of {@link #getMeasuredWidthAndState()} and * {@link #getMeasuredWidthAndState()} that provide the actual measured size. */ @@ -4680,6 +4691,23 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal } /** + * Computes whether this view is visible on the screen. + * + * @return Whether the view is visible on the screen. + */ + boolean isDisplayedOnScreen() { + // The first two checks are made also made by isShown() which + // however traverses the tree up to the parent to catch that. + // Therefore, we do some fail fast check to minimize the up + // tree traversal. + return (mAttachInfo != null + && mAttachInfo.mWindowVisibility == View.VISIBLE + && getAlpha() > 0 + && isShown() + && getGlobalVisibleRect(mAttachInfo.mTmpInvalRect)); + } + + /** * Sets a delegate for implementing accessibility support via compositon as * opposed to inheritance. The delegate's primary use is for implementing * backwards compatible widgets. For more details see {@link AccessibilityDelegate}. @@ -6301,9 +6329,9 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal boolean includeForAccessibility() { if (mAttachInfo != null) { if (!mAttachInfo.mIncludeNotImportantViews) { - return isImportantForAccessibility(); + return isImportantForAccessibility() && isDisplayedOnScreen(); } else { - return true; + return isDisplayedOnScreen(); } } return false; @@ -6373,7 +6401,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal * @param action The action to perform. * @return Whether the action was performed. */ - public boolean performAccessibilityAction(int action) { + public boolean performAccessibilityAction(int action, Bundle args) { switch (action) { case AccessibilityNodeInfo.ACTION_CLICK: { if (isClickable()) { @@ -7338,7 +7366,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_HOVER_EXIT); // If the window does not have input focus we take away accessibility // focus as soon as the user stop hovering over the view. - if (!mAttachInfo.mHasWindowFocus) { + if (mAttachInfo != null && !mAttachInfo.mHasWindowFocus) { getViewRootImpl().setAccessibilityFocusedHost(null); } } diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 91e945b14e25..1641d4c784d1 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -1569,6 +1569,43 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager return handled; } + private void exitHoverTargets() { + if (mHoveredSelf || mFirstHoverTarget != null) { + final long now = SystemClock.uptimeMillis(); + MotionEvent event = MotionEvent.obtain(now, now, + MotionEvent.ACTION_HOVER_EXIT, 0.0f, 0.0f, 0); + event.setSource(InputDevice.SOURCE_TOUCHSCREEN); + dispatchHoverEvent(event); + event.recycle(); + } + } + + private void cancelHoverTarget(View view) { + HoverTarget predecessor = null; + HoverTarget target = mFirstHoverTarget; + while (target != null) { + final HoverTarget next = target.next; + if (target.child == view) { + if (predecessor == null) { + mFirstHoverTarget = next; + } else { + predecessor.next = next; + } + target.recycle(); + + final long now = SystemClock.uptimeMillis(); + MotionEvent event = MotionEvent.obtain(now, now, + MotionEvent.ACTION_HOVER_EXIT, 0.0f, 0.0f, 0); + event.setSource(InputDevice.SOURCE_TOUCHSCREEN); + view.dispatchHoverEvent(event); + event.recycle(); + return; + } + predecessor = target; + target = next; + } + } + /** @hide */ @Override protected boolean hasHoveredChild() { @@ -1997,6 +2034,32 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager } } + private void cancelTouchTarget(View view) { + TouchTarget predecessor = null; + TouchTarget target = mFirstTouchTarget; + while (target != null) { + final TouchTarget next = target.next; + if (target.child == view) { + if (predecessor == null) { + mFirstTouchTarget = next; + } else { + predecessor.next = next; + } + target.recycle(); + + final long now = SystemClock.uptimeMillis(); + MotionEvent event = MotionEvent.obtain(now, now, + MotionEvent.ACTION_CANCEL, 0.0f, 0.0f, 0); + event.setSource(InputDevice.SOURCE_TOUCHSCREEN); + view.dispatchTouchEvent(event); + event.recycle(); + return; + } + predecessor = target; + target = next; + } + } + /** * Returns true if a child view can receive pointer events. * @hide @@ -2416,6 +2479,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager // first send it an ACTION_CANCEL motion event. cancelAndClearTouchTargets(null); + // Similarly, set ACTION_EXIT to all hover targets and clear them. + exitHoverTargets(); + // In case view is detached while transition is running mLayoutSuppressed = false; @@ -3453,6 +3519,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager clearChildFocus = true; } + cancelTouchTarget(view); + cancelHoverTarget(view); + if (view.getAnimation() != null || (mTransitioningViews != null && mTransitioningViews.contains(view))) { addDisappearingView(view); @@ -3533,6 +3602,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager clearChildFocus = view; } + cancelTouchTarget(view); + cancelHoverTarget(view); + if (view.getAnimation() != null || (mTransitioningViews != null && mTransitioningViews.contains(view))) { addDisappearingView(view); @@ -3603,6 +3675,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager clearChildFocus = view; } + cancelTouchTarget(view); + cancelHoverTarget(view); + if (view.getAnimation() != null || (mTransitioningViews != null && mTransitioningViews.contains(view))) { addDisappearingView(view); @@ -3648,6 +3723,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager child.clearFocus(); } + cancelTouchTarget(child); + cancelHoverTarget(child); + if ((animate && child.getAnimation() != null) || (mTransitioningViews != null && mTransitioningViews.contains(child))) { addDisappearingView(child); diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 3d40b2fcc284..e3681df4244d 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -59,6 +59,7 @@ import android.util.EventLog; import android.util.Log; import android.util.Slog; import android.util.TypedValue; +import android.view.KeyCharacterMap.FallbackAction; import android.view.View.AttachInfo; import android.view.View.MeasureSpec; import android.view.accessibility.AccessibilityEvent; @@ -323,6 +324,8 @@ public final class ViewRootImpl implements ViewParent, private final int mDensity; + final KeyCharacterMap.FallbackAction mFallbackAction = new KeyCharacterMap.FallbackAction(); + /** * Consistency verifier for debugging purposes. */ @@ -1199,13 +1202,13 @@ public final class ViewRootImpl implements ViewParent, } } + // Execute enqueued actions on every traversal in case a detached view enqueued an action + getRunQueue().executeActions(attachInfo.mHandler); + boolean insetsChanged = false; boolean layoutRequested = mLayoutRequested && !mStopped; if (layoutRequested) { - // Execute enqueued actions on every layout in case a view that was detached - // enqueued an action after being detached - getRunQueue().executeActions(attachInfo.mHandler); final Resources res = mView.getContext().getResources(); @@ -4383,6 +4386,31 @@ public final class ViewRootImpl implements ViewParent, mHandler.sendMessage(msg); } + public void dispatchUnhandledKey(KeyEvent event) { + if ((event.getFlags() & KeyEvent.FLAG_FALLBACK) == 0) { + final KeyCharacterMap kcm = event.getKeyCharacterMap(); + final int keyCode = event.getKeyCode(); + final int metaState = event.getMetaState(); + + KeyEvent fallbackEvent = null; + synchronized (mFallbackAction) { + // Check for fallback actions specified by the key character map. + if (kcm.getFallbackAction(keyCode, metaState, mFallbackAction)) { + int flags = event.getFlags() | KeyEvent.FLAG_FALLBACK; + fallbackEvent = KeyEvent.obtain( + event.getDownTime(), event.getEventTime(), + event.getAction(), mFallbackAction.keyCode, + event.getRepeatCount(), mFallbackAction.metaState, + event.getDeviceId(), event.getScanCode(), + flags, event.getSource(), null); + } + } + if (fallbackEvent != null) { + dispatchKey(fallbackEvent); + } + } + } + public void dispatchAppVisibility(boolean visible) { Message msg = mHandler.obtainMessage(MSG_DISPATCH_APP_VISIBILITY); msg.arg1 = visible ? 1 : 0; @@ -5132,12 +5160,13 @@ public final class ViewRootImpl implements ViewParent, @Override public void performAccessibilityAction(long accessibilityNodeId, int action, - int interactionId, IAccessibilityInteractionConnectionCallback callback, - int flags, int interogatingPid, long interrogatingTid) { + Bundle arguments, int interactionId, + IAccessibilityInteractionConnectionCallback callback, int flags, + int interogatingPid, long interrogatingTid) { ViewRootImpl viewRootImpl = mViewRootImpl.get(); if (viewRootImpl != null && viewRootImpl.mView != null) { viewRootImpl.getAccessibilityInteractionController() - .performAccessibilityActionClientThread(accessibilityNodeId, action, + .performAccessibilityActionClientThread(accessibilityNodeId, action, arguments, interactionId, callback, flags, interogatingPid, interrogatingTid); } else { // We cannot make the call and notify the caller so it does not wait. diff --git a/core/java/android/view/accessibility/AccessibilityInteractionClient.java b/core/java/android/view/accessibility/AccessibilityInteractionClient.java index 35f0d9d6fd5a..24e90fdfe160 100644 --- a/core/java/android/view/accessibility/AccessibilityInteractionClient.java +++ b/core/java/android/view/accessibility/AccessibilityInteractionClient.java @@ -19,6 +19,7 @@ package android.view.accessibility; import android.accessibilityservice.IAccessibilityServiceConnection; import android.graphics.Rect; import android.os.Binder; +import android.os.Bundle; import android.os.Message; import android.os.Process; import android.os.RemoteException; @@ -84,7 +85,7 @@ public final class AccessibilityInteractionClient private final Object mInstanceLock = new Object(); - private int mInteractionId = -1; + private volatile int mInteractionId = -1; private AccessibilityNodeInfo mFindAccessibilityNodeInfoResult; @@ -150,6 +151,18 @@ public final class AccessibilityInteractionClient } /** + * Gets the root {@link AccessibilityNodeInfo} in the currently active window. + * + * @param connectionId The id of a connection for interacting with the system. + * @return The root {@link AccessibilityNodeInfo} if found, null otherwise. + */ + public AccessibilityNodeInfo getRootInActiveWindow(int connectionId) { + return findAccessibilityNodeInfoByAccessibilityId(connectionId, + AccessibilityNodeInfo.ACTIVE_WINDOW_ID, AccessibilityNodeInfo.ROOT_NODE_ID, + AccessibilityNodeInfo.FLAG_PREFETCH_DESCENDANTS); + } + + /** * Finds an {@link AccessibilityNodeInfo} by accessibility id. * * @param connectionId The id of a connection for interacting with the system. @@ -396,17 +409,18 @@ public final class AccessibilityInteractionClient * {@link android.view.accessibility.AccessibilityNodeInfo#ROOT_NODE_ID} * to start from the root. * @param action The action to perform. + * @param arguments Optional action arguments. * @return Whether the action was performed. */ public boolean performAccessibilityAction(int connectionId, int accessibilityWindowId, - long accessibilityNodeId, int action) { + long accessibilityNodeId, int action, Bundle arguments) { try { IAccessibilityServiceConnection connection = getConnection(connectionId); if (connection != null) { final int interactionId = mInteractionIdCounter.getAndIncrement(); final boolean success = connection.performAccessibilityAction( - accessibilityWindowId, accessibilityNodeId, action, interactionId, this, - Thread.currentThread().getId()); + accessibilityWindowId, accessibilityNodeId, action, arguments, + interactionId, this, Thread.currentThread().getId()); if (success) { return getPerformAccessibilityActionResultAndClear(interactionId); } diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java index c5f2062daff4..cdb9e77bf6e0 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java +++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java @@ -17,9 +17,9 @@ package android.view.accessibility; import android.graphics.Rect; +import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import android.text.TextUtils; import android.util.SparseLongArray; import android.view.View; @@ -122,6 +122,80 @@ public class AccessibilityNodeInfo implements Parcelable { public static final int ACTION_CLEAR_ACCESSIBILITY_FOCUS = 0x00000080; /** + * Action that requests from the node to go to the next entity in its content + * at a given granularity. For example, move to the next word, link, etc. + * <p> + * <strong>Arguments:</strong> + * <ul> + * <li> + * {@link #ACTION_ARGUMENT_GRANULARITY} + * </li> + * <li> + * </p> + * <p> + * <strong>Example:</strong> + * <code><pre><p> + * // Assume the first granularity was presented to the user and she is + * // making an explicit action to traverse the node at that granularity. + * CharSequence granularity = info.getGranularity(0); + * Bundle arguments = new Bundle(); + * arguments.putCharSequence(AccessibilityNodeInfo.ACTION_ARGUMENT_GRANULARITY, granularity); + * info.performAction(AccessibilityNodeInfo.ACTION_NEXT_AT_GRANULARITY, arguments); + * </code></pre></p> + * </li> + * </ul> + * </p> + * @see #setGranularities(CharSequence[]) + * @see #getGranularities() + */ + public static final int ACTION_NEXT_AT_GRANULARITY = 0x00000100; + + /** + * Action that requests from the node to go to the previous entity in its content + * at a given granularity. For example, move to the next word, link, etc. + * <p> + * <strong>Arguments:</strong> + * <ul> + * <li> + * {@link #ACTION_ARGUMENT_GRANULARITY} + * </li> + * <li> + * </p> + * <p> + * <strong>Example:</strong> + * <code><pre><p> + * // Assume the first granularity was presented to the user and she is + * // making an explicit action to traverse the node at that granularity. + * CharSequence granularity = info.getGranularity(0); + * Bundle arguments = new Bundle(); + * arguments.putCharSequence(AccessibilityNodeInfo.ACTION_ARGUMENT_GRANULARITY, granularity); + * info.performAction(AccessibilityNodeInfo.ACTION_NEXT_AT_GRANULARITY, arguments); + * </code></pre></p> + * </li> + * </ul> + * </p> + * @see #setGranularities(CharSequence[]) + * @see #getGranularities() + */ + public static final int ACTION_PREVIOUS_AT_GRANULARITY = 0x00000200; + + /** + * Argument for which content granularity to be used when traversing the node content. + * <p> + * <strong>Actions:</strong> + * <ul> + * <li> + * {@link #ACTION_PREVIOUS_AT_GRANULARITY} + * </li> + * <li> + * {@link #ACTION_PREVIOUS_AT_GRANULARITY} + * </li> + * </ul> + * </p> + */ + public static final String ACTION_ARGUMENT_GRANULARITY = "ACTION_ARGUMENT_GRANULARITY"; + + /** * The input focus. */ public static final int FOCUS_INPUT = 1; @@ -231,9 +305,11 @@ public class AccessibilityNodeInfo implements Parcelable { private CharSequence mText; private CharSequence mContentDescription; - private SparseLongArray mChildNodeIds = new SparseLongArray(); + private final SparseLongArray mChildNodeIds = new SparseLongArray(); private int mActions; + private CharSequence[] mGranularities; + private int mConnectionId = UNDEFINED; /** @@ -458,6 +534,32 @@ public class AccessibilityNodeInfo implements Parcelable { } /** + * Sets the granularities for traversing the content of this node. + * <p> + * <strong>Note:</strong> Cannot be called from an + * {@link android.accessibilityservice.AccessibilityService}. + * This class is made immutable before being delivered to an AccessibilityService. + * </p> + * + * @param granularities The granularity names. + * + * @throws IllegalStateException If called from an AccessibilityService. + */ + public void setGranularities(CharSequence[] granularities) { + enforceNotSealed(); + mGranularities = granularities; + } + + /** + * Gets the granularities for traversing the content of this node. + * + * @return The count. + */ + public CharSequence[] getGranularities() { + return mGranularities; + } + + /** * Performs an action on the node. * <p> * <strong>Note:</strong> An action can be performed only if the request is made @@ -475,7 +577,31 @@ public class AccessibilityNodeInfo implements Parcelable { return false; } AccessibilityInteractionClient client = AccessibilityInteractionClient.getInstance(); - return client.performAccessibilityAction(mConnectionId, mWindowId, mSourceNodeId, action); + return client.performAccessibilityAction(mConnectionId, mWindowId, mSourceNodeId, + action, null); + } + + /** + * Performs an action on the node. + * <p> + * <strong>Note:</strong> An action can be performed only if the request is made + * from an {@link android.accessibilityservice.AccessibilityService}. + * </p> + * + * @param action The action to perform. + * @param arguments A bundle with additional arguments. + * @return True if the action was performed. + * + * @throws IllegalStateException If called outside of an AccessibilityService. + */ + public boolean performAction(int action, Bundle arguments) { + enforceSealed(); + if (!canPerformRequestOverConnection(mSourceNodeId)) { + return false; + } + AccessibilityInteractionClient client = AccessibilityInteractionClient.getInstance(); + return client.performAccessibilityAction(mConnectionId, mWindowId, mSourceNodeId, + action, arguments); } /** @@ -1215,6 +1341,8 @@ public class AccessibilityNodeInfo implements Parcelable { parcel.writeLong(mParentNodeId); parcel.writeInt(mConnectionId); + parcel.writeCharSequenceArray(mGranularities); + SparseLongArray childIds = mChildNodeIds; final int childIdsSize = childIds.size(); parcel.writeInt(childIdsSize); @@ -1236,10 +1364,10 @@ public class AccessibilityNodeInfo implements Parcelable { parcel.writeInt(mBooleanProperties); - TextUtils.writeToParcel(mPackageName, parcel, flags); - TextUtils.writeToParcel(mClassName, parcel, flags); - TextUtils.writeToParcel(mText, parcel, flags); - TextUtils.writeToParcel(mContentDescription, parcel, flags); + parcel.writeCharSequence(mPackageName); + parcel.writeCharSequence(mClassName); + parcel.writeCharSequence(mText); + parcel.writeCharSequence(mContentDescription); // Since instances of this class are fetched via synchronous i.e. blocking // calls in IPCs we always recycle as soon as the instance is marshaled. @@ -1251,6 +1379,7 @@ public class AccessibilityNodeInfo implements Parcelable { * * @param other The other instance. */ + @SuppressWarnings("unchecked") private void init(AccessibilityNodeInfo other) { mSealed = other.mSealed; mSourceNodeId = other.mSourceNodeId; @@ -1265,7 +1394,11 @@ public class AccessibilityNodeInfo implements Parcelable { mContentDescription = other.mContentDescription; mActions= other.mActions; mBooleanProperties = other.mBooleanProperties; - mChildNodeIds = other.mChildNodeIds.clone(); + mGranularities = (other.mGranularities) != null ? other.mGranularities.clone() : null; + final int otherChildIdCount = other.mChildNodeIds.size(); + for (int i = 0; i < otherChildIdCount; i++) { + mChildNodeIds.put(i, other.mChildNodeIds.valueAt(i)); + } } /** @@ -1280,6 +1413,8 @@ public class AccessibilityNodeInfo implements Parcelable { mParentNodeId = parcel.readLong(); mConnectionId = parcel.readInt(); + mGranularities = parcel.readCharSequenceArray(); + SparseLongArray childIds = mChildNodeIds; final int childrenSize = parcel.readInt(); for (int i = 0; i < childrenSize; i++) { @@ -1301,10 +1436,10 @@ public class AccessibilityNodeInfo implements Parcelable { mBooleanProperties = parcel.readInt(); - mPackageName = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(parcel); - mClassName = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(parcel); - mText = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(parcel); - mContentDescription = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(parcel); + mPackageName = parcel.readCharSequence(); + mClassName = parcel.readCharSequence(); + mText = parcel.readCharSequence(); + mContentDescription = parcel.readCharSequence(); } /** @@ -1316,6 +1451,7 @@ public class AccessibilityNodeInfo implements Parcelable { mParentNodeId = ROOT_NODE_ID; mWindowId = UNDEFINED; mConnectionId = UNDEFINED; + mGranularities = null; mChildNodeIds.clear(); mBoundsInParent.set(0, 0, 0, 0); mBoundsInScreen.set(0, 0, 0, 0); @@ -1394,6 +1530,17 @@ public class AccessibilityNodeInfo implements Parcelable { builder.append("; accessibilityViewId: " + getAccessibilityViewId(mSourceNodeId)); builder.append("; virtualDescendantId: " + getVirtualDescendantId(mSourceNodeId)); builder.append("; mParentNodeId: " + mParentNodeId); + + CharSequence[] granularities = mGranularities; + builder.append("; granularities: ["); + for (int i = 0, count = granularities.length; i < count; i++) { + builder.append(granularities[i]); + if (i < count - 1) { + builder.append(", "); + } + } + builder.append("]"); + SparseLongArray childIds = mChildNodeIds; builder.append("; childAccessibilityIds: ["); for (int i = 0, count = childIds.size(); i < count; i++) { @@ -1401,8 +1548,8 @@ public class AccessibilityNodeInfo implements Parcelable { if (i < count - 1) { builder.append(", "); } - } - builder.append("]"); + } + builder.append("]"); } builder.append("; boundsInParent: " + mBoundsInParent); diff --git a/core/java/android/view/accessibility/AccessibilityNodeProvider.java b/core/java/android/view/accessibility/AccessibilityNodeProvider.java index 19e35ddd3d90..ba6433ff8144 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeProvider.java +++ b/core/java/android/view/accessibility/AccessibilityNodeProvider.java @@ -17,6 +17,7 @@ package android.view.accessibility; import android.accessibilityservice.AccessibilityService; +import android.os.Bundle; import android.view.View; import java.util.List; @@ -47,12 +48,13 @@ import java.util.List; * getAccessibilityNodeProvider( * if (mAccessibilityNodeProvider == null) { * mAccessibilityNodeProvider = new AccessibilityNodeProvider() { - * public boolean performAccessibilityAction(int action, int virtualDescendantId) { + * public boolean performAction(int action, int virtualDescendantId) { * // Implementation. * return false; * } * - * public List<AccessibilityNodeInfo> findAccessibilityNodeInfosByText(String text, int virtualDescendantId) { + * public List<AccessibilityNodeInfo> findAccessibilityNodeInfosByText(String text, + * int virtualDescendantId) { * // Implementation. * return null; * } @@ -99,15 +101,16 @@ public abstract class AccessibilityNodeProvider { * host View, with the given <code>virtualViewId</code> or the host View itself * if <code>virtualViewId</code> equals to {@link View#NO_ID}. * - * @param action The action to perform. * @param virtualViewId A client defined virtual view id. + * @param action The action to perform. + * @param arguments Optional action arguments. * @return True if the action was performed. * - * @see View#performAccessibilityAction(int) + * @see View#performAccessibilityAction(int, Bundle) * @see #createAccessibilityNodeInfo(int) * @see AccessibilityNodeInfo */ - public boolean performAccessibilityAction(int action, int virtualViewId) { + public boolean performAction(int virtualViewId, int action, Bundle arguments) { return false; } diff --git a/core/java/android/view/accessibility/IAccessibilityInteractionConnection.aidl b/core/java/android/view/accessibility/IAccessibilityInteractionConnection.aidl index 8182d292cc3a..9d7a928833bd 100644 --- a/core/java/android/view/accessibility/IAccessibilityInteractionConnection.aidl +++ b/core/java/android/view/accessibility/IAccessibilityInteractionConnection.aidl @@ -16,6 +16,7 @@ package android.view.accessibility; +import android.os.Bundle; import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.IAccessibilityInteractionConnectionCallback; @@ -47,7 +48,7 @@ oneway interface IAccessibilityInteractionConnection { IAccessibilityInteractionConnectionCallback callback, int flags, int interrogatingPid, long interrogatingTid); - void performAccessibilityAction(long accessibilityNodeId, int action, int interactionId, - IAccessibilityInteractionConnectionCallback callback, int flags, int interrogatingPid, - long interrogatingTid); + void performAccessibilityAction(long accessibilityNodeId, int action, in Bundle arguments, + int interactionId, IAccessibilityInteractionConnectionCallback callback, int flags, + int interrogatingPid, long interrogatingTid); } diff --git a/core/java/android/webkit/CallbackProxy.java b/core/java/android/webkit/CallbackProxy.java index ab798e8db6bc..2d9f60dbc89f 100644 --- a/core/java/android/webkit/CallbackProxy.java +++ b/core/java/android/webkit/CallbackProxy.java @@ -1047,15 +1047,7 @@ class CallbackProxy extends Handler { Message msg = obtainMessage(OVERRIDE_URL); msg.getData().putString("url", url); msg.obj = res; - synchronized (this) { - sendMessage(msg); - try { - wait(); - } catch (InterruptedException e) { - Log.e(LOGTAG, "Caught exception while waiting for overrideUrl"); - Log.e(LOGTAG, Log.getStackTraceString(e)); - } - } + sendMessageToUiThreadSync(msg); return res.getResult().booleanValue(); } @@ -1223,16 +1215,7 @@ class CallbackProxy extends Handler { bundle.putString("host", schemePlusHost); bundle.putString("username", username); bundle.putString("password", password); - synchronized (this) { - sendMessage(msg); - try { - wait(); - } catch (InterruptedException e) { - Log.e(LOGTAG, - "Caught exception while waiting for onSavePassword"); - Log.e(LOGTAG, Log.getStackTraceString(e)); - } - } + sendMessageToUiThreadSync(msg); // Doesn't matter here return false; } @@ -1281,18 +1264,8 @@ class CallbackProxy extends Handler { mWebView.getWebView().new WebViewTransport(); final Message msg = obtainMessage(NOTIFY); msg.obj = transport; - synchronized (this) { - sendMessage(obtainMessage(CREATE_WINDOW, dialog ? 1 : 0, - userGesture ? 1 : 0, msg)); - try { - wait(); - } catch (InterruptedException e) { - Log.e(LOGTAG, - "Caught exception while waiting for createWindow"); - Log.e(LOGTAG, Log.getStackTraceString(e)); - } - } - + sendMessageToUiThreadSync(obtainMessage(CREATE_WINDOW, dialog ? 1 : 0, + userGesture ? 1 : 0, msg)); WebViewClassic w = WebViewClassic.fromWebView(transport.getWebView()); if (w != null) { WebViewCore core = w.getWebViewCore(); @@ -1375,15 +1348,7 @@ class CallbackProxy extends Handler { Message alert = obtainMessage(JS_ALERT, result); alert.getData().putString("message", message); alert.getData().putString("url", url); - synchronized (this) { - sendMessage(alert); - try { - wait(); - } catch (InterruptedException e) { - Log.e(LOGTAG, "Caught exception while waiting for jsAlert"); - Log.e(LOGTAG, Log.getStackTraceString(e)); - } - } + sendMessageToUiThreadSync(alert); } public boolean onJsConfirm(String url, String message) { @@ -1396,15 +1361,7 @@ class CallbackProxy extends Handler { Message confirm = obtainMessage(JS_CONFIRM, result); confirm.getData().putString("message", message); confirm.getData().putString("url", url); - synchronized (this) { - sendMessage(confirm); - try { - wait(); - } catch (InterruptedException e) { - Log.e(LOGTAG, "Caught exception while waiting for jsConfirm"); - Log.e(LOGTAG, Log.getStackTraceString(e)); - } - } + sendMessageToUiThreadSync(confirm); return result.mJsResult.getResult(); } @@ -1419,15 +1376,7 @@ class CallbackProxy extends Handler { prompt.getData().putString("message", message); prompt.getData().putString("default", defaultValue); prompt.getData().putString("url", url); - synchronized (this) { - sendMessage(prompt); - try { - wait(); - } catch (InterruptedException e) { - Log.e(LOGTAG, "Caught exception while waiting for jsPrompt"); - Log.e(LOGTAG, Log.getStackTraceString(e)); - } - } + sendMessageToUiThreadSync(prompt); return result.mJsResult.getStringResult(); } @@ -1441,15 +1390,7 @@ class CallbackProxy extends Handler { Message confirm = obtainMessage(JS_UNLOAD, result); confirm.getData().putString("message", message); confirm.getData().putString("url", url); - synchronized (this) { - sendMessage(confirm); - try { - wait(); - } catch (InterruptedException e) { - Log.e(LOGTAG, "Caught exception while waiting for jsUnload"); - Log.e(LOGTAG, Log.getStackTraceString(e)); - } - } + sendMessageToUiThreadSync(confirm); return result.mJsResult.getResult(); } @@ -1586,15 +1527,7 @@ class CallbackProxy extends Handler { } JsResultReceiver result = new JsResultReceiver(); Message timeout = obtainMessage(JS_TIMEOUT, result); - synchronized (this) { - sendMessage(timeout); - try { - wait(); - } catch (InterruptedException e) { - Log.e(LOGTAG, "Caught exception while waiting for jsUnload"); - Log.e(LOGTAG, Log.getStackTraceString(e)); - } - } + sendMessageToUiThreadSync(timeout); return result.mJsResult.getResult(); } @@ -1655,16 +1588,7 @@ class CallbackProxy extends Handler { UploadFile uploadFile = new UploadFile(); UploadFileMessageData data = new UploadFileMessageData(uploadFile, acceptType, capture); myMessage.obj = data; - synchronized (this) { - sendMessage(myMessage); - try { - wait(); - } catch (InterruptedException e) { - Log.e(LOGTAG, - "Caught exception while waiting for openFileChooser"); - Log.e(LOGTAG, Log.getStackTraceString(e)); - } - } + sendMessageToUiThreadSync(myMessage); return uploadFile.getResult(); } @@ -1723,4 +1647,16 @@ class CallbackProxy extends Handler { sendMessage(msg); } + + private synchronized void sendMessageToUiThreadSync(Message msg) { + sendMessage(msg); + WebCoreThreadWatchdog.pause(); + try { + wait(); + } catch (InterruptedException e) { + Log.e(LOGTAG, "Caught exception waiting for synchronous UI message to be processed"); + Log.e(LOGTAG, Log.getStackTraceString(e)); + } + WebCoreThreadWatchdog.resume(); + } } diff --git a/core/java/android/webkit/CookieManager.java b/core/java/android/webkit/CookieManager.java index 2997c1abedfb..825436fc6311 100644 --- a/core/java/android/webkit/CookieManager.java +++ b/core/java/android/webkit/CookieManager.java @@ -16,27 +16,20 @@ package android.webkit; -import android.net.ParseException; import android.net.WebAddress; -import android.os.AsyncTask; -import android.util.Log; - /** * Manages the cookies used by an application's {@link WebView} instances. * Cookies are manipulated according to RFC2109. */ public class CookieManager { - - private static CookieManager sRef; - - private static final String LOGTAG = "webkit"; - - private int mPendingCookieOperations = 0; - - private CookieManager() { + /** + * @hide Only for use by WebViewProvider implementations + */ + protected CookieManager() { } + @Override protected Object clone() throws CloneNotSupportedException { throw new CloneNotSupportedException("doesn't implement Cloneable"); } @@ -46,14 +39,11 @@ public class CookieManager { * before the application instantiates a {@link WebView} instance, * {@link CookieSyncManager#createInstance(Context)} must be called * first. - * + * * @return The singleton CookieManager instance */ public static synchronized CookieManager getInstance() { - if (sRef == null) { - sRef = new CookieManager(); - } - return sRef; + return WebViewFactory.getProvider().getCookieManager(); } /** @@ -63,7 +53,7 @@ public class CookieManager { * cookies */ public synchronized void setAcceptCookie(boolean accept) { - nativeSetAcceptCookie(accept); + throw new MustOverrideException(); } /** @@ -72,39 +62,20 @@ public class CookieManager { * @return True if {@link WebView} instances send and accept cookies */ public synchronized boolean acceptCookie() { - return nativeAcceptCookie(); + throw new MustOverrideException(); } - /** + /** * Sets a cookie for the given URL. Any existing cookie with the same host, * path and name will be replaced with the new cookie. The cookie being set * must not have expired and must not be a session cookie, otherwise it * will be ignored. * @param url The URL for which the cookie is set - * @param value The cookie as a string, using the format of the - * 'Set-Cookie' HTTP response header + * @param value The cookie as a string, using the format of the 'Set-Cookie' + * HTTP response header */ public void setCookie(String url, String value) { - setCookie(url, value, false); - } - - /** - * See {@link setCookie(String, String)} - * @param url The URL for which the cookie is set - * @param value The value of the cookie, as a string, using the format of - * the 'Set-Cookie' HTTP response header - * @param privateBrowsing Whether to use the private browsing cookie jar - */ - void setCookie(String url, String value, boolean privateBrowsing) { - WebAddress uri; - try { - uri = new WebAddress(url); - } catch (ParseException ex) { - Log.e(LOGTAG, "Bad address: " + url); - return; - } - - nativeSetCookie(uri.toString(), value, privateBrowsing); + throw new MustOverrideException(); } /** @@ -114,11 +85,11 @@ public class CookieManager { * HTTP request header */ public String getCookie(String url) { - return getCookie(url, false); + throw new MustOverrideException(); } /** - * See {@link getCookie(String)} + * See {@link #getCookie(String)} * @param url The URL for which the cookies are requested * @param privateBrowsing Whether to use the private browsing cookie jar * @return value The cookies as a string, using the format of the 'Cookie' @@ -126,15 +97,7 @@ public class CookieManager { * @hide Used by Browser, no intention to publish. */ public String getCookie(String url, boolean privateBrowsing) { - WebAddress uri; - try { - uri = new WebAddress(url); - } catch (ParseException ex) { - Log.e(LOGTAG, "Bad address: " + url); - return null; - } - - return nativeGetCookie(uri.toString(), privateBrowsing); + throw new MustOverrideException(); } /** @@ -146,32 +109,7 @@ public class CookieManager { * @hide Used by RequestHandle, no intention to publish. */ public synchronized String getCookie(WebAddress uri) { - return nativeGetCookie(uri.toString(), false); - } - - /** - * Waits for pending operations to completed. - */ - void waitForCookieOperationsToComplete() { - // Note that this function is applicable for both the java - // and native http stacks, and works correctly with either. - synchronized (this) { - while (mPendingCookieOperations > 0) { - try { - wait(); - } catch (InterruptedException e) { } - } - } - } - - private synchronized void signalCookieOperationsComplete() { - mPendingCookieOperations--; - assert mPendingCookieOperations > -1; - notify(); - } - - private synchronized void signalCookieOperationsStart() { - mPendingCookieOperations++; + throw new MustOverrideException(); } /** @@ -179,21 +117,14 @@ public class CookieManager { * date. */ public void removeSessionCookie() { - signalCookieOperationsStart(); - new AsyncTask<Void, Void, Void>() { - protected Void doInBackground(Void... none) { - nativeRemoveSessionCookie(); - signalCookieOperationsComplete(); - return null; - } - }.execute(); + throw new MustOverrideException(); } /** * Removes all cookies. */ public void removeAllCookie() { - nativeRemoveAllCookie(); + throw new MustOverrideException(); } /** @@ -201,32 +132,32 @@ public class CookieManager { * @return True if there are stored cookies. */ public synchronized boolean hasCookies() { - return hasCookies(false); + throw new MustOverrideException(); } /** - * See {@link hasCookies()}. + * See {@link #hasCookies()}. * @param privateBrowsing Whether to use the private browsing cookie jar * @hide Used by Browser, no intention to publish. */ public synchronized boolean hasCookies(boolean privateBrowsing) { - return nativeHasCookies(privateBrowsing); + throw new MustOverrideException(); } /** * Removes all expired cookies. */ public void removeExpiredCookie() { - nativeRemoveExpiredCookie(); + throw new MustOverrideException(); } /** - * Package level api, called from CookieSyncManager - * * Flush all cookies managed by the Chrome HTTP stack to flash. + * + * @hide Package level api, called from CookieSyncManager */ - void flushCookieStore() { - nativeFlushCookieStore(); + protected void flushCookieStore() { + throw new MustOverrideException(); } /** @@ -236,7 +167,7 @@ public class CookieManager { * file scheme URLs */ public static boolean allowFileSchemeCookies() { - return nativeAcceptFileSchemeCookies(); + throw new MustOverrideException(); } /** @@ -250,19 +181,6 @@ public class CookieManager { * {@link WebView} or CookieManager instance has been created. */ public static void setAcceptFileSchemeCookies(boolean accept) { - nativeSetAcceptFileSchemeCookies(accept); + throw new MustOverrideException(); } - - // Native functions - private static native boolean nativeAcceptCookie(); - private static native String nativeGetCookie(String url, boolean privateBrowsing); - private static native boolean nativeHasCookies(boolean privateBrowsing); - private static native void nativeRemoveAllCookie(); - private static native void nativeRemoveExpiredCookie(); - private static native void nativeRemoveSessionCookie(); - private static native void nativeSetAcceptCookie(boolean accept); - private static native void nativeSetCookie(String url, String value, boolean privateBrowsing); - private static native void nativeFlushCookieStore(); - private static native boolean nativeAcceptFileSchemeCookies(); - private static native void nativeSetAcceptFileSchemeCookies(boolean accept); } diff --git a/core/java/android/webkit/CookieManagerClassic.java b/core/java/android/webkit/CookieManagerClassic.java new file mode 100644 index 000000000000..f1aebcf29e61 --- /dev/null +++ b/core/java/android/webkit/CookieManagerClassic.java @@ -0,0 +1,198 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.webkit; + +import android.net.ParseException; +import android.net.WebAddress; +import android.os.AsyncTask; +import android.util.Log; + +class CookieManagerClassic extends CookieManager { + + private static CookieManagerClassic sRef; + + private static final String LOGTAG = "webkit"; + + private int mPendingCookieOperations = 0; + + private CookieManagerClassic() { + } + + public static synchronized CookieManagerClassic getInstance() { + if (sRef == null) { + sRef = new CookieManagerClassic(); + } + return sRef; + } + + @Override + public synchronized void setAcceptCookie(boolean accept) { + nativeSetAcceptCookie(accept); + } + + @Override + public synchronized boolean acceptCookie() { + return nativeAcceptCookie(); + } + + @Override + public void setCookie(String url, String value) { + setCookie(url, value, false); + } + + /** + * See {@link #setCookie(String, String)} + * @param url The URL for which the cookie is set + * @param value The value of the cookie, as a string, using the format of + * the 'Set-Cookie' HTTP response header + * @param privateBrowsing Whether to use the private browsing cookie jar + */ + void setCookie(String url, String value, boolean privateBrowsing) { + WebAddress uri; + try { + uri = new WebAddress(url); + } catch (ParseException ex) { + Log.e(LOGTAG, "Bad address: " + url); + return; + } + + nativeSetCookie(uri.toString(), value, privateBrowsing); + } + + @Override + public String getCookie(String url) { + return getCookie(url, false); + } + + @Override + public String getCookie(String url, boolean privateBrowsing) { + WebAddress uri; + try { + uri = new WebAddress(url); + } catch (ParseException ex) { + Log.e(LOGTAG, "Bad address: " + url); + return null; + } + + return nativeGetCookie(uri.toString(), privateBrowsing); + } + + @Override + public synchronized String getCookie(WebAddress uri) { + return nativeGetCookie(uri.toString(), false); + } + + /** + * Waits for pending operations to completed. + */ + void waitForCookieOperationsToComplete() { + // Note that this function is applicable for both the java + // and native http stacks, and works correctly with either. + synchronized (this) { + while (mPendingCookieOperations > 0) { + try { + wait(); + } catch (InterruptedException e) { } + } + } + } + + private synchronized void signalCookieOperationsComplete() { + mPendingCookieOperations--; + assert mPendingCookieOperations > -1; + notify(); + } + + private synchronized void signalCookieOperationsStart() { + mPendingCookieOperations++; + } + + @Override + public void removeSessionCookie() { + signalCookieOperationsStart(); + new AsyncTask<Void, Void, Void>() { + @Override + protected Void doInBackground(Void... none) { + nativeRemoveSessionCookie(); + signalCookieOperationsComplete(); + return null; + } + }.execute(); + } + + @Override + public void removeAllCookie() { + nativeRemoveAllCookie(); + } + + @Override + public synchronized boolean hasCookies() { + return hasCookies(false); + } + + @Override + public synchronized boolean hasCookies(boolean privateBrowsing) { + return nativeHasCookies(privateBrowsing); + } + + @Override + public void removeExpiredCookie() { + nativeRemoveExpiredCookie(); + } + + @Override + protected void flushCookieStore() { + nativeFlushCookieStore(); + } + + /** + * Gets whether the application's {@link WebView} instances send and accept + * cookies for file scheme URLs. + * @return True if {@link WebView} instances send and accept cookies for + * file scheme URLs + */ + public static boolean allowFileSchemeCookies() { + return nativeAcceptFileSchemeCookies(); + } + + /** + * Sets whether the application's {@link WebView} instances should send and + * accept cookies for file scheme URLs. + * Use of cookies with file scheme URLs is potentially insecure. Do not use + * this feature unless you can be sure that no unintentional sharing of + * cookie data can take place. + * <p> + * Note that calls to this method will have no effect if made after a + * {@link WebView} or CookieManager instance has been created. + */ + public static void setAcceptFileSchemeCookies(boolean accept) { + nativeSetAcceptFileSchemeCookies(accept); + } + + // Native functions + private static native boolean nativeAcceptCookie(); + private static native String nativeGetCookie(String url, boolean privateBrowsing); + private static native boolean nativeHasCookies(boolean privateBrowsing); + private static native void nativeRemoveAllCookie(); + private static native void nativeRemoveExpiredCookie(); + private static native void nativeRemoveSessionCookie(); + private static native void nativeSetAcceptCookie(boolean accept); + private static native void nativeSetCookie(String url, String value, boolean privateBrowsing); + private static native void nativeFlushCookieStore(); + private static native boolean nativeAcceptFileSchemeCookies(); + private static native void nativeSetAcceptFileSchemeCookies(boolean accept); +} diff --git a/core/java/android/webkit/GeolocationPermissions.java b/core/java/android/webkit/GeolocationPermissions.java index a91688455ff7..cd5c9d136816 100755 --- a/core/java/android/webkit/GeolocationPermissions.java +++ b/core/java/android/webkit/GeolocationPermissions.java @@ -16,13 +16,7 @@ package android.webkit; -import android.os.Handler; -import android.os.Message; - -import java.util.HashMap; -import java.util.Map; import java.util.Set; -import java.util.Vector; /** * This class is used to manage permissions for the WebView's Geolocation @@ -44,9 +38,6 @@ import java.util.Vector; * The methods of this class can be used to modify and interrogate the stored * Geolocation permissions at any time. */ -// This class is the Java counterpart of the WebKit C++ GeolocationPermissions -// class. It simply marshals calls from the UI thread to the WebKit thread. -// // Within WebKit, Geolocation permissions may be applied either temporarily // (for the duration of the page) or permanently. This class deals only with // permanent permissions. @@ -68,144 +59,12 @@ public class GeolocationPermissions { public void invoke(String origin, boolean allow, boolean retain); }; - // Global instance - private static GeolocationPermissions sInstance; - - private Handler mHandler; - private Handler mUIHandler; - - // A queue to store messages until the handler is ready. - private Vector<Message> mQueuedMessages; - - // Message ids - static final int GET_ORIGINS = 0; - static final int GET_ALLOWED = 1; - static final int CLEAR = 2; - static final int ALLOW = 3; - static final int CLEAR_ALL = 4; - - // Message ids on the UI thread - static final int RETURN_ORIGINS = 0; - static final int RETURN_ALLOWED = 1; - - private static final String ORIGINS = "origins"; - private static final String ORIGIN = "origin"; - private static final String CALLBACK = "callback"; - private static final String ALLOWED = "allowed"; - /** * Get the singleton instance of this class. * @return The singleton {@link GeolocationPermissions} instance. */ public static GeolocationPermissions getInstance() { - if (sInstance == null) { - sInstance = new GeolocationPermissions(); - } - return sInstance; - } - - /** - * Creates the UI message handler. Must be called on the UI thread. - * @hide - */ - public void createUIHandler() { - if (mUIHandler == null) { - mUIHandler = new Handler() { - @Override - public void handleMessage(Message msg) { - // Runs on the UI thread. - switch (msg.what) { - case RETURN_ORIGINS: { - Map values = (Map) msg.obj; - Set<String> origins = (Set<String>) values.get(ORIGINS); - ValueCallback<Set<String> > callback = (ValueCallback<Set<String> >) values.get(CALLBACK); - callback.onReceiveValue(origins); - } break; - case RETURN_ALLOWED: { - Map values = (Map) msg.obj; - Boolean allowed = (Boolean) values.get(ALLOWED); - ValueCallback<Boolean> callback = (ValueCallback<Boolean>) values.get(CALLBACK); - callback.onReceiveValue(allowed); - } break; - } - } - }; - } - } - - /** - * Creates the message handler. Must be called on the WebKit thread. - * @hide - */ - public synchronized void createHandler() { - if (mHandler == null) { - mHandler = new Handler() { - @Override - public void handleMessage(Message msg) { - // Runs on the WebKit thread. - switch (msg.what) { - case GET_ORIGINS: { - Set origins = nativeGetOrigins(); - ValueCallback callback = (ValueCallback) msg.obj; - Map values = new HashMap<String, Object>(); - values.put(CALLBACK, callback); - values.put(ORIGINS, origins); - postUIMessage(Message.obtain(null, RETURN_ORIGINS, values)); - } break; - case GET_ALLOWED: { - Map values = (Map) msg.obj; - String origin = (String) values.get(ORIGIN); - ValueCallback callback = (ValueCallback) values.get(CALLBACK); - boolean allowed = nativeGetAllowed(origin); - Map retValues = new HashMap<String, Object>(); - retValues.put(CALLBACK, callback); - retValues.put(ALLOWED, Boolean.valueOf(allowed)); - postUIMessage(Message.obtain(null, RETURN_ALLOWED, retValues)); - } break; - case CLEAR: - nativeClear((String) msg.obj); - break; - case ALLOW: - nativeAllow((String) msg.obj); - break; - case CLEAR_ALL: - nativeClearAll(); - break; - } - } - }; - - // Handle the queued messages - if (mQueuedMessages != null) { - while (!mQueuedMessages.isEmpty()) { - mHandler.sendMessage(mQueuedMessages.remove(0)); - } - mQueuedMessages = null; - } - } - } - - /** - * Utility function to send a message to our handler. - */ - private synchronized void postMessage(Message msg) { - if (mHandler == null) { - if (mQueuedMessages == null) { - mQueuedMessages = new Vector<Message>(); - } - mQueuedMessages.add(msg); - } else { - mHandler.sendMessage(msg); - } - } - - /** - * Utility function to send a message to the handler on the UI thread - */ - private void postUIMessage(Message msg) { - if (mUIHandler != null) { - mUIHandler.sendMessage(msg); - } + return WebViewFactory.getProvider().getGeolocationPermissions(); } /** @@ -222,14 +81,7 @@ public class GeolocationPermissions { // (Database, Geolocation etc) do so, it's safe to match up origins based // on this string. public void getOrigins(ValueCallback<Set<String> > callback) { - if (callback != null) { - if (WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName())) { - Set origins = nativeGetOrigins(); - callback.onReceiveValue(origins); - } else { - postMessage(Message.obtain(null, GET_ORIGINS, callback)); - } - } + // Must be a no-op for backward compatibility: see the hidden constructor for reason. } /** @@ -243,54 +95,30 @@ public class GeolocationPermissions { * Geolocation API. */ public void getAllowed(String origin, ValueCallback<Boolean> callback) { - if (callback == null) { - return; - } - if (origin == null) { - callback.onReceiveValue(null); - return; - } - if (WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName())) { - boolean allowed = nativeGetAllowed(origin); - callback.onReceiveValue(Boolean.valueOf(allowed)); - } else { - Map values = new HashMap<String, Object>(); - values.put(ORIGIN, origin); - values.put(CALLBACK, callback); - postMessage(Message.obtain(null, GET_ALLOWED, values)); - } + // Must be a no-op for backward compatibility: see the hidden constructor for reason. } /** * Clear the Geolocation permission state for the specified origin. * @param origin The origin for which Geolocation permissions are cleared. */ - // This method may be called before the WebKit - // thread has intialized the message handler. Messages will be queued until - // this time. public void clear(String origin) { - // Called on the UI thread. - postMessage(Message.obtain(null, CLEAR, origin)); + // Must be a no-op for backward compatibility: see the hidden constructor for reason. } /** * Allow the specified origin to use the Geolocation API. * @param origin The origin for which Geolocation API use is allowed. */ - // This method may be called before the WebKit - // thread has intialized the message handler. Messages will be queued until - // this time. public void allow(String origin) { - // Called on the UI thread. - postMessage(Message.obtain(null, ALLOW, origin)); + // Must be a no-op for backward compatibility: see the hidden constructor for reason. } /** * Clear the Geolocation permission state for all origins. */ public void clearAll() { - // Called on the UI thread. - postMessage(Message.obtain(null, CLEAR_ALL)); + // Must be a no-op for backward compatibility: see the hidden constructor for reason. } /** @@ -299,14 +127,7 @@ public class GeolocationPermissions { * Note this constructor was erroneously public and published in SDK levels prior to 16, but * applications using it would receive a non-functional instance of this class (there was no * way to call createHandler() and createUIHandler(), so it would not work). - * @hide + * @hide Only for use by WebViewProvider implementations */ public GeolocationPermissions() {} - - // Native functions, run on the WebKit thread. - private static native Set nativeGetOrigins(); - private static native boolean nativeGetAllowed(String origin); - private static native void nativeClear(String origin); - private static native void nativeAllow(String origin); - private static native void nativeClearAll(); } diff --git a/core/java/android/webkit/GeolocationPermissionsClassic.java b/core/java/android/webkit/GeolocationPermissionsClassic.java new file mode 100755 index 000000000000..8a9df3921fce --- /dev/null +++ b/core/java/android/webkit/GeolocationPermissionsClassic.java @@ -0,0 +1,234 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.webkit; + +import android.os.Handler; +import android.os.Message; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.Vector; + +// This class is the Java counterpart of the WebKit C++ GeolocationPermissions +// class. It simply marshals calls from the UI thread to the WebKit thread. +final class GeolocationPermissionsClassic extends GeolocationPermissions { + private Handler mHandler; + private Handler mUIHandler; + + // A queue to store messages until the handler is ready. + private Vector<Message> mQueuedMessages; + + // Message ids + static final int GET_ORIGINS = 0; + static final int GET_ALLOWED = 1; + static final int CLEAR = 2; + static final int ALLOW = 3; + static final int CLEAR_ALL = 4; + + // Message ids on the UI thread + static final int RETURN_ORIGINS = 0; + static final int RETURN_ALLOWED = 1; + + private static final String ORIGINS = "origins"; + private static final String ORIGIN = "origin"; + private static final String CALLBACK = "callback"; + private static final String ALLOWED = "allowed"; + + // Global instance + private static GeolocationPermissionsClassic sInstance; + + public static GeolocationPermissionsClassic getInstance() { + if (sInstance == null) { + sInstance = new GeolocationPermissionsClassic(); + } + return sInstance; + } + + /** + * Creates the UI message handler. Must be called on the UI thread. + * @hide + */ + public void createUIHandler() { + if (mUIHandler == null) { + mUIHandler = new Handler() { + @Override + public void handleMessage(Message msg) { + // Runs on the UI thread. + switch (msg.what) { + case RETURN_ORIGINS: { + Map values = (Map) msg.obj; + Set<String> origins = (Set<String>) values.get(ORIGINS); + ValueCallback<Set<String> > callback = (ValueCallback<Set<String> >) values.get(CALLBACK); + callback.onReceiveValue(origins); + } break; + case RETURN_ALLOWED: { + Map values = (Map) msg.obj; + Boolean allowed = (Boolean) values.get(ALLOWED); + ValueCallback<Boolean> callback = (ValueCallback<Boolean>) values.get(CALLBACK); + callback.onReceiveValue(allowed); + } break; + } + } + }; + } + } + + /** + * Creates the message handler. Must be called on the WebKit thread. + * @hide + */ + public synchronized void createHandler() { + if (mHandler == null) { + mHandler = new Handler() { + @Override + public void handleMessage(Message msg) { + // Runs on the WebKit thread. + switch (msg.what) { + case GET_ORIGINS: { + Set origins = nativeGetOrigins(); + ValueCallback callback = (ValueCallback) msg.obj; + Map values = new HashMap<String, Object>(); + values.put(CALLBACK, callback); + values.put(ORIGINS, origins); + postUIMessage(Message.obtain(null, RETURN_ORIGINS, values)); + } break; + case GET_ALLOWED: { + Map values = (Map) msg.obj; + String origin = (String) values.get(ORIGIN); + ValueCallback callback = (ValueCallback) values.get(CALLBACK); + boolean allowed = nativeGetAllowed(origin); + Map retValues = new HashMap<String, Object>(); + retValues.put(CALLBACK, callback); + retValues.put(ALLOWED, Boolean.valueOf(allowed)); + postUIMessage(Message.obtain(null, RETURN_ALLOWED, retValues)); + } break; + case CLEAR: + nativeClear((String) msg.obj); + break; + case ALLOW: + nativeAllow((String) msg.obj); + break; + case CLEAR_ALL: + nativeClearAll(); + break; + } + } + }; + + // Handle the queued messages + if (mQueuedMessages != null) { + while (!mQueuedMessages.isEmpty()) { + mHandler.sendMessage(mQueuedMessages.remove(0)); + } + mQueuedMessages = null; + } + } + } + + /** + * Utility function to send a message to our handler. + */ + private synchronized void postMessage(Message msg) { + if (mHandler == null) { + if (mQueuedMessages == null) { + mQueuedMessages = new Vector<Message>(); + } + mQueuedMessages.add(msg); + } else { + mHandler.sendMessage(msg); + } + } + + /** + * Utility function to send a message to the handler on the UI thread + */ + private void postUIMessage(Message msg) { + if (mUIHandler != null) { + mUIHandler.sendMessage(msg); + } + } + + // Note that we represent the origins as strings. These are created using + // WebCore::SecurityOrigin::toString(). As long as all 'HTML 5 modules' + // (Database, Geolocation etc) do so, it's safe to match up origins based + // on this string. + @Override + public void getOrigins(ValueCallback<Set<String> > callback) { + if (callback != null) { + if (WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName())) { + Set origins = nativeGetOrigins(); + callback.onReceiveValue(origins); + } else { + postMessage(Message.obtain(null, GET_ORIGINS, callback)); + } + } + } + + @Override + public void getAllowed(String origin, ValueCallback<Boolean> callback) { + if (callback == null) { + return; + } + if (origin == null) { + callback.onReceiveValue(null); + return; + } + if (WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName())) { + boolean allowed = nativeGetAllowed(origin); + callback.onReceiveValue(Boolean.valueOf(allowed)); + } else { + Map values = new HashMap<String, Object>(); + values.put(ORIGIN, origin); + values.put(CALLBACK, callback); + postMessage(Message.obtain(null, GET_ALLOWED, values)); + } + } + + // This method may be called before the WebKit + // thread has intialized the message handler. Messages will be queued until + // this time. + @Override + public void clear(String origin) { + // Called on the UI thread. + postMessage(Message.obtain(null, CLEAR, origin)); + } + + // This method may be called before the WebKit + // thread has intialized the message handler. Messages will be queued until + // this time. + @Override + public void allow(String origin) { + // Called on the UI thread. + postMessage(Message.obtain(null, ALLOW, origin)); + } + + @Override + public void clearAll() { + // Called on the UI thread. + postMessage(Message.obtain(null, CLEAR_ALL)); + } + + GeolocationPermissionsClassic() {} + + // Native functions, run on the WebKit thread. + private static native Set nativeGetOrigins(); + private static native boolean nativeGetAllowed(String origin); + private static native void nativeClear(String origin); + private static native void nativeAllow(String origin); + private static native void nativeClearAll(); +} diff --git a/core/java/android/webkit/MustOverrideException.java b/core/java/android/webkit/MustOverrideException.java new file mode 100644 index 000000000000..0643bf0749a7 --- /dev/null +++ b/core/java/android/webkit/MustOverrideException.java @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.webkit; + +// TODO: Remove MustOverrideException and make all methods throwing it abstract instead; +// needs API file update. +class MustOverrideException extends RuntimeException { + MustOverrideException() { + super("abstract function called: must be overriden!"); + } +}
\ No newline at end of file diff --git a/core/java/android/webkit/ViewStateSerializer.java b/core/java/android/webkit/ViewStateSerializer.java index e672b6250cf0..35168cf11c3d 100644 --- a/core/java/android/webkit/ViewStateSerializer.java +++ b/core/java/android/webkit/ViewStateSerializer.java @@ -34,21 +34,21 @@ class ViewStateSerializer { static final int VERSION = 1; - static boolean serializeViewState(OutputStream stream, WebViewClassic web) + static boolean serializeViewState(OutputStream stream, DrawData draw) throws IOException { - int baseLayer = web.getBaseLayer(); + int baseLayer = draw.mBaseLayer; if (baseLayer == 0) { return false; } DataOutputStream dos = new DataOutputStream(stream); dos.writeInt(VERSION); - dos.writeInt(web.getContentWidth()); - dos.writeInt(web.getContentHeight()); + dos.writeInt(draw.mContentSize.x); + dos.writeInt(draw.mContentSize.y); return nativeSerializeViewState(baseLayer, dos, new byte[WORKING_STREAM_STORAGE]); } - static DrawData deserializeViewState(InputStream stream, WebViewClassic web) + static DrawData deserializeViewState(InputStream stream) throws IOException { DataInputStream dis = new DataInputStream(stream); int version = dis.readInt(); @@ -62,13 +62,10 @@ class ViewStateSerializer { final WebViewCore.DrawData draw = new WebViewCore.DrawData(); draw.mViewState = new WebViewCore.ViewState(); - int viewWidth = web.getViewWidth(); - int viewHeight = web.getViewHeightWithTitle() - web.getTitleHeight(); - draw.mViewSize = new Point(viewWidth, viewHeight); draw.mContentSize = new Point(contentWidth, contentHeight); - draw.mViewState.mDefaultScale = web.getDefaultZoomScale(); draw.mBaseLayer = baseLayer; draw.mInvalRegion = new Region(0, 0, contentWidth, contentHeight); + stream.close(); return draw; } diff --git a/core/java/android/webkit/WebIconDatabase.java b/core/java/android/webkit/WebIconDatabase.java index 9299b714edea..99f20fffd1d2 100644 --- a/core/java/android/webkit/WebIconDatabase.java +++ b/core/java/android/webkit/WebIconDatabase.java @@ -17,16 +17,7 @@ package android.webkit; import android.content.ContentResolver; -import android.database.Cursor; import android.graphics.Bitmap; -import android.os.Handler; -import android.os.Message; -import android.provider.Browser; -import android.util.Log; - -import java.io.File; -import java.util.HashMap; -import java.util.Vector; /** * Functions for manipulating the icon database used by WebView. @@ -36,149 +27,6 @@ import java.util.Vector; * single object. */ public class WebIconDatabase { - private static final String LOGTAG = "WebIconDatabase"; - // Global instance of a WebIconDatabase - private static WebIconDatabase sIconDatabase; - // EventHandler for handling messages before and after the WebCore thread is - // ready. - private final EventHandler mEventHandler = new EventHandler(); - - // Class to handle messages before WebCore is ready - private static class EventHandler extends Handler { - // Message ids - static final int OPEN = 0; - static final int CLOSE = 1; - static final int REMOVE_ALL = 2; - static final int REQUEST_ICON = 3; - static final int RETAIN_ICON = 4; - static final int RELEASE_ICON = 5; - static final int BULK_REQUEST_ICON = 6; - // Message for dispatching icon request results - private static final int ICON_RESULT = 10; - // Actual handler that runs in WebCore thread - private Handler mHandler; - // Vector of messages before the WebCore thread is ready - private Vector<Message> mMessages = new Vector<Message>(); - // Class to handle a result dispatch - private class IconResult { - private final String mUrl; - private final Bitmap mIcon; - private final IconListener mListener; - IconResult(String url, Bitmap icon, IconListener l) { - mUrl = url; - mIcon = icon; - mListener = l; - } - void dispatch() { - mListener.onReceivedIcon(mUrl, mIcon); - } - } - - @Override - public void handleMessage(Message msg) { - // Note: This is the message handler for the UI thread. - switch (msg.what) { - case ICON_RESULT: - ((IconResult) msg.obj).dispatch(); - break; - } - } - - // Called by WebCore thread to create the actual handler - private synchronized void createHandler() { - if (mHandler == null) { - mHandler = new Handler() { - @Override - public void handleMessage(Message msg) { - // Note: This is the message handler for the WebCore - // thread. - switch (msg.what) { - case OPEN: - nativeOpen((String) msg.obj); - break; - - case CLOSE: - nativeClose(); - break; - - case REMOVE_ALL: - nativeRemoveAllIcons(); - break; - - case REQUEST_ICON: - IconListener l = (IconListener) msg.obj; - String url = msg.getData().getString("url"); - requestIconAndSendResult(url, l); - break; - - case BULK_REQUEST_ICON: - bulkRequestIcons(msg); - break; - - case RETAIN_ICON: - nativeRetainIconForPageUrl((String) msg.obj); - break; - - case RELEASE_ICON: - nativeReleaseIconForPageUrl((String) msg.obj); - break; - } - } - }; - // Transfer all pending messages - for (int size = mMessages.size(); size > 0; size--) { - mHandler.sendMessage(mMessages.remove(0)); - } - mMessages = null; - } - } - - private synchronized boolean hasHandler() { - return mHandler != null; - } - - private synchronized void postMessage(Message msg) { - if (mMessages != null) { - mMessages.add(msg); - } else { - mHandler.sendMessage(msg); - } - } - - private void bulkRequestIcons(Message msg) { - HashMap map = (HashMap) msg.obj; - IconListener listener = (IconListener) map.get("listener"); - ContentResolver cr = (ContentResolver) map.get("contentResolver"); - String where = (String) map.get("where"); - - Cursor c = null; - try { - c = cr.query( - Browser.BOOKMARKS_URI, - new String[] { Browser.BookmarkColumns.URL }, - where, null, null); - if (c.moveToFirst()) { - do { - String url = c.getString(0); - requestIconAndSendResult(url, listener); - } while (c.moveToNext()); - } - } catch (IllegalStateException e) { - Log.e(LOGTAG, "BulkRequestIcons", e); - } finally { - if (c != null) c.close(); - } - } - - private void requestIconAndSendResult(String url, IconListener listener) { - Bitmap icon = nativeIconForPageUrl(url); - if (icon != null) { - sendMessage(obtainMessage(ICON_RESULT, - new IconResult(url, icon, listener))); - } - } - } - /** * Interface for receiving icons from the database. */ @@ -197,31 +45,21 @@ public class WebIconDatabase { * @param path The directory path where the icon database will be stored. */ public void open(String path) { - if (path != null) { - // Make the directories and parents if they don't exist - File db = new File(path); - if (!db.exists()) { - db.mkdirs(); - } - mEventHandler.postMessage( - Message.obtain(null, EventHandler.OPEN, db.getAbsolutePath())); - } + throw new MustOverrideException(); } /** * Close the shared instance of the icon database. */ public void close() { - mEventHandler.postMessage( - Message.obtain(null, EventHandler.CLOSE)); + throw new MustOverrideException(); } /** * Removes all the icons in the database. */ public void removeAllIcons() { - mEventHandler.postMessage( - Message.obtain(null, EventHandler.REMOVE_ALL)); + throw new MustOverrideException(); } /** @@ -231,36 +69,14 @@ public class WebIconDatabase { * @param listener An implementation on IconListener to receive the result. */ public void requestIconForPageUrl(String url, IconListener listener) { - if (listener == null || url == null) { - return; - } - Message msg = Message.obtain(null, EventHandler.REQUEST_ICON, listener); - msg.getData().putString("url", url); - mEventHandler.postMessage(msg); + throw new MustOverrideException(); } /** {@hide} */ public void bulkRequestIconForPageUrl(ContentResolver cr, String where, IconListener listener) { - if (listener == null) { - return; - } - - // Special case situation: we don't want to add this message to the - // queue if there is no handler because we may never have a real - // handler to service the messages and the cursor will never get - // closed. - if (mEventHandler.hasHandler()) { - // Don't use Bundle as it is parcelable. - HashMap<String, Object> map = new HashMap<String, Object>(); - map.put("contentResolver", cr); - map.put("where", where); - map.put("listener", listener); - Message msg = - Message.obtain(null, EventHandler.BULK_REQUEST_ICON, map); - mEventHandler.postMessage(msg); - } + throw new MustOverrideException(); } /** @@ -268,10 +84,7 @@ public class WebIconDatabase { * @param url The page's url. */ public void retainIconForPageUrl(String url) { - if (url != null) { - mEventHandler.postMessage( - Message.obtain(null, EventHandler.RETAIN_ICON, url)); - } + throw new MustOverrideException(); } /** @@ -279,10 +92,7 @@ public class WebIconDatabase { * @param url The page's url. */ public void releaseIconForPageUrl(String url) { - if (url != null) { - mEventHandler.postMessage( - Message.obtain(null, EventHandler.RELEASE_ICON, url)); - } + throw new MustOverrideException(); } /** @@ -293,30 +103,11 @@ public class WebIconDatabase { */ public static WebIconDatabase getInstance() { // XXX: Must be created in the UI thread. - if (sIconDatabase == null) { - sIconDatabase = new WebIconDatabase(); - } - return sIconDatabase; + return WebViewFactory.getProvider().getWebIconDatabase(); } /** - * Create the internal handler and transfer all pending messages. - * XXX: Called by WebCore thread only! + * @hide Only for use by WebViewProvider implementations */ - /*package*/ void createHandler() { - mEventHandler.createHandler(); - } - - /** - * Private constructor to avoid anyone else creating an instance. - */ - private WebIconDatabase() {} - - // Native functions - private static native void nativeOpen(String path); - private static native void nativeClose(); - private static native void nativeRemoveAllIcons(); - private static native Bitmap nativeIconForPageUrl(String url); - private static native void nativeRetainIconForPageUrl(String url); - private static native void nativeReleaseIconForPageUrl(String url); + protected WebIconDatabase() {} } diff --git a/core/java/android/webkit/WebIconDatabaseClassic.java b/core/java/android/webkit/WebIconDatabaseClassic.java new file mode 100644 index 000000000000..d6c4c3374893 --- /dev/null +++ b/core/java/android/webkit/WebIconDatabaseClassic.java @@ -0,0 +1,289 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.webkit; + +import android.content.ContentResolver; +import android.database.Cursor; +import android.graphics.Bitmap; +import android.os.Handler; +import android.os.Message; +import android.provider.Browser; +import android.util.Log; + +import java.io.File; +import java.util.HashMap; +import java.util.Vector; + +class WebIconDatabaseClassic extends WebIconDatabase { + private static final String LOGTAG = "WebIconDatabase"; + // Global instance of a WebIconDatabase + private static WebIconDatabaseClassic sIconDatabase; + // EventHandler for handling messages before and after the WebCore thread is + // ready. + private final EventHandler mEventHandler = new EventHandler(); + + // Class to handle messages before WebCore is ready + private static class EventHandler extends Handler { + // Message ids + static final int OPEN = 0; + static final int CLOSE = 1; + static final int REMOVE_ALL = 2; + static final int REQUEST_ICON = 3; + static final int RETAIN_ICON = 4; + static final int RELEASE_ICON = 5; + static final int BULK_REQUEST_ICON = 6; + // Message for dispatching icon request results + private static final int ICON_RESULT = 10; + // Actual handler that runs in WebCore thread + private Handler mHandler; + // Vector of messages before the WebCore thread is ready + private Vector<Message> mMessages = new Vector<Message>(); + // Class to handle a result dispatch + private class IconResult { + private final String mUrl; + private final Bitmap mIcon; + private final IconListener mListener; + IconResult(String url, Bitmap icon, IconListener l) { + mUrl = url; + mIcon = icon; + mListener = l; + } + void dispatch() { + mListener.onReceivedIcon(mUrl, mIcon); + } + } + + @Override + public void handleMessage(Message msg) { + // Note: This is the message handler for the UI thread. + switch (msg.what) { + case ICON_RESULT: + ((IconResult) msg.obj).dispatch(); + break; + } + } + + // Called by WebCore thread to create the actual handler + private synchronized void createHandler() { + if (mHandler == null) { + mHandler = new Handler() { + @Override + public void handleMessage(Message msg) { + // Note: This is the message handler for the WebCore + // thread. + switch (msg.what) { + case OPEN: + nativeOpen((String) msg.obj); + break; + + case CLOSE: + nativeClose(); + break; + + case REMOVE_ALL: + nativeRemoveAllIcons(); + break; + + case REQUEST_ICON: + IconListener l = (IconListener) msg.obj; + String url = msg.getData().getString("url"); + requestIconAndSendResult(url, l); + break; + + case BULK_REQUEST_ICON: + bulkRequestIcons(msg); + break; + + case RETAIN_ICON: + nativeRetainIconForPageUrl((String) msg.obj); + break; + + case RELEASE_ICON: + nativeReleaseIconForPageUrl((String) msg.obj); + break; + } + } + }; + // Transfer all pending messages + for (int size = mMessages.size(); size > 0; size--) { + mHandler.sendMessage(mMessages.remove(0)); + } + mMessages = null; + } + } + + private synchronized boolean hasHandler() { + return mHandler != null; + } + + private synchronized void postMessage(Message msg) { + if (mMessages != null) { + mMessages.add(msg); + } else { + mHandler.sendMessage(msg); + } + } + + private void bulkRequestIcons(Message msg) { + HashMap map = (HashMap) msg.obj; + IconListener listener = (IconListener) map.get("listener"); + ContentResolver cr = (ContentResolver) map.get("contentResolver"); + String where = (String) map.get("where"); + + Cursor c = null; + try { + c = cr.query( + Browser.BOOKMARKS_URI, + new String[] { Browser.BookmarkColumns.URL }, + where, null, null); + if (c.moveToFirst()) { + do { + String url = c.getString(0); + requestIconAndSendResult(url, listener); + } while (c.moveToNext()); + } + } catch (IllegalStateException e) { + Log.e(LOGTAG, "BulkRequestIcons", e); + } finally { + if (c != null) c.close(); + } + } + + private void requestIconAndSendResult(String url, IconListener listener) { + Bitmap icon = nativeIconForPageUrl(url); + if (icon != null) { + sendMessage(obtainMessage(ICON_RESULT, + new IconResult(url, icon, listener))); + } + } + } + + @Override + public void open(String path) { + if (path != null) { + // Make the directories and parents if they don't exist + File db = new File(path); + if (!db.exists()) { + db.mkdirs(); + } + mEventHandler.postMessage( + Message.obtain(null, EventHandler.OPEN, db.getAbsolutePath())); + } + } + + @Override + public void close() { + mEventHandler.postMessage( + Message.obtain(null, EventHandler.CLOSE)); + } + + @Override + public void removeAllIcons() { + mEventHandler.postMessage( + Message.obtain(null, EventHandler.REMOVE_ALL)); + } + + /** + * Request the Bitmap representing the icon for the given page + * url. If the icon exists, the listener will be called with the result. + * @param url The page's url. + * @param listener An implementation on IconListener to receive the result. + */ + public void requestIconForPageUrl(String url, IconListener listener) { + if (listener == null || url == null) { + return; + } + Message msg = Message.obtain(null, EventHandler.REQUEST_ICON, listener); + msg.getData().putString("url", url); + mEventHandler.postMessage(msg); + } + + /** {@hide} + */ + public void bulkRequestIconForPageUrl(ContentResolver cr, String where, + IconListener listener) { + if (listener == null) { + return; + } + + // Special case situation: we don't want to add this message to the + // queue if there is no handler because we may never have a real + // handler to service the messages and the cursor will never get + // closed. + if (mEventHandler.hasHandler()) { + // Don't use Bundle as it is parcelable. + HashMap<String, Object> map = new HashMap<String, Object>(); + map.put("contentResolver", cr); + map.put("where", where); + map.put("listener", listener); + Message msg = + Message.obtain(null, EventHandler.BULK_REQUEST_ICON, map); + mEventHandler.postMessage(msg); + } + } + + @Override + public void retainIconForPageUrl(String url) { + if (url != null) { + mEventHandler.postMessage( + Message.obtain(null, EventHandler.RETAIN_ICON, url)); + } + } + + @Override + public void releaseIconForPageUrl(String url) { + if (url != null) { + mEventHandler.postMessage( + Message.obtain(null, EventHandler.RELEASE_ICON, url)); + } + } + + /** + * Get the global instance of WebIconDatabase. + * @return A single instance of WebIconDatabase. It will be the same + * instance for the current process each time this method is + * called. + */ + public static WebIconDatabaseClassic getInstance() { + // XXX: Must be created in the UI thread. + if (sIconDatabase == null) { + sIconDatabase = new WebIconDatabaseClassic(); + } + return sIconDatabase; + } + + /** + * Create the internal handler and transfer all pending messages. + * XXX: Called by WebCore thread only! + */ + /*package*/ void createHandler() { + mEventHandler.createHandler(); + } + + /** + * Private constructor to avoid anyone else creating an instance. + */ + private WebIconDatabaseClassic() {} + + // Native functions + private static native void nativeOpen(String path); + private static native void nativeClose(); + private static native void nativeRemoveAllIcons(); + private static native Bitmap nativeIconForPageUrl(String url); + private static native void nativeRetainIconForPageUrl(String url); + private static native void nativeReleaseIconForPageUrl(String url); +} diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index ba48da14f29f..1bbf00f5fe62 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -17,6 +17,7 @@ package android.webkit; import android.os.Message; +import android.os.Build; /** * Manages settings state for a WebView. When a WebView is first created, it @@ -26,18 +27,10 @@ import android.os.Message; * been destroyed, any method call on WebSettings will throw an * IllegalStateException. */ -// This is (effectively) an abstract base class; concrete WebViewProviders must +// This is an abstract base class: concrete WebViewProviders must // create a class derived from this, and return an instance of it in the // WebViewProvider.getWebSettingsProvider() method implementation. -public class WebSettings { - // TODO: Remove MustOverrideException and make all methods throwing it abstract instead; - // needs API file update. - private static class MustOverrideException extends RuntimeException { - MustOverrideException() { - super("abstract function called: must be overriden!"); - } - } - +public abstract class WebSettings { /** * Enum for controlling the layout of html. * NORMAL means no rendering changes. @@ -771,6 +764,29 @@ public class WebSettings { } /** + * Configure scripting (such as XmlHttpRequest) access from file scheme URLs + * to any origin. Note, calling this method with a true argument value also + * implies calling setAllowFileAccessFromFileURLs with a true. The default + * value is false for API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN} + * and higher and true otherwise. + * + . * @param flag True if the WebView should allow scripting access from file + * scheme URLs to any origin + */ + public abstract void setAllowUniversalAccessFromFileURLs(boolean flag); + + /** + * Configure scripting (such as XmlHttpRequest) access from file scheme URLs + * to file origin. The default value is false for API level + * {@link android.os.Build.VERSION_CODES#JELLY_BEAN} and higher and true + * otherwise. + * + * @param flag True if the WebView should allow scripting access from file + * scheme URLs to file origin + */ + public abstract void setAllowFileAccessFromFileURLs(boolean flag); + + /** * Tell the WebView to enable plugins. * @param flag True if the WebView should load plugins. * @deprecated This method has been deprecated in favor of @@ -912,6 +928,26 @@ public class WebSettings { } /** + * Return true if scripting access {see @setAllowUniversalAccessFromFileURLs} from + * file URLs to any origin is enabled. The default value is false for API level + * {@link android.os.Build.VERSION_CODES#JELLY_BEAN} and higher and true otherwise. + * + * @return True if the WebView allows scripting access from file scheme requests + * to any origin + */ + public abstract boolean getAllowUniversalAccessFromFileURLs(); + + /** + * Return true if scripting access {see @setAllowFileAccessFromFileURLs} from file + * URLs to file origin is enabled. The default value is false for API level + * {@link android.os.Build.VERSION_CODES#JELLY_BEAN} and higher, and true otherwise. + * + * @return True if the WebView allows scripting access from file scheme requests + * to file origin + */ + public abstract boolean getAllowFileAccessFromFileURLs(); + + /** * Return true if plugins are enabled. * @return True if plugins are enabled. * @deprecated This method has been replaced by {@link #getPluginState} diff --git a/core/java/android/webkit/WebSettingsClassic.java b/core/java/android/webkit/WebSettingsClassic.java index aa3d8d3b1ab1..354bb5a254b6 100644 --- a/core/java/android/webkit/WebSettingsClassic.java +++ b/core/java/android/webkit/WebSettingsClassic.java @@ -72,6 +72,8 @@ public class WebSettingsClassic extends WebSettings { private boolean mBlockNetworkImage = false; private boolean mBlockNetworkLoads; private boolean mJavaScriptEnabled = false; + private boolean mAllowUniversalAccessFromFileURLs = false; + private boolean mAllowFileAccessFromFileURLs = false; private boolean mHardwareAccelSkia = false; private boolean mShowVisualIndicator = false; private PluginState mPluginState = PluginState.OFF; @@ -286,6 +288,13 @@ public class WebSettingsClassic extends WebSettings { mBlockNetworkLoads = mContext.checkPermission( "android.permission.INTERNET", android.os.Process.myPid(), android.os.Process.myUid()) != PackageManager.PERMISSION_GRANTED; + + // SDK specific settings. See issue 6212665 + if (mContext.getApplicationInfo().targetSdkVersion < + Build.VERSION_CODES.JELLY_BEAN) { + mAllowUniversalAccessFromFileURLs = true; + mAllowFileAccessFromFileURLs = true; + } } private static final String ACCEPT_LANG_FOR_US_LOCALE = "en-US"; @@ -1101,6 +1110,28 @@ public class WebSettingsClassic extends WebSettings { } /** + * @see android.webkit.WebSettings#setAllowUniversalAccessFromFileURLs + */ + @Override + public synchronized void setAllowUniversalAccessFromFileURLs(boolean flag) { + if (mAllowUniversalAccessFromFileURLs != flag) { + mAllowUniversalAccessFromFileURLs = flag; + postSync(); + } + } + + /** + * @see android.webkit.WebSettings#setAllowFileAccessFromFileURLs + */ + @Override + public synchronized void setAllowFileAccessFromFileURLs(boolean flag) { + if (mAllowFileAccessFromFileURLs != flag) { + mAllowFileAccessFromFileURLs = flag; + postSync(); + } + } + + /** * Tell the WebView to use Skia's hardware accelerated rendering path * @param flag True if the WebView should use Skia's hw-accel path */ @@ -1324,6 +1355,22 @@ public class WebSettingsClassic extends WebSettings { } /** + * @see android.webkit.WebSettings#getAllowUniversalFileAccessFromFileURLs + */ + @Override + public synchronized boolean getAllowUniversalAccessFromFileURLs() { + return mAllowUniversalAccessFromFileURLs; + } + + /** + * @see android.webkit.WebSettings#getAllowFileAccessFromFileURLs + */ + @Override + public synchronized boolean getAllowFileAccessFromFileURLs() { + return mAllowFileAccessFromFileURLs; + } + + /** * @see android.webkit.WebSettings#getPluginsEnabled() */ @Override diff --git a/core/java/android/webkit/WebStorage.java b/core/java/android/webkit/WebStorage.java index 041791bb52af..c46d16122bfd 100644 --- a/core/java/android/webkit/WebStorage.java +++ b/core/java/android/webkit/WebStorage.java @@ -16,13 +16,7 @@ package android.webkit; -import android.os.Handler; -import android.os.Message; - -import java.util.Collection; -import java.util.HashMap; import java.util.Map; -import java.util.Set; /** * This class is used to manage the JavaScript storage APIs provided by the @@ -56,34 +50,6 @@ public class WebStorage { public void updateQuota(long newQuota); }; - // Global instance of a WebStorage - private static WebStorage sWebStorage; - - // Message ids - static final int UPDATE = 0; - static final int SET_QUOTA_ORIGIN = 1; - static final int DELETE_ORIGIN = 2; - static final int DELETE_ALL = 3; - static final int GET_ORIGINS = 4; - static final int GET_USAGE_ORIGIN = 5; - static final int GET_QUOTA_ORIGIN = 6; - - // Message ids on the UI thread - static final int RETURN_ORIGINS = 0; - static final int RETURN_USAGE_ORIGIN = 1; - static final int RETURN_QUOTA_ORIGIN = 2; - - private static final String ORIGINS = "origins"; - private static final String ORIGIN = "origin"; - private static final String CALLBACK = "callback"; - private static final String USAGE = "usage"; - private static final String QUOTA = "quota"; - - private Map <String, Origin> mOrigins; - - private Handler mHandler = null; - private Handler mUIHandler = null; - /** * This class encapsulates information about the amount of storage * currently used by an origin for the JavaScript storage APIs. @@ -94,18 +60,21 @@ public class WebStorage { private long mQuota = 0; private long mUsage = 0; - private Origin(String origin, long quota, long usage) { + /** @hide */ + protected Origin(String origin, long quota, long usage) { mOrigin = origin; mQuota = quota; mUsage = usage; } - private Origin(String origin, long quota) { + /** @hide */ + protected Origin(String origin, long quota) { mOrigin = origin; mQuota = quota; } - private Origin(String origin) { + /** @hide */ + protected Origin(String origin) { mOrigin = origin; } @@ -142,114 +111,6 @@ public class WebStorage { } } - /** - * Message handler, UI side - * @hide - */ - public void createUIHandler() { - if (mUIHandler == null) { - mUIHandler = new Handler() { - @Override - public void handleMessage(Message msg) { - switch (msg.what) { - case RETURN_ORIGINS: { - Map values = (Map) msg.obj; - Map origins = (Map) values.get(ORIGINS); - ValueCallback<Map> callback = (ValueCallback<Map>) values.get(CALLBACK); - callback.onReceiveValue(origins); - } break; - - case RETURN_USAGE_ORIGIN: { - Map values = (Map) msg.obj; - ValueCallback<Long> callback = (ValueCallback<Long>) values.get(CALLBACK); - callback.onReceiveValue((Long)values.get(USAGE)); - } break; - - case RETURN_QUOTA_ORIGIN: { - Map values = (Map) msg.obj; - ValueCallback<Long> callback = (ValueCallback<Long>) values.get(CALLBACK); - callback.onReceiveValue((Long)values.get(QUOTA)); - } break; - } - } - }; - } - } - - /** - * Message handler, WebCore side - * @hide - */ - public synchronized void createHandler() { - if (mHandler == null) { - mHandler = new Handler() { - @Override - public void handleMessage(Message msg) { - switch (msg.what) { - case SET_QUOTA_ORIGIN: { - Origin website = (Origin) msg.obj; - nativeSetQuotaForOrigin(website.getOrigin(), - website.getQuota()); - } break; - - case DELETE_ORIGIN: { - Origin website = (Origin) msg.obj; - nativeDeleteOrigin(website.getOrigin()); - } break; - - case DELETE_ALL: - nativeDeleteAllData(); - break; - - case GET_ORIGINS: { - syncValues(); - ValueCallback callback = (ValueCallback) msg.obj; - Map origins = new HashMap(mOrigins); - Map values = new HashMap<String, Object>(); - values.put(CALLBACK, callback); - values.put(ORIGINS, origins); - postUIMessage(Message.obtain(null, RETURN_ORIGINS, values)); - } break; - - case GET_USAGE_ORIGIN: { - syncValues(); - Map values = (Map) msg.obj; - String origin = (String) values.get(ORIGIN); - ValueCallback callback = (ValueCallback) values.get(CALLBACK); - Origin website = mOrigins.get(origin); - Map retValues = new HashMap<String, Object>(); - retValues.put(CALLBACK, callback); - if (website != null) { - long usage = website.getUsage(); - retValues.put(USAGE, new Long(usage)); - } - postUIMessage(Message.obtain(null, RETURN_USAGE_ORIGIN, retValues)); - } break; - - case GET_QUOTA_ORIGIN: { - syncValues(); - Map values = (Map) msg.obj; - String origin = (String) values.get(ORIGIN); - ValueCallback callback = (ValueCallback) values.get(CALLBACK); - Origin website = mOrigins.get(origin); - Map retValues = new HashMap<String, Object>(); - retValues.put(CALLBACK, callback); - if (website != null) { - long quota = website.getQuota(); - retValues.put(QUOTA, new Long(quota)); - } - postUIMessage(Message.obtain(null, RETURN_QUOTA_ORIGIN, retValues)); - } break; - - case UPDATE: - syncValues(); - break; - } - } - }; - } - } - /* * When calling getOrigins(), getUsageForOrigin() and getQuotaForOrigin(), * we need to get the values from WebCore, but we cannot block while doing so @@ -270,26 +131,7 @@ public class WebStorage { * representation of the origin to a {@link WebStorage.Origin} object. */ public void getOrigins(ValueCallback<Map> callback) { - if (callback != null) { - if (WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName())) { - syncValues(); - callback.onReceiveValue(mOrigins); - } else { - postMessage(Message.obtain(null, GET_ORIGINS, callback)); - } - } - } - - /** - * Returns a list of origins having a database - * should only be called from WebViewCore. - */ - Collection<Origin> getOriginsSync() { - if (WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName())) { - update(); - return mOrigins.values(); - } - return null; + // Must be a no-op for backward compatibility: see the hidden constructor for reason. } /** @@ -300,23 +142,7 @@ public class WebStorage { * a {@link ValueCallback}. */ public void getUsageForOrigin(String origin, ValueCallback<Long> callback) { - if (callback == null) { - return; - } - if (origin == null) { - callback.onReceiveValue(null); - return; - } - if (WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName())) { - syncValues(); - Origin website = mOrigins.get(origin); - callback.onReceiveValue(new Long(website.getUsage())); - } else { - HashMap values = new HashMap<String, Object>(); - values.put(ORIGIN, origin); - values.put(CALLBACK, callback); - postMessage(Message.obtain(null, GET_USAGE_ORIGIN, values)); - } + // Must be a no-op for backward compatibility: see the hidden constructor for reason. } /** @@ -327,23 +153,7 @@ public class WebStorage { * enforced on a per-origin basis for the Application Cache API. */ public void getQuotaForOrigin(String origin, ValueCallback<Long> callback) { - if (callback == null) { - return; - } - if (origin == null) { - callback.onReceiveValue(null); - return; - } - if (WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName())) { - syncValues(); - Origin website = mOrigins.get(origin); - callback.onReceiveValue(new Long(website.getUsage())); - } else { - HashMap values = new HashMap<String, Object>(); - values.put(ORIGIN, origin); - values.put(CALLBACK, callback); - postMessage(Message.obtain(null, GET_QUOTA_ORIGIN, values)); - } + // Must be a no-op for backward compatibility: see the hidden constructor for reason. } /** @@ -353,14 +163,7 @@ public class WebStorage { * for the Application Cache API. */ public void setQuotaForOrigin(String origin, long quota) { - if (origin != null) { - if (WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName())) { - nativeSetQuotaForOrigin(origin, quota); - } else { - postMessage(Message.obtain(null, SET_QUOTA_ORIGIN, - new Origin(origin, quota))); - } - } + // Must be a no-op for backward compatibility: see the hidden constructor for reason. } /** @@ -369,14 +172,7 @@ public class WebStorage { * its string representation. */ public void deleteOrigin(String origin) { - if (origin != null) { - if (WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName())) { - nativeDeleteOrigin(origin); - } else { - postMessage(Message.obtain(null, DELETE_ORIGIN, - new Origin(origin))); - } - } + // Must be a no-op for backward compatibility: see the hidden constructor for reason. } /** @@ -385,38 +181,7 @@ public class WebStorage { * Storage APIs. */ public void deleteAllData() { - if (WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName())) { - nativeDeleteAllData(); - } else { - postMessage(Message.obtain(null, DELETE_ALL)); - } - } - - /** - * Sets the maximum size of the ApplicationCache. - * This should only ever be called on the WebKit thread. - * @hide - */ - public void setAppCacheMaximumSize(long size) { - nativeSetAppCacheMaximumSize(size); - } - - /** - * Utility function to send a message to our handler - */ - private synchronized void postMessage(Message msg) { - if (mHandler != null) { - mHandler.sendMessage(msg); - } - } - - /** - * Utility function to send a message to the handler on the UI thread - */ - private void postUIMessage(Message msg) { - if (mUIHandler != null) { - mUIHandler.sendMessage(msg); - } + // Must be a no-op for backward compatibility: see the hidden constructor for reason. } /** @@ -424,37 +189,7 @@ public class WebStorage { * @return The singleton {@link WebStorage} instance. */ public static WebStorage getInstance() { - if (sWebStorage == null) { - sWebStorage = new WebStorage(); - } - return sWebStorage; - } - - /** - * @hide - * Post a Sync request - */ - public void update() { - if (WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName())) { - syncValues(); - } else { - postMessage(Message.obtain(null, UPDATE)); - } - } - - /** - * Run on the WebCore thread - * set the local values with the current ones - */ - private void syncValues() { - Set<String> tmp = nativeGetOrigins(); - mOrigins = new HashMap<String, Origin>(); - for (String origin : tmp) { - Origin website = new Origin(origin, - nativeGetQuotaForOrigin(origin), - nativeGetUsageForOrigin(origin)); - mOrigins.put(origin, website); - } + return WebViewFactory.getProvider().getWebStorage(); } /** @@ -466,13 +201,4 @@ public class WebStorage { * @hide */ public WebStorage() {} - - // Native functions - private static native Set nativeGetOrigins(); - private static native long nativeGetUsageForOrigin(String origin); - private static native long nativeGetQuotaForOrigin(String origin); - private static native void nativeSetQuotaForOrigin(String origin, long quota); - private static native void nativeDeleteOrigin(String origin); - private static native void nativeDeleteAllData(); - private static native void nativeSetAppCacheMaximumSize(long size); } diff --git a/core/java/android/webkit/WebStorageClassic.java b/core/java/android/webkit/WebStorageClassic.java new file mode 100644 index 000000000000..62de5e6c2efe --- /dev/null +++ b/core/java/android/webkit/WebStorageClassic.java @@ -0,0 +1,352 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.webkit; + +import android.os.Handler; +import android.os.Message; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +/** @hide */ +public class WebStorageClassic extends WebStorage { + // Global instance of a WebStorage + private static WebStorageClassic sWebStorage; + + // Message ids + static final int UPDATE = 0; + static final int SET_QUOTA_ORIGIN = 1; + static final int DELETE_ORIGIN = 2; + static final int DELETE_ALL = 3; + static final int GET_ORIGINS = 4; + static final int GET_USAGE_ORIGIN = 5; + static final int GET_QUOTA_ORIGIN = 6; + + // Message ids on the UI thread + static final int RETURN_ORIGINS = 0; + static final int RETURN_USAGE_ORIGIN = 1; + static final int RETURN_QUOTA_ORIGIN = 2; + + private static final String ORIGINS = "origins"; + private static final String ORIGIN = "origin"; + private static final String CALLBACK = "callback"; + private static final String USAGE = "usage"; + private static final String QUOTA = "quota"; + + private Map <String, Origin> mOrigins; + + private Handler mHandler = null; + private Handler mUIHandler = null; + + /** + * @hide + * Message handler, UI side + * @hide + */ + public void createUIHandler() { + if (mUIHandler == null) { + mUIHandler = new Handler() { + @Override + public void handleMessage(Message msg) { + switch (msg.what) { + case RETURN_ORIGINS: { + Map values = (Map) msg.obj; + Map origins = (Map) values.get(ORIGINS); + ValueCallback<Map> callback = (ValueCallback<Map>) values.get(CALLBACK); + callback.onReceiveValue(origins); + } break; + + case RETURN_USAGE_ORIGIN: { + Map values = (Map) msg.obj; + ValueCallback<Long> callback = (ValueCallback<Long>) values.get(CALLBACK); + callback.onReceiveValue((Long)values.get(USAGE)); + } break; + + case RETURN_QUOTA_ORIGIN: { + Map values = (Map) msg.obj; + ValueCallback<Long> callback = (ValueCallback<Long>) values.get(CALLBACK); + callback.onReceiveValue((Long)values.get(QUOTA)); + } break; + } + } + }; + } + } + + /** + * Message handler, WebCore side + * @hide + */ + public synchronized void createHandler() { + if (mHandler == null) { + mHandler = new Handler() { + @Override + public void handleMessage(Message msg) { + switch (msg.what) { + case SET_QUOTA_ORIGIN: { + Origin website = (Origin) msg.obj; + nativeSetQuotaForOrigin(website.getOrigin(), + website.getQuota()); + } break; + + case DELETE_ORIGIN: { + Origin website = (Origin) msg.obj; + nativeDeleteOrigin(website.getOrigin()); + } break; + + case DELETE_ALL: + nativeDeleteAllData(); + break; + + case GET_ORIGINS: { + syncValues(); + ValueCallback callback = (ValueCallback) msg.obj; + Map origins = new HashMap(mOrigins); + Map values = new HashMap<String, Object>(); + values.put(CALLBACK, callback); + values.put(ORIGINS, origins); + postUIMessage(Message.obtain(null, RETURN_ORIGINS, values)); + } break; + + case GET_USAGE_ORIGIN: { + syncValues(); + Map values = (Map) msg.obj; + String origin = (String) values.get(ORIGIN); + ValueCallback callback = (ValueCallback) values.get(CALLBACK); + Origin website = mOrigins.get(origin); + Map retValues = new HashMap<String, Object>(); + retValues.put(CALLBACK, callback); + if (website != null) { + long usage = website.getUsage(); + retValues.put(USAGE, new Long(usage)); + } + postUIMessage(Message.obtain(null, RETURN_USAGE_ORIGIN, retValues)); + } break; + + case GET_QUOTA_ORIGIN: { + syncValues(); + Map values = (Map) msg.obj; + String origin = (String) values.get(ORIGIN); + ValueCallback callback = (ValueCallback) values.get(CALLBACK); + Origin website = mOrigins.get(origin); + Map retValues = new HashMap<String, Object>(); + retValues.put(CALLBACK, callback); + if (website != null) { + long quota = website.getQuota(); + retValues.put(QUOTA, new Long(quota)); + } + postUIMessage(Message.obtain(null, RETURN_QUOTA_ORIGIN, retValues)); + } break; + + case UPDATE: + syncValues(); + break; + } + } + }; + } + } + + /* + * When calling getOrigins(), getUsageForOrigin() and getQuotaForOrigin(), + * we need to get the values from WebCore, but we cannot block while doing so + * as we used to do, as this could result in a full deadlock (other WebCore + * messages received while we are still blocked here, see http://b/2127737). + * + * We have to do everything asynchronously, by providing a callback function. + * We post a message on the WebCore thread (mHandler) that will get the result + * from WebCore, and we post it back on the UI thread (using mUIHandler). + * We can then use the callback function to return the value. + */ + + @Override + public void getOrigins(ValueCallback<Map> callback) { + if (callback != null) { + if (WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName())) { + syncValues(); + callback.onReceiveValue(mOrigins); + } else { + postMessage(Message.obtain(null, GET_ORIGINS, callback)); + } + } + } + + /** + * Returns a list of origins having a database + * should only be called from WebViewCore. + */ + Collection<Origin> getOriginsSync() { + if (WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName())) { + update(); + return mOrigins.values(); + } + return null; + } + + @Override + public void getUsageForOrigin(String origin, ValueCallback<Long> callback) { + if (callback == null) { + return; + } + if (origin == null) { + callback.onReceiveValue(null); + return; + } + if (WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName())) { + syncValues(); + Origin website = mOrigins.get(origin); + callback.onReceiveValue(new Long(website.getUsage())); + } else { + HashMap values = new HashMap<String, Object>(); + values.put(ORIGIN, origin); + values.put(CALLBACK, callback); + postMessage(Message.obtain(null, GET_USAGE_ORIGIN, values)); + } + } + + @Override + public void getQuotaForOrigin(String origin, ValueCallback<Long> callback) { + if (callback == null) { + return; + } + if (origin == null) { + callback.onReceiveValue(null); + return; + } + if (WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName())) { + syncValues(); + Origin website = mOrigins.get(origin); + callback.onReceiveValue(new Long(website.getUsage())); + } else { + HashMap values = new HashMap<String, Object>(); + values.put(ORIGIN, origin); + values.put(CALLBACK, callback); + postMessage(Message.obtain(null, GET_QUOTA_ORIGIN, values)); + } + } + + @Override + public void setQuotaForOrigin(String origin, long quota) { + if (origin != null) { + if (WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName())) { + nativeSetQuotaForOrigin(origin, quota); + } else { + postMessage(Message.obtain(null, SET_QUOTA_ORIGIN, + new Origin(origin, quota))); + } + } + } + + @Override + public void deleteOrigin(String origin) { + if (origin != null) { + if (WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName())) { + nativeDeleteOrigin(origin); + } else { + postMessage(Message.obtain(null, DELETE_ORIGIN, + new Origin(origin))); + } + } + } + + @Override + public void deleteAllData() { + if (WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName())) { + nativeDeleteAllData(); + } else { + postMessage(Message.obtain(null, DELETE_ALL)); + } + } + + /** + * Sets the maximum size of the ApplicationCache. + * This should only ever be called on the WebKit thread. + * Not part of the base-class API: this is only used by dump render tree. + */ + public void setAppCacheMaximumSize(long size) { + nativeSetAppCacheMaximumSize(size); + } + + /** + * Utility function to send a message to our handler + */ + private synchronized void postMessage(Message msg) { + if (mHandler != null) { + mHandler.sendMessage(msg); + } + } + + /** + * Utility function to send a message to the handler on the UI thread + */ + private void postUIMessage(Message msg) { + if (mUIHandler != null) { + mUIHandler.sendMessage(msg); + } + } + + /** + * Get the singleton instance of this class. + * @return The singleton {@link WebStorage} instance. + */ + public static WebStorageClassic getInstance() { + if (sWebStorage == null) { + sWebStorage = new WebStorageClassic(); + } + return sWebStorage; + } + + /** + * @hide + * Post a Sync request + */ + public void update() { + if (WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName())) { + syncValues(); + } else { + postMessage(Message.obtain(null, UPDATE)); + } + } + + /** + * Run on the WebCore thread + * set the local values with the current ones + */ + private void syncValues() { + Set<String> tmp = nativeGetOrigins(); + mOrigins = new HashMap<String, Origin>(); + for (String origin : tmp) { + Origin website = new Origin(origin, + nativeGetQuotaForOrigin(origin), + nativeGetUsageForOrigin(origin)); + mOrigins.put(origin, website); + } + } + + WebStorageClassic() {} + + // Native functions + private static native Set nativeGetOrigins(); + private static native long nativeGetUsageForOrigin(String origin); + private static native long nativeGetQuotaForOrigin(String origin); + private static native void nativeSetQuotaForOrigin(String origin, long quota); + private static native void nativeDeleteOrigin(String origin); + private static native void nativeDeleteAllData(); + private static native void nativeSetAppCacheMaximumSize(long size); +} diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index bd10cca4f42e..f848430982f4 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -268,12 +268,7 @@ public class WebView extends AbsoluteLayout implements ViewTreeObserver.OnGlobalFocusChangeListener, ViewGroup.OnHierarchyChangeListener { - // Default Provider factory class name. - private static final String DEFAULT_WEB_VIEW_FACTORY = "android.webkit.WebViewClassic$Factory"; - private static final String LOGTAG = "webview_proxy"; - // TODO: flip DEBUG to always be disabled. - private static final boolean DEBUG = true; /** * Transportation object for returning WebView across thread boundaries. @@ -1702,16 +1697,11 @@ public class WebView extends AbsoluteLayout // Private internal stuff //------------------------------------------------------------------------- - // Cache the factory both for efficiency, and ensure any one process gets all webviews from the - // same provider. - private static WebViewFactoryProvider sProviderFactory; - private WebViewProvider mProvider; private void ensureProviderCreated() { checkThread(); if (mProvider == null) { - if (DEBUG) Log.v(LOGTAG, "instantiating webview provider instance"); // As this can get called during the base class constructor chain, pass the minimum // number of dependencies here; the rest are deferred to init(). mProvider = getFactory().createWebView(this, new PrivateAccess()); @@ -1722,30 +1712,7 @@ public class WebView extends AbsoluteLayout // For now the main purpose of this function (and the factory abstration) is to keep // us honest and minimize usage of WebViewClassic internals when binding the proxy. checkThread(); - if (sProviderFactory != null) return sProviderFactory; - - sProviderFactory = getFactoryByName(DEFAULT_WEB_VIEW_FACTORY); - if (sProviderFactory == null) { - if (DEBUG) Log.v (LOGTAG, "Falling back to explicit linkage"); - sProviderFactory = new WebViewClassic.Factory(); - } - return sProviderFactory; - } - - private static WebViewFactoryProvider getFactoryByName(String providerName) { - try { - if (DEBUG) Log.v(LOGTAG, "attempt to load class " + providerName); - Class<?> c = Class.forName(providerName); - if (DEBUG) Log.v(LOGTAG, "instantiating factory"); - return (WebViewFactoryProvider) c.newInstance(); - } catch (ClassNotFoundException e) { - Log.e(LOGTAG, "error loading " + providerName, e); - } catch (IllegalAccessException e) { - Log.e(LOGTAG, "error loading " + providerName, e); - } catch (InstantiationException e) { - Log.e(LOGTAG, "error loading " + providerName, e); - } - return null; + return WebViewFactory.getProvider(); } private static void checkThread() { diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index f1eacfffc0e1..3bd9960a6359 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -1074,7 +1074,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc private static final int STD_SPEED = 480; // pixels per second // time for the longest scroll animation private static final int MAX_DURATION = 750; // milliseconds - private static final int SLIDE_TITLE_DURATION = 500; // milliseconds // Used by OverScrollGlow OverScroller mScroller; @@ -1460,14 +1459,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc static class Factory implements WebViewFactoryProvider, WebViewFactoryProvider.Statics { @Override - public WebViewProvider createWebView(WebView webView, WebView.PrivateAccess privateAccess) { - return new WebViewClassic(webView, privateAccess); - } - - @Override - public Statics getStatics() { return this; } - - @Override public String findAddress(String addr) { return WebViewClassic.findAddress(addr); } @@ -1480,6 +1471,33 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc } } + @Override + public Statics getStatics() { return this; } + + @Override + public WebViewProvider createWebView(WebView webView, WebView.PrivateAccess privateAccess) { + return new WebViewClassic(webView, privateAccess); + } + + @Override + public GeolocationPermissions getGeolocationPermissions() { + return GeolocationPermissionsClassic.getInstance(); + } + + @Override + public CookieManager getCookieManager() { + return CookieManagerClassic.getInstance(); + } + + @Override + public WebIconDatabase getWebIconDatabase() { + return WebIconDatabaseClassic.getInstance(); + } + + @Override + public WebStorage getWebStorage() { + return WebStorageClassic.getInstance(); + } } private void onHandleUiEvent(MotionEvent event, int eventType, int flags) { @@ -2438,34 +2456,51 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc * version specific, and may not be able to be loaded by newer versions * of WebView. * @param stream The {@link OutputStream} to save to - * @return True if saved successfully + * @param callback The {@link ValueCallback} to call with the result */ - public boolean saveViewState(OutputStream stream) { - try { - return ViewStateSerializer.serializeViewState(stream, this); - } catch (IOException e) { - Log.w(LOGTAG, "Failed to saveViewState", e); + public void saveViewState(OutputStream stream, ValueCallback<Boolean> callback) { + if (mWebViewCore == null) { + callback.onReceiveValue(false); + return; } - return false; + mWebViewCore.sendMessageAtFrontOfQueue(EventHub.SAVE_VIEW_STATE, + new WebViewCore.SaveViewStateRequest(stream, callback)); } /** * Loads the view data from the input stream. See * {@link #saveViewState(OutputStream)} for more information. * @param stream The {@link InputStream} to load from - * @return True if loaded successfully */ - public boolean loadViewState(InputStream stream) { - try { - mLoadedPicture = ViewStateSerializer.deserializeViewState(stream, this); - mBlockWebkitViewMessages = true; - setNewPicture(mLoadedPicture, true); - mLoadedPicture.mViewState = null; - return true; - } catch (IOException e) { - Log.w(LOGTAG, "Failed to loadViewState", e); - } - return false; + public void loadViewState(InputStream stream) { + mBlockWebkitViewMessages = true; + new AsyncTask<InputStream, Void, DrawData>() { + + @Override + protected DrawData doInBackground(InputStream... params) { + try { + return ViewStateSerializer.deserializeViewState(params[0]); + } catch (IOException e) { + return null; + } + } + + @Override + protected void onPostExecute(DrawData draw) { + if (draw == null) { + Log.e(LOGTAG, "Failed to load view state!"); + return; + } + int viewWidth = getViewWidth(); + int viewHeight = getViewHeightWithTitle() - getTitleHeight(); + draw.mViewSize = new Point(viewWidth, viewHeight); + draw.mViewState.mDefaultScale = getDefaultZoomScale(); + mLoadedPicture = draw; + setNewPicture(mLoadedPicture, true); + mLoadedPicture.mViewState = null; + } + + }.execute(stream); } /** @@ -3909,6 +3944,9 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc mSelectCursorExtent.offset(dx, dy); mSelectCursorExtentTextQuad.offset(dx, dy); } + } else if (mHandleAlpha.getAlpha() > 0) { + // stop fading as we're not going to move with the layer. + mHandleAlphaAnimator.end(); } if (mAutoCompletePopup != null && mCurrentScrollingLayerId == mEditTextLayerId) { @@ -4012,17 +4050,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc * @param url The URL of the page which has finished loading. */ /* package */ void onPageFinished(String url) { - if (mPageThatNeedsToSlideTitleBarOffScreen != null) { - // If the user is now on a different page, or has scrolled the page - // past the point where the title bar is offscreen, ignore the - // scroll request. - if (mPageThatNeedsToSlideTitleBarOffScreen.equals(url) - && getScrollX() == 0 && getScrollY() == 0) { - pinScrollTo(0, mYDistanceToSlideTitleOffScreen, true, - SLIDE_TITLE_DURATION); - } - mPageThatNeedsToSlideTitleBarOffScreen = null; - } mZoomManager.onPageFinished(url); injectAccessibilityForUrl(url); } @@ -4134,93 +4161,16 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc return -1; } - /** - * The URL of a page that sent a message to scroll the title bar off screen. - * - * Many mobile sites tell the page to scroll to (0,1) in order to scroll the - * title bar off the screen. Sometimes, the scroll position is set before - * the page finishes loading. Rather than scrolling while the page is still - * loading, keep track of the URL and new scroll position so we can perform - * the scroll once the page finishes loading. - */ - private String mPageThatNeedsToSlideTitleBarOffScreen; - - /** - * The destination Y scroll position to be used when the page finishes - * loading. See mPageThatNeedsToSlideTitleBarOffScreen. - */ - private int mYDistanceToSlideTitleOffScreen; - - // scale from content to view coordinates, and pin - // return true if pin caused the final x/y different than the request cx/cy, - // and a future scroll may reach the request cx/cy after our size has - // changed - // return false if the view scroll to the exact position as it is requested, - // where negative numbers are taken to mean 0 - private boolean setContentScrollTo(int cx, int cy) { - if (mDrawHistory) { - // disallow WebView to change the scroll position as History Picture - // is used in the view system. - // One known case where this is called is that WebCore tries to - // restore the scroll position. As history Picture already uses the - // saved scroll position, it is ok to skip this. - return false; - } - int vx; - int vy; - if ((cx | cy) == 0) { - // If the page is being scrolled to (0,0), do not add in the title - // bar's height, and simply scroll to (0,0). (The only other work - // in contentToView_ is to multiply, so this would not change 0.) - vx = 0; - vy = 0; - } else { - vx = contentToViewX(cx); - vy = contentToViewY(cy); - } -// Log.d(LOGTAG, "content scrollTo [" + cx + " " + cy + "] view=[" + -// vx + " " + vy + "]"); - // Some mobile sites attempt to scroll the title bar off the page by - // scrolling to (0,1). If we are at the top left corner of the - // page, assume this is an attempt to scroll off the title bar, and - // animate the title bar off screen slowly enough that the user can see - // it. - if (cx == 0 && cy == 1 && getScrollX() == 0 && getScrollY() == 0 - && getTitleHeight() > 0) { - // FIXME: 100 should be defined somewhere as our max progress. - if (getProgress() < 100) { - // Wait to scroll the title bar off screen until the page has - // finished loading. Keep track of the URL and the destination - // Y position - mPageThatNeedsToSlideTitleBarOffScreen = getUrl(); - mYDistanceToSlideTitleOffScreen = vy; - } else { - pinScrollTo(vx, vy, true, SLIDE_TITLE_DURATION); - } - // Since we are animating, we have not yet reached the desired - // scroll position. Do not return true to request another attempt - return false; - } - pinScrollTo(vx, vy, false, 0); - // If the request was to scroll to a negative coordinate, treat it as if - // it was a request to scroll to 0 - if ((getScrollX() != vx && cx >= 0) || (getScrollY() != vy && cy >= 0)) { - return true; - } else { - return false; - } - } - // scale from content to view coordinates, and pin - private void spawnContentScrollTo(int cx, int cy) { + private void contentScrollTo(int cx, int cy, boolean animate) { if (mDrawHistory) { // disallow WebView to change the scroll position as History Picture // is used in the view system. return; } - int vx = contentToViewDimension(cx - mScrollOffset.x); - int vy = contentToViewDimension(cy - mScrollOffset.y); - pinScrollBy(vx, vy, true, 0); + int vx = contentToViewX(cx); + int vy = contentToViewY(cy); + pinScrollTo(vx, vy, animate, 0); } /** @@ -4490,9 +4440,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc } canvas.restoreToCount(saveCount); - if (mSelectingText) { - drawTextSelectionHandles(canvas); - } + drawTextSelectionHandles(canvas); if (extras == DRAW_EXTRAS_CURSOR_RING) { if (mTouchMode == TOUCH_SHORTPRESS_START_MODE) { @@ -4730,6 +4678,9 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc } private void onZoomAnimationStart() { + if (!mSelectingText && mHandleAlpha.getAlpha() > 0) { + mHandleAlphaAnimator.end(); + } } private void onZoomAnimationEnd() { @@ -4760,6 +4711,36 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc private final DrawFilter mScrollFilter = new PaintFlagsDrawFilter(SCROLL_BITS, 0); + private class SelectionHandleAlpha { + private int mAlpha = 0; + public void setAlpha(int alpha) { + mAlpha = alpha; + if (mSelectHandleCenter != null) { + mSelectHandleCenter.setAlpha(alpha); + mSelectHandleLeft.setAlpha(alpha); + mSelectHandleRight.setAlpha(alpha); + // TODO: Use partial invalidate + invalidate(); + } + } + + public int getAlpha() { + return mAlpha; + } + + } + + private void startSelectingText() { + mSelectingText = true; + mHandleAlphaAnimator.setIntValues(255); + mHandleAlphaAnimator.start(); + } + private void endSelectingText() { + mSelectingText = false; + mHandleAlphaAnimator.setIntValues(0); + mHandleAlphaAnimator.start(); + } + private void ensureSelectionHandles() { if (mSelectHandleCenter == null) { mSelectHandleCenter = mContext.getResources().getDrawable( @@ -4768,6 +4749,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc com.android.internal.R.drawable.text_select_handle_left); mSelectHandleRight = mContext.getResources().getDrawable( com.android.internal.R.drawable.text_select_handle_right); + mHandleAlpha.setAlpha(mHandleAlpha.getAlpha()); mSelectHandleCenterOffset = new Point(0, -mSelectHandleCenter.getIntrinsicHeight()); mSelectHandleLeftOffset = new Point(0, @@ -4779,31 +4761,40 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc } private void drawTextSelectionHandles(Canvas canvas) { + if (mHandleAlpha.getAlpha() == 0) { + return; + } ensureSelectionHandles(); - int[] handles = new int[4]; - getSelectionHandles(handles); - int start_x = contentToViewDimension(handles[0]); - int start_y = contentToViewDimension(handles[1]); - int end_x = contentToViewDimension(handles[2]); - int end_y = contentToViewDimension(handles[3]); + if (mSelectingText) { + int[] handles = new int[4]; + getSelectionHandles(handles); + int start_x = contentToViewDimension(handles[0]); + int start_y = contentToViewDimension(handles[1]); + int end_x = contentToViewDimension(handles[2]); + int end_y = contentToViewDimension(handles[3]); + + if (mIsCaretSelection) { + // Caret handle is centered + start_x -= (mSelectHandleCenter.getIntrinsicWidth() / 2); + mSelectHandleCenter.setBounds(start_x, start_y, + start_x + mSelectHandleCenter.getIntrinsicWidth(), + start_y + mSelectHandleCenter.getIntrinsicHeight()); + } else { + // Magic formula copied from TextView + start_x -= (mSelectHandleLeft.getIntrinsicWidth() * 3) / 4; + mSelectHandleLeft.setBounds(start_x, start_y, + start_x + mSelectHandleLeft.getIntrinsicWidth(), + start_y + mSelectHandleLeft.getIntrinsicHeight()); + end_x -= mSelectHandleRight.getIntrinsicWidth() / 4; + mSelectHandleRight.setBounds(end_x, end_y, + end_x + mSelectHandleRight.getIntrinsicWidth(), + end_y + mSelectHandleRight.getIntrinsicHeight()); + } + } if (mIsCaretSelection) { - // Caret handle is centered - start_x -= (mSelectHandleCenter.getIntrinsicWidth() / 2); - mSelectHandleCenter.setBounds(start_x, start_y, - start_x + mSelectHandleCenter.getIntrinsicWidth(), - start_y + mSelectHandleCenter.getIntrinsicHeight()); mSelectHandleCenter.draw(canvas); } else { - // Magic formula copied from TextView - start_x -= (mSelectHandleLeft.getIntrinsicWidth() * 3) / 4; - mSelectHandleLeft.setBounds(start_x, start_y, - start_x + mSelectHandleLeft.getIntrinsicWidth(), - start_y + mSelectHandleLeft.getIntrinsicHeight()); - end_x -= mSelectHandleRight.getIntrinsicWidth() / 4; - mSelectHandleRight.setBounds(end_x, end_y, - end_x + mSelectHandleRight.getIntrinsicWidth(), - end_y + mSelectHandleRight.getIntrinsicHeight()); mSelectHandleLeft.draw(canvas); mSelectHandleRight.draw(canvas); } @@ -5457,7 +5448,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc selectionDone(); return false; } - mSelectingText = true; + startSelectingText(); mTouchMode = TOUCH_DRAG_MODE; return true; } @@ -5511,7 +5502,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc void selectionDone() { if (mSelectingText) { hidePasteButton(); - mSelectingText = false; + endSelectingText(); // finish is idempotent, so this is fine even if selectionDone was // called by mSelectCallback.onDestroyActionMode if (mSelectCallback != null) { @@ -6643,6 +6634,9 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc private long mTrackballUpTime = 0; private long mLastCursorTime = 0; private Rect mLastCursorBounds; + private SelectionHandleAlpha mHandleAlpha = new SelectionHandleAlpha(); + private ObjectAnimator mHandleAlphaAnimator = + ObjectAnimator.ofInt(mHandleAlpha, "alpha", 0); // Set by default; BrowserActivity clears to interpret trackball data // directly for movement. Currently, the framework only passes @@ -7427,11 +7421,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc } } final Point p = (Point) msg.obj; - if (msg.arg1 == 1) { - spawnContentScrollTo(p.x, p.y); - } else { - setContentScrollTo(p.x, p.y); - } + contentScrollTo(p.x, p.y, msg.arg1 == 1); break; } case UPDATE_ZOOM_RANGE: { @@ -8072,7 +8062,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc int scrollX = viewState.mShouldStartScrolledRight ? getContentWidth() : viewState.mScrollX; int scrollY = viewState.mScrollY; - setContentScrollTo(scrollX, scrollY); + contentScrollTo(scrollX, scrollY, false); if (!mDrawHistory) { // As we are on a new page, hide the keyboard hideSoftKeyboard(); diff --git a/core/java/android/webkit/WebViewClient.java b/core/java/android/webkit/WebViewClient.java index 0c34037329d6..6aff10a958cc 100644 --- a/core/java/android/webkit/WebViewClient.java +++ b/core/java/android/webkit/WebViewClient.java @@ -20,6 +20,7 @@ import android.graphics.Bitmap; import android.net.http.SslError; import android.os.Message; import android.view.KeyEvent; +import android.view.ViewRootImpl; public class WebViewClient { @@ -273,6 +274,10 @@ public class WebViewClient { * @param event The key event. */ public void onUnhandledKeyEvent(WebView view, KeyEvent event) { + ViewRootImpl root = view.getViewRootImpl(); + if (root != null) { + root.dispatchUnhandledKey(event); + } } /** diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index f86262e98b18..75141fd37575 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -44,6 +44,7 @@ import android.webkit.WebViewInputDispatcher.WebKitCallbacks; import junit.framework.Assert; +import java.io.OutputStream; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -188,10 +189,10 @@ public final class WebViewCore { // The WebIconDatabase needs to be initialized within the UI thread so // just request the instance here. WebIconDatabase.getInstance(); - // Create the WebStorage singleton and the UI handler - WebStorage.getInstance().createUIHandler(); + // Create the WebStorageClassic singleton and the UI handler + WebStorageClassic.getInstance().createUIHandler(); // Create the UI handler for GeolocationPermissions - GeolocationPermissions.getInstance().createUIHandler(); + GeolocationPermissionsClassic.getInstance().createUIHandler(); // Get the memory class of the current device. V8 will use these values // to GC more effectively. @@ -226,11 +227,11 @@ public final class WebViewCore { // Sync the native settings and also create the WebCore thread handler. mSettings.syncSettingsAndCreateHandler(mBrowserFrame); // Create the handler and transfer messages for the IconDatabase - WebIconDatabase.getInstance().createHandler(); - // Create the handler for WebStorage - WebStorage.getInstance().createHandler(); + WebIconDatabaseClassic.getInstance().createHandler(); + // Create the handler for WebStorageClassic + WebStorageClassic.getInstance().createHandler(); // Create the handler for GeolocationPermissions. - GeolocationPermissions.getInstance().createHandler(); + GeolocationPermissionsClassic.getInstance().createHandler(); // The transferMessages call will transfer all pending messages to the // WebCore thread handler. mEventHub.transferMessages(); @@ -1048,6 +1049,15 @@ public final class WebViewCore { public int mMatchIndex; } + static class SaveViewStateRequest { + SaveViewStateRequest(OutputStream s, ValueCallback<Boolean> cb) { + mStream = s; + mCallback = cb; + } + public OutputStream mStream; + public ValueCallback<Boolean> mCallback; + } + /** * @hide */ @@ -1180,6 +1190,8 @@ public final class WebViewCore { static final int KEY_PRESS = 223; static final int SET_INITIAL_FOCUS = 224; + static final int SAVE_VIEW_STATE = 225; + // Private handler for WebCore messages. private Handler mHandler; // Message queue for containing messages before the WebCore thread is @@ -1296,20 +1308,20 @@ public final class WebViewCore { break; case LOAD_URL: { - CookieManager.getInstance().waitForCookieOperationsToComplete(); + CookieManagerClassic.getInstance().waitForCookieOperationsToComplete(); GetUrlData param = (GetUrlData) msg.obj; loadUrl(param.mUrl, param.mExtraHeaders); break; } case POST_URL: { - CookieManager.getInstance().waitForCookieOperationsToComplete(); + CookieManagerClassic.getInstance().waitForCookieOperationsToComplete(); PostUrlData param = (PostUrlData) msg.obj; mBrowserFrame.postUrl(param.mUrl, param.mPostData); break; } case LOAD_DATA: - CookieManager.getInstance().waitForCookieOperationsToComplete(); + CookieManagerClassic.getInstance().waitForCookieOperationsToComplete(); BaseUrlData loadParams = (BaseUrlData) msg.obj; String baseUrl = loadParams.mBaseUrl; if (baseUrl != null) { @@ -1754,8 +1766,13 @@ public final class WebViewCore { case SET_INITIAL_FOCUS: nativeSetInitialFocus(mNativeClass, msg.arg1); break; + case SAVE_VIEW_STATE: + SaveViewStateRequest request = (SaveViewStateRequest) msg.obj; + saveViewState(request.mStream, request.mCallback); + break; } } + }; // Take all queued messages and resend them to the new handler. synchronized (this) { @@ -2112,7 +2129,7 @@ public final class WebViewCore { // Utility method for exceededDatabaseQuota and reachedMaxAppCacheSize // callbacks. Computes the sum of database quota for all origins. private long getUsedQuota() { - WebStorage webStorage = WebStorage.getInstance(); + WebStorageClassic webStorage = WebStorageClassic.getInstance(); Collection<WebStorage.Origin> origins = webStorage.getOriginsSync(); if (origins == null) { @@ -2254,6 +2271,31 @@ public final class WebViewCore { } } + private void saveViewState(OutputStream stream, + ValueCallback<Boolean> callback) { + // TODO: Create a native method to do this better without overloading + // the draw path (and fix saving <canvas>) + DrawData draw = new DrawData(); + if (DebugFlags.WEB_VIEW_CORE) Log.v(LOGTAG, "saveViewState start"); + draw.mBaseLayer = nativeRecordContent(mNativeClass, draw.mInvalRegion, + draw.mContentSize); + boolean result = false; + try { + result = ViewStateSerializer.serializeViewState(stream, draw); + } catch (Throwable t) { + Log.w(LOGTAG, "Failed to save view state", t); + } + callback.onReceiveValue(result); + if (draw.mBaseLayer != 0) { + if (mDrawIsScheduled) { + mDrawIsScheduled = false; + mEventHub.removeMessages(EventHub.WEBKIT_DRAW); + } + mLastDrawData = draw; + webkitDraw(draw); + } + } + static void reducePriority() { // remove the pending REDUCE_PRIORITY and RESUME_PRIORITY messages sWebCoreHandler.removeMessages(WebCoreThread.REDUCE_PRIORITY); diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java new file mode 100644 index 000000000000..73ae9109b517 --- /dev/null +++ b/core/java/android/webkit/WebViewFactory.java @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.webkit; + +import android.util.Log; + +/** + * Top level factory, used creating all the main WebView implementation classes. + */ +class WebViewFactory { + // Default Provider factory class name. + private static final String DEFAULT_WEB_VIEW_FACTORY = "android.webkit.WebViewClassic$Factory"; + + private static final String LOGTAG = "WebViewFactory"; + + private static final boolean DEBUG = false; + + // Cache the factory both for efficiency, and ensure any one process gets all webviews from the + // same provider. + private static WebViewFactoryProvider sProviderInstance; + + static synchronized WebViewFactoryProvider getProvider() { + // For now the main purpose of this function (and the factory abstraction) is to keep + // us honest and minimize usage of WebViewClassic internals when binding the proxy. + if (sProviderInstance != null) return sProviderInstance; + + sProviderInstance = getFactoryByName(DEFAULT_WEB_VIEW_FACTORY); + if (sProviderInstance == null) { + if (DEBUG) Log.v(LOGTAG, "Falling back to explicit linkage"); + sProviderInstance = new WebViewClassic.Factory(); + } + return sProviderInstance; + } + + private static WebViewFactoryProvider getFactoryByName(String providerName) { + try { + if (DEBUG) Log.v(LOGTAG, "attempt to load class " + providerName); + Class<?> c = Class.forName(providerName); + if (DEBUG) Log.v(LOGTAG, "instantiating factory"); + return (WebViewFactoryProvider) c.newInstance(); + } catch (ClassNotFoundException e) { + Log.e(LOGTAG, "error loading " + providerName, e); + } catch (IllegalAccessException e) { + Log.e(LOGTAG, "error loading " + providerName, e); + } catch (InstantiationException e) { + Log.e(LOGTAG, "error loading " + providerName, e); + } + return null; + } +} diff --git a/core/java/android/webkit/WebViewFactoryProvider.java b/core/java/android/webkit/WebViewFactoryProvider.java index 22bf0bf0df64..a832b0ae8075 100644 --- a/core/java/android/webkit/WebViewFactoryProvider.java +++ b/core/java/android/webkit/WebViewFactoryProvider.java @@ -23,18 +23,6 @@ package android.webkit; * @hide */ public interface WebViewFactoryProvider { - - /** - * Construct a new WebView provider. - * @param webView the WebView instance bound to this implementation instance. Note it will not - * necessarily be fully constructed at the point of this call: defer real initialization to - * WebViewProvider.init(). - * @param privateAccess provides access into WebView internal methods. - */ - WebViewProvider createWebView(WebView webView, WebView.PrivateAccess privateAccess); - - Statics getStatics(); - /** * This Interface provides glue for implementing the backend of WebView static methods which * cannot be implemented in-situ in the proxy class. @@ -53,4 +41,43 @@ public interface WebViewFactoryProvider { */ void setPlatformNotificationsEnabled(boolean enable); } + + Statics getStatics(); + + /** + * Construct a new WebViewProvider. + * @param webView the WebView instance bound to this implementation instance. Note it will not + * necessarily be fully constructed at the point of this call: defer real initialization to + * WebViewProvider.init(). + * @param privateAccess provides access into WebView internal methods. + */ + WebViewProvider createWebView(WebView webView, WebView.PrivateAccess privateAccess); + + /** + * Gets the singleton GeolocationPermissions instance for this WebView implementation. The + * implementation must return the same instance on subsequent calls. + * @return the single GeolocationPermissions instance. + */ + GeolocationPermissions getGeolocationPermissions(); + + /** + * Gets the singleton CookieManager instance for this WebView implementation. The + * implementation must return the same instance on subsequent calls. + * @return the singleton CookieManager instance. + */ + CookieManager getCookieManager(); + + /** + * Gets the singleton WebIconDatabase instance for this WebView implementation. The + * implementation must return the same instance on subsequent calls. + * @return the singleton WebIconDatabase instance. + */ + WebIconDatabase getWebIconDatabase(); + + /** + * Gets the singleton WebStorage instance for this WebView implementation. The + * implementation must return the same instance on subsequent calls. + * @return the singleton WebStorage instance. + */ + WebStorage getWebStorage(); } diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index e68049caf459..53d5e0b4c497 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -403,7 +403,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te /** * Handles scrolling between positions within the list. */ - private PositionScroller mPositionScroller; + PositionScroller mPositionScroller; /** * The offset in pixels form the top of the AdapterView to the top @@ -3080,6 +3080,10 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te return isClickable() || isLongClickable(); } + if (mPositionScroller != null) { + mPositionScroller.stop(); + } + if (mFastScroller != null) { boolean intercepted = mFastScroller.onTouchEvent(ev); if (intercepted) { @@ -3564,6 +3568,10 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te int action = ev.getAction(); View v; + if (mPositionScroller != null) { + mPositionScroller.stop(); + } + if (mFastScroller != null) { boolean intercepted = mFastScroller.onInterceptTouchEvent(ev); if (intercepted) { @@ -3748,7 +3756,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te mScroller.fling(0, initialY, 0, initialVelocity, 0, Integer.MAX_VALUE, 0, Integer.MAX_VALUE); mTouchMode = TOUCH_MODE_FLING; - post(this); + postOnAnimation(this); if (PROFILE_FLINGING) { if (!mFlingProfilingStarted) { @@ -3766,7 +3774,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te if (mScroller.springBack(0, mScrollY, 0, 0, 0, 0)) { mTouchMode = TOUCH_MODE_OVERFLING; invalidate(); - post(this); + postOnAnimation(this); } else { mTouchMode = TOUCH_MODE_REST; reportScrollStateChange(OnScrollListener.SCROLL_STATE_IDLE); @@ -3778,7 +3786,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te Integer.MIN_VALUE, Integer.MAX_VALUE, 0, getHeight()); mTouchMode = TOUCH_MODE_OVERFLING; invalidate(); - post(this); + postOnAnimation(this); } void edgeReached(int delta) { @@ -3800,7 +3808,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te } } invalidate(); - post(this); + postOnAnimation(this); } void startScroll(int distance, int duration) { @@ -3808,7 +3816,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te mLastFlingY = initialY; mScroller.startScroll(0, initialY, 0, distance, duration); mTouchMode = TOUCH_MODE_FLING; - post(this); + postOnAnimation(this); } void endFling() { @@ -3907,7 +3915,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te if (more && !atEnd) { if (atEdge) invalidate(); mLastFlingY = y; - post(this); + postOnAnimation(this); } else { endFling(); @@ -3948,7 +3956,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te } } else { invalidate(); - post(this); + postOnAnimation(this); } } else { endFling(); @@ -3959,7 +3967,6 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te } } - class PositionScroller implements Runnable { private static final int SCROLL_DURATION = 400; @@ -4009,7 +4016,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te mBoundPos = INVALID_POSITION; mLastSeenPos = INVALID_POSITION; - post(this); + postOnAnimation(this); } void start(int position, int boundPosition) { @@ -4070,7 +4077,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te mBoundPos = boundPosition; mLastSeenPos = INVALID_POSITION; - post(this); + postOnAnimation(this); } void startWithOffset(int position, int offset) { @@ -4080,6 +4087,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te void startWithOffset(int position, int offset, int duration) { stop(); + offset += getPaddingTop(); + mTargetPos = position; mOffsetFromTop = offset; mBoundPos = INVALID_POSITION; @@ -4108,7 +4117,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te (int) (duration / screenTravelCount); mLastSeenPos = INVALID_POSITION; - post(this); + postOnAnimation(this); } void stop() { @@ -4116,10 +4125,6 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te } public void run() { - if (mTouchMode != TOUCH_MODE_FLING && mLastSeenPos != INVALID_POSITION) { - return; - } - final int listHeight = getHeight(); final int firstPos = mFirstPosition; @@ -4134,7 +4139,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te if (lastPos == mLastSeenPos) { // No new views, let things keep going. - post(this); + postOnAnimation(this); return; } @@ -4142,14 +4147,15 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te final int lastViewHeight = lastView.getHeight(); final int lastViewTop = lastView.getTop(); final int lastViewPixelsShowing = listHeight - lastViewTop; - final int extraScroll = lastPos < mItemCount - 1 ? mExtraScroll : mListPadding.bottom; + final int extraScroll = lastPos < mItemCount - 1 ? + Math.max(mListPadding.bottom, mExtraScroll) : mListPadding.bottom; - smoothScrollBy(lastViewHeight - lastViewPixelsShowing + extraScroll, - mScrollDuration); + final int scrollBy = lastViewHeight - lastViewPixelsShowing + extraScroll; + smoothScrollBy(scrollBy, mScrollDuration); mLastSeenPos = lastPos; if (lastPos < mTargetPos) { - post(this); + postOnAnimation(this); } break; } @@ -4166,21 +4172,21 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te if (nextPos == mLastSeenPos) { // No new views, let things keep going. - post(this); + postOnAnimation(this); return; } final View nextView = getChildAt(nextViewIndex); final int nextViewHeight = nextView.getHeight(); final int nextViewTop = nextView.getTop(); - final int extraScroll = mExtraScroll; + final int extraScroll = Math.max(mListPadding.bottom, mExtraScroll); if (nextPos < mBoundPos) { smoothScrollBy(Math.max(0, nextViewHeight + nextViewTop - extraScroll), mScrollDuration); mLastSeenPos = nextPos; - post(this); + postOnAnimation(this); } else { if (nextViewTop > extraScroll) { smoothScrollBy(nextViewTop - extraScroll, mScrollDuration); @@ -4192,7 +4198,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te case MOVE_UP_POS: { if (firstPos == mLastSeenPos) { // No new views, let things keep going. - post(this); + postOnAnimation(this); return; } @@ -4201,14 +4207,15 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te return; } final int firstViewTop = firstView.getTop(); - final int extraScroll = firstPos > 0 ? mExtraScroll : mListPadding.top; + final int extraScroll = firstPos > 0 ? + Math.max(mExtraScroll, mListPadding.top) : mListPadding.top; smoothScrollBy(firstViewTop - extraScroll, mScrollDuration); mLastSeenPos = firstPos; if (firstPos > mTargetPos) { - post(this); + postOnAnimation(this); } break; } @@ -4230,12 +4237,13 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te final int lastViewHeight = lastView.getHeight(); final int lastViewTop = lastView.getTop(); final int lastViewPixelsShowing = listHeight - lastViewTop; + final int extraScroll = Math.max(mListPadding.top, mExtraScroll); mLastSeenPos = lastPos; if (lastPos > mBoundPos) { - smoothScrollBy(-(lastViewPixelsShowing - mExtraScroll), mScrollDuration); - post(this); + smoothScrollBy(-(lastViewPixelsShowing - extraScroll), mScrollDuration); + postOnAnimation(this); } else { - final int bottom = listHeight - mExtraScroll; + final int bottom = listHeight - extraScroll; final int lastViewBottom = lastViewTop + lastViewHeight; if (bottom > lastViewBottom) { smoothScrollBy(-(bottom - lastViewBottom), mScrollDuration); @@ -4270,10 +4278,10 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te final float modifier = Math.min(Math.abs(screenTravelCount), 1.f); if (position < firstPos) { smoothScrollBy((int) (-getHeight() * modifier), mScrollDuration); - post(this); + postOnAnimation(this); } else if (position > lastPos) { smoothScrollBy((int) (getHeight() * modifier), mScrollDuration); - post(this); + postOnAnimation(this); } else { // On-screen, just scroll. final int targetTop = getChildAt(position - firstPos).getTop(); @@ -4620,7 +4628,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te // invalidate before moving the children to avoid unnecessary invalidate // calls to bubble up from the children all the way to the top if (!awakenScrollBars()) { - invalidate(); + invalidate(); } offsetChildrenTopAndBottom(incrementalDeltaY); diff --git a/core/java/android/widget/ActivityChooserModel.java b/core/java/android/widget/ActivityChooserModel.java index bc44521adbfc..c53b5f64a11c 100644 --- a/core/java/android/widget/ActivityChooserModel.java +++ b/core/java/android/widget/ActivityChooserModel.java @@ -365,7 +365,7 @@ public class ActivityChooserModel extends DataSetObservable { } else { mHistoryFileName = historyFileName; } - mPackageMonitor.register(mContext, true); + mPackageMonitor.register(mContext, null, true); } /** diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index 040a3853a273..8d199d7f49b2 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -1241,24 +1241,21 @@ public class Editor { } DynamicLayout dynamicLayout = (DynamicLayout) layout; - int[] blockEnds = dynamicLayout.getBlockEnds(); + int[] blockEndLines = dynamicLayout.getBlockEndLines(); int[] blockIndices = dynamicLayout.getBlockIndices(); final int numberOfBlocks = dynamicLayout.getNumberOfBlocks(); - final int mScrollX = mTextView.getScrollX(); - final int mScrollY = mTextView.getScrollY(); - canvas.translate(mScrollX, mScrollY); int endOfPreviousBlock = -1; int searchStartIndex = 0; for (int i = 0; i < numberOfBlocks; i++) { - int blockEnd = blockEnds[i]; + int blockEndLine = blockEndLines[i]; int blockIndex = blockIndices[i]; final boolean blockIsInvalid = blockIndex == DynamicLayout.INVALID_BLOCK_INDEX; if (blockIsInvalid) { blockIndex = getAvailableDisplayListIndex(blockIndices, numberOfBlocks, searchStartIndex); - // Dynamic layout internal block indices structure is updated from Editor + // Note how dynamic layout's internal block indices get updated from Editor blockIndices[i] = blockIndex; searchStartIndex = blockIndex + 1; } @@ -1272,28 +1269,38 @@ public class Editor { } if (!blockDisplayList.isValid()) { + final int blockBeginLine = endOfPreviousBlock + 1; + final int top = layout.getLineTop(blockBeginLine); + final int bottom = layout.getLineBottom(blockEndLine); + final HardwareCanvas hardwareCanvas = blockDisplayList.start(); try { - hardwareCanvas.setViewport(width, height); + hardwareCanvas.setViewport(width, bottom - top); // The dirty rect should always be null for a display list hardwareCanvas.onPreDraw(null); - hardwareCanvas.translate(-mScrollX, -mScrollY); - layout.drawText(hardwareCanvas, endOfPreviousBlock + 1, blockEnd); - hardwareCanvas.translate(mScrollX, mScrollY); + // drawText is always relative to TextView's origin, this translation brings + // this range of text back to the top of the viewport + hardwareCanvas.translate(0, -top); + layout.drawText(hardwareCanvas, blockBeginLine, blockEndLine); + hardwareCanvas.translate(0, top); } finally { hardwareCanvas.onPostDraw(); blockDisplayList.end(); if (View.USE_DISPLAY_LIST_PROPERTIES) { - blockDisplayList.setLeftTopRightBottom(0, 0, width, height); + blockDisplayList.setLeftTopRightBottom(0, top, width, bottom); + // Same as drawDisplayList below, handled by our TextView's parent + blockDisplayList.setClipChildren(false); } } } + // TODO When View.USE_DISPLAY_LIST_PROPERTIES is the only code path, the + // width and height parameters should be removed and the bounds set above in + // setLeftTopRightBottom should be used instead for quick rejection. ((HardwareCanvas) canvas).drawDisplayList(blockDisplayList, width, height, null, - DisplayList.FLAG_CLIP_CHILDREN); - endOfPreviousBlock = blockEnd; + 0 /* no child clipping, our TextView parent enforces it */); + endOfPreviousBlock = blockEndLine; } - canvas.translate(-mScrollX, -mScrollY); } else { // Boring layout is used for empty and hint text layout.drawText(canvas, firstLine, lastLine); @@ -1332,6 +1339,38 @@ public class Editor { if (translate) canvas.translate(0, -cursorOffsetVertical); } + /** + * Invalidates all the sub-display lists that overlap the specified character range + */ + void invalidateTextDisplayList(Layout layout, int start, int end) { + if (mTextDisplayLists != null && layout instanceof DynamicLayout) { + final int firstLine = layout.getLineForOffset(start); + final int lastLine = layout.getLineForOffset(end); + + DynamicLayout dynamicLayout = (DynamicLayout) layout; + int[] blockEndLines = dynamicLayout.getBlockEndLines(); + int[] blockIndices = dynamicLayout.getBlockIndices(); + final int numberOfBlocks = dynamicLayout.getNumberOfBlocks(); + + int i = 0; + // Skip the blocks before firstLine + while (i < numberOfBlocks) { + if (blockEndLines[i] >= firstLine) break; + i++; + } + + // Invalidate all subsequent blocks until lastLine is passed + while (i < numberOfBlocks) { + final int blockIndex = blockIndices[i]; + if (blockIndex != DynamicLayout.INVALID_BLOCK_INDEX) { + mTextDisplayLists[blockIndex].invalidate(); + } + if (blockEndLines[i] >= lastLine) break; + i++; + } + } + } + void invalidateTextDisplayList() { if (mTextDisplayLists != null) { for (int i = 0; i < mTextDisplayLists.length; i++) { @@ -1572,11 +1611,9 @@ public class Editor { } void onScrollChanged() { - if (mPositionListener != null) { - mPositionListener.onScrollChanged(); - } - // Internal scroll affects the clip boundaries - invalidateTextDisplayList(); + if (mPositionListener != null) { + mPositionListener.onScrollChanged(); + } } /** diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java index 0f1dab58ea7a..0a40d5efba5d 100644 --- a/core/java/android/widget/GridView.java +++ b/core/java/android/widget/GridView.java @@ -1463,6 +1463,9 @@ public class GridView extends AbsListView { mResurrectToPosition = position; } mLayoutMode = LAYOUT_SET_SELECTION; + if (mPositionScroller != null) { + mPositionScroller.stop(); + } requestLayout(); } @@ -1475,6 +1478,10 @@ public class GridView extends AbsListView { void setSelectionInt(int position) { int previousSelectedPosition = mNextSelectedPosition; + if (mPositionScroller != null) { + mPositionScroller.stop(); + } + setNextSelectedPositionInt(position); layoutChildren(); diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java index 71700b367b40..5098523d580f 100644 --- a/core/java/android/widget/ListView.java +++ b/core/java/android/widget/ListView.java @@ -1926,6 +1926,9 @@ public class ListView extends AbsListView { mSyncRowId = mAdapter.getItemId(position); } + if (mPositionScroller != null) { + mPositionScroller.stop(); + } requestLayout(); } } @@ -1950,6 +1953,10 @@ public class ListView extends AbsListView { } } + if (mPositionScroller != null) { + mPositionScroller.stop(); + } + layoutChildren(); if (awakeScrollbars) { diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java index 992849dbb4e2..11d1ed05708c 100644 --- a/core/java/android/widget/NumberPicker.java +++ b/core/java/android/widget/NumberPicker.java @@ -26,6 +26,7 @@ import android.graphics.Paint; import android.graphics.Paint.Align; import android.graphics.Rect; import android.graphics.drawable.Drawable; +import android.os.Bundle; import android.text.InputFilter; import android.text.InputType; import android.text.Spanned; @@ -2068,7 +2069,7 @@ public class NumberPicker extends LinearLayout { } @Override - public boolean performAccessibilityAction(int action, int virtualViewId) { + public boolean performAction(int virtualViewId, int action, Bundle arguments) { switch (virtualViewId) { case VIRTUAL_VIEW_ID_INPUT: { switch (action) { @@ -2086,7 +2087,7 @@ public class NumberPicker extends LinearLayout { } } break; } - return super.performAccessibilityAction(action, virtualViewId); + return super.performAction(virtualViewId, action, arguments); } public void sendAccessibilityEventForVirtualView(int virtualViewId, int eventType) { diff --git a/core/java/android/widget/SpellChecker.java b/core/java/android/widget/SpellChecker.java index a13ee5a3c335..02cb46b8a79a 100644 --- a/core/java/android/widget/SpellChecker.java +++ b/core/java/android/widget/SpellChecker.java @@ -60,6 +60,8 @@ public class SpellChecker implements SpellCheckerSessionListener { // Pause between each spell check to keep the UI smooth private final static int SPELL_PAUSE_DURATION = 400; // milliseconds + private static final int MIN_SENTENCE_LENGTH = 50; + private static final int USE_SPAN_RANGE = -1; private final TextView mTextView; @@ -508,11 +510,10 @@ public class SpellChecker implements SpellCheckerSessionListener { if (wordEnd < start) { return; } - wordStart = regionEnd; // TODO: Find the start position of the sentence. // Set span with the context final int spellCheckStart = Math.max( - 0, Math.min(wordStart, regionEnd - WORD_ITERATOR_INTERVAL)); + 0, Math.min(wordStart, regionEnd - MIN_SENTENCE_LENGTH)); if (regionEnd <= spellCheckStart) { return; } @@ -530,6 +531,7 @@ public class SpellChecker implements SpellCheckerSessionListener { && (selectionEnd < spellCheckStart || selectionStart > regionEnd)) { addSpellCheckSpan(editable, spellCheckStart, regionEnd); } + wordStart = regionEnd; } else { while (wordStart <= end) { if (wordEnd >= start && wordEnd > wordStart) { diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 37d9db7bad64..0e7fe7f3eb89 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -6860,7 +6860,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } else { ims.mContentChanged = true; } - if (mEditor != null) getEditor().invalidateTextDisplayList(); + if (mEditor != null) { + if (oldStart >= 0) getEditor().invalidateTextDisplayList(mLayout, oldStart, oldEnd); + if (newStart >= 0) getEditor().invalidateTextDisplayList(mLayout, newStart, newEnd); + } } if (MetaKeyKeyListener.isMetaTracker(buf, what)) { diff --git a/core/java/com/android/internal/app/ActionBarImpl.java b/core/java/com/android/internal/app/ActionBarImpl.java index 1ba6d438b85e..d0071e3af602 100644 --- a/core/java/com/android/internal/app/ActionBarImpl.java +++ b/core/java/com/android/internal/app/ActionBarImpl.java @@ -16,6 +16,7 @@ package com.android.internal.app; +import com.android.internal.view.ActionBarPolicy; import com.android.internal.view.menu.MenuBuilder; import com.android.internal.view.menu.MenuPopupHelper; import com.android.internal.view.menu.SubMenuBuilder; @@ -183,18 +184,13 @@ public class ActionBarImpl extends ActionBar { mContextDisplayMode = mActionView.isSplitActionBar() ? CONTEXT_DISPLAY_SPLIT : CONTEXT_DISPLAY_NORMAL; - // Older apps get the home button interaction enabled by default. - // Newer apps need to enable it explicitly. - setHomeButtonEnabled(mContext.getApplicationInfo().targetSdkVersion < - Build.VERSION_CODES.ICE_CREAM_SANDWICH); - - setHasEmbeddedTabs(mContext.getResources().getBoolean( - com.android.internal.R.bool.action_bar_embed_tabs)); + ActionBarPolicy abp = ActionBarPolicy.get(mContext); + setHomeButtonEnabled(abp.enableHomeButtonByDefault()); + setHasEmbeddedTabs(abp.hasEmbeddedTabs()); } public void onConfigurationChanged(Configuration newConfig) { - setHasEmbeddedTabs(mContext.getResources().getBoolean( - com.android.internal.R.bool.action_bar_embed_tabs)); + setHasEmbeddedTabs(ActionBarPolicy.get(mContext).hasEmbeddedTabs()); } private void setHasEmbeddedTabs(boolean hasEmbeddedTabs) { diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index af722a8d910d..5862d3e08b5e 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -99,7 +99,7 @@ public class ResolverActivity extends AlertActivity implements ap.mTitle = title; ap.mOnClickListener = this; - mPackageMonitor.register(this, false); + mPackageMonitor.register(this, getMainLooper(), false); if (alwaysUseOption) { LayoutInflater inflater = (LayoutInflater) getSystemService( @@ -135,7 +135,7 @@ public class ResolverActivity extends AlertActivity implements @Override protected void onRestart() { super.onRestart(); - mPackageMonitor.register(this, false); + mPackageMonitor.register(this, getMainLooper(), false); mAdapter.handlePackagesChanged(); } diff --git a/core/java/com/android/internal/app/ShutdownThread.java b/core/java/com/android/internal/app/ShutdownThread.java index 6a469293ca52..d867ff9eed03 100644 --- a/core/java/com/android/internal/app/ShutdownThread.java +++ b/core/java/com/android/internal/app/ShutdownThread.java @@ -24,6 +24,8 @@ import android.app.IActivityManager; import android.app.ProgressDialog; import android.bluetooth.BluetoothAdapter; import android.bluetooth.IBluetooth; +import android.nfc.NfcAdapter; +import android.nfc.INfcAdapter; import android.content.BroadcastReceiver; import android.content.Context; import android.content.DialogInterface; @@ -48,7 +50,7 @@ import android.view.WindowManager; public final class ShutdownThread extends Thread { // constants private static final String TAG = "ShutdownThread"; - private static final int MAX_NUM_PHONE_STATE_READS = 16; + private static final int MAX_NUM_PHONE_STATE_READS = 24; private static final int PHONE_STATE_POLL_SLEEP_MSEC = 500; // maximum time we wait for the shutdown broadcast before going on. private static final int MAX_BROADCAST_TIME = 10*1000; @@ -62,11 +64,15 @@ public final class ShutdownThread extends Thread { private static boolean sIsStarted = false; private static boolean mReboot; + private static boolean mRebootSafeMode; private static String mRebootReason; // Provides shutdown assurance in case the system_server is killed public static final String SHUTDOWN_ACTION_PROPERTY = "sys.shutdown.requested"; + // Indicates whether we are rebooting into safe mode + public static final String REBOOT_SAFEMODE_PROPERTY = "persist.sys.safemode"; + // static instance of this thread private static final ShutdownThread sInstance = new ShutdownThread(); @@ -90,6 +96,12 @@ public final class ShutdownThread extends Thread { * @param confirm true if user confirmation is needed before shutting down. */ public static void shutdown(final Context context, boolean confirm) { + mReboot = false; + mRebootSafeMode = false; + shutdownInner(context, confirm); + } + + static void shutdownInner(final Context context, boolean confirm) { // ensure that only one thread is trying to power down. // any additional calls are just returned synchronized (sIsStartedGuard) { @@ -101,16 +113,20 @@ public final class ShutdownThread extends Thread { final int longPressBehavior = context.getResources().getInteger( com.android.internal.R.integer.config_longPressOnPowerBehavior); - final int resourceId = longPressBehavior == 2 - ? com.android.internal.R.string.shutdown_confirm_question - : com.android.internal.R.string.shutdown_confirm; + final int resourceId = mRebootSafeMode + ? com.android.internal.R.string.reboot_safemode_confirm + : (longPressBehavior == 2 + ? com.android.internal.R.string.shutdown_confirm_question + : com.android.internal.R.string.shutdown_confirm); Log.d(TAG, "Notifying thread to start shutdown longPressBehavior=" + longPressBehavior); if (confirm) { final CloseDialogReceiver closer = new CloseDialogReceiver(context); final AlertDialog dialog = new AlertDialog.Builder(context) - .setTitle(com.android.internal.R.string.power_off) + .setTitle(mRebootSafeMode + ? com.android.internal.R.string.reboot_safemode_title + : com.android.internal.R.string.power_off) .setMessage(resourceId) .setPositiveButton(com.android.internal.R.string.yes, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { @@ -160,8 +176,23 @@ public final class ShutdownThread extends Thread { */ public static void reboot(final Context context, String reason, boolean confirm) { mReboot = true; + mRebootSafeMode = false; mRebootReason = reason; - shutdown(context, confirm); + shutdownInner(context, confirm); + } + + /** + * Request a reboot into safe mode. Must be called from a Looper thread in which its UI + * is shown. + * + * @param context Context used to display the shutdown progress dialog. + * @param confirm true if user confirmation is needed before shutting down. + */ + public static void rebootSafeMode(final Context context, boolean confirm) { + mReboot = true; + mRebootSafeMode = true; + mRebootReason = null; + shutdownInner(context, confirm); } private static void beginShutdownSequence(Context context) { @@ -231,6 +262,7 @@ public final class ShutdownThread extends Thread { * Shuts off power regardless of radio and bluetooth state if the alloted time has passed. */ public void run() { + boolean nfcOff; boolean bluetoothOff; boolean radioOff; @@ -251,6 +283,14 @@ public final class ShutdownThread extends Thread { SystemProperties.set(SHUTDOWN_ACTION_PROPERTY, reason); } + /* + * If we are rebooting into safe mode, write a system property + * indicating so. + */ + if (mRebootSafeMode) { + SystemProperties.set(REBOOT_SAFEMODE_PROPERTY, "1"); + } + Log.i(TAG, "Sending shutdown broadcast..."); // First send the high-level shut down broadcast. @@ -284,16 +324,29 @@ public final class ShutdownThread extends Thread { } } + final INfcAdapter nfc = + INfcAdapter.Stub.asInterface(ServiceManager.checkService("nfc")); final ITelephony phone = ITelephony.Stub.asInterface(ServiceManager.checkService("phone")); final IBluetooth bluetooth = IBluetooth.Stub.asInterface(ServiceManager.checkService( BluetoothAdapter.BLUETOOTH_SERVICE)); - final IMountService mount = IMountService.Stub.asInterface( ServiceManager.checkService("mount")); - + + try { + nfcOff = nfc == null || + nfc.getState() == NfcAdapter.STATE_OFF; + if (!nfcOff) { + Log.w(TAG, "Turning off NFC..."); + nfc.disable(false); // Don't persist new state + } + } catch (RemoteException ex) { + Log.e(TAG, "RemoteException during NFC shutdown", ex); + nfcOff = true; + } + try { bluetoothOff = bluetooth == null || bluetooth.getBluetoothState() == BluetoothAdapter.STATE_OFF; @@ -317,7 +370,7 @@ public final class ShutdownThread extends Thread { radioOff = true; } - Log.i(TAG, "Waiting for Bluetooth and Radio..."); + Log.i(TAG, "Waiting for NFC, Bluetooth and Radio..."); // Wait a max of 32 seconds for clean shutdown for (int i = 0; i < MAX_NUM_PHONE_STATE_READS; i++) { @@ -338,8 +391,17 @@ public final class ShutdownThread extends Thread { radioOff = true; } } - if (radioOff && bluetoothOff) { - Log.i(TAG, "Radio and Bluetooth shutdown complete."); + if (!nfcOff) { + try { + nfcOff = nfc.getState() == NfcAdapter.STATE_OFF; + } catch (RemoteException ex) { + Log.e(TAG, "RemoteException during NFC shutdown", ex); + nfcOff = true; + } + } + + if (radioOff && bluetoothOff && nfcOff) { + Log.i(TAG, "NFC, Radio and Bluetooth shutdown complete."); break; } SystemClock.sleep(PHONE_STATE_POLL_SLEEP_MSEC); diff --git a/core/java/com/android/internal/appwidget/IAppWidgetService.aidl b/core/java/com/android/internal/appwidget/IAppWidgetService.aidl index fa0873d70f5a..b1b57e7c81aa 100644 --- a/core/java/com/android/internal/appwidget/IAppWidgetService.aidl +++ b/core/java/com/android/internal/appwidget/IAppWidgetService.aidl @@ -20,6 +20,7 @@ import android.content.ComponentName; import android.content.Intent; import android.appwidget.AppWidgetProviderInfo; import com.android.internal.appwidget.IAppWidgetHost; +import android.os.Bundle; import android.os.IBinder; import android.widget.RemoteViews; @@ -42,6 +43,8 @@ interface IAppWidgetService { // for AppWidgetManager // void updateAppWidgetIds(in int[] appWidgetIds, in RemoteViews views); + void updateAppWidgetExtras(int appWidgetId, in Bundle extras); + Bundle getAppWidgetExtras(int appWidgetId); void partiallyUpdateAppWidgetIds(in int[] appWidgetIds, in RemoteViews views); void updateAppWidgetProvider(in ComponentName provider, in RemoteViews views); void notifyAppWidgetViewDataChanged(in int[] appWidgetIds, int viewId); diff --git a/core/java/com/android/internal/content/PackageHelper.java b/core/java/com/android/internal/content/PackageHelper.java index 266728b93e60..61866e5fb7de 100644 --- a/core/java/com/android/internal/content/PackageHelper.java +++ b/core/java/com/android/internal/content/PackageHelper.java @@ -16,15 +16,24 @@ package com.android.internal.content; -import android.os.storage.IMountService; - +import android.os.FileUtils; import android.os.IBinder; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.storage.IMountService; import android.os.storage.StorageResultCode; import android.util.Log; import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Collections; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; +import java.util.zip.ZipOutputStream; + +import libcore.io.IoUtils; /** * Constants used internally between the PackageManager @@ -196,4 +205,64 @@ public class PackageHelper { } return false; } + + public static void extractPublicFiles(String packagePath, File publicZipFile) + throws IOException { + final FileOutputStream fstr = new FileOutputStream(publicZipFile); + final ZipOutputStream publicZipOutStream = new ZipOutputStream(fstr); + try { + final ZipFile privateZip = new ZipFile(packagePath); + try { + // Copy manifest, resources.arsc and res directory to public zip + for (final ZipEntry zipEntry : Collections.list(privateZip.entries())) { + final String zipEntryName = zipEntry.getName(); + if ("AndroidManifest.xml".equals(zipEntryName) + || "resources.arsc".equals(zipEntryName) + || zipEntryName.startsWith("res/")) { + copyZipEntry(zipEntry, privateZip, publicZipOutStream); + } + } + } finally { + try { + privateZip.close(); + } catch (IOException e) { + } + } + + publicZipOutStream.finish(); + publicZipOutStream.flush(); + FileUtils.sync(fstr); + publicZipOutStream.close(); + FileUtils.setPermissions(publicZipFile.getAbsolutePath(), FileUtils.S_IRUSR + | FileUtils.S_IWUSR | FileUtils.S_IRGRP | FileUtils.S_IROTH, -1, -1); + } finally { + IoUtils.closeQuietly(publicZipOutStream); + } + } + + private static void copyZipEntry(ZipEntry zipEntry, ZipFile inZipFile, + ZipOutputStream outZipStream) throws IOException { + byte[] buffer = new byte[4096]; + int num; + + ZipEntry newEntry; + if (zipEntry.getMethod() == ZipEntry.STORED) { + // Preserve the STORED method of the input entry. + newEntry = new ZipEntry(zipEntry); + } else { + // Create a new entry so that the compressed len is recomputed. + newEntry = new ZipEntry(zipEntry.getName()); + } + outZipStream.putNextEntry(newEntry); + + final InputStream data = inZipFile.getInputStream(zipEntry); + try { + while ((num = data.read(buffer)) > 0) { + outZipStream.write(buffer, 0, num); + } + outZipStream.flush(); + } finally { + IoUtils.closeQuietly(data); + } + } } diff --git a/core/java/com/android/internal/content/PackageMonitor.java b/core/java/com/android/internal/content/PackageMonitor.java index 32d86413e49a..f41fcc606344 100644 --- a/core/java/com/android/internal/content/PackageMonitor.java +++ b/core/java/com/android/internal/content/PackageMonitor.java @@ -21,6 +21,9 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.net.Uri; +import android.os.Handler; +import android.os.HandlerThread; +import android.os.Looper; import java.util.HashSet; @@ -32,7 +35,11 @@ public abstract class PackageMonitor extends android.content.BroadcastReceiver { static final IntentFilter sPackageFilt = new IntentFilter(); static final IntentFilter sNonDataFilt = new IntentFilter(); static final IntentFilter sExternalFilt = new IntentFilter(); - + + static final Object sLock = new Object(); + static HandlerThread sBackgroundThread; + static Handler sBackgroundHandler; + static { sPackageFilt.addAction(Intent.ACTION_PACKAGE_ADDED); sPackageFilt.addAction(Intent.ACTION_PACKAGE_REMOVED); @@ -49,6 +56,7 @@ public abstract class PackageMonitor extends android.content.BroadcastReceiver { final HashSet<String> mUpdatingPackages = new HashSet<String>(); Context mRegisteredContext; + Handler mRegisteredHandler; String[] mDisappearingPackages; String[] mAppearingPackages; String[] mModifiedPackages; @@ -57,18 +65,35 @@ public abstract class PackageMonitor extends android.content.BroadcastReceiver { String[] mTempArray = new String[1]; - public void register(Context context, boolean externalStorage) { + public void register(Context context, Looper thread, boolean externalStorage) { if (mRegisteredContext != null) { throw new IllegalStateException("Already registered"); } mRegisteredContext = context; - context.registerReceiver(this, sPackageFilt); - context.registerReceiver(this, sNonDataFilt); + if (thread == null) { + synchronized (sLock) { + if (sBackgroundThread == null) { + sBackgroundThread = new HandlerThread("PackageMonitor", + android.os.Process.THREAD_PRIORITY_BACKGROUND); + sBackgroundThread.start(); + sBackgroundHandler = new Handler(sBackgroundThread.getLooper()); + } + mRegisteredHandler = sBackgroundHandler; + } + } else { + mRegisteredHandler = new Handler(thread); + } + context.registerReceiver(this, sPackageFilt, null, mRegisteredHandler); + context.registerReceiver(this, sNonDataFilt, null, mRegisteredHandler); if (externalStorage) { - context.registerReceiver(this, sExternalFilt); + context.registerReceiver(this, sExternalFilt, null, mRegisteredHandler); } } - + + public Handler getRegisteredHandler() { + return mRegisteredHandler; + } + public void unregister() { if (mRegisteredContext == null) { throw new IllegalStateException("Not registered"); diff --git a/core/java/com/android/internal/view/ActionBarPolicy.java b/core/java/com/android/internal/view/ActionBarPolicy.java new file mode 100644 index 000000000000..0c6b7800f45c --- /dev/null +++ b/core/java/com/android/internal/view/ActionBarPolicy.java @@ -0,0 +1,90 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.internal.view; + +import com.android.internal.R; + +import android.content.Context; +import android.content.res.Resources; +import android.content.res.TypedArray; +import android.os.Build; +import android.view.ViewConfiguration; + +/** + * Allows components to query for various configuration policy decisions + * about how the action bar should lay out and behave on the current device. + */ +public class ActionBarPolicy { + private Context mContext; + + public static ActionBarPolicy get(Context context) { + return new ActionBarPolicy(context); + } + + private ActionBarPolicy(Context context) { + mContext = context; + } + + public int getMaxActionButtons() { + return mContext.getResources().getInteger(R.integer.max_action_buttons); + } + + public boolean showsOverflowMenuButton() { + return !ViewConfiguration.get(mContext).hasPermanentMenuKey(); + } + + public int getEmbeddedMenuWidthLimit() { + return mContext.getResources().getDisplayMetrics().widthPixels / 2; + } + + public boolean hasEmbeddedTabs() { + final int targetSdk = mContext.getApplicationInfo().targetSdkVersion; + if (targetSdk >= Build.VERSION_CODES.JELLY_BEAN) { + return mContext.getResources().getBoolean(R.bool.action_bar_embed_tabs); + } + + // The embedded tabs policy changed in Jellybean; give older apps the old policy + // so they get what they expect. + return mContext.getResources().getBoolean(R.bool.action_bar_embed_tabs_pre_jb); + } + + public int getTabContainerHeight() { + TypedArray a = mContext.obtainStyledAttributes(null, R.styleable.ActionBar, + com.android.internal.R.attr.actionBarStyle, 0); + int height = a.getLayoutDimension(R.styleable.ActionBar_height, 0); + Resources r = mContext.getResources(); + if (!hasEmbeddedTabs()) { + // Stacked tabs; limit the height + height = Math.min(height, + r.getDimensionPixelSize(R.dimen.action_bar_stacked_max_height)); + } + a.recycle(); + return height; + } + + public boolean enableHomeButtonByDefault() { + // Older apps get the home button interaction enabled by default. + // Newer apps need to enable it explicitly. + return mContext.getApplicationInfo().targetSdkVersion < + Build.VERSION_CODES.ICE_CREAM_SANDWICH; + } + + public int getStackedTabMaxWidth() { + return mContext.getResources().getDimensionPixelSize( + R.dimen.action_bar_stacked_tab_max_width); + } +} diff --git a/core/java/com/android/internal/view/menu/ActionMenuPresenter.java b/core/java/com/android/internal/view/menu/ActionMenuPresenter.java index dca45a9a9b64..73324c026451 100644 --- a/core/java/com/android/internal/view/menu/ActionMenuPresenter.java +++ b/core/java/com/android/internal/view/menu/ActionMenuPresenter.java @@ -16,6 +16,7 @@ package com.android.internal.view.menu; +import com.android.internal.view.ActionBarPolicy; import com.android.internal.view.menu.ActionMenuView.ActionMenuChildView; import android.content.Context; @@ -29,7 +30,6 @@ import android.view.MenuItem; import android.view.SoundEffectConstants; import android.view.View; import android.view.View.MeasureSpec; -import android.view.ViewConfiguration; import android.view.ViewGroup; import android.widget.ImageButton; @@ -79,17 +79,18 @@ public class ActionMenuPresenter extends BaseMenuPresenter final Resources res = context.getResources(); + final ActionBarPolicy abp = ActionBarPolicy.get(context); if (!mReserveOverflowSet) { - mReserveOverflow = !ViewConfiguration.get(context).hasPermanentMenuKey(); + mReserveOverflow = abp.showsOverflowMenuButton(); } if (!mWidthLimitSet) { - mWidthLimit = res.getDisplayMetrics().widthPixels / 2; + mWidthLimit = abp.getEmbeddedMenuWidthLimit(); } // Measure for initial configuration if (!mMaxItemsSet) { - mMaxItems = res.getInteger(com.android.internal.R.integer.max_action_buttons); + mMaxItems = abp.getMaxActionButtons(); } int width = mWidthLimit; diff --git a/core/java/com/android/internal/widget/AbsActionBarView.java b/core/java/com/android/internal/widget/AbsActionBarView.java index 06f5158f43e4..25a9c54b88ff 100644 --- a/core/java/com/android/internal/widget/AbsActionBarView.java +++ b/core/java/com/android/internal/widget/AbsActionBarView.java @@ -161,10 +161,12 @@ public abstract class AbsActionBarView extends ViewGroup { @Override public void setVisibility(int visibility) { - if (mVisibilityAnim != null) { - mVisibilityAnim.end(); + if (visibility != getVisibility()) { + if (mVisibilityAnim != null) { + mVisibilityAnim.end(); + } + super.setVisibility(visibility); } - super.setVisibility(visibility); } public boolean showOverflowMenu() { diff --git a/core/java/com/android/internal/widget/ScrollingTabContainerView.java b/core/java/com/android/internal/widget/ScrollingTabContainerView.java index 1767d6841530..83ac89689942 100644 --- a/core/java/com/android/internal/widget/ScrollingTabContainerView.java +++ b/core/java/com/android/internal/widget/ScrollingTabContainerView.java @@ -15,7 +15,7 @@ */ package com.android.internal.widget; -import com.android.internal.R; +import com.android.internal.view.ActionBarPolicy; import android.animation.Animator; import android.animation.ObjectAnimator; @@ -23,7 +23,6 @@ import android.animation.TimeInterpolator; import android.app.ActionBar; import android.content.Context; import android.content.res.Configuration; -import android.content.res.TypedArray; import android.graphics.drawable.Drawable; import android.text.TextUtils.TruncateAt; import android.view.Gravity; @@ -55,6 +54,7 @@ public class ScrollingTabContainerView extends HorizontalScrollView private boolean mAllowCollapse; int mMaxTabWidth; + int mStackedTabMaxWidth; private int mContentHeight; private int mSelectedTabIndex; @@ -69,10 +69,9 @@ public class ScrollingTabContainerView extends HorizontalScrollView super(context); setHorizontalScrollBarEnabled(false); - TypedArray a = getContext().obtainStyledAttributes(null, R.styleable.ActionBar, - com.android.internal.R.attr.actionBarStyle, 0); - setContentHeight(a.getLayoutDimension(R.styleable.ActionBar_height, 0)); - a.recycle(); + ActionBarPolicy abp = ActionBarPolicy.get(context); + setContentHeight(abp.getTabContainerHeight()); + mStackedTabMaxWidth = abp.getStackedTabMaxWidth(); mTabLayout = createTabLayout(); addView(mTabLayout, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, @@ -93,6 +92,7 @@ public class ScrollingTabContainerView extends HorizontalScrollView } else { mMaxTabWidth = MeasureSpec.getSize(widthMeasureSpec) / 2; } + mMaxTabWidth = Math.min(mMaxTabWidth, mStackedTabMaxWidth); } else { mMaxTabWidth = -1; } @@ -187,6 +187,7 @@ public class ScrollingTabContainerView extends HorizontalScrollView final LinearLayout tabLayout = new LinearLayout(getContext(), null, com.android.internal.R.attr.actionBarTabBarStyle); tabLayout.setMeasureWithLargestChildEnabled(true); + tabLayout.setGravity(Gravity.CENTER); tabLayout.setLayoutParams(new LinearLayout.LayoutParams( LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.MATCH_PARENT)); return tabLayout; @@ -205,12 +206,11 @@ public class ScrollingTabContainerView extends HorizontalScrollView protected void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); + ActionBarPolicy abp = ActionBarPolicy.get(getContext()); // Action bar can change size on configuration changes. // Reread the desired height from the theme-specified style. - TypedArray a = getContext().obtainStyledAttributes(null, R.styleable.ActionBar, - com.android.internal.R.attr.actionBarStyle, 0); - setContentHeight(a.getLayoutDimension(R.styleable.ActionBar_height, 0)); - a.recycle(); + setContentHeight(abp.getTabContainerHeight()); + mStackedTabMaxWidth = abp.getStackedTabMaxWidth(); } public void animateToVisibility(int visibility) { diff --git a/core/java/com/android/internal/widget/SizeAdaptiveLayout.java b/core/java/com/android/internal/widget/SizeAdaptiveLayout.java index adfd3dcbd365..0a99f174fdc3 100644 --- a/core/java/com/android/internal/widget/SizeAdaptiveLayout.java +++ b/core/java/com/android/internal/widget/SizeAdaptiveLayout.java @@ -26,8 +26,11 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; +import android.graphics.drawable.Drawable; +import android.graphics.drawable.StateListDrawable; import android.util.AttributeSet; import android.util.Log; +import android.util.StateSet; import android.view.View; import android.view.ViewDebug; import android.view.ViewGroup; @@ -90,8 +93,14 @@ public class SizeAdaptiveLayout extends ViewGroup { private void initialize() { mModestyPanel = new View(getContext()); // If the SizeAdaptiveLayout has a solid background, use it as a transition hint. - if (getBackground() instanceof ColorDrawable) { - mModestyPanel.setBackgroundDrawable(getBackground()); + Drawable background = getBackground(); + if (background instanceof StateListDrawable) { + StateListDrawable sld = (StateListDrawable) background; + sld.setState(StateSet.WILD_CARD); + background = sld.getCurrent(); + } + if (background instanceof ColorDrawable) { + mModestyPanel.setBackgroundDrawable(background); } else { mModestyPanel.setBackgroundColor(Color.BLACK); } diff --git a/core/jni/android_database_SQLiteConnection.cpp b/core/jni/android_database_SQLiteConnection.cpp index fca5f20dddce..0777ea2b1859 100644 --- a/core/jni/android_database_SQLiteConnection.cpp +++ b/core/jni/android_database_SQLiteConnection.cpp @@ -120,6 +120,13 @@ static jint nativeOpen(JNIEnv* env, jclass clazz, jstring pathStr, jint openFlag return 0; } + // Check that the database is really read/write when that is what we asked for. + if ((sqliteFlags & SQLITE_OPEN_READWRITE) && sqlite3_db_readonly(db, NULL)) { + throw_sqlite3_exception(env, db, "Could not open the database in read/write mode."); + sqlite3_close(db); + return 0; + } + // Set the default busy handler to retry for 1000ms and then return SQLITE_BUSY err = sqlite3_busy_timeout(db, 1000 /* ms */); if (err != SQLITE_OK) { diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp index 2fe0b9e4625e..0f04e6fd45e6 100644 --- a/core/jni/android_media_AudioRecord.cpp +++ b/core/jni/android_media_AudioRecord.cpp @@ -28,6 +28,8 @@ #include <android_runtime/AndroidRuntime.h> #include <utils/Log.h> +#include <utils/SortedVector.h> +#include <utils/threads.h> #include <media/AudioRecord.h> #include <media/mediarecorder.h> @@ -55,9 +57,12 @@ static fields_t javaAudioRecordFields; struct audiorecord_callback_cookie { jclass audioRecord_class; jobject audioRecord_ref; - }; + bool busy; + Condition cond; +}; -Mutex sLock; +static Mutex sLock; +static SortedVector <audiorecord_callback_cookie *> sAudioRecordCallBackCookies; // ---------------------------------------------------------------------------- @@ -87,13 +92,21 @@ jint android_media_translateRecorderErrorCode(int code) { // ---------------------------------------------------------------------------- static void recorderCallback(int event, void* user, void *info) { + + audiorecord_callback_cookie *callbackInfo = (audiorecord_callback_cookie *)user; + { + Mutex::Autolock l(sLock); + if (sAudioRecordCallBackCookies.indexOf(callbackInfo) < 0) { + return; + } + callbackInfo->busy = true; + } if (event == AudioRecord::EVENT_MORE_DATA) { // set size to 0 to signal we're not using the callback to read more data AudioRecord::Buffer* pBuff = (AudioRecord::Buffer*)info; pBuff->size = 0; } else if (event == AudioRecord::EVENT_MARKER) { - audiorecord_callback_cookie *callbackInfo = (audiorecord_callback_cookie *)user; JNIEnv *env = AndroidRuntime::getJNIEnv(); if (user && env) { env->CallStaticVoidMethod( @@ -107,7 +120,6 @@ static void recorderCallback(int event, void* user, void *info) { } } else if (event == AudioRecord::EVENT_NEW_POS) { - audiorecord_callback_cookie *callbackInfo = (audiorecord_callback_cookie *)user; JNIEnv *env = AndroidRuntime::getJNIEnv(); if (user && env) { env->CallStaticVoidMethod( @@ -120,8 +132,36 @@ static void recorderCallback(int event, void* user, void *info) { } } } + { + Mutex::Autolock l(sLock); + callbackInfo->busy = false; + callbackInfo->cond.broadcast(); + } } +// ---------------------------------------------------------------------------- +static sp<AudioRecord> getAudioRecord(JNIEnv* env, jobject thiz) +{ + Mutex::Autolock l(sLock); + AudioRecord* const ar = + (AudioRecord*)env->GetIntField(thiz, javaAudioRecordFields.nativeRecorderInJavaObj); + return sp<AudioRecord>(ar); +} + +static sp<AudioRecord> setAudioRecord(JNIEnv* env, jobject thiz, const sp<AudioRecord>& ar) +{ + Mutex::Autolock l(sLock); + sp<AudioRecord> old = + (AudioRecord*)env->GetIntField(thiz, javaAudioRecordFields.nativeRecorderInJavaObj); + if (ar.get()) { + ar->incStrong(thiz); + } + if (old != 0) { + old->decStrong(thiz); + } + env->SetIntField(thiz, javaAudioRecordFields.nativeRecorderInJavaObj, (int)ar.get()); + return old; +} // ---------------------------------------------------------------------------- static int @@ -162,6 +202,12 @@ android_media_AudioRecord_setup(JNIEnv *env, jobject thiz, jobject weak_this, return AUDIORECORD_ERROR_SETUP_INVALIDSOURCE; } + jclass clazz = env->GetObjectClass(thiz); + if (clazz == NULL) { + ALOGE("Can't find %s when setting up callback.", kClassPathName); + return AUDIORECORD_ERROR_SETUP_NATIVEINITFAILED; + } + if (jSession == NULL) { ALOGE("Error creating AudioRecord: invalid session ID pointer"); return AUDIORECORD_ERROR; @@ -176,27 +222,20 @@ android_media_AudioRecord_setup(JNIEnv *env, jobject thiz, jobject weak_this, env->ReleasePrimitiveArrayCritical(jSession, nSession, 0); nSession = NULL; - audiorecord_callback_cookie *lpCallbackData = NULL; - AudioRecord* lpRecorder = NULL; - // create an uninitialized AudioRecord object - lpRecorder = new AudioRecord(); - if (lpRecorder == NULL) { + sp<AudioRecord> lpRecorder = new AudioRecord(); + if (lpRecorder == NULL) { ALOGE("Error creating AudioRecord instance."); return AUDIORECORD_ERROR_SETUP_NATIVEINITFAILED; } // create the callback information: // this data will be passed with every AudioRecord callback - jclass clazz = env->GetObjectClass(thiz); - if (clazz == NULL) { - ALOGE("Can't find %s when setting up callback.", kClassPathName); - goto native_track_failure; - } - lpCallbackData = new audiorecord_callback_cookie; + audiorecord_callback_cookie *lpCallbackData = new audiorecord_callback_cookie; lpCallbackData->audioRecord_class = (jclass)env->NewGlobalRef(clazz); // we use a weak reference so the AudioRecord object can be garbage collected. lpCallbackData->audioRecord_ref = env->NewGlobalRef(weak_this); + lpCallbackData->busy = false; lpRecorder->set((audio_source_t) source, sampleRateInHertz, @@ -225,9 +264,13 @@ android_media_AudioRecord_setup(JNIEnv *env, jobject thiz, jobject weak_this, env->ReleasePrimitiveArrayCritical(jSession, nSession, 0); nSession = NULL; + { // scope for the lock + Mutex::Autolock l(sLock); + sAudioRecordCallBackCookies.add(lpCallbackData); + } // save our newly created C++ AudioRecord in the "nativeRecorderInJavaObj" field // of the Java object - env->SetIntField(thiz, javaAudioRecordFields.nativeRecorderInJavaObj, (int)lpRecorder); + setAudioRecord(env, thiz, lpRecorder); // save our newly created callback information in the "nativeCallbackCookie" field // of the Java object (in mNativeCallbackCookie) so we can free the memory in finalize() @@ -240,11 +283,6 @@ native_init_failure: env->DeleteGlobalRef(lpCallbackData->audioRecord_class); env->DeleteGlobalRef(lpCallbackData->audioRecord_ref); delete lpCallbackData; - -native_track_failure: - delete lpRecorder; - - env->SetIntField(thiz, javaAudioRecordFields.nativeRecorderInJavaObj, 0); env->SetIntField(thiz, javaAudioRecordFields.nativeCallbackCookie, 0); return AUDIORECORD_ERROR_SETUP_NATIVEINITFAILED; @@ -256,8 +294,7 @@ native_track_failure: static int android_media_AudioRecord_start(JNIEnv *env, jobject thiz, jint event, jint triggerSession) { - AudioRecord *lpRecorder = - (AudioRecord *)env->GetIntField(thiz, javaAudioRecordFields.nativeRecorderInJavaObj); + sp<AudioRecord> lpRecorder = getAudioRecord(env, thiz); if (lpRecorder == NULL ) { jniThrowException(env, "java/lang/IllegalStateException", NULL); return AUDIORECORD_ERROR; @@ -272,8 +309,7 @@ android_media_AudioRecord_start(JNIEnv *env, jobject thiz, jint event, jint trig static void android_media_AudioRecord_stop(JNIEnv *env, jobject thiz) { - AudioRecord *lpRecorder = - (AudioRecord *)env->GetIntField(thiz, javaAudioRecordFields.nativeRecorderInJavaObj); + sp<AudioRecord> lpRecorder = getAudioRecord(env, thiz); if (lpRecorder == NULL ) { jniThrowException(env, "java/lang/IllegalStateException", NULL); return; @@ -285,30 +321,35 @@ android_media_AudioRecord_stop(JNIEnv *env, jobject thiz) // ---------------------------------------------------------------------------- + +#define CALLBACK_COND_WAIT_TIMEOUT_MS 1000 static void android_media_AudioRecord_release(JNIEnv *env, jobject thiz) { + sp<AudioRecord> lpRecorder = setAudioRecord(env, thiz, 0); + if (lpRecorder == NULL) { + return; + } + ALOGV("About to delete lpRecorder: %x\n", (int)lpRecorder.get()); + lpRecorder->stop(); - // serialize access. Ugly, but functional. - Mutex::Autolock lock(&sLock); - AudioRecord *lpRecorder = - (AudioRecord *)env->GetIntField(thiz, javaAudioRecordFields.nativeRecorderInJavaObj); audiorecord_callback_cookie *lpCookie = (audiorecord_callback_cookie *)env->GetIntField( thiz, javaAudioRecordFields.nativeCallbackCookie); // reset the native resources in the Java object so any attempt to access // them after a call to release fails. - env->SetIntField(thiz, javaAudioRecordFields.nativeRecorderInJavaObj, 0); env->SetIntField(thiz, javaAudioRecordFields.nativeCallbackCookie, 0); - // delete the AudioRecord object - if (lpRecorder) { - ALOGV("About to delete lpRecorder: %x\n", (int)lpRecorder); - lpRecorder->stop(); - delete lpRecorder; - } - // delete the callback information if (lpCookie) { + Mutex::Autolock l(sLock); ALOGV("deleting lpCookie: %x\n", (int)lpCookie); + while (lpCookie->busy) { + if (lpCookie->cond.waitRelative(sLock, + milliseconds(CALLBACK_COND_WAIT_TIMEOUT_MS)) != + NO_ERROR) { + break; + } + } + sAudioRecordCallBackCookies.remove(lpCookie); env->DeleteGlobalRef(lpCookie->audioRecord_class); env->DeleteGlobalRef(lpCookie->audioRecord_ref); delete lpCookie; @@ -327,11 +368,8 @@ static jint android_media_AudioRecord_readInByteArray(JNIEnv *env, jobject thiz jbyteArray javaAudioData, jint offsetInBytes, jint sizeInBytes) { jbyte* recordBuff = NULL; - AudioRecord *lpRecorder = NULL; - // get the audio recorder from which we'll read new audio samples - lpRecorder = - (AudioRecord *)env->GetIntField(thiz, javaAudioRecordFields.nativeRecorderInJavaObj); + sp<AudioRecord> lpRecorder = getAudioRecord(env, thiz); if (lpRecorder == NULL) { ALOGE("Unable to retrieve AudioRecord object, can't record"); return 0; @@ -378,12 +416,8 @@ static jint android_media_AudioRecord_readInShortArray(JNIEnv *env, jobject thi // ---------------------------------------------------------------------------- static jint android_media_AudioRecord_readInDirectBuffer(JNIEnv *env, jobject thiz, jobject jBuffer, jint sizeInBytes) { - AudioRecord *lpRecorder = NULL; - //ALOGV("Entering android_media_AudioRecord_readInBuffer"); - // get the audio recorder from which we'll read new audio samples - lpRecorder = - (AudioRecord *)env->GetIntField(thiz, javaAudioRecordFields.nativeRecorderInJavaObj); + sp<AudioRecord> lpRecorder = getAudioRecord(env, thiz); if (lpRecorder==NULL) return 0; @@ -411,35 +445,29 @@ static jint android_media_AudioRecord_readInDirectBuffer(JNIEnv *env, jobject t static jint android_media_AudioRecord_set_marker_pos(JNIEnv *env, jobject thiz, jint markerPos) { - AudioRecord *lpRecorder = (AudioRecord *)env->GetIntField( - thiz, javaAudioRecordFields.nativeRecorderInJavaObj); - - if (lpRecorder) { - return - android_media_translateRecorderErrorCode( lpRecorder->setMarkerPosition(markerPos) ); - } else { + sp<AudioRecord> lpRecorder = getAudioRecord(env, thiz); + if (lpRecorder == NULL) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioRecord pointer for setMarkerPosition()"); return AUDIORECORD_ERROR; } + return android_media_translateRecorderErrorCode( lpRecorder->setMarkerPosition(markerPos) ); } // ---------------------------------------------------------------------------- static jint android_media_AudioRecord_get_marker_pos(JNIEnv *env, jobject thiz) { - AudioRecord *lpRecorder = (AudioRecord *)env->GetIntField( - thiz, javaAudioRecordFields.nativeRecorderInJavaObj); + sp<AudioRecord> lpRecorder = getAudioRecord(env, thiz); uint32_t markerPos = 0; - if (lpRecorder) { - lpRecorder->getMarkerPosition(&markerPos); - return (jint)markerPos; - } else { + if (lpRecorder == NULL) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioRecord pointer for getMarkerPosition()"); return AUDIORECORD_ERROR; } + lpRecorder->getMarkerPosition(&markerPos); + return (jint)markerPos; } @@ -447,35 +475,30 @@ static jint android_media_AudioRecord_get_marker_pos(JNIEnv *env, jobject thiz) static jint android_media_AudioRecord_set_pos_update_period(JNIEnv *env, jobject thiz, jint period) { - AudioRecord *lpRecorder = (AudioRecord *)env->GetIntField( - thiz, javaAudioRecordFields.nativeRecorderInJavaObj); + sp<AudioRecord> lpRecorder = getAudioRecord(env, thiz); - if (lpRecorder) { - return - android_media_translateRecorderErrorCode( lpRecorder->setPositionUpdatePeriod(period) ); - } else { + if (lpRecorder == NULL) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioRecord pointer for setPositionUpdatePeriod()"); return AUDIORECORD_ERROR; } + return android_media_translateRecorderErrorCode( lpRecorder->setPositionUpdatePeriod(period) ); } // ---------------------------------------------------------------------------- static jint android_media_AudioRecord_get_pos_update_period(JNIEnv *env, jobject thiz) { - AudioRecord *lpRecorder = (AudioRecord *)env->GetIntField( - thiz, javaAudioRecordFields.nativeRecorderInJavaObj); + sp<AudioRecord> lpRecorder = getAudioRecord(env, thiz); uint32_t period = 0; - if (lpRecorder) { - lpRecorder->getPositionUpdatePeriod(&period); - return (jint)period; - } else { + if (lpRecorder == NULL) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioRecord pointer for getPositionUpdatePeriod()"); return AUDIORECORD_ERROR; } + lpRecorder->getPositionUpdatePeriod(&period); + return (jint)period; } @@ -486,7 +509,8 @@ static jint android_media_AudioRecord_get_pos_update_period(JNIEnv *env, jobjec static jint android_media_AudioRecord_get_min_buff_size(JNIEnv *env, jobject thiz, jint sampleRateInHertz, jint nbChannels, jint audioFormat) { - ALOGV(">> android_media_AudioRecord_get_min_buff_size(%d, %d, %d)", sampleRateInHertz, nbChannels, audioFormat); + ALOGV(">> android_media_AudioRecord_get_min_buff_size(%d, %d, %d)", + sampleRateInHertz, nbChannels, audioFormat); int frameCount = 0; status_t result = AudioRecord::getMinFrameCount(&frameCount, diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp index a46714e9b8bc..7e5263d036be 100644 --- a/core/jni/android_media_AudioTrack.cpp +++ b/core/jni/android_media_AudioTrack.cpp @@ -59,7 +59,9 @@ static fields_t javaAudioTrackFields; struct audiotrack_callback_cookie { jclass audioTrack_class; jobject audioTrack_ref; - }; + bool busy; + Condition cond; +}; // ---------------------------------------------------------------------------- class AudioTrackJniStorage { @@ -90,6 +92,9 @@ class AudioTrackJniStorage { } }; +static Mutex sLock; +static SortedVector <audiotrack_callback_cookie *> sAudioTrackCallBackCookies; + // ---------------------------------------------------------------------------- #define DEFAULT_OUTPUT_SAMPLE_RATE 44100 @@ -120,13 +125,22 @@ jint android_media_translateErrorCode(int code) { // ---------------------------------------------------------------------------- static void audioCallback(int event, void* user, void *info) { + + audiotrack_callback_cookie *callbackInfo = (audiotrack_callback_cookie *)user; + { + Mutex::Autolock l(sLock); + if (sAudioTrackCallBackCookies.indexOf(callbackInfo) < 0) { + return; + } + callbackInfo->busy = true; + } + if (event == AudioTrack::EVENT_MORE_DATA) { // set size to 0 to signal we're not using the callback to write more data AudioTrack::Buffer* pBuff = (AudioTrack::Buffer*)info; pBuff->size = 0; } else if (event == AudioTrack::EVENT_MARKER) { - audiotrack_callback_cookie *callbackInfo = (audiotrack_callback_cookie *)user; JNIEnv *env = AndroidRuntime::getJNIEnv(); if (user && env) { env->CallStaticVoidMethod( @@ -140,7 +154,6 @@ static void audioCallback(int event, void* user, void *info) { } } else if (event == AudioTrack::EVENT_NEW_POS) { - audiotrack_callback_cookie *callbackInfo = (audiotrack_callback_cookie *)user; JNIEnv *env = AndroidRuntime::getJNIEnv(); if (user && env) { env->CallStaticVoidMethod( @@ -153,10 +166,39 @@ static void audioCallback(int event, void* user, void *info) { } } } + { + Mutex::Autolock l(sLock); + callbackInfo->busy = false; + callbackInfo->cond.broadcast(); + } } // ---------------------------------------------------------------------------- +static sp<AudioTrack> getAudioTrack(JNIEnv* env, jobject thiz) +{ + Mutex::Autolock l(sLock); + AudioTrack* const at = + (AudioTrack*)env->GetIntField(thiz, javaAudioTrackFields.nativeTrackInJavaObj); + return sp<AudioTrack>(at); +} + +static sp<AudioTrack> setAudioTrack(JNIEnv* env, jobject thiz, const sp<AudioTrack>& at) +{ + Mutex::Autolock l(sLock); + sp<AudioTrack> old = + (AudioTrack*)env->GetIntField(thiz, javaAudioTrackFields.nativeTrackInJavaObj); + if (at.get()) { + at->incStrong(thiz); + } + if (old != 0) { + old->decStrong(thiz); + } + env->SetIntField(thiz, javaAudioTrackFields.nativeTrackInJavaObj, (int)at.get()); + return old; +} + +// ---------------------------------------------------------------------------- static int android_media_AudioTrack_native_setup(JNIEnv *env, jobject thiz, jobject weak_this, jint streamType, jint sampleRateInHertz, jint javaChannelMask, @@ -231,32 +273,20 @@ android_media_AudioTrack_native_setup(JNIEnv *env, jobject thiz, jobject weak_th AUDIO_FORMAT_PCM_16_BIT : AUDIO_FORMAT_PCM_8_BIT; int frameCount = buffSizeInBytes / (nbChannels * bytesPerSample); - AudioTrackJniStorage* lpJniStorage = new AudioTrackJniStorage(); - - // initialize the callback information: - // this data will be passed with every AudioTrack callback jclass clazz = env->GetObjectClass(thiz); if (clazz == NULL) { ALOGE("Can't find %s when setting up callback.", kClassPathName); - delete lpJniStorage; return AUDIOTRACK_ERROR_SETUP_NATIVEINITFAILED; } - lpJniStorage->mCallbackData.audioTrack_class = (jclass)env->NewGlobalRef(clazz); - // we use a weak reference so the AudioTrack object can be garbage collected. - lpJniStorage->mCallbackData.audioTrack_ref = env->NewGlobalRef(weak_this); - - lpJniStorage->mStreamType = atStreamType; if (jSession == NULL) { ALOGE("Error creating AudioTrack: invalid session ID pointer"); - delete lpJniStorage; return AUDIOTRACK_ERROR; } jint* nSession = (jint *) env->GetPrimitiveArrayCritical(jSession, NULL); if (nSession == NULL) { ALOGE("Error creating AudioTrack: Error retrieving session id pointer"); - delete lpJniStorage; return AUDIOTRACK_ERROR; } int sessionId = nSession[0]; @@ -264,12 +294,21 @@ android_media_AudioTrack_native_setup(JNIEnv *env, jobject thiz, jobject weak_th nSession = NULL; // create the native AudioTrack object - AudioTrack* lpTrack = new AudioTrack(); + sp<AudioTrack> lpTrack = new AudioTrack(); if (lpTrack == NULL) { ALOGE("Error creating uninitialized AudioTrack"); - goto native_track_failure; + return AUDIOTRACK_ERROR_SETUP_NATIVEINITFAILED; } + // initialize the callback information: + // this data will be passed with every AudioTrack callback + AudioTrackJniStorage* lpJniStorage = new AudioTrackJniStorage(); + lpJniStorage->mStreamType = atStreamType; + lpJniStorage->mCallbackData.audioTrack_class = (jclass)env->NewGlobalRef(clazz); + // we use a weak reference so the AudioTrack object can be garbage collected. + lpJniStorage->mCallbackData.audioTrack_ref = env->NewGlobalRef(weak_this); + lpJniStorage->mCallbackData.busy = false; + // initialize the native AudioTrack object if (memoryMode == javaAudioTrackFields.MODE_STREAM) { @@ -323,9 +362,13 @@ android_media_AudioTrack_native_setup(JNIEnv *env, jobject thiz, jobject weak_th env->ReleasePrimitiveArrayCritical(jSession, nSession, 0); nSession = NULL; + { // scope for the lock + Mutex::Autolock l(sLock); + sAudioTrackCallBackCookies.add(&lpJniStorage->mCallbackData); + } // save our newly created C++ AudioTrack in the "nativeTrackInJavaObj" field // of the Java object (in mNativeTrackInJavaObj) - env->SetIntField(thiz, javaAudioTrackFields.nativeTrackInJavaObj, (int)lpTrack); + setAudioTrack(env, thiz, lpTrack); // save the JNI resources so we can free them later //ALOGV("storing lpJniStorage: %x\n", (int)lpJniStorage); @@ -335,10 +378,6 @@ android_media_AudioTrack_native_setup(JNIEnv *env, jobject thiz, jobject weak_th // failures: native_init_failure: - delete lpTrack; - env->SetIntField(thiz, javaAudioTrackFields.nativeTrackInJavaObj, 0); - -native_track_failure: if (nSession != NULL) { env->ReleasePrimitiveArrayCritical(jSession, nSession, 0); } @@ -346,8 +385,8 @@ native_track_failure: env->DeleteGlobalRef(lpJniStorage->mCallbackData.audioTrack_ref); delete lpJniStorage; env->SetIntField(thiz, javaAudioTrackFields.jniData, 0); - return AUDIOTRACK_ERROR_SETUP_NATIVEINITFAILED; + return AUDIOTRACK_ERROR_SETUP_NATIVEINITFAILED; } @@ -355,9 +394,8 @@ native_track_failure: static void android_media_AudioTrack_start(JNIEnv *env, jobject thiz) { - AudioTrack *lpTrack = (AudioTrack *)env->GetIntField( - thiz, javaAudioTrackFields.nativeTrackInJavaObj); - if (lpTrack == NULL ) { + sp<AudioTrack> lpTrack = getAudioTrack(env, thiz); + if (lpTrack == NULL) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioTrack pointer for start()"); return; @@ -371,9 +409,8 @@ android_media_AudioTrack_start(JNIEnv *env, jobject thiz) static void android_media_AudioTrack_stop(JNIEnv *env, jobject thiz) { - AudioTrack *lpTrack = (AudioTrack *)env->GetIntField( - thiz, javaAudioTrackFields.nativeTrackInJavaObj); - if (lpTrack == NULL ) { + sp<AudioTrack> lpTrack = getAudioTrack(env, thiz); + if (lpTrack == NULL) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioTrack pointer for stop()"); return; @@ -387,9 +424,8 @@ android_media_AudioTrack_stop(JNIEnv *env, jobject thiz) static void android_media_AudioTrack_pause(JNIEnv *env, jobject thiz) { - AudioTrack *lpTrack = (AudioTrack *)env->GetIntField( - thiz, javaAudioTrackFields.nativeTrackInJavaObj); - if (lpTrack == NULL ) { + sp<AudioTrack> lpTrack = getAudioTrack(env, thiz); + if (lpTrack == NULL) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioTrack pointer for pause()"); return; @@ -403,9 +439,8 @@ android_media_AudioTrack_pause(JNIEnv *env, jobject thiz) static void android_media_AudioTrack_flush(JNIEnv *env, jobject thiz) { - AudioTrack *lpTrack = (AudioTrack *)env->GetIntField( - thiz, javaAudioTrackFields.nativeTrackInJavaObj); - if (lpTrack == NULL ) { + sp<AudioTrack> lpTrack = getAudioTrack(env, thiz); + if (lpTrack == NULL) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioTrack pointer for flush()"); return; @@ -418,9 +453,8 @@ android_media_AudioTrack_flush(JNIEnv *env, jobject thiz) static void android_media_AudioTrack_set_volume(JNIEnv *env, jobject thiz, jfloat leftVol, jfloat rightVol ) { - AudioTrack *lpTrack = (AudioTrack *)env->GetIntField( - thiz, javaAudioTrackFields.nativeTrackInJavaObj); - if (lpTrack == NULL ) { + sp<AudioTrack> lpTrack = getAudioTrack(env, thiz); + if (lpTrack == NULL) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioTrack pointer for setVolume()"); return; @@ -430,68 +464,75 @@ android_media_AudioTrack_set_volume(JNIEnv *env, jobject thiz, jfloat leftVol, j } // ---------------------------------------------------------------------------- -static void android_media_AudioTrack_native_finalize(JNIEnv *env, jobject thiz) { - //ALOGV("android_media_AudioTrack_native_finalize jobject: %x\n", (int)thiz); - // delete the AudioTrack object - AudioTrack *lpTrack = (AudioTrack *)env->GetIntField( - thiz, javaAudioTrackFields.nativeTrackInJavaObj); - if (lpTrack) { - //ALOGV("deleting lpTrack: %x\n", (int)lpTrack); - lpTrack->stop(); - delete lpTrack; +#define CALLBACK_COND_WAIT_TIMEOUT_MS 1000 +static void android_media_AudioTrack_native_release(JNIEnv *env, jobject thiz) { + sp<AudioTrack> lpTrack = setAudioTrack(env, thiz, 0); + if (lpTrack == NULL) { + return; } + //ALOGV("deleting lpTrack: %x\n", (int)lpTrack); + lpTrack->stop(); // delete the JNI data AudioTrackJniStorage* pJniStorage = (AudioTrackJniStorage *)env->GetIntField( thiz, javaAudioTrackFields.jniData); + // reset the native resources in the Java object so any attempt to access + // them after a call to release fails. + env->SetIntField(thiz, javaAudioTrackFields.jniData, 0); + if (pJniStorage) { - // delete global refs created in native_setup - env->DeleteGlobalRef(pJniStorage->mCallbackData.audioTrack_class); - env->DeleteGlobalRef(pJniStorage->mCallbackData.audioTrack_ref); + Mutex::Autolock l(sLock); + audiotrack_callback_cookie *lpCookie = &pJniStorage->mCallbackData; //ALOGV("deleting pJniStorage: %x\n", (int)pJniStorage); + while (lpCookie->busy) { + if (lpCookie->cond.waitRelative(sLock, + milliseconds(CALLBACK_COND_WAIT_TIMEOUT_MS)) != + NO_ERROR) { + break; + } + } + sAudioTrackCallBackCookies.remove(lpCookie); + // delete global refs created in native_setup + env->DeleteGlobalRef(lpCookie->audioTrack_class); + env->DeleteGlobalRef(lpCookie->audioTrack_ref); delete pJniStorage; } } -// ---------------------------------------------------------------------------- -static void android_media_AudioTrack_native_release(JNIEnv *env, jobject thiz) { - // do everything a call to finalize would - android_media_AudioTrack_native_finalize(env, thiz); - // + reset the native resources in the Java object so any attempt to access - // them after a call to release fails. - env->SetIntField(thiz, javaAudioTrackFields.nativeTrackInJavaObj, 0); - env->SetIntField(thiz, javaAudioTrackFields.jniData, 0); +// ---------------------------------------------------------------------------- +static void android_media_AudioTrack_native_finalize(JNIEnv *env, jobject thiz) { + //ALOGV("android_media_AudioTrack_native_finalize jobject: %x\n", (int)thiz); + android_media_AudioTrack_native_release(env, thiz); } - // ---------------------------------------------------------------------------- -jint writeToTrack(AudioTrack* pTrack, jint audioFormat, jbyte* data, +jint writeToTrack(const sp<AudioTrack>& track, jint audioFormat, jbyte* data, jint offsetInBytes, jint sizeInBytes) { // give the data to the native AudioTrack object (the data starts at the offset) ssize_t written = 0; // regular write() or copy the data to the AudioTrack's shared memory? - if (pTrack->sharedBuffer() == 0) { - written = pTrack->write(data + offsetInBytes, sizeInBytes); + if (track->sharedBuffer() == 0) { + written = track->write(data + offsetInBytes, sizeInBytes); } else { if (audioFormat == javaAudioTrackFields.PCM16) { // writing to shared memory, check for capacity - if ((size_t)sizeInBytes > pTrack->sharedBuffer()->size()) { - sizeInBytes = pTrack->sharedBuffer()->size(); + if ((size_t)sizeInBytes > track->sharedBuffer()->size()) { + sizeInBytes = track->sharedBuffer()->size(); } - memcpy(pTrack->sharedBuffer()->pointer(), data + offsetInBytes, sizeInBytes); + memcpy(track->sharedBuffer()->pointer(), data + offsetInBytes, sizeInBytes); written = sizeInBytes; } else if (audioFormat == javaAudioTrackFields.PCM8) { // data contains 8bit data we need to expand to 16bit before copying // to the shared memory // writing to shared memory, check for capacity, // note that input data will occupy 2X the input space due to 8 to 16bit conversion - if (((size_t)sizeInBytes)*2 > pTrack->sharedBuffer()->size()) { - sizeInBytes = pTrack->sharedBuffer()->size() / 2; + if (((size_t)sizeInBytes)*2 > track->sharedBuffer()->size()) { + sizeInBytes = track->sharedBuffer()->size() / 2; } int count = sizeInBytes; - int16_t *dst = (int16_t *)pTrack->sharedBuffer()->pointer(); + int16_t *dst = (int16_t *)track->sharedBuffer()->pointer(); const int8_t *src = (const int8_t *)(data + offsetInBytes); while (count--) { *dst++ = (int16_t)(*src++^0x80) << 8; @@ -510,13 +551,9 @@ static jint android_media_AudioTrack_native_write_byte(JNIEnv *env, jobject thi jbyteArray javaAudioData, jint offsetInBytes, jint sizeInBytes, jint javaAudioFormat) { - jbyte* cAudioData = NULL; - AudioTrack *lpTrack = NULL; //ALOGV("android_media_AudioTrack_native_write_byte(offset=%d, sizeInBytes=%d) called", // offsetInBytes, sizeInBytes); - - // get the audio track to load with samples - lpTrack = (AudioTrack *)env->GetIntField(thiz, javaAudioTrackFields.nativeTrackInJavaObj); + sp<AudioTrack> lpTrack = getAudioTrack(env, thiz); if (lpTrack == NULL) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioTrack pointer for write()"); @@ -528,6 +565,7 @@ static jint android_media_AudioTrack_native_write_byte(JNIEnv *env, jobject thi // a way that it becomes much more efficient. When doing so, we will have to prevent the // AudioSystem callback to be called while in critical section (in case of media server // process crash for instance) + jbyte* cAudioData = NULL; if (javaAudioData) { cAudioData = (jbyte *)env->GetByteArrayElements(javaAudioData, NULL); if (cAudioData == NULL) { @@ -564,183 +602,148 @@ static jint android_media_AudioTrack_native_write_short(JNIEnv *env, jobject th // ---------------------------------------------------------------------------- static jint android_media_AudioTrack_get_native_frame_count(JNIEnv *env, jobject thiz) { - AudioTrack *lpTrack = (AudioTrack *)env->GetIntField( - thiz, javaAudioTrackFields.nativeTrackInJavaObj); - - if (lpTrack) { - return lpTrack->frameCount(); - } else { + sp<AudioTrack> lpTrack = getAudioTrack(env, thiz); + if (lpTrack == NULL) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioTrack pointer for frameCount()"); return AUDIOTRACK_ERROR; } + + return lpTrack->frameCount(); } // ---------------------------------------------------------------------------- static jint android_media_AudioTrack_set_playback_rate(JNIEnv *env, jobject thiz, jint sampleRateInHz) { - AudioTrack *lpTrack = (AudioTrack *)env->GetIntField( - thiz, javaAudioTrackFields.nativeTrackInJavaObj); - - if (lpTrack) { - return android_media_translateErrorCode(lpTrack->setSampleRate(sampleRateInHz)); - } else { + sp<AudioTrack> lpTrack = getAudioTrack(env, thiz); + if (lpTrack == NULL) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioTrack pointer for setSampleRate()"); return AUDIOTRACK_ERROR; } + return android_media_translateErrorCode(lpTrack->setSampleRate(sampleRateInHz)); } // ---------------------------------------------------------------------------- static jint android_media_AudioTrack_get_playback_rate(JNIEnv *env, jobject thiz) { - AudioTrack *lpTrack = (AudioTrack *)env->GetIntField( - thiz, javaAudioTrackFields.nativeTrackInJavaObj); - - if (lpTrack) { - return (jint) lpTrack->getSampleRate(); - } else { + sp<AudioTrack> lpTrack = getAudioTrack(env, thiz); + if (lpTrack == NULL) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioTrack pointer for getSampleRate()"); return AUDIOTRACK_ERROR; } + return (jint) lpTrack->getSampleRate(); } // ---------------------------------------------------------------------------- static jint android_media_AudioTrack_set_marker_pos(JNIEnv *env, jobject thiz, jint markerPos) { - - AudioTrack *lpTrack = (AudioTrack *)env->GetIntField( - thiz, javaAudioTrackFields.nativeTrackInJavaObj); - - if (lpTrack) { - return android_media_translateErrorCode( lpTrack->setMarkerPosition(markerPos) ); - } else { + sp<AudioTrack> lpTrack = getAudioTrack(env, thiz); + if (lpTrack == NULL) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioTrack pointer for setMarkerPosition()"); return AUDIOTRACK_ERROR; } + return android_media_translateErrorCode( lpTrack->setMarkerPosition(markerPos) ); } // ---------------------------------------------------------------------------- static jint android_media_AudioTrack_get_marker_pos(JNIEnv *env, jobject thiz) { - - AudioTrack *lpTrack = (AudioTrack *)env->GetIntField( - thiz, javaAudioTrackFields.nativeTrackInJavaObj); + sp<AudioTrack> lpTrack = getAudioTrack(env, thiz); uint32_t markerPos = 0; - if (lpTrack) { - lpTrack->getMarkerPosition(&markerPos); - return (jint)markerPos; - } else { + if (lpTrack == NULL) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioTrack pointer for getMarkerPosition()"); return AUDIOTRACK_ERROR; } + lpTrack->getMarkerPosition(&markerPos); + return (jint)markerPos; } // ---------------------------------------------------------------------------- static jint android_media_AudioTrack_set_pos_update_period(JNIEnv *env, jobject thiz, jint period) { - - AudioTrack *lpTrack = (AudioTrack *)env->GetIntField( - thiz, javaAudioTrackFields.nativeTrackInJavaObj); - - if (lpTrack) { - return android_media_translateErrorCode( lpTrack->setPositionUpdatePeriod(period) ); - } else { + sp<AudioTrack> lpTrack = getAudioTrack(env, thiz); + if (lpTrack == NULL) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioTrack pointer for setPositionUpdatePeriod()"); return AUDIOTRACK_ERROR; } + return android_media_translateErrorCode( lpTrack->setPositionUpdatePeriod(period) ); } // ---------------------------------------------------------------------------- static jint android_media_AudioTrack_get_pos_update_period(JNIEnv *env, jobject thiz) { - - AudioTrack *lpTrack = (AudioTrack *)env->GetIntField( - thiz, javaAudioTrackFields.nativeTrackInJavaObj); + sp<AudioTrack> lpTrack = getAudioTrack(env, thiz); uint32_t period = 0; - if (lpTrack) { - lpTrack->getPositionUpdatePeriod(&period); - return (jint)period; - } else { + if (lpTrack == NULL) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioTrack pointer for getPositionUpdatePeriod()"); return AUDIOTRACK_ERROR; } + lpTrack->getPositionUpdatePeriod(&period); + return (jint)period; } // ---------------------------------------------------------------------------- static jint android_media_AudioTrack_set_position(JNIEnv *env, jobject thiz, jint position) { - - AudioTrack *lpTrack = (AudioTrack *)env->GetIntField( - thiz, javaAudioTrackFields.nativeTrackInJavaObj); - - if (lpTrack) { - return android_media_translateErrorCode( lpTrack->setPosition(position) ); - } else { + sp<AudioTrack> lpTrack = getAudioTrack(env, thiz); + if (lpTrack == NULL) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioTrack pointer for setPosition()"); return AUDIOTRACK_ERROR; } + return android_media_translateErrorCode( lpTrack->setPosition(position) ); } // ---------------------------------------------------------------------------- static jint android_media_AudioTrack_get_position(JNIEnv *env, jobject thiz) { - - AudioTrack *lpTrack = (AudioTrack *)env->GetIntField( - thiz, javaAudioTrackFields.nativeTrackInJavaObj); + sp<AudioTrack> lpTrack = getAudioTrack(env, thiz); uint32_t position = 0; - if (lpTrack) { - lpTrack->getPosition(&position); - return (jint)position; - } else { + if (lpTrack == NULL) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioTrack pointer for getPosition()"); return AUDIOTRACK_ERROR; } + lpTrack->getPosition(&position); + return (jint)position; } // ---------------------------------------------------------------------------- static jint android_media_AudioTrack_set_loop(JNIEnv *env, jobject thiz, jint loopStart, jint loopEnd, jint loopCount) { - - AudioTrack *lpTrack = (AudioTrack *)env->GetIntField( - thiz, javaAudioTrackFields.nativeTrackInJavaObj); - if (lpTrack) { - return android_media_translateErrorCode( lpTrack->setLoop(loopStart, loopEnd, loopCount) ); - } else { + sp<AudioTrack> lpTrack = getAudioTrack(env, thiz); + if (lpTrack == NULL) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioTrack pointer for setLoop()"); return AUDIOTRACK_ERROR; } + return android_media_translateErrorCode( lpTrack->setLoop(loopStart, loopEnd, loopCount) ); } // ---------------------------------------------------------------------------- static jint android_media_AudioTrack_reload(JNIEnv *env, jobject thiz) { - - AudioTrack *lpTrack = (AudioTrack *)env->GetIntField( - thiz, javaAudioTrackFields.nativeTrackInJavaObj); - if (lpTrack) { - return android_media_translateErrorCode( lpTrack->reload() ); - } else { + sp<AudioTrack> lpTrack = getAudioTrack(env, thiz); + if (lpTrack == NULL) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioTrack pointer for reload()"); return AUDIOTRACK_ERROR; } + return android_media_translateErrorCode( lpTrack->reload() ); } @@ -795,8 +798,7 @@ static jint android_media_AudioTrack_get_min_buff_size(JNIEnv *env, jobject thi static void android_media_AudioTrack_setAuxEffectSendLevel(JNIEnv *env, jobject thiz, jfloat level ) { - AudioTrack *lpTrack = (AudioTrack *)env->GetIntField( - thiz, javaAudioTrackFields.nativeTrackInJavaObj); + sp<AudioTrack> lpTrack = getAudioTrack(env, thiz); if (lpTrack == NULL ) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioTrack pointer for setAuxEffectSendLevel()"); @@ -809,17 +811,13 @@ android_media_AudioTrack_setAuxEffectSendLevel(JNIEnv *env, jobject thiz, jfloat // ---------------------------------------------------------------------------- static jint android_media_AudioTrack_attachAuxEffect(JNIEnv *env, jobject thiz, jint effectId) { - - AudioTrack *lpTrack = (AudioTrack *)env->GetIntField( - thiz, javaAudioTrackFields.nativeTrackInJavaObj); - - if (lpTrack) { - return android_media_translateErrorCode( lpTrack->attachAuxEffect(effectId) ); - } else { + sp<AudioTrack> lpTrack = getAudioTrack(env, thiz); + if (lpTrack == NULL) { jniThrowException(env, "java/lang/IllegalStateException", "Unable to retrieve AudioTrack pointer for attachAuxEffect()"); return AUDIOTRACK_ERROR; } + return android_media_translateErrorCode( lpTrack->attachAuxEffect(effectId) ); } // ---------------------------------------------------------------------------- diff --git a/core/jni/android_view_InputDevice.cpp b/core/jni/android_view_InputDevice.cpp index 5cb172bb9c53..d1f0a6a8673a 100644 --- a/core/jni/android_view_InputDevice.cpp +++ b/core/jni/android_view_InputDevice.cpp @@ -35,13 +35,13 @@ static struct { } gInputDeviceClassInfo; jobject android_view_InputDevice_create(JNIEnv* env, const InputDeviceInfo& deviceInfo) { - ScopedLocalRef<jstring> nameObj(env, env->NewStringUTF(deviceInfo.getName().string())); + ScopedLocalRef<jstring> nameObj(env, env->NewStringUTF(deviceInfo.getDisplayName().string())); if (!nameObj.get()) { return NULL; } ScopedLocalRef<jstring> descriptorObj(env, - env->NewStringUTF(deviceInfo.getDescriptor().string())); + env->NewStringUTF(deviceInfo.getIdentifier().descriptor.string())); if (!descriptorObj.get()) { return NULL; } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index f5c0f8f83c2d..4443bc8088b9 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -202,6 +202,23 @@ android:label="@string/permlab_receiveEmergencyBroadcast" android:description="@string/permdesc_receiveEmergencyBroadcast" /> + <!-- Allows an application to read previously received cell broadcast + messages and to register a content observer to get notifications when + a cell broadcast has been received and added to the database. For + emergency alerts, the database is updated immediately after the + alert dialog and notification sound/vibration/speech are presented. + The "read" column is then updated after the user dismisses the alert. + This enables supplementary emergency assistance apps to start loading + additional emergency information (if Internet access is available) + when the alert is first received, and to delay presenting the info + to the user until after the initial alert dialog is dismissed. + @hide Pending API council approval --> + <permission android:name="android.permission.READ_CELL_BROADCASTS" + android:permissionGroup="android.permission-group.MESSAGES" + android:protectionLevel="dangerous" + android:label="@string/permlab_readCellBroadcasts" + android:description="@string/permdesc_readCellBroadcasts" /> + <!-- Allows an application to read SMS messages. --> <permission android:name="android.permission.READ_SMS" android:permissionGroup="android.permission-group.MESSAGES" @@ -737,6 +754,14 @@ android:label="@string/permlab_removeTasks" android:description="@string/permdesc_removeTasks" /> + <!-- Allows an application to start any activity, regardless of permission + protection or exported state. @hide --> + <permission android:name="android.permission.START_ANY_ACTIVITY" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:protectionLevel="signature" + android:label="@string/permlab_startAnyActivity" + android:description="@string/permdesc_startAnyActivity" /> + <!-- @hide Change the screen compatibility mode of applications --> <permission android:name="android.permission.SET_SCREEN_COMPATIBILITY" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" diff --git a/packages/SystemUI/res/drawable/notification_row_bg.xml b/core/res/res/drawable/notification_bg.xml index 1bb21723af91..1bb21723af91 100644 --- a/packages/SystemUI/res/drawable/notification_row_bg.xml +++ b/core/res/res/drawable/notification_bg.xml diff --git a/core/res/res/layout-sw600dp/status_bar_latest_event_ticker.xml b/core/res/res/layout-sw720dp/status_bar_latest_event_ticker.xml index 269e086e1644..269e086e1644 100644 --- a/core/res/res/layout-sw600dp/status_bar_latest_event_ticker.xml +++ b/core/res/res/layout-sw720dp/status_bar_latest_event_ticker.xml diff --git a/core/res/res/layout-sw600dp/status_bar_latest_event_ticker_large_icon.xml b/core/res/res/layout-sw720dp/status_bar_latest_event_ticker_large_icon.xml index 69eac92d8728..69eac92d8728 100644 --- a/core/res/res/layout-sw600dp/status_bar_latest_event_ticker_large_icon.xml +++ b/core/res/res/layout-sw720dp/status_bar_latest_event_ticker_large_icon.xml diff --git a/core/res/res/layout/notification_template_base.xml b/core/res/res/layout/notification_template_base.xml index bd26232696d3..af05aed4cabe 100644 --- a/core/res/res/layout/notification_template_base.xml +++ b/core/res/res/layout/notification_template_base.xml @@ -16,7 +16,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:internal="http://schemas.android.com/apk/prv/res/android" - android:background="@android:color/background_dark" + android:background="@android:drawable/notification_bg" android:id="@+id/status_bar_latest_event_content" android:layout_width="match_parent" android:layout_height="64dp" diff --git a/core/res/res/layout/notification_template_big_picture.xml b/core/res/res/layout/notification_template_big_picture.xml index 215009690c3d..51e46b273e62 100644 --- a/core/res/res/layout/notification_template_big_picture.xml +++ b/core/res/res/layout/notification_template_big_picture.xml @@ -16,7 +16,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:internal="http://schemas.android.com/apk/prv/res/android" - android:background="@android:color/background_dark" + android:background="@android:drawable/notification_bg" android:id="@+id/status_bar_latest_event_content" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/core/res/res/layout/notification_template_big_text.xml b/core/res/res/layout/notification_template_big_text.xml index 3a0bfc7a2edb..b6d71e1f35a6 100644 --- a/core/res/res/layout/notification_template_big_text.xml +++ b/core/res/res/layout/notification_template_big_text.xml @@ -15,7 +15,7 @@ --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:internal="http://schemas.android.com/apk/prv/res/android" - android:background="@android:color/background_dark" + android:background="@android:drawable/notification_bg" android:id="@+id/status_bar_latest_event_content" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index d299436f1af4..a6176cd9d150 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Laat die program toe om MMS-boodskappe te ontvang en te verwerk. Kwaadwillige programme kan jou boodskappe monitor of uitvee sonder om dit aan jou te wys."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"ontvang nooduitsendings"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Laat die program toe om nooduitsending-boodskappe te ontvang en te verwerk. Hierdie toestemming is net beskikbaar vir stelselprogramme."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"stuur SMS-boodskappe"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Laat die program toe om SMS-boodskappe te stuur. Kwaadwillige programme kan jou geld kos deur boodskappe te stuur sonder jou bevestiging."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"stuur sms-boodskappe met geen bestiging"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Laat die program toe om take na die voorgrond en agtergrond te skuif. Kwaadwillige programme kan hulself sonder jou beheer na vore dwing."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"stop lopende programme"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Laat die program toe om take te verwyder en hul programme te dood. Kwaadwillige programme kan die gedrag van ander programme ontwrig."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"stel skermversoenbaarheid"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Laat die program toe om om die skermversoenbaarheid-modus van ander programme te beheer. Kwaadwillige programme kan die gedrag van ander programme breek."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"aktiveer programontfouting"</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index 15f56f365225..063d45af5862 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"ኤም ኤም ኤስ መልዕክቶችን ለመቀበል እና ለማስኬድ ለመተግበሪያው ይፈቅዳሉ፡፡ ተንኮል አዘል መተግበሪያዎች አንተን ሳያሳዩ ሊሰርዙዎቸው ወይም መልዕክቶችህን ሊቆጣጠሩ ይችላሉ፡፡"</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"የአደጋ ጊዜ ስርጭቶችን ተቀበል"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"ድንገተኛ የስርጭት መልዕክቶችን ለመቀበል እና ለማስኬድ ለመተግበሪያው ይፈቅዳሉ፡፡ ይሄ ፍቃድ ለስርዓት መተግበሪዎች ብቻ ነው የሚገኘው፡፡"</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"የSMS መልዕክቶች ላክ"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"ኤስ ኤም ኤስ መልዕክቶችን መላክ ለመተግበሪያው ይፈቅዳሉ፡፡ ያላንተ ማረጋገጫ ተንኮል አዘል መተግበሪያዎች መልዕክቶችን በመላክ ገንዘብ ሊያስወጡህ ይችላሉ፡፡"</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"ያለ ምንም ማረጋገጫ የSMS መልዕክቶች ላክ"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"ወደ ግንባር ዎይ እና ዳራ ስራዎችን ለማንቀሳቀስ ለመተግበሪያው ይፈቅዳሉ፡፡ ያለአንተ ቁጥጥር ተንኮል አዘል መተግበሪያዎች ራሳቸውን ወደፊት መምጣት ሊያስገድዱ ይችላሉ፡፡"</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"የአሂድ ትግበራዎች አቁም"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"ተግባሮችን ለማስወገድ እና መተግበሪያዎቻቸውን ለመግደል ለመተግበሪያ ይፈቅዳል። ጎጂ የሆኑ መተግበሪያዎች የሌሎችን መተግበሪያዎችን ባህሪ ሊያውኩ ይችላሉ።"</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"የማያ ገጽ ተኳኋኝነት መድብ"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"መተግበሪያው የሌሎች መተግበሪያዎች የማያ ገጽ ተኳኋኝነት ሁናቴ እንዲቆጣጠር ይፈቅዳል። ተንኮለኛ መተግበሪያዎች የሌሎች መተግበሪያዎች ባህሪ ሊሰብሩ ይችላሉ።"</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"የትግበራ ማረሚያ አንቃ"</string> @@ -1008,7 +1016,7 @@ <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"ፒን፦"</string> <string name="select_character" msgid="3365550120617701745">"ቁምፊ አስገባ"</string> <string name="sms_control_title" msgid="7296612781128917719">"የSMS መልዕክቶች መበላክ ላይ"</string> - <string name="sms_control_message" msgid="3867899169651496433">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ቁጥሩ ብዙ የሆኑ የኤስ.ኤም.ኤስ. መልዕቶችን እየላከ ነው። ይሄ መተግበሪያ መልዕክቶችን መላኩን እንዲቀጥል መፍቀድ ትፈልጋለህ?"</string> + <string name="sms_control_message" msgid="3867899169651496433">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ቁጥራቸው ብዙ የሆኑ የኤስ.ኤም.ኤስ. መልዕክቶችን እየላከ ነው። ይሄ መተግበሪያ መልዕክቶችን መላኩን እንዲቀጥል መፍቀድ ትፈልጋለህ?"</string> <string name="sms_control_yes" msgid="3663725993855816807">"ፍቀድ"</string> <string name="sms_control_no" msgid="625438561395534982">"ከልክል"</string> <string name="sms_short_code_confirm_title" msgid="1666863092640877318">"ኤስ.ኤም.ኤስ. ለአጭር ኮድ ይላክ?"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 9a1530f55cf7..a989fc6b36a5 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"للسماح للتطبيق بتلقي رسائل الوسائط المتعددة ومعالجتها. قد تراقب بعض التطبيقات الضارة رسائلك أو تحذفها بدون عرضها لك."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"تلقي بث الطوارئ"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"للسماح للتطبيق بتلقي رسائل بث الطوارئ ومعالجتها. لا يتوفر هذا الإذن سوى لتطبيقات النظام."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"إرسال رسائل قصيرة SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"للسماح للتطبيق بإرسال رسائل قصيرة SMS. قد تكلفك التطبيقات الضارة المال من خلال إرسال رسائل بدون تأكيدك."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"إرسال رسائل قصيرة SMS بدون تأكيد"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"للسماح لتطبيق ما بنقل المهام إلى المقدمة والخلفية. قد تفرض التطبيقات الضارة نفسها إلى المقدمة بدون تحكم منك."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"إيقاف التطبيقات التي قيد التشغيل"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"للسماح للتطبيق بإزالة المهام وإنهاء تطبيقاتها. قد تعطل التطبيقات الضارة عمل التطبيقات الأخرى."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"تعيين توافق الشاشة"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"السماح للتطبيق بالتحكم في وضع التوافق مع شاشة التطبيقات الأخرى. قد تتسبب التطبيقات الضارة في تعطيل سلوك التطبيقات الأخرى."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"تمكين تصحيح أخطاء التطبيق"</string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 9f11db1fbdac..9fb8aedcf027 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Дазваляе прыкладанням атрымліваць і апрацоўваць MMS-паведамленні. Шкоднасныя прыкладанні могуць адсочваць вашы паведамленні або выдаляць іх, не паказваючы вам."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"атрымліваць экстраныя трансляцыі"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Дазваляе прыкладанням атрымліваць і апрацоўваць экстраныя паведамленні. Гэты дазвол даступны толькі для сістэмных прыкладанняў."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"адпраўляць SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Дазваляе прыкладанням дасылаць SMS-паведамленні. Шкоднасныя прыкладанні могуць каштаваць вам грошай з-за адпраўкі паведамленняў без вашага пацвярджэння."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"адпраўляць SMS-паведамленні без пацверджання"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Дазваляе прыкладанням перамяшчаць заданні на пярэдні план і фон. Шкоднасныя прыкладанні могуць прымусова рабіць сябе асноўнымі без вашага ведама."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"спыніць запушчаныя прыкладанні"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Дазваляе прыкладанням выдаляць заданні і спыняць прыкладанні, якія іх выкарыстоўваюць. Шкоднасныя прыкладаннi могуць перашкодзiць працы іншых прыкладанняў."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"усталяваць сумяшчальнасць экранаў"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Дазваляе прыкладанню кіраваць рэжымам сумяшчальнасці экранаў іншых прыкладанняў. Шкоднаснае ПЗ можа перашкодзiць працы іншых прыкладанняў."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"уключыць адладку прыкладання"</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index 4a1d3e6e6835..4b69cb28af0a 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Разрешава на приложението да получава и обработва MMS съобщения. Злонамерените приложения могат да наблюдават съобщенията ви или да ги изтрият, без да ви ги покажат."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"получаване на спешни излъчвания"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Разрешава на приложението да получава и обработва спешни съобщения за излъчване. Това разрешение е налице само за системни приложения."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"изпращане на SMS съобщения"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Разрешава на приложението да изпраща SMS съобщения. Злонамерените приложения могат да ви въвлекат в разходи, като изпращат съобщения без потвърждение от ваша страна."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"изпращане на SMS съобщения без потвърждаване"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Разрешава на приложението да прехвърля задачи на преден и на заден план. Злонамерените приложения могат сами да се изведат на преден план без ваша намеса."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"спиране на изпълняваните приложения"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Разрешава на приложението да премахва задачи и да прекратява приложенията им. Злонамерените приложения могат да нарушат поведението на други приложения."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"задаване на съвместимост на екрана"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Разрешава на приложението да контролира режима на съвместимост на екрана на други приложения. Злонамерените програми могат да нарушат поведението на други приложения."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"активиране на отстраняването на грешки в приложения"</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index e266a858559c..d322644d63dd 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Permet que l\'aplicació rebi i processi missatges MMS. Les aplicacions malicioses poden supervisar els missatges o suprimir-los sense mostrar-te\'ls."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"recepció d\'emissions d\'emergència"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Permet que l\'aplicació rebi i processi missatges de difusió d\'emergència. Aquest permís només està disponible per a les aplicacions del sistema."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"enviar missatges SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Permet que l\'aplicació enviï missatges SMS. Les aplicacions malicioses poden enviar missatges sense la teva confirmació, cosa que et pot fer gastar diners."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"enviament de missatges SMS sense confirmació"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Permet que l\'aplicació desplaci tasques en primer o segon pla. Les aplicacions malicioses poden aparèixer en primer pla sense el teu consentiment."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"atura les aplicacions que s\'estan executant"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Permet que l\'aplicació elimini tasques i finalitzi les seves aplicacions. Les aplicacions malicioses poden alterar el comportament d\'altres aplicacions."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"definició de la compatibilitat de pantalla"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Permet que l\'aplicació controli el mode de compatibilitat de pantalla d\'altres aplicacions. És possible que les aplicacions malicioses interrompin el comportament d\'altres aplicacions."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"activa la depuració d\'aplicacions"</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index eead99efbee0..735756dd367a 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Umožňuje aplikaci přijmout a zpracovat zprávy MMS. Škodlivé aplikace mohou sledovat vaše zprávy nebo je smazat, aniž by se vám zobrazily."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"příjem nouzového vysílání"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Umožňuje aplikaci přijmout a zpracovat zprávy tísňového vysílání. Toto oprávnění je dostupné pouze pro systémové aplikace."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"odesílaní zpráv SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Umožňuje aplikaci odesílat zprávy SMS. Škodlivé aplikace vás mohou připravit o peníze odesíláním zpráv bez vašeho svolení."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"posílat zprávy SMS bez potvrzení"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Umožňuje aplikaci přesunout úlohy na popředí nebo pozadí. Škodlivé aplikace mohou vynutit zobrazení na popředí bez vašeho svolení."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"zastavení činnosti aplikací"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Umožňuje aplikaci odstranit úlohy a ukončit jejich aplikace. Škodlivé aplikace mohou narušit chování ostatních aplikací."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"nastavit kompatibilitu obrazovky"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Umožňuje aplikaci ovládat režim kompatibility obrazovky v ostatních aplikacích. Škodlivé aplikace mohou narušit chování ostatních aplikací."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"povolení ladění aplikací"</string> @@ -1011,9 +1019,9 @@ <string name="sms_control_message" msgid="3867899169651496433">"Aplikace <b><xliff:g id="APP_NAME">%1$s</xliff:g></b>odesílá velký počet SMS zpráv. Chcete aplikaci povolit, aby zprávy odesílala i nadále?"</string> <string name="sms_control_yes" msgid="3663725993855816807">"Povolit"</string> <string name="sms_control_no" msgid="625438561395534982">"Odmítnout"</string> - <string name="sms_short_code_confirm_title" msgid="1666863092640877318">"Odeslat SMS na prémiové číslo?"</string> + <string name="sms_short_code_confirm_title" msgid="1666863092640877318">"Odeslat SMS?"</string> <string name="sms_premium_short_code_confirm_title" msgid="3811263856304367838">"Odeslat zprávu Premium SMS?"</string> - <string name="sms_short_code_confirm_message" msgid="5616409294907295407">"Aplikace<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> chce odeslat zprávu na číslo <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>, což je zřejmě číslo služby Premium SMS.<p>Za odesílání zpráv na určitá prémiová čísla mohou být na mobilní účet naúčtovány poplatky za prémiové služby.<p>Chcete aplikaci povolit odeslání zprávy?"</string> + <string name="sms_short_code_confirm_message" msgid="5616409294907295407">"Aplikace<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> chce odeslat zprávu na číslo <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>, což je zřejmě číslo služby SMS.<p>Za odesílání zpráv na určitá čísla mohou být na mobilní účet naúčtovány poplatky za prémiové služby.<p>Chcete aplikaci povolit odeslání zprávy?"</string> <string name="sms_premium_short_code_confirm_message" msgid="6214083016284738667">"Aplikace <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> chce poslat zprávu na číslo <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>, což je číslo služby Premium SMS.<p><b>Pokud zprávu odešlete na toto číslo, budou vám na mobilní účet naúčtovány poplatky za prémiové služby.</b><p>Chcete aplikaci povolit odeslání zprávy?"</string> <string name="sms_short_code_confirm_allow" msgid="8957573662645722940">"Odeslat zprávu"</string> <string name="sms_short_code_confirm_deny" msgid="6374609298084435887">"Neodesílat"</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index f6419277ac29..2760fe9eabce 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Tillader, at appen kan modtage og behandle mms-beskeder. Ondsindede apps kan overvåge dine beskeder eller slette dem uden at vise dem til dig."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"modtage nødudsendelser"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Tillader, at appen kan modtage og behandle nødtransmissioner. Denne tilladelse er kun tilgængelig for systemapps."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"send sms-beskeder"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Tillader, at appen kan sende sms-beskeder. Ondsindede apps kan medføre store omkostninger ved at sende beskeder uden din bekræftelse."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"sende sms-meddelelser uden bekræftelse"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Tillader, at appen kan flytte opgaver til forgrunden og baggrunden. Ondsindede apps kan tvinge sig selv i forgrunden uden din kontrol."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"stoppe kørsel af apps"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Tillader, at en app kan fjerne opgaver og lukke deres apps. Ondsindede apps kan forstyrre adfærden for andre apps."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"indstil skærmens kompatibilitet"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Tillader, at appen kontrollerer kompatibilitetstilstanden for skærme i andre applikationer. Ondsindede applikationer kan forstyrre andre applikationers adfærd."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"aktivere fejlretning af appen"</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 072005d479ef..3d5ef93ce283 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Ermöglicht der App, MMS-Mitteilungen zu empfangen und zu verarbeiten. Schädliche Apps können so Ihre Nachrichten überwachen oder löschen, bevor sie angezeigt werden."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"Notfall-Broadcasts empfangen"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Ermöglicht der App, Notfall-Broadcasts zu empfangen und zu verarbeiten. Diese Berechtigung steht nur System-Apps zur Verfügung."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"Kurznachrichten senden"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Ermöglicht der App das Senden von SMS. Bei schädlichen Apps können Kosten entstehen, wenn diese Nachrichten ohne Ihre Zustimmung versenden."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"SMS-Nachrichten ohne Bestätigung senden"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Ermöglicht der App, Aufgaben in den Vorder- und Hintergrund zu verschieben. Schädliche Apps können so ohne Ihr Zutun eine Anzeige im Vordergrund erzwingen."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"Aktive Apps beenden"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Ermöglicht der App, Aufgaben zu entfernen und die entsprechenden Apps zu beenden. Schädliche Apps können das Verhalten anderer Apps stören."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"Bildschirmkompatibilität festlegen"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Ermöglicht der App, den Bildschirmkompatibilitätsmodus anderer Apps zu steuern. Schädliche Apps können das Verhalten anderer Apps stören."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"Fehlerbeseitigung für App aktivieren"</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index b668965ba190..4766da97da22 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Επιτρέπει στην εφαρμογή τη λήψη και την επεξεργασία μηνυμάτων MMS. Τυχόν κακόβουλες εφαρμογές ενδέχεται να παρακολουθούν τα μηνύματά σας ή να τα διαγράφουν χωρίς να εμφανίζονται πρώτα σε εσάς."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"λαμβάνει τις μεταδόσεις σε περιπτώσεις έκτακτης ανάγκης"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Επιτρέπει στην εφαρμογή τη λήψη και την επεξεργασία μηνυμάτων μετάδοσης. Αυτή η άδεια διατίθεται μόνο για εφαρμογές συστήματος."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"αποστολή μηνυμάτων SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Επιτρέπει στην εφαρμογή την αποστολή μηνυμάτων SMS. Τυχόν κακόβουλες εφαρμογές ενδέχεται να κοστίσουν μέσω της αποστολής μηνυμάτων χωρίς δική σας επιβεβαίωση."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"αποστολή μηνυμάτων SMS χωρίς επιβεβαίωση"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Επιτρέπει στην εφαρμογή τη μετακίνηση εργασιών στο προσκήνιο και στο φόντο. Τυχόν κακόβουλες εφαρμογές μπορούν να προωθηθούν στο προσκήνιο χωρίς να μπορείτε να τις ελέγξετε."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"διακοπή εκτέλεσης εφαρμογών"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Επιτρέπει στην εφαρμογή την κατάργηση ενεργειών και την απομάκρυνση των εφαρμογών τους. Τυχόν κακόβουλες εφαρμογές ενδέχεται να διαταράξουν τη λειτουργία άλλων εφαρμογών."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"ρύθμιση συμβατότητας οθόνης"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Επιτρέπει στην εφαρμογή να ελέγξει τη λειτουργία συμβατότητας της οθόνης με άλλες εφαρμογές. Οι κακόβουλες εφαρμογές μπορεί να επηρεάσουν τη συμπεριφορά άλλων εφαρμογών."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"ενεργοποίηση εντοπισμού σφαλμάτων εφαρμογής"</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index 208e96af6f1e..58890db36d20 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Allows the app to receive and process MMS messages. Malicious apps may monitor your messages or delete them without showing them to you."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"receive emergency broadcasts"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Allows the app to receive and process emergency broadcast messages. This permission is only available for system apps."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"send SMS messages"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Allows the app to send SMS messages. Malicious apps may cost you money by sending messages without your confirmation."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"send SMS messages with no confirmation"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Allows the app to move tasks to the foreground and background. Malicious apps may force themselves to the front without your control."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"stop running apps"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Allows the app to remove tasks and kill their apps. Malicious apps may disrupt the behaviour of other apps."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"set screen compatibility"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Allows the app to control the screen compatibility mode of other applications. Malicious applications may break the behaviour of other applications."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"enable app debugging"</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index d46409529f2d..c51850a58af0 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Permite que la aplicación reciba y procese mensajes MMS. Las aplicaciones maliciosas pueden controlar tus mensajes o eliminarlos sin mostrártelos."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"recibir mensajes de emergencia"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Permite que la aplicación reciba y procese mensajes de emergencia. Este permiso sólo está disponible para las aplicaciones del sistema."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"enviar mensajes SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Permite que la aplicación envíe mensajes SMS. Las aplicaciones maliciosas pueden generar gastos a causa del envío de mensajes sin tu confirmación."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"Enviar mensajes SMS sin confirmación"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Permite que la aplicación mueva tareas al primero o segundo plano. Las aplicaciones maliciosas pueden forzar su paso al primer plano sin que tú las controles."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"detener las aplicaciones en ejecución"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Permite que la aplicación elimine tareas y cierre sus aplicaciones. Las aplicaciones malintencionadas pueden usar este permiso para interferir en el comportamiento de otras aplicaciones."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"Definir compatibilidad de pantalla"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Permite a la aplicación controlar el modo de compatibilidad de las pantallas de otras aplicaciones. Las aplicaciones malintencionadas pueden interrumpir el funcionamiento de otras aplicaciones."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"activar depuración de aplicación"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 9bf23ffd0053..de39504566d3 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Permite que la aplicación reciba y procese mensajes MMS. Las aplicaciones malintencionadas pueden usar este permiso para controlar o eliminar los mensajes sin mostrarlos al usuario."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"recibir mensajes de emergencia"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Permite que la aplicación reciba y procese mensajes de emergencia. Este permiso solo está disponible para las aplicaciones del sistema."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"enviar mensajes SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Permite que la aplicación envíe mensajes SMS. Es posible que tengas que pagar por los mensajes que las aplicaciones malintencionadas envíen sin tu confirmación."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"enviar mensajes SMS sin confirmación"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Permite que la aplicación mueva tareas a segundo o a primer plano. Algunas aplicaciones malintencionadas pueden aparecer en primer plano sin el control del usuario."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"detener aplicaciones en ejecución"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Permite que la aplicación termine tareas y cierre sus aplicaciones. Las aplicaciones malintencionadas pueden usar este permiso para interferir en el comportamiento de otras aplicaciones."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"establecer compatibilidad de pantalla"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Permite que la aplicación controle el modo de compatibilidad de la pantalla de otras aplicaciones. Las aplicaciones malintencionadas pueden influir de forma negativa en el funcionamiento de otras aplicaciones."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"habilitar depuración de aplicación"</string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index c4e0c414c7cd..845491a83d24 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Võimaldab rakendusel vastu võtta ja töödelda multimeediumsõnumeid. Pahatahtlikud rakendused võivad teie sõnumeid jälgida või neid kustutada teile näitamata."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"hädaabiteadete vastuvõtmine"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Võimaldab rakendusel vastu võtta ja töödelda hädaabisõnumeid. See õigus on saadaval ainult süsteemirakendustele."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"saada SMS-sõnumeid"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Võimaldab rakendusel saata SMS-sõnumeid. Pahatahtlikud rakendused võivad teile kulukaks minna, kui saadavad sõnumeid teie nõusolekuta."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"lühisõnumite saatmine ilma kinnituseta"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Võimaldab rakendusel teisaldada ülesanded esiplaanile ja taustale. Pahatahtlikud rakendused võivad sundida end esiplaanile tulema teie loata."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"käitatud rakenduste peatamine"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Võimaldab rakendusel eemaldada ülesanded ja peatada nende rakendused. Pahatahtlikud rakendused võivad häirida teiste rakenduste käitumist."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"kuva ühilduvuse seadmine"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Võimaldab rakendusel juhtida teiste rakenduste kuva ühilduvuse režiimi. Pahatahtlikud rakendused võivad teisi rakendusi häirida."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"Rakenduse silumise lubamine"</string> @@ -1014,7 +1022,7 @@ <string name="sms_short_code_confirm_title" msgid="1666863092640877318">"Kas saata SMS lühinumbrile?"</string> <string name="sms_premium_short_code_confirm_title" msgid="3811263856304367838">"Kas saata tasuline SMS?"</string> <string name="sms_short_code_confirm_message" msgid="5616409294907295407">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> tahab saata tekstsõnumi adressaadile <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>, mis paistab olevat SMS-i lühinumber.<p>Mõnele lühinumbrile saadetud sõnumi eest võidakse teie mobiilikontole esitada arve tasuliste teenuste eest.<p>Kas lubate rakendusel selle sõnumi saata?"</string> - <string name="sms_premium_short_code_confirm_message" msgid="6214083016284738667">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> tahab saata tekstisõnumi adressaadile <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>, mis on tasulise SMS-i lühinumber.<p><b>Kui saadate sõnumi sellele adressaadile, esitatakse teie mobiilikontole arve tasuliste teenuste eest.</b><p>Kas lubate rakendusel sõnumi saata?"</string> + <string name="sms_premium_short_code_confirm_message" msgid="6214083016284738667">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> tahab saata tekstsõnumi adressaadile <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>, mis on tasulise SMS-i lühinumber.<p><b>Kui saadate sõnumi sellele adressaadile, esitatakse teie mobiilikontole arve tasuliste teenuste eest.</b><p>Kas lubate rakendusel sõnumi saata?"</string> <string name="sms_short_code_confirm_allow" msgid="8957573662645722940">"Saada sõnum"</string> <string name="sms_short_code_confirm_deny" msgid="6374609298084435887">"Ära saada"</string> <string name="sms_short_code_confirm_report" msgid="2588793956061677070">"Teata pahatahtlikust rakend."</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index 6a4c8cbe6ff1..cd57e9a14637 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"به برنامه اجازه میدهد تا پیامهای MMS را دریافت و پردازش کند. برنامههای مخرب پیامهای شما را کنترل میکنند یا بدون نشان دادن آنها به شما آنها را پاک میکنند."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"دریافت پخش های اضطراری"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"به برنامه اجازه میدهد تا پیامهای پخش اضطراری را دریافت و پردازش کند. این مجوز فقط برای برنامههای سیستم در دسترس است."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"ارسال پیامک ها"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"به برنامه اجازه میدهد پیامهای کوتاه ارسال کند. ممکن است برنامههای مخرب با ارسال پیام بدون تایید شما برای شما هزینه داشته باشند."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"ارسال پیامک بدون تأیید"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"به برنامه اجازه میدهد تا کارها را به پیش زمینه و پس زمینه منتقل کند. برنامههای مخرب میتوانند بدون کنترل به اجبار خود را به جلو منتقل کنند."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"متوقف کردن برنامههای در حال اجرا"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"به برنامه اجازه میدهد تا کارها را حذف کند و برنامههای آنها را متوقف کند. برنامههای مخرب میتوانند در اجرای برنامههای دیگر اختلال ایجاد کنند."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"تنظیم سازگاری با صفحه نمایش"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"به برنامه کاربردی اجازه کنترل حالت سازگاری صفحه نمایش برای برنامههای دیگر را میدهد. برنامههای خرابکار ممکن است باعث کارکرد نادرست دیگر برنامهها شوند."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"فعال کردن عیبیابی برنامه"</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index 4451192546fb..431ec819a65e 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Antaa sovelluksen vastaanottaa ja käsitellä MMS-viestejä. Haitalliset sovellukset voivat valvoa viestejä tai poistaa niitä näyttämättä niitä sinulle."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"vastaanota hätätilalähetyksiä"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Antaa sovelluksen vastaanottaa ja käsitellä hätälähetysviestejä. Tämä lupa on vain järjestelmäsovellusten käytettävissä."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"lähetä tekstiviestejä"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Antaa sovelluksen lähettää tekstiviestejä. Haitalliset sovellukset voivat tuhlata rahaa lähettämällä viestejä ilman vahvistusta."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"lähettää tekstiviestejä ilman vahvistusta"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Antaa sovelluksen siirtää tehtäviä etualalle ja taustalle. Haitalliset sovellukset voivat pakottaa itsensä etualalle ilman käyttäjän hallintaa."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"käynnissä olevien sovellusten pysäyttäminen"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Antaa sovelluksen poistaa tehtäviä ja lopettaa niiden sovelluksia. Haitalliset sovellukset voivat häiritä muiden sovellusten toimintaa."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"aseta näytön yhteensopivuus"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Sallii sovelluksen hallita toisten sovellusten näytön yhteensopivuustilaa. Haittasovellukset voivat häiritä toisten sovellusten toimintaa."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"sovellusten vianetsinnän käyttöönotto"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 2d5dbb1679a0..c2b17cb44092 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Permet à l\'application de recevoir et de traiter des MMS. Des applications malveillantes peuvent surveiller vos messages ou les supprimer avant même que vous puissiez les voir."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"recevoir les messages de diffusion d\'urgence"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Permet à l\'application de recevoir et de traiter les messages d\'urgence. Cette autorisation n\'est disponible que pour les applications système."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"Envoi de messages SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Permet à l\'application d\'envoyer des SMS. Des applications malveillantes peuvent engendrer des frais en envoyant des messages à votre insu."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"envoyer des SMS sans confirmation"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Permet à l\'application de faire passer les tâches de premier plan en arrière-plan. Des applications malveillantes peuvent exploiter cette fonctionnalité pour passer au premier plan sans votre consentement."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"arrêter les applications en cours d\'exécution"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Permet à l\'application de supprimer des tâches et de fermer les applications qui les exécutent. Des applications malveillantes peuvent exploiter cette fonctionnalité pour perturber le comportement des autres applications."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"définir la compatibilité de l\'écran"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Permettre de contrôler le mode de compatibilité de l\'écran des autres applications. Des applications malveillantes peuvent perturber le fonctionnement d\'autres applications."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"activer le débogage des applications"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 6eeb9423d3bd..8b1f1a55dca5 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"एप्लिकेशन को MMS संदेश प्राप्त करने और संसाधित करने देता है. दुर्भावनापूर्ण एप्लिकेशन आपके संदेशों की निगरानी कर सकते हैं या आपको दिखाए बिना उन्हें हटा सकते हैं."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"आपातकालीन प्रसारण प्राप्त करें"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"एप्लिकेशन को आपातकालीन प्रसारण संदेशों को प्राप्त करने और संसाधित करने देता है. यह अनुमति केवल सिस्टम एप्लिकेशन में उपलब्ध है."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"SMS संदेश भेजें"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"एप्लिकेशन को SMS संदेशों को भेजने देता है. दुर्भावनापूर्ण एप्लिकेशन आपकी पुष्टि के बिना संदेश भेजकर आप पर शुल्क लगा सकते हैं."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"बिना किसी पुष्टि के SMS संदेश भेजें"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"एप्लिकेशन को अग्रभूमि और पृष्ठभूमि में कार्यों को ले जाने देता है. दुर्भावनापूर्ण एप्लिकेशन आपके नियंत्रण के बिना स्वयं को बलपूर्वक आगे कर सकते हैं."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"चलने वाले एप्लिकेशन रोकें"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"किसी एप्लिकेशन को कार्यों को निकालने और उनके एप्लिकेशन समाप्त करने देता है. दुर्भावनापूर्ण एप्लिकेशन अन्य एप्लिकेशन का व्यवहार बाधित कर सकते हैं."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"स्क्रीन संगतता सेट करें"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"एप्लिकेशन को अन्य एप्लिकेशन के स्क्रीन संगतता मोड को नियंत्रित करने देता है. दुर्भावनापूर्ण एप्लिकेशन अन्य एप्लिकेशन का व्यवहार बाधित कर सकते हैं."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"एप्लिकेशन डीबग करना सक्षम करें"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 0409168d62c0..766ada4fbe9a 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Omogućuje aplikaciji primanje i obradu MMS poruka. Zlonamjerne aplikacije mogu nadzirati vaše poruke ili ih brisati, a da vam ih ne pokažu."</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> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"slanje SMS poruka"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Omogućuje aplikaciji slanje SMS poruka. Zlonamjerne aplikacije mogu vam prouzročiti troškove šaljući poruke bez vašeg znanja."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"slanje SMS poruka bez potvrde"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Omogućuje aplikaciji da premjesti zadatke u prednji plan ili pozadinu. Zlonamjerne aplikacije mogu na silu doći u prednji plan bez vašeg nadzora."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"zaustavljanje pokrenutih aplikacija"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Omogućuje aplikaciji uklanjanje zadataka i uklanjanje njihovih aplikacija. Zlonamjerne aplikacije mogu poremetiti rad drugih aplikacija."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"postavljanje kompatibilnosti sa zaslonom"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Aplikaciji omogućuje upravljanje načinom kompatibilnosti aplikacija sa zaslonom. Zlonamjerne aplikacije mogu prekinuti takvo ponašanje ostalih aplikacija."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"omogućavanje rješavanja programskih pogrešaka u aplikaciji"</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index bdd802d7b4a1..bd0f78cd93b6 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Lehetővé teszi az alkalmazás számára, hogy MMS-eket fogadjon és dolgozzon fel. A rosszindulatú alkalmazások megfigyelhetik vagy törölhetik az üzeneteket anélkül, hogy Ön látná azokat."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"vészhelyzeti közlemények fogadása"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Lehetővé teszi az alkalmazás számára vészhelyzeti üzenetek fogadását és feldolgozását. Ez az engedély csak rendszeralkalmazások számára érhető el."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"SMS-ek küldése"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Lehetővé teszi az alkalmazás számára SMS üzeneteket küldését. A rosszindulatú alkalmazások pénzbe kerülő üzeneteket küldhetnek az Ön jóváhagyása nélkül."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"SMS üzenetek küldése megerősítés nélkül"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Lehetővé teszi az alkalmazás számára, hogy feladatokat helyezzen át az előtérből a háttérbe és fordítva. A rosszindulatú alkalmazások az előtérbe helyezhetik magukat az Ön engedélye nélkül."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"futó alkalmazások leállítása"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Lehetővé teszi, hogy az alkalmazás feladatokat távolítson el és leállítsa azok alkalmazásait. Rosszindulatú alkalmazások megzavarhatják más alkalmazások viselkedését."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"Képernyő-kompatibilitás beállítása"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Lehetővé teszi, hogy az alkalmazás szabályozza az egyéb alkalmazások képernyő-kompatibilitási módját. A kártékony alkalmazások megzavarhatják a többi alkalmazás viselkedését."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"alkalmazások hibakeresésének bekapcsolása"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 03c7f798b385..0cc74bf621d6 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Mengizinkan apl menerima dan memproses pesan MMS. Apl berbahaya dapat memantau atau menghapus pesan tanpa menunjukkannya kepada Anda."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"terima siaran darurat"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Mengizinkan apl menerima dan memproses pesan siaran darurat. Izin ini hanya tersedia untuk apl sistem."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"kirim pesan SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Mengizinkan apl mengirim pesan SMS. Apl berbahaya dapat menimbulkan pengeluaran dengan mengirimkan pesan tanpa konfirmasi."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"mengirim SMS tanpa konfirmasi"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Mengizinkan apl memindah tugas ke latar depan dan latar belakang. Apl berbahaya dapat memaksa berpindah ke depan tanpa kontrol Anda."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"menghentikan apl yang berjalan"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Memungkinkan apl menghapus tugas dan menutup aplikasinya. Apl berbahaya dapat mengganggu perilaku apl lain."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"menyetel kompatibilitas layar"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Memungkinkan apl mengontrol mode kompatibilitas layar aplikasi lain. Aplikasi berbahaya dapat merusak perilaku aplikasi lain."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"mengaktifkan debugging apl"</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 7ec07d218371..bc56ae31a4b8 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Consente all\'applicazione di ricevere ed elaborare messaggi MMS. Le applicazioni dannose potrebbero monitorare i tuoi messaggi o eliminarli senza mostrarteli."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"ricezione di trasmissioni di emergenza"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Consente all\'applicazione di ricevere ed elaborare messaggi broadcast di emergenza. Questa autorizzazione è disponibile solo per applicazioni di sistema."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"invio SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Consente all\'applicazione di inviare messaggi SMS. Le applicazioni dannose potrebbero comportare addebiti inviando messaggi senza la tua conferma."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"invio di messaggi SMS senza conferma"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Consente all\'applicazione di spostare attività in primo piano e in background. Le applicazioni dannose potrebbero forzare la loro impostazione in primo piano senza il tuo controllo."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"interruzione applicazioni in esecuzione"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Consente all\'applicazione di rimuovere le attività e terminare le loro applicazioni. Le applicazioni dannose potrebbero interferire con il comportamento di altre applicazioni."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"impostazione compatibilità schermo"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Consente all\'applicazione di controllare la modalità di compatibilità dello schermo di altre applicazioni. Le applicazioni dannose potrebbero disturbare il comportamento di altre applicazioni."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"attivazione debug delle applicazioni"</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 68f5e7e405db..462e0caa9692 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"מאפשר ליישום לקבל ולעבד הודעות MMS. יישומים זדוניים עלולים לעקוב אחר ההודעות שלך או למחוק אותן מבלי להציגן בפניך."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"קבל שידורי חירום"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"מאפשר ליישום לקבל ולעבד לשדר הודעות חירום משודרות. הרשאה זו זמינה רק ליישומי מערכת."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"שלוח הודעות SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"מאפשר ליישום לשלוח הודעות SMS. יישומים זדוניים עלולים לעלות לך כסף בגין שליחת הודעות ללא אישור שלך."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"שלח הודעות SMS ללא אישור"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"מאפשר ליישום להעביר משימות לחזית ולרקע. יישומים זדוניים עלולים לאלץ את עצמם לעבור לחזית ללא שליטה מצדך."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"עצירת יישומים פעילים"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"הרשאה זו מאפשרת ליישום להסיר משימות ולסגור את היישומים שבהם הן פועלות. יישומים זדוניים עלולים לשבש את פעולתם של יישומים אחרים."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"הגדרת תאימות מסך"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"מאפשר ליישום לשלוט במצב תאימות המסך של יישומים אחרים. יישומים זדוניים עלולים לפגוע בהתנהגות של יישומים אחרים."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"הפעלה של ניקוי באגים ביישומים"</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index aa4864c0affe..7d529b2c7de8 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"MMSメッセージの受信と処理をアプリに許可します。この許可を悪意のあるアプリに利用されると、メッセージが監視されたり、表示されずに削除されたりする恐れがあります。"</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"緊急放送の受信"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"緊急ブロードキャストメッセージの受信と処理をアプリに許可します。これはシステムアプリのみが利用できる権限です。"</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"SMSメッセージの送信"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"SMSメッセージの送信をアプリに許可します。この許可を悪意のあるアプリに利用されると、ユーザーの確認なしでメッセージが送信され、料金が発生する恐れがあります。"</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"確認せずにSMSメッセージを送信する"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"タスクをフォアグラウンドやバックグラウンドに移動することをアプリに許可します。この許可を悪意のあるアプリに利用されると、悪意のあるアプリが強制的に優先される恐れがあります。"</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"実行中のアプリの停止"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"タスクの削除とアプリの終了をアプリに許可します。この許可を悪意のあるアプリケーションに利用されると、他のアプリの動作が妨害される恐れがあります。"</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"画面互換性の設定"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"他のアプリの画面互換性モードをコントロールすることをアプリに許可します。この許可を悪意のあるアプリに利用されると、他のアプリの動作が中断される恐れがあります。"</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"アプリのデバッグの有効化"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 0ada67d08644..6db74bee7b39 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"앱이 MMS 메시지를 받고 처리할 수 있도록 허용합니다. 이 경우 악성 앱이 메시지를 모니터링하거나 사용자가 보기 전에 삭제할 수 있습니다."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"긴급 방송 수신"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"앱이 긴급 브로드캐스트 메시지를 수신하고 처리할 수 있도록 허용합니다. 이 권한은 시스템 앱에만 사용할 수 있습니다."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"SMS 메시지 보내기"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"앱이 SMS 메시지를 보낼 수 있도록 허용합니다. 이 경우 악성 앱이 사용자의 확인 없이 메시지를 전송하여 요금이 부과될 수 있습니다."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"확인 없이 SMS 메시지 보내기"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"앱이 작업을 포그라운드나 백그라운드로 이동할 수 있도록 허용합니다. 이 경우 악성 앱이 사용자의 조작 없이 앞으로 이동할 수 있습니다."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"실행 중인 앱 중지"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"애플리케이션이 작업을 삭제하거나 다른 애플리케이션을 중지시킬 수 있도록 허용합니다. 이 경우 악성 애플리케이션이 다른 애플리케이션의 동작을 멈추게 할 수 있습니다."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"화면 호환성 설정"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"앱이 다른 애플리케이션의 화면 호환성 모드를 제어할 수 있도록 허용합니다. 이 경우 악성 애플리케이션이 다른 애플리케이션의 동작을 멈추게 할 수 있습니다."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"앱 디버깅 사용"</string> @@ -1012,9 +1020,9 @@ <string name="sms_control_yes" msgid="3663725993855816807">"허용"</string> <string name="sms_control_no" msgid="625438561395534982">"거부"</string> <string name="sms_short_code_confirm_title" msgid="1666863092640877318">"SMS를 단축 코드로 보내시겠습니까?"</string> - <string name="sms_premium_short_code_confirm_title" msgid="3811263856304367838">"프리미엄 SMS를 보내도록 하시겠습니까?"</string> + <string name="sms_premium_short_code_confirm_title" msgid="3811263856304367838">"프리미엄 SMS를 보내시겠습니까?"</string> <string name="sms_short_code_confirm_message" msgid="5616409294907295407">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>이(가) SMS 단축 코드로 추정되는 문자 메시지를 <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>(으)로 보내려 합니다.<p>문자 메시지를 단축 코드로 보내면 사용자의 모바일 계정에 프리미엄 서비스 요금이 청구될 수 있습니다.<p>해당 앱이 메시지를 보내도록 하시겠습니까?"</string> - <string name="sms_premium_short_code_confirm_message" msgid="6214083016284738667">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>이(가) 문자 메시지를 프리미엄 SMS 단축 코드인 <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>(으)로 보내려 합니다.<p><b>이 목적지로 메시지를 보내면 사용자의 모바일 계정에 프리미엄 서비스 요금이 청구됩니다.</b><p>해당 앱이 메시지를 보내도록 하시겠습니까?"</string> + <string name="sms_premium_short_code_confirm_message" msgid="6214083016284738667">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>이(가) 문자 메시지를 프리미엄 SMS 단축 코드인 <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>(으)로 보내려 합니다.<p><b>메시지를 보내면 사용자의 모바일 계정에 프리미엄 서비스 요금이 청구됩니다.</b><p>해당 앱이 메시지를 보내도록 하시겠습니까?"</string> <string name="sms_short_code_confirm_allow" msgid="8957573662645722940">"메시지 보내기"</string> <string name="sms_short_code_confirm_deny" msgid="6374609298084435887">"보내지 않음"</string> <string name="sms_short_code_confirm_report" msgid="2588793956061677070">"악성 앱 신고"</string> diff --git a/core/res/res/values-large/dimens.xml b/core/res/res/values-large/dimens.xml index 4f49135e566e..864675a49d26 100644 --- a/core/res/res/values-large/dimens.xml +++ b/core/res/res/values-large/dimens.xml @@ -17,13 +17,6 @@ */ --> <resources> - <!-- Height of the status bar --> - <dimen name="status_bar_height">48dip</dimen> - <!-- Width and height of a single notification icon in the status bar --> - <dimen name="status_bar_icon_size">32dip</dimen> - <!-- Size of the giant number (unread count) in the notifications --> - <dimen name="status_bar_content_number_size">48sp</dimen> - <!-- Default height of a key in the password keyboard for alpha --> <dimen name="password_keyboard_key_height_alpha">75dip</dimen> <!-- Default height of a key in the password keyboard for numeric --> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index b37cfda26946..87fe922b7b29 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Leidžiama programai gauti ir apdoroti MMS pranešimus. Kenkėjiškos programos gali stebėti jūsų pranešimus ar ištrinti juos neparodydamos jų jums."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"gauti kritinės padėties transliacijas"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Leidžiama programai gauti ir apdoroti skubiai pateikiamus pranešimus. Šis leidimas galimas tik sistemos programoms."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"siųsti SMS pranešimus"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Leidžiama programai siųsti SMS pranešimus. Kenkėjiškos programos gali siųsti mokamus pranešimus be jūsų patvirtinimo."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"siųsti SMS pranešimus be patvirtinimo"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Leidžiama programai užduotis perkelti į priekinį planą ir į foną. Kenkėjiškos programos gali priverstinai persikelti į priekį be jūsų įsikišimo."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"sustabdyti vykdomas programas"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Leidžiama programai pašalinti užduotis ir panaikinti jų programas. Kenkėjiškos programos gali trikdyti kitų programų veikimą."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"nustatyti ekrano suderinamumo režimą"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Programai leidžiama valdyti kitų programų ekrano suderinamumo režimą. Kenkėjiškos programos gali kliudyti veikti kitoms programoms."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"įgalinti programos derinimą"</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index 2c59d240cce1..9f942c650c34 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Ļauj lietotnei saņemt un apstrādāt multiziņas. Ļaunprātīgas lietotnes var pārraudzīt vai dzēst šos ziņojumus, neparādot tos jums."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"Ārkārtas apraižu saņemšana"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Ļauj lietotnei saņemt un apstrādāt ārkārtas apraides ziņojumus. Šī atļauja attiecas tikai uz sistēmas lietotnēm."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"sūtīt īsziņas"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Ļauj lietotnei sūtīt īsziņas. Ļaunprātīgu lietotņu darbības dēļ jums var būt jāmaksā papildus, jo tiks sūtītas īsziņas bez jūsu apstiprinājuma."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"īsziņu sūtīšana bez apstiprinājuma"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Ļauj lietotnei pārvietot uzdevumus priekšplānā un fonā. Ļaunprātīgas lietotnes var tikt izvirzītas priekšplānā bez jūsu vadības."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"apturēt izmantoto lietotņu darbību"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Ļauj lietotnei noņemt uzdevumus un pārtraukt to lietotņu darbību. Ļaunprātīgas lietotnes var traucēt citu lietotņu darbību."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"Ekrāna saderības noteikšana"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Ļauj lietotnei kontrolēt citu lietotņu ekrāna saderības režīmu. Ļaunprātīgas lietojumprogrammas var mainīt citu lietojumprogrammu darbību."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"iespējot lietotnes atkļūdošanu"</string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index a97b9c1f8853..d7b600300afd 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Membenarkan apl untuk menerima dan memproses mesej MMS. Apl hasad boleh memantau mesej anda atau memadamnya tanpa menunjukkannya kepada anda."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"terima siaran kecemasan"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Membenarkan apl untuk menerima dan memproses mesej siaran kecemasan. Kebenaran ini hanya tersedia kepada apl sistem."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"hantar mesej SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Membenarkan apl untuk menghantar mesej SMS. Apl hasad boleh menyebabkan anda kehilangan wang dengan menghantar mesej tanpa pengesahan anda."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"hantar mesej SMS tanpa pengesahan"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Membenarkan apl untuk memindahkan tugasan ke latar depan dan latar belakang. Apl hasad boleh memaksa diri mereka ke hadapan tanpa kawalan anda."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"hentikan apl yang sedang dijalankan"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Membenarkan apl untuk mengalih keluar tugasan dan melupuskan aplnya. Apl hasad boleh mengganggu tingkah laku apl lain."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"tetapkan keserasian skrin"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Membenarkan apl mengawal mod keserasian skrin aplikasi lain. Aplikasi hasad mungkin mematahkan kelakuan aplikasi lain."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"dayakan penyahpepijatan apl"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 409ee6de8824..ba6fcfbc0445 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Lar appen motta og behandle MMS-meldinger. Ondsinnede apper kan overvåke meldingene dine eller slette dem uten å vise dem til deg."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"motta nødkringkastinger"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Lar appen motta og behandle nødkringkastingsmeldinger. Denne tillatelsen er bare tilgjengelig for systemapper."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"sende SMS-meldinger"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Lar appen sende SMS-meldinger. Ondsinnede apper kan koste deg penger ved å sende meldinger uten din bekreftelse."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"send tekstmeldinger uten godkjenning"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Lar appen flytte oppgaver til forgrunnen eller bakgrunnen. Ondsinnede apper kan tvinge seg frem til forgrunnen utenfor din kontroll."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"avslutte apper som kjører"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Lar appen fjerne oppgaver og avslutte apper. Ondsinnede apper kan forstyrre atferden til andre apper."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"angi skjermkompatibilitet"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Lar appen kontrollere modus for skjermkompatibilitet i andre apper. Skadelige apper kan ødelegge funksjoner i andre apper."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"aktivere feilsøking av app"</string> @@ -1013,7 +1021,7 @@ <string name="sms_control_no" msgid="625438561395534982">"Sperr"</string> <string name="sms_short_code_confirm_title" msgid="1666863092640877318">"Vil du sende SMS til kortkoden?"</string> <string name="sms_premium_short_code_confirm_title" msgid="3811263856304367838">"Vil du sende premium-SMS?"</string> - <string name="sms_short_code_confirm_message" msgid="5616409294907295407">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> vil sende en tekstmelding til <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>, som ser ut ti å være en SMS-kortkode.<p>Hvis du sender en melding til denne destinasjonen, kan mobilkontoen din komme til å belastes for premium-tjenester.<p>Vil du la denne meldingen sendes av appen?"</string> + <string name="sms_short_code_confirm_message" msgid="5616409294907295407">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> vil sende en tekstmelding til <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>, som ser ut til å være en SMS-kortkode.<p>Hvis du sender en melding til denne destinasjonen, kan mobilkontoen din komme til å belastes for premium-tjenester.<p>Vil du la denne meldingen sendes av appen?"</string> <string name="sms_premium_short_code_confirm_message" msgid="6214083016284738667">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> vil sende en tekstmelding til <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>, som er en premium SMS-kortkode.<p><b>Hvis du sender en melding til denne destinasjonen, belastes mobilkontoen din for premium-tjenester.</b><p>Vil du la denne meldingen sendes av appen?"</string> <string name="sms_short_code_confirm_allow" msgid="8957573662645722940">"Send melding"</string> <string name="sms_short_code_confirm_deny" msgid="6374609298084435887">"Ikke send"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index acb6bef04432..4b023e5c3a55 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Hiermee kan de app MMS-berichten ontvangen en verwerken. Schadelijke apps kunnen uw berichten bijhouden of deze verwijderen zonder dat u ze te zien krijgt."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"noodberichten ontvangen"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Hiermee kan de app berichten over noodsituaties ontvangen en verwerken. Deze rechten zijn alleen beschikbaar voor systeemapps."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"SMS-berichten verzenden"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Hiermee kan de app sms\'jes verzenden. Schadelijke apps kunnen u geld kosten door zonder uw toestemming berichten te verzenden."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"zonder toestemming sms\'jes verzenden"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Hiermee kan de app taken naar de voor- en achtergrond verplaatsen. Schadelijke apps kunnen zichzelf op de voorgrond plaatsen zonder dat u hier iets aan kunt doen."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"actieve apps stoppen"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Hiermee kan de app taken verwijderen en apps sluiten. Schadelijke apps kunnen het gedrag van andere apps verstoren."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"schermcompatibiliteit instellen"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Toestaan dat de app de schermcompatibiliteitsmodus van andere apps beheert. Schadelijke apps kunnen het gedrag van andere apps verstoren."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"foutopsporing in apps inschakelen"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 39a6583b720a..76319c2d535b 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Pozwala aplikacji na odbieranie i przetwarzanie wiadomości MMS. Złośliwe aplikacje mogą monitorować wiadomości lub usuwać je, zanim zostaną wyświetlone."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"odbiór emisji alarmowych"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Pozwala aplikacji na odbieranie i przetwarzanie komunikatów transmisji alarmowych. To pozwolenie jest dostępne tylko dla aplikacji systemowych."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"wysyłanie wiadomości SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Pozwala aplikacji na wysyłanie wiadomości SMS. Złośliwe aplikacje mogą generować koszty, wysyłając wiadomości bez Twojej wiedzy."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"wysyłanie wiadomości SMS bez potwierdzenia"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Pozwala aplikacji na przenoszenie zadań między tłem i pierwszym planem. Złośliwe aplikacje mogą wymusić przeniesienie się na pierwszy plan bez Twojego udziału."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"zatrzymywanie uruchomionych aplikacji"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Umożliwia aplikacji usuwanie zadań i kończenie powiązanych z nimi aplikacji. Złośliwe aplikacje mogą zakłócić działanie innych aplikacji."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"ustaw zgodność ekranu"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Pozwala aplikacji na sterowanie trybem zgodności ekranu innych aplikacji. Złośliwe aplikacje mogą zmienić zachowanie innych programów."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"włączenie debugowania aplikacji"</string> diff --git a/core/res/res/values-port/bools.xml b/core/res/res/values-port/bools.xml new file mode 100644 index 000000000000..fc62b69b8584 --- /dev/null +++ b/core/res/res/values-port/bools.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<resources> + <bool name="action_bar_embed_tabs">false</bool> +</resources> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index c35cbb66c5a5..63c8144fe6b4 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Permite que a aplicação receba e processe mensagens MMS. As aplicações maliciosas podem monitorizar as mensagens ou eliminá-las sem mostrá-las ao utilizador."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"receber transmissões de emergência"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Permite à aplicação receber e processar mensagens de difusão de emergência. Esta permissão só está disponível para aplicações do sistema."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"enviar mensagens SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Permite que a aplicação envie mensagens SMS. As aplicações maliciosas podem custar-lhe dinheiro com o envio de mensagens sem a sua confirmação."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"enviar mensagens SMS sem confirmação"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Permite à aplicação mover tarefas para primeiro e segundo plano. As aplicações maliciosas podem impor-se em primeiro plano sem o controlo do utilizador."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"parar aplicações em execução"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Permite que a aplicação remova tarefas e elimine as respetivas aplicações. As aplicações maliciosas podem perturbar o comportamento de outras aplicações."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"definir compatibilidade de ecrã"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Permite que a aplicação controle o modo de compatibilidade de ecrã de outras aplicações. As aplicações maliciosas poderão afetar o comportamento de outras aplicações."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"ativar depuração da aplicação"</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index c22a170b890f..fddea3b9e59e 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Permite que o aplicativo receba e processe mensagens MMS. Aplicativos maliciosos podem monitorar suas mensagens ou excluí-las sem mostrá-las a você."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"receber transmissões de emergência"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Permite que o aplicativo receba e processe mensagens de transmissão de emergência. Esta permissão só está disponível para aplicativos do sistema."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"enviar mensagens SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Permite que o aplicativo envie mensagens SMS. Aplicativos maliciosos podem gerar gastos ao enviar mensagens sem sua confirmação."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"enviar mensagens SMS sem confirmação"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Permite que o aplicativo mova tarefas para o primeiro plano e para o plano de fundo. Aplicativos maliciosos podem forçar-se para a primeiro plano sem que você tenha controle sobre a ação."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"parar os aplicativos em execução"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Permite que um aplicativo remova tarefas e elimine seus aplicativos. Aplicativos maliciosos podem interferir no comportamento de outros aplicativos."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"definir a compatibilidade de tela"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Permite que o aplicativo controle o modo de compatibilidade de tela de outros aplicativos. Aplicativos maliciosos podem interromper o comportamento de outros aplicativos."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"ativar depuração do aplicativo"</string> diff --git a/core/res/res/values-rm/strings.xml b/core/res/res/values-rm/strings.xml index 6f066de38a38..cd5b67d9837c 100644 --- a/core/res/res/values-rm/strings.xml +++ b/core/res/res/values-rm/strings.xml @@ -251,6 +251,10 @@ <skip /> <!-- no translation found for permdesc_receiveEmergencyBroadcast (848524070262431974) --> <skip /> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"trametter messadis SMS"</string> <!-- no translation found for permdesc_sendSms (906546667507626156) --> <skip /> @@ -283,6 +287,10 @@ <skip /> <!-- no translation found for permdesc_removeTasks (1394714352062635493) --> <skip /> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <!-- no translation found for permlab_setScreenCompatibility (6975387118861842061) --> <skip /> <!-- no translation found for permdesc_setScreenCompatibility (692043618693917374) --> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 619e3b9de245..d95db5f92242 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Permite aplicaţiei să primească şi să proceseze mesaje MMS. Aplicaţiile rău intenţionate pot să monitorizeze mesajele sau să le şteargă fără să vi le arate."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"primeşte mesaje difuzate de urgenţă"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Permite aplicaţiei să primească şi să proceseze mesajele difuzate de urgenţă. Această permisiune este disponibilă numai pentru aplicaţiile de sistem."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"trimitere mesaje SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Permite aplicaţiei să trimită mesaje SMS. Aplicaţiile rău intenţionate pot să vă genereze costuri, deoarece trimit mesaje fără confirmarea dvs."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"trimitere mesaje SMS fără confirmare"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Permite aplicaţiei să mute activităţile în prim-plan şi în fundal. Aplicaţiile rău intenţionate pot să apară forţat în prim-plan, fără ca dvs. să puteţi controla acest lucru."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"oprire aplicaţii care rulează"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Permite aplicaţiei să elimine sarcini şi să închidă aplicaţiile corespunzătoare acestora. Aplicaţiile rău intenţionate pot perturba comportamentul altor aplicaţii."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"setaţi compatibilitatea ecranului"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Permite aplicaţiei să controleze modul de compatibilitate a ecranului pentru alte aplicaţii. Aplicaţiile rău intenţionate pot afecta comportamentul altor aplicaţii."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"activare depanare aplicaţie"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 1de5237db931..2bbfbeac29ef 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Приложение сможет получать и обрабатывать MMS. Вредоносные программы смогут отслеживать и удалять сообщения, не показывая их."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"принимать экстренные вызовы"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Приложение сможет получать и обрабатывать экстренные сообщения рассылок. Это разрешение доступно только для системных приложений."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"отправлять SMS-сообщения"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Приложение сможет отправлять SMS. Вредоносные программы смогут отправлять SMS без вашего подтверждения, что приведет к непредвиденным расходам."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"отправка SMS без подтверждения"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Приложение сможет перемещать задачи в режим активного или фонового выполнения. Вредоносные программы смогут переводить себя в активный режим без вашего ведома."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"остановка запущенных приложений"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Приложение сможет удалять задачи и собственные программы. Вредоносное ПО при этом сможет нарушать работу других приложений."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"Установка режима совместимости"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Приложение сможет управлять режимом совместимости экрана других приложений. Вредоносное ПО может привести к сбоям в работе других программ."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"включение отладки приложений"</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 34c9eb037bf2..5d58d701795d 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Umožňuje aplikácii prijímať a spracovávať správy MMS. Škodlivé aplikácie môžu sledovať vaše správy alebo ich odstrániť bez toho, aby ich zobrazili."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"príjem núdzového vysielania"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Umožňuje aplikácii prijímať a spracovávať správy núdzového vysielania. Toto povolenie je k dispozícii len pre systémové aplikácie."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"odosielať správy SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Umožňuje aplikácii odosielať správy SMS. Škodlivé aplikácie môžu bez vášho potvrdenia odosielať spoplatnené správy."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"posielať správy SMS bez potvrdenia"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Umožňuje aplikácii presúvať úlohy do popredia a pozadia. Škodlivé aplikácie sa môžu pretlačiť do popredia bez vášho vedomia."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"zastaviť spustené aplikácie"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Umožňuje aplikácii odstrániť úlohy a ukončiť ich aplikácie. Škodlivé aplikácie môžu narušiť správanie iných aplikácií."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"nastaviť kompatibilitu obrazovky"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Umožňuje aplikácii ovládať režim kompatibility obrazovky v ostatných aplikáciách. Škodlivé aplikácie môžu narušiť správanie ostatných aplikácií."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"povoliť ladenie aplikácií"</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index a1a9a0372e9c..42114728bd4e 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Programu omogoča prejemanje in obdelavo sporočil MMS. Zlonamerni programi lahko nadzirajo sporočila ali jih brišejo, ne da bi vam jih pokazali."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"prejemanje oddaj v sili"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Programu omogoča prejemanje in obdelavo sporočil za oddajanje v sili. To dovoljenje je na voljo samo sistemskim programom."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"pošiljanje sporočil SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Programu omogoča pošiljanje SMS-ov. Zlonamerni programi lahko pošiljajo sporočila brez vaše potrditve, kar vas lahko drago stane."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"pošiljanje SMS-ov brez potrditve"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Programu omogoča premikanje opravil v ospredje in ozadje. Zlonamerni programi se lahko brez vašega nadzora vsilijo v ospredje."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"ustavitev programov, ki se izvajajo"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Programu omogoča odstranjevanje opravil in zapiranje njihovih programov. Zlonamerni programi lahko motijo delovanje drugih programov."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"nastavitev združljivosti zaslona"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Programu omogoča nadzor združljivostnega načina zaslona drugih programov. Zlonamerni programi lahko prekinejo delovanje drugih programov."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"omogočanje iskanja in odpravljanja napak v programu"</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index b28719b42cfa..64c90d3e1bc1 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Дозвољава апликацији да прима и обрађује MMS поруке. Злонамерне апликације могу да надгледају поруке или да их бришу, а да вам их не прикажу."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"пријем хитних преноса"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Дозвољава апликацији да прима и обрађује поруке хитног преноса. Ова дозвола је доступна само за системске апликације."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"слање SMS порука"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Дозвољава апликацији да шаље SMS поруке. Злонамерне апликације могу да шаљу поруке без ваше потврде, што вам може изазвати трошкове."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"слање SMS порука без потврде"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Дозвољава апликацији да премешта задатке у први план и у позадину. Злонамерне апликације могу на тај начин да принудно пређу у први план без ваше контроле."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"заустављање покренутих апликација"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Дозвољава апликацији да уклања задатке и уништава њихове апликације. Злонамерне апликације могу да поремете понашање других апликација."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"подешавање компатибилности екрана"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Дозвољава апликацији да контролише режим компатибилности екрана других апликација. Злонамерне апликације могу да угрозе понашање других апликација."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"омогућавање отклањања грешака у апликацији"</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index da3640d0b436..5c4d81b75b4c 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Tillåter att appen tar emot och bearbetar MMS. Skadliga appar kan övervaka dina meddelanden eller ta bort dem innan du har sett dem."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"ta emot sändningar i nödsituationer"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Tillåter att appen tar emot och bearbetar sändningar i nödsituationer. Behörigheten är bara tillgänglig för systemappar."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"skicka SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Tillåter att appen skickar SMS. 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> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Tillåter att appen flyttar uppgifter till förgrunden eller bakgrunden. Skadliga appar kan tvinga sig till förgrunden utan att du kan styra det."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"avsluta appar som körs"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Tillåter att appen tar bort uppgifter och avslutar appar. Skadliga appar kan störa funktionen i andra appar."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"ange skärmkompatibilitet"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Tillåter att appen styr skärmkompatibilitetsläget i andra appar. Skadliga appar kan störa andra appars funktion."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"aktivera felsökning av appar"</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 5f9a8b130e99..ffd4b196c17f 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Inaruhusu programu kupokea na kuchakata jumbe za MMS. Programu hasidi zinaweza kufuatilia jumbe zako au kuzifuta bila kukuonyesha."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"Pokea matangazo ya dharura"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Inaruhusu programu kupokea na kuchakata jumbe za dharura. Ruhusa hii inapatikana tu kwa programu za mfumo."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"tuma ujumbe wa SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Inaruhusu programu kutuma jumbe za SMS. Programu hasidi zinaweza kukugharimu fedha kwa kutuma jumbe bila uthibitisho wako."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"Tuma ujumbe wa SMS bila ya thibitisho"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Inaruhusu programu kusongesha kazi kwenye mandhari-mbele na mandhari-nyuma. Programu hasidi zinaweza kujilazimisha mbele bila udhibiti wako."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"Komesha programu zinazoendeshwa"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Huruhusu programu kuondoa majukumu na kuua programu zao. Programu hasidi zinaweza kutatiza tabia ya programu zingine."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"weka utangamano wa skrini"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Huruhusu programu kudhibiti hali ya utangamano wa skrini ya programu zingine. Programu hasidi zinaweza kuvunja mwenendo wa programu zingine."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"wezesha utatuaji wa programu"</string> diff --git a/core/res/res/values-sw600dp/bools.xml b/core/res/res/values-sw600dp/bools.xml index 2097049e3229..e74379cc46f8 100644 --- a/core/res/res/values-sw600dp/bools.xml +++ b/core/res/res/values-sw600dp/bools.xml @@ -17,6 +17,5 @@ <resources> <bool name="preferences_prefer_dual_pane">true</bool> <bool name="show_ongoing_ime_switcher">false</bool> - <bool name="action_bar_expanded_action_views_exclusive">false</bool> <bool name="target_honeycomb_needs_options_menu">false</bool> </resources> diff --git a/core/res/res/values-sw600dp/dimens.xml b/core/res/res/values-sw600dp/dimens.xml index 13acdd6c499f..45147602cd57 100644 --- a/core/res/res/values-sw600dp/dimens.xml +++ b/core/res/res/values-sw600dp/dimens.xml @@ -18,13 +18,6 @@ */ --> <resources> - <!-- Height of the status bar --> - <dimen name="status_bar_height">48dip</dimen> - <!-- Width and height of a single notification icon in the status bar --> - <dimen name="status_bar_icon_size">24dip</dimen> - <!-- Size of the giant number (unread count) in the notifications --> - <dimen name="status_bar_content_number_size">48sp</dimen> - <!-- The maximum number of action buttons that should be permitted within an action bar/action mode. This will be used to determine how many showAsAction="ifRoom" items can fit. "always" items can override this. --> @@ -82,5 +75,8 @@ (the screen is in landscape). This may be either a fraction or a dimension.--> <item type="dimen" name="dialog_fixed_height_minor">90%</item> + <!-- Height of the bottom navigation bar in portrait; on sw600dp devices + this is a bit taller --> + <dimen name="navigation_bar_height_portrait">56dp</dimen> </resources> diff --git a/packages/SystemUI/res/values-sw600dp/config.xml b/core/res/res/values-sw720dp/dimens.xml index 24185a4f1844..cac5aab0000e 100644 --- a/packages/SystemUI/res/values-sw600dp/config.xml +++ b/core/res/res/values-sw720dp/dimens.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* -** Copyright 2011, The Android Open Source Project +** +** Copyright 2012, The Android Open Source Project ** ** Licensed under the Apache License, Version 2.0 (the "License"); ** you may not use this file except in compliance with the License. @@ -16,13 +16,10 @@ ** limitations under the License. */ --> - <resources> - <!-- Whether we're using the tablet-optimized recents interface (we use this - value at runtime for some things) --> - <bool name="config_recents_interface_for_tablets">true</bool> - - <!-- Whether recents thumbnails should stretch in both x and y to fill their - ImageView --> - <bool name="config_recents_thumbnail_image_fits_to_xy">true</bool> + <!-- Height of the bottom navigation bar in portrait; on sw720dp devices + this is the same as the height in landscape --> + <dimen name="navigation_bar_height_portrait">@dimen/navigation_bar_height</dimen> </resources> + + diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 0dd113f0917e..e85e02ac2188 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"อนุญาตให้แอปพลิเคชันรับและประมวลผลข้อความ MMS แอปพลิเคชันที่เป็นอันตรายอาจตรวจสอบข้อความของคุณหรือลบออกโดยไม่แสดงให้คุณเห็น"</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"ได้รับการกระจายข้อความฉุกเฉิน"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"อนุญาตให้แอปพลิเคชันรับและประมวลผลข้อความที่เผยแพร่กรณีฉุกเฉิน การอนุญาตนี้ใช้ได้เฉพาะกับแอปพลิเคชันระบบเท่านั้น"</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"ส่งข้อความ SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"อนุญาตให้แอปพลิเคชันส่งข้อความ SMS แอปพลิเคชันที่เป็นอันตรายอาจทำให้คุณต้องเสียค่าใช้จ่ายด้วยการส่งข้อความโดยไม่มีการยืนยันจากคุณ"</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"ส่งข้อความ SMS โดยไม่มีการยืนยัน"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"อนุญาตให้แอปพลิเคชันย้ายงานไปยังส่วนหน้าและพื้นหลัง แอปพลิเคชันที่เป็นอันตรายอาจบังคับตัวเองให้ไปที่ส่วนหน้าโดยไม่มีการควบคุมจากคุณ"</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"หยุดแอปพลิเคชันที่ทำงานอยู่"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"อนุญาตให้แอปพลิเคชันลบงานออกและยุติแอปพลิเคชันต่างๆ ของงานนั้น แอปพลิเคชันที่เป็นอันตรายอาจทำให้แอปพลิเคชันอื่นๆ ทำงานได้ไม่ถูกต้อง"</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"ตั้งค่าความเข้ากันได้ของหน้าจอ"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"อนุญาตให้แอปพลิเคชันควบคุมโหมดความเข้ากันได้ของหน้าจอของแอปพลิเคชันอื่น แอปพลิเคชันที่เป็นอันตรายอาจทำให้แอปพลิเคชันอื่นทำงานผิดพลาด"</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"เปิดใช้งานการแก้ไขบกพร่องของแอปพลิเคชัน"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index f72709ad2419..389fe11dbfc7 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Pinapayagan ang app na tumanggap at magproseso ng mga mensaheng MMS. Maaaring subaybayan ng nakakahamak na apps ang iyong mga mensahe o tanggalin ang mga ito nang hindi ipinapakita ang mga ito sa iyo."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"makatanggap ng mga emergency broadcast"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Pinapayagan ang app na tumanggap at magproseso ng mga mensahe ng broadcast na pang-emergency. Available lamang ang pahintulot na ito sa apps ng system."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"magpadala ng mga SMS na mensahe"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Pinapayagan ang app na magpadala ng mga mensaheng SMS. Maaari kang magastusan ng nakakahamak na apps sa pamamagitan ng pagpapadala ng mga mensahe nang wala ang iyong pagkumpirma."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"magpadala ng mga SMS na mensahe nang walang pagkumpirma"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Pinapayagan ang app na ilipat ang mga gawain sa foreground at background. Maaaring puwersahin ng nakakahamak na apps ang mga sarili nito sa harapan nang wala ang iyong pagkontrol."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"ihinto ang pagpapatakbo ng apps"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Pinapayagan ang app na mag-alis ng mga gawain at i-off ang apps nito. Maaaring maantala ng nakakahamak na apps ang pagkilos ng iba pang apps."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"itakda ang pagkakatugma ng screen"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Pinapayagan ang app na kontrolin ang mode ng pagkakatugma ng screen ng iba pang mga application. Maaaring sirain ng mga nakakahamak na application ang pag-uugali ng iba pang mga application."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"paganahin ang pag-debug ng app"</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index cb99c5f995f5..b3aaea220bf2 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Uygulamaya, MMS mesajlarını alma ve işleme izni verir. Kötü amaçlı uygulamalar mesajlarınızı izleyebilir veya onları size göstermeden silebilir."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"acil durum yayınlarını al"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Uygulamaya, acil yayın mesajları alma ve işleme izni verir. Bu izin, sadece sistem uygulamaları için kullanılabilir."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"SMS mesajları gönder"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Uygulamaya, SMS mesajları gönderme izni verir. Kötü amaçlı uygulamalar onayınızı almadan mesaj göndererek size masraf çıkarabilir."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"SMS mesajlarını onaysız gönder"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Uygulamaya, görevleri ön plana ve arka plana taşıma izni verir. Kötü amaçlı uygulamalar kendilerini sizin denetiminiz dışında ön plana taşıyabilir."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"çalışan uygulamaları durdur"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Uygulamaya, görevleri kaldırma ve bunlara ait uygulamaları kapatma izni verir. Kötü amaçlı uygulamalar diğer uygulamaların çalışmasını bozabilir."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"ekran uyumluluğunu ayarla"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Uygulamaya diğer uygulamaların ekran uyumluluk modunu denetleme izni verir. Kötü amaçlı uygulamalar diğer uygulamaların çalışma şeklini bozabilir."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"uygulama hata ayıklamayı etkinleştir"</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 67319036b534..28da58ce5004 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Дозволяє програмі отримувати й обробляти MMS повідомлення. Шкідливі програми можуть відстежувати ваші повідомлення чи видаляти їх, навіть не показуючи вам."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"отримувати повідомлення екстрених служб"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Дозволяє програмі отримувати й обробляти повідомлення екстрених служб. Цей дозвіл доступний лише для системних програм."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"надсил. SMS повідом."</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Дозволяє програмі надсилати SMS повідомлення. Шкідливі програми можуть надсилати повідомлення без вашого підтвердження, заставляючи вас платити."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"надсилати SMS-повідомлення без підтвердження"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Дозволяє програмі переміщувати завдання в активні чи фонові вікна. Шкідливі програми можуть примусово ставати активними без вашого відома."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"зупиняти запущені програми"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Дозволяє програмі видаляти завдання та примусово припиняти роботу відповідних програм. Шкідливі програми можуть переривати роботу інших програм."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"установити сумісність екрана"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Дозволяє програмі контролювати режим сумісності екрана інших програм. Шкідливі програми можуть переривати роботу інших програм."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"вмикати налагодження програми"</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index c4d9470010f0..e155d385aea2 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Cho phép ứng dụng nhận và xử lý tin nhắn MMS. Ứng dụng độc hại có thể theo dõi tin nhắn của bạn hoặc xóa tin nhắn mà không hiển thị chúng cho bạn."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"nhận các truyền phát khẩn cấp"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Cho phép ứng dụng nhận và xử lý tin nhắn truyền phát khẩn cấp. Quyền này chỉ sẵn có cho các ứng dụng hệ thống."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"gửi tin nhắn SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Cho phép ứng dụng gửi tin nhắn SMS. Ứng dụng độc hại có thể khiến bạn tốn tiền bằng cách gửi tin nhắn mà không cần xác nhận của bạn."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"gửi tin nhắn SMS mà không cần xác nhận"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Cho phép ứng dụng di chuyển công việc sang nền trước và nền sau. Ứng dụng độc hại có thể tự hiển thị ở nền trước mà không chịu sự kiểm soát của bạn."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"dừng các ứng dụng đang chạy"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Cho phép ứng dụng xóa công việc và loại bỏ các ứng dụng của chúng. Ứng dụng độc hại có thể làm gián đoạn hoạt động của các ứng dụng khác."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"đặt độ tương thích màn hình"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Cho phép ứng dụng kiểm soát chế độ tương thích màn hình của ứng dụng khác. Các ứng dụng độc hại có thể phá vỡ hoạt động của các ứng dụng khác."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"bật gỡ lỗi ứng dụng"</string> diff --git a/core/res/res/values-w480dp/bools.xml b/core/res/res/values-w480dp/bools.xml index 57a2939b34ed..3a463a6a77d0 100644 --- a/core/res/res/values-w480dp/bools.xml +++ b/core/res/res/values-w480dp/bools.xml @@ -17,6 +17,6 @@ */ --> <resources> - <bool name="action_bar_embed_tabs">true</bool> + <bool name="action_bar_embed_tabs_pre_jb">true</bool> <bool name="split_action_bar_is_narrow">false</bool> </resources> diff --git a/core/res/res/values-w720dp/bools.xml b/core/res/res/values-w720dp/bools.xml new file mode 100644 index 000000000000..352c3198c303 --- /dev/null +++ b/core/res/res/values-w720dp/bools.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<resources> + <bool name="action_bar_expanded_action_views_exclusive">false</bool> +</resources> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index c0c30ffd7341..1e53029babc3 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"允许应用接收和处理彩信。恶意应用可能会监视您的短信，或删除短信而不向您显示。"</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"接收紧急广播"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"允许应用接收和处理紧急广播消息。此权限仅适用于系统应用。"</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"发送短信"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"允许应用发送短信。恶意应用可能会未经您的确认而发送短信，由此产生相关费用。"</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"不经确认直接发送短信"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"允许应用将任务移动到前台和后台。恶意应用可能会不受您的控制，强行让自己处于前台。"</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"停止正在运行的应用"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"允许该应用删除任务并终止这些任务的应用。恶意应用可以籍此影响其他应用的行为。"</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"设置屏幕兼容性"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"允许该应用控制其他应用的屏幕兼容模式。恶意应用可以籍此影响其他应用的行为。"</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"启用应用调试"</string> @@ -1011,8 +1019,8 @@ <string name="sms_control_message" msgid="3867899169651496433">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>在发送大量短信。是否允许该应用继续发送短信？"</string> <string name="sms_control_yes" msgid="3663725993855816807">"允许"</string> <string name="sms_control_no" msgid="625438561395534982">"拒绝"</string> - <string name="sms_short_code_confirm_title" msgid="1666863092640877318">"向短码发送短信吗？"</string> - <string name="sms_premium_short_code_confirm_title" msgid="3811263856304367838">"发送付费短信吗？"</string> + <string name="sms_short_code_confirm_title" msgid="1666863092640877318">"是否向短码发送短信？"</string> + <string name="sms_premium_short_code_confirm_title" msgid="3811263856304367838">"是否发送付费短信？"</string> <string name="sms_short_code_confirm_message" msgid="5616409294907295407">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>想要向 <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>（这似乎是一个短信短码）发送短信。<p>向某些短码发送短信可能会导致您的移动帐户因使用付费服务而扣费。<p>是否允许该应用发送短信？"</string> <string name="sms_premium_short_code_confirm_message" msgid="6214083016284738667">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>想要向 <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>（这是一个付费短信短码）发送短信。<p><b>向该地址发送短信会导致您的移动帐户因使用付费服务而扣费</b>。<p>是否允许该应用发送短信？"</string> <string name="sms_short_code_confirm_allow" msgid="8957573662645722940">"发送短信"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 1e08a95e06d0..51678ba6f144 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"允許應用程式接收及處理 MMS 簡訊。請注意，惡意應用程式可能利用此功能監視您的訊息，或在您讀取訊息前擅自將其刪除。"</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"接收緊急廣播"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"允許應用程式接收及處理緊急廣播訊息，只有系統應用程式可以具備這項權限。"</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"傳送 SMS 簡訊"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"允許應用程式傳送 SMS 簡訊。請注意，惡意應用程式可能利用此功能擅自傳送簡訊，導致您必須支付大筆費用。"</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"不需經過確認即傳送 SMS 簡訊"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"允許應用程式將工作移至前景或背景。請注意，惡意應用程式可能利用此功能自行移動至前景。"</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"停止執行中的應用程式"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"允許應用程式移除工作並終止執行工作的應用程式。請注意，惡意應用程式可能利用此功能干擾其他應用程式的行為。"</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"設定螢幕相容性"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"允許應用程式控制其他應用程式的螢幕相容性模式。惡意應用程式可能藉此破壞其他應用程式的正常運作。"</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"啟用應用程式偵錯"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 114d45bcc429..5e52129a20c7 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -199,6 +199,10 @@ <string name="permdesc_receiveMms" msgid="1424805308566612086">"Ivumela ukuthi insiza yamukele iphinde isebenze imiyalezo ye-MMS. Izinsiza ezinobungozi zingabheka imiyalezo yakho noma ziyisuse ziyikhombisa wena."</string> <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"yamukela ukusakazwa okuphuthumayo"</string> <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Ivumela insiza ukuthi yamukele iphinde isebenze ukusakakwa kwemiyalezo yezokuphuthumayo. Imvume itholakla ezinsizeni zesistimu kuphela."</string> + <!-- no translation found for permlab_readCellBroadcasts (1598328843619646166) --> + <skip /> + <!-- no translation found for permdesc_readCellBroadcasts (6361972776080458979) --> + <skip /> <string name="permlab_sendSms" msgid="5600830612147671529">"thumela imiyalezo ye-SMS"</string> <string name="permdesc_sendSms" msgid="906546667507626156">"Ivumela insiza ukuthi ithumele imiyalezo ye-SMS. Izinsiza ezinobungozi zingakudla ephaketheni ngokuthi zithuele imiyalezo ngaphandle kokuqinisekisa kwakho."</string> <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"thumela i-SMS engenakuqinisekiswa"</string> @@ -217,6 +221,10 @@ <string name="permdesc_reorderTasks" msgid="4175137612205663399">"Ivumela insiza ukuthi ihambise izenzo ziye ngaphambili kanye nasemumva. Izinsiza ezinobungozi zingaziphoqelela ukuth iziye phambili ngaphandle kokulawula kwakho."</string> <string name="permlab_removeTasks" msgid="6821513401870377403">"misa izinsiza ezisebenzayo"</string> <string name="permdesc_removeTasks" msgid="1394714352062635493">"Vumela ukuthi insiza isuse okumele kwenziwe ibulale nezinsiza zakho. Izinsiza eziwubungozi zingaphazamisa ukusebenza kwezinye izinsiza."</string> + <!-- no translation found for permlab_startAnyActivity (2918768238045206456) --> + <skip /> + <!-- no translation found for permdesc_startAnyActivity (997823695343584001) --> + <skip /> <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"setha ukuhambelana kwesikrini"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Ivumela uhlelo lokusebenza ukulawula imodi yokuhambelana kwesikrini kwezinye izinhlelo zokusebenza. Izinhlelo zokusebenza ezinonya zingase zephule ukuziphatha kwezinye izinhlelo zokusebenza."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"vumela insiza ilungise inkinga"</string> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 6f489d4d3512..aa4799356353 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -2470,6 +2470,8 @@ <!-- Flag whether the accessibility service wants to be able to retrieve the active window content. This setting cannot be changed at runtime. --> <attr name="canRetrieveWindowContent" format="boolean" /> + <!-- Flag whether the accessibility service can handle gesrures and wants such. --> + <attr name="canHandleGestures" format="boolean" /> <!-- Short description of the accessibility serivce purpose or behavior.--> <attr name="description" /> </declare-styleable> diff --git a/core/res/res/values/bools.xml b/core/res/res/values/bools.xml index 87a98e2c220d..f9762b18f9ad 100644 --- a/core/res/res/values/bools.xml +++ b/core/res/res/values/bools.xml @@ -15,7 +15,8 @@ --> <resources> - <bool name="action_bar_embed_tabs">false</bool> + <bool name="action_bar_embed_tabs">true</bool> + <bool name="action_bar_embed_tabs_pre_jb">false</bool> <bool name="split_action_bar_is_narrow">true</bool> <bool name="preferences_prefer_dual_pane">false</bool> <bool name="show_ongoing_ime_switcher">true</bool> diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml index 5ff2c01167ae..e23e3c60d5d6 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -22,6 +22,8 @@ <drawable name="screen_background_dark">#ff000000</drawable> <drawable name="status_bar_closed_default_background">#ff000000</drawable> <drawable name="status_bar_opened_default_background">#ff000000</drawable> + <drawable name="notification_item_background_color">#ff111111</drawable> + <drawable name="notification_item_background_color_pressed">#ff257390</drawable> <drawable name="search_bar_default_color">#ff000000</drawable> <drawable name="safe_mode_background">#60000000</drawable> <!-- Background drawable that can be used for a transparent activity to diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index 0442be87ff64..392116f32727 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -34,16 +34,22 @@ <dimen name="status_bar_height">25dip</dimen> <!-- Height of the bottom navigation / system bar. --> <dimen name="navigation_bar_height">48dp</dimen> + <!-- Height of the bottom navigation bar in portrait --> + <dimen name="navigation_bar_height_portrait">@dimen/navigation_bar_height</dimen> <!-- Width of the navigation bar when it is placed vertically on the screen --> <dimen name="navigation_bar_width">42dp</dimen> <!-- Height of notification icons in the status bar --> <dimen name="status_bar_icon_size">24dip</dimen> <!-- Size of the giant number (unread count) in the notifications --> <dimen name="status_bar_content_number_size">48sp</dimen> + <!-- Height of the system bar (combined status & navigation); used by + SystemUI internally, not respected by the window manager. --> + <dimen name="system_bar_height">@dimen/navigation_bar_height</dimen> <!-- Height of notification icons in the system bar --> <dimen name="system_bar_icon_size">32dip</dimen> <!-- Margin at the edge of the screen to ignore touch events for in the windowshade. --> <dimen name="status_bar_edge_ignore">5dp</dimen> + <!-- Size of the fastscroll hint letter --> <dimen name="fastscroll_overlay_size">104dp</dimen> <!-- Width of the fastscroll thumb --> @@ -213,4 +219,12 @@ <!-- Minimum width for an action button in the menu area of an action bar --> <dimen name="action_button_min_width">56dip</dimen> + + <!-- Maximum height for a stacked tab bar as part of an action bar --> + <dimen name="action_bar_stacked_max_height">48dp</dimen> + + <!-- Maximum width for a stacked action bar tab. This prevents + action bar tabs from becoming too wide on a wide screen when only + a few are present. --> + <dimen name="action_bar_stacked_tab_max_width">180dp</dimen> </resources> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index b564b97ae8a8..05150fd528b4 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -234,6 +234,7 @@ <java-symbol type="attr" name="accessibilityFocusedDrawable"/> <java-symbol type="bool" name="action_bar_embed_tabs" /> + <java-symbol type="bool" name="action_bar_embed_tabs_pre_jb" /> <java-symbol type="bool" name="action_bar_expanded_action_views_exclusive" /> <java-symbol type="bool" name="config_allowActionMenuItemTextWithIcon" /> <java-symbol type="bool" name="config_bluetooth_adapter_quick_switch" /> @@ -292,6 +293,8 @@ <java-symbol type="dimen" name="textview_error_popup_default_width" /> <java-symbol type="dimen" name="toast_y_offset" /> <java-symbol type="dimen" name="volume_panel_top" /> + <java-symbol type="dimen" name="action_bar_stacked_max_height" /> + <java-symbol type="dimen" name="action_bar_stacked_tab_max_width" /> <java-symbol type="string" name="addToDictionary" /> <java-symbol type="string" name="action_bar_home_description" /> @@ -705,6 +708,8 @@ <java-symbol type="string" name="preposition_for_time" /> <java-symbol type="string" name="progress_erasing" /> <java-symbol type="string" name="progress_unmounting" /> + <java-symbol type="string" name="reboot_safemode_confirm" /> + <java-symbol type="string" name="reboot_safemode_title" /> <java-symbol type="string" name="relationTypeAssistant" /> <java-symbol type="string" name="relationTypeBrother" /> <java-symbol type="string" name="relationTypeChild" /> @@ -862,6 +867,10 @@ <java-symbol type="string" name="yesterday" /> <java-symbol type="string" name="imei" /> <java-symbol type="string" name="meid" /> + <java-symbol type="string" name="granularity_label_character" /> + <java-symbol type="string" name="granularity_label_word" /> + <java-symbol type="string" name="granularity_label_link" /> + <java-symbol type="string" name="granularity_label_line" /> <java-symbol type="plurals" name="abbrev_in_num_days" /> <java-symbol type="plurals" name="abbrev_in_num_hours" /> @@ -999,6 +1008,7 @@ <java-symbol type="drawable" name="ic_lockscreen_silent" /> <java-symbol type="drawable" name="ic_lockscreen_unlock" /> <java-symbol type="drawable" name="ic_lockscreen_search" /> + <java-symbol type="drawable" name="notification_bg" /> <java-symbol type="layout" name="action_bar_home" /> <java-symbol type="layout" name="action_bar_title_item" /> @@ -3596,5 +3606,6 @@ <public type="attr" name="parentActivityName" /> <public type="attr" name="importantForAccessibility"/> + <public type="attr" name="canHandleGestures"/> </resources> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index e00986cf510b..9546a10782d8 100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -315,6 +315,15 @@ power off dialog instead of the global actions menu. --> <string name="shutdown_confirm_question">Do you want to shut down?</string> + <!-- Title of dialog to confirm rebooting into safe mode. [CHAR LIMIT=50] --> + <string name="reboot_safemode_title">Reboot to safe mode</string> + + <!-- Shutdown Confirmation Dialog. Message in the confirmation dialog + when the user asks to reboot into safe mode. [CHAR LIMIT=NONE] --> + <string name="reboot_safemode_confirm">Do you want to reboot into safe mode? + This will disable all third party applications you have installed. + They will be restored when you reboot again.</string> + <!-- Recent Tasks dialog: title TODO: this should move to SystemUI.apk, but the code for the old recent dialog is still in the framework @@ -474,6 +483,15 @@ and process emergency broadcast messages. This permission is only available to system apps.</string> + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permlab_readCellBroadcasts">read cell broadcast messages</string> + <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permdesc_readCellBroadcasts">Allows the app to read + cell broadcast messages received by your device. Cell broadcast alerts + are delivered in some locations to warn you of emergency situations. + Malicious apps may interfere with the performance or operation of your + device when an emergency cell broadcast is received.</string> + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_sendSms">send SMS messages</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> @@ -538,6 +556,11 @@ tasks and kill their apps. Malicious apps may disrupt the behavior of other apps.</string> + <!-- Title of an application permission, allowing an application to start any activity, regardless of permission protection or exported state. --> + <string name="permlab_startAnyActivity">start any activity</string> + <!-- Description of an application permission, allowing an application to start any activity, regardless of permission protection or exported state. --> + <string name="permdesc_startAnyActivity">Allows the app to start any activity, regardless of permission protection or exported state.</string> + <!-- Title of an application permission, allowing control of app screen compatibility mode --> <string name="permlab_setScreenCompatibility">set screen compatibility</string> <!-- Description of an application permission, allowing control of app screen compatibility mode --> @@ -2013,6 +2036,15 @@ <!-- Label for ALT modifier key. Must be short to fit on key! --> <string name="password_keyboard_label_alt_key">ALT</string> + <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by character. Only spoken to the user. [CHAR LIMIT=NONE] --> + <string name="granularity_label_character">character</string> + <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by word. Only spoken to the user. [CHAR LIMIT=NONE] --> + <string name="granularity_label_word">word</string> + <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by link. Only spoken to the user. [CHAR LIMIT=NONE] --> + <string name="granularity_label_link">link</string> + <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by line. Only spoken to the user. [CHAR LIMIT=NONE] --> + <string name="granularity_label_line">line</string> + <!-- A format string for 12-hour time of day, just the hour, not the minute, with lower-case "am" or "pm" (example: "3pm"). --> <string name="hour_ampm">"<xliff:g id="hour" example="3">%-l</xliff:g><xliff:g id="ampm" example="pm">%P</xliff:g>"</string> diff --git a/core/tests/coretests/res/drawable/size_adaptive_statelist.xml b/core/tests/coretests/res/drawable/size_adaptive_statelist.xml new file mode 100644 index 000000000000..aaa2de78811f --- /dev/null +++ b/core/tests/coretests/res/drawable/size_adaptive_statelist.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<selector xmlns:android="http://schemas.android.com/apk/res/android" + android:exitFadeDuration="@android:integer/config_mediumAnimTime"> + + <item android:state_pressed="true" android:drawable="@drawable/blue" /> + <item android:state_pressed="false" android:drawable="@drawable/red" /> +</selector> diff --git a/core/tests/coretests/res/layout/size_adaptive_color_statelist.xml b/core/tests/coretests/res/layout/size_adaptive_color_statelist.xml new file mode 100644 index 000000000000..d24df5b30462 --- /dev/null +++ b/core/tests/coretests/res/layout/size_adaptive_color_statelist.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<com.android.internal.widget.SizeAdaptiveLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:internal="http://schemas.android.com/apk/prv/res/android" + android:background="@drawable/size_adaptive_statelist" + android:id="@+id/multi1" + android:layout_width="match_parent" + android:layout_height="64dp" > + + <include + android:id="@+id/one_u" + layout="@layout/size_adaptive_one_u" + android:layout_width="fill_parent" + android:layout_height="64dp" + internal:layout_minHeight="64dp" + internal:layout_maxHeight="64dp" + /> + + <include + android:id="@+id/four_u" + layout="@layout/size_adaptive_four_u" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + internal:layout_minHeight="65dp" + internal:layout_maxHeight="unbounded"/> + +</com.android.internal.widget.SizeAdaptiveLayout> diff --git a/core/tests/coretests/src/android/text/DynamicLayoutBlocksTest.java b/core/tests/coretests/src/android/text/DynamicLayoutBlocksTest.java index 73da84f4e35a..2e42e5a1d384 100644 --- a/core/tests/coretests/src/android/text/DynamicLayoutBlocksTest.java +++ b/core/tests/coretests/src/android/text/DynamicLayoutBlocksTest.java @@ -45,18 +45,18 @@ public class DynamicLayoutBlocksTest extends TestCase { public void printBlocks(String message) { System.out.print(message); for (int i = 0; i < dl.getNumberOfBlocks(); i++) { - System.out.print(" " + Integer.toString(dl.getBlockEnds()[i])); + System.out.print(" " + Integer.toString(dl.getBlockEndLines()[i])); } System.out.println(); } public void checkInvariants() { assertTrue(dl.getNumberOfBlocks() > 0); - assertTrue(dl.getNumberOfBlocks() <= dl.getBlockEnds().length); - assertEquals(dl.getBlockEnds().length, dl.getBlockIndices().length); + assertTrue(dl.getNumberOfBlocks() <= dl.getBlockEndLines().length); + assertEquals(dl.getBlockEndLines().length, dl.getBlockIndices().length); for (int i = 1; i < dl.getNumberOfBlocks(); i++) { - assertTrue(dl.getBlockEnds()[i] > dl.getBlockEnds()[i-1]); + assertTrue(dl.getBlockEndLines()[i] > dl.getBlockEndLines()[i-1]); } } @@ -78,7 +78,7 @@ public class DynamicLayoutBlocksTest extends TestCase { } for (int i = 0; i < dl.getNumberOfBlocks(); i++) { - assertEquals(ends[i], dl.getBlockEnds()[i]); + assertEquals(ends[i], dl.getBlockEndLines()[i]); assertEquals(indices[i], dl.getBlockIndices()[i]); } } diff --git a/core/tests/coretests/src/com/android/internal/widget/SizeAdaptiveLayoutTest.java b/core/tests/coretests/src/com/android/internal/widget/SizeAdaptiveLayoutTest.java index fc83e4aebe85..a937f6570569 100644 --- a/core/tests/coretests/src/com/android/internal/widget/SizeAdaptiveLayoutTest.java +++ b/core/tests/coretests/src/com/android/internal/widget/SizeAdaptiveLayoutTest.java @@ -19,6 +19,7 @@ package com.android.internal.widget; import com.android.frameworks.coretests.R; import android.content.Context; +import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.SmallTest; @@ -428,6 +429,17 @@ public class SizeAdaptiveLayoutTest extends AndroidTestCase { } @SmallTest + public void testModestyPanelTracksStateListColor() { + inflate(R.layout.size_adaptive_color_statelist); + View panel = mSizeAdaptiveLayout.getModestyPanel(); + assertEquals("ModestyPanel should have a ColorDrawable background" , + panel.getBackground().getClass(), ColorDrawable.class); + ColorDrawable panelColor = (ColorDrawable) panel.getBackground(); + assertEquals("ModestyPanel color should match the SizeAdaptiveLayout", + panelColor.getColor(), Color.RED); + } + + @SmallTest public void testModestyPanelHasDefault() { inflate(R.layout.size_adaptive); View panel = mSizeAdaptiveLayout.getModestyPanel(); diff --git a/docs/html/images/training/basic-SDK-manager.png b/docs/html/images/training/basic-SDK-manager.png Binary files differnew file mode 100644 index 000000000000..1f09bdca7811 --- /dev/null +++ b/docs/html/images/training/basic-SDK-manager.png diff --git a/docs/html/images/training/basic-simple-screen-mock.graffle/QuickLook/Preview.pdf b/docs/html/images/training/basic-simple-screen-mock.graffle/QuickLook/Preview.pdf Binary files differnew file mode 100644 index 000000000000..192bb8de237b --- /dev/null +++ b/docs/html/images/training/basic-simple-screen-mock.graffle/QuickLook/Preview.pdf diff --git a/docs/html/images/training/basic-simple-screen-mock.graffle/QuickLook/Thumbnail.tiff b/docs/html/images/training/basic-simple-screen-mock.graffle/QuickLook/Thumbnail.tiff Binary files differnew file mode 100644 index 000000000000..85dd23df62cb --- /dev/null +++ b/docs/html/images/training/basic-simple-screen-mock.graffle/QuickLook/Thumbnail.tiff diff --git a/docs/html/images/training/basic-simple-screen-mock.graffle/data.plist b/docs/html/images/training/basic-simple-screen-mock.graffle/data.plist new file mode 100644 index 000000000000..3c391df6ff29 --- /dev/null +++ b/docs/html/images/training/basic-simple-screen-mock.graffle/data.plist @@ -0,0 +1,635 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>ActiveLayerIndex</key> + <integer>0</integer> + <key>ApplicationVersion</key> + <array> + <string>com.omnigroup.OmniGrafflePro</string> + <string>138.33.0.157554</string> + </array> + <key>AutoAdjust</key> + <true/> + <key>BackgroundGraphic</key> + <dict> + <key>Bounds</key> + <string>{{0, 0}, {576, 733}}</string> + <key>Class</key> + <string>SolidGraphic</string> + <key>ID</key> + <integer>2</integer> + <key>Style</key> + <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> + </dict> + <key>CanvasOrigin</key> + <string>{0, 0}</string> + <key>ColumnAlign</key> + <integer>1</integer> + <key>ColumnSpacing</key> + <real>36</real> + <key>CreationDate</key> + <string>2012-03-20 17:38:46 -0700</string> + <key>Creator</key> + <string>Billy Rutledge</string> + <key>DisplayScale</key> + <string>1 0/72 in = 1 0/72 in</string> + <key>GraphDocumentVersion</key> + <integer>8</integer> + <key>GraphicsList</key> + <array> + <dict> + <key>Bounds</key> + <string>{{257, 117}, {282, 231}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>DroidSans-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>200</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.628571</string> + <key>g</key> + <string>0.768599</string> + <key>r</key> + <string>1</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.236788</string> + <key>g</key> + <string>0.532236</string> + <key>r</key> + <string>0.990271</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.131021</string> + <key>g</key> + <string>0.363196</string> + <key>r</key> + <string>0.725948</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 Fragment B}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{163, 117}, {92, 231}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>DroidSans-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>1203</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>1</string> + <key>g</key> + <string>0.874135</string> + <key>r</key> + <string>0.71718</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>1</string> + <key>g</key> + <string>0.662438</string> + <key>r</key> + <string>0.464468</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.93512</string> + <key>g</key> + <string>0.472602</string> + <key>r</key> + <string>0.333854</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 Fragment A}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{24, 168}, {92, 152}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>DroidSans-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>157</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>1</string> + <key>g</key> + <string>0.874135</string> + <key>r</key> + <string>0.71718</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>1</string> + <key>g</key> + <string>0.662438</string> + <key>r</key> + <string>0.464468</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.93512</string> + <key>g</key> + <string>0.472602</string> + <key>r</key> + <string>0.333854</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 Fragment A}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{11.96, 141.616}, {117.52, 224.884}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>ID</key> + <integer>1202</integer> + <key>ImageID</key> + <integer>2</integer> + <key>Magnets</key> + <array> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + </array> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{140, 95}, {422.773, 277}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>ID</key> + <integer>1201</integer> + <key>ImageID</key> + <integer>1</integer> + <key>Magnets</key> + <array> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + </array> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> + </dict> + </array> + <key>GridInfo</key> + <dict/> + <key>GuidesLocked</key> + <string>NO</string> + <key>GuidesVisible</key> + <string>YES</string> + <key>HPages</key> + <integer>1</integer> + <key>ImageCounter</key> + <integer>3</integer> + <key>ImageLinkBack</key> + <array> + <dict/> + <dict/> + </array> + <key>ImageList</key> + <array> + <string>image2.png</string> + <string>image1.png</string> + </array> + <key>KeepToScale</key> + <false/> + <key>Layers</key> + <array> + <dict> + <key>Lock</key> + <string>NO</string> + <key>Name</key> + <string>Layer 1</string> + <key>Print</key> + <string>YES</string> + <key>View</key> + <string>YES</string> + </dict> + </array> + <key>LayoutInfo</key> + <dict> + <key>Animate</key> + <string>NO</string> + <key>circoMinDist</key> + <real>18</real> + <key>circoSeparation</key> + <real>0.0</real> + <key>layoutEngine</key> + <string>dot</string> + <key>neatoSeparation</key> + <real>0.0</real> + <key>twopiSeparation</key> + <real>0.0</real> + </dict> + <key>LinksVisible</key> + <string>NO</string> + <key>MagnetsVisible</key> + <string>NO</string> + <key>MasterSheets</key> + <array/> + <key>ModificationDate</key> + <string>2012-03-20 17:52:44 -0700</string> + <key>Modifier</key> + <string>Billy Rutledge</string> + <key>NotesVisible</key> + <string>NO</string> + <key>Orientation</key> + <integer>2</integer> + <key>OriginVisible</key> + <string>NO</string> + <key>PageBreaks</key> + <string>YES</string> + <key>PrintInfo</key> + <dict> + <key>NSBottomMargin</key> + <array> + <string>float</string> + <string>41</string> + </array> + <key>NSLeftMargin</key> + <array> + <string>float</string> + <string>18</string> + </array> + <key>NSPaperSize</key> + <array> + <string>coded</string> + <string>BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU1ZhbHVlAISECE5TT2JqZWN0AIWEASqEhAx7X05TU2l6ZT1mZn2WgWQCgRgDhg==</string> + </array> + <key>NSRightMargin</key> + <array> + <string>float</string> + <string>18</string> + </array> + <key>NSTopMargin</key> + <array> + <string>float</string> + <string>18</string> + </array> + </dict> + <key>PrintOnePage</key> + <false/> + <key>ReadOnly</key> + <string>NO</string> + <key>RowAlign</key> + <integer>1</integer> + <key>RowSpacing</key> + <real>36</real> + <key>SheetTitle</key> + <string>Canvas 1</string> + <key>SmartAlignmentGuidesActive</key> + <string>YES</string> + <key>SmartDistanceGuidesActive</key> + <string>YES</string> + <key>UniqueID</key> + <integer>1</integer> + <key>UseEntirePage</key> + <false/> + <key>VPages</key> + <integer>1</integer> + <key>WindowInfo</key> + <dict> + <key>CurrentSheet</key> + <integer>0</integer> + <key>ExpandedCanvases</key> + <array> + <dict> + <key>name</key> + <string>Canvas 1</string> + </dict> + </array> + <key>Frame</key> + <string>{{837, 167}, {1214, 1013}}</string> + <key>ListView</key> + <true/> + <key>OutlineWidth</key> + <integer>142</integer> + <key>RightSidebar</key> + <false/> + <key>ShowRuler</key> + <true/> + <key>Sidebar</key> + <true/> + <key>SidebarWidth</key> + <integer>120</integer> + <key>VisibleRegion</key> + <string>{{-252, -63}, {1079, 859}}</string> + <key>Zoom</key> + <real>1</real> + <key>ZoomValues</key> + <array> + <array> + <string>Canvas 1</string> + <real>1</real> + <real>1</real> + </array> + </array> + </dict> + <key>saveQuickLookFiles</key> + <string>YES</string> +</dict> +</plist> diff --git a/docs/html/images/training/basic-simple-screen-mock.graffle/image1.png b/docs/html/images/training/basic-simple-screen-mock.graffle/image1.png Binary files differnew file mode 100644 index 000000000000..80baf143138d --- /dev/null +++ b/docs/html/images/training/basic-simple-screen-mock.graffle/image1.png diff --git a/docs/html/images/training/basic-simple-screen-mock.graffle/image2.png b/docs/html/images/training/basic-simple-screen-mock.graffle/image2.png Binary files differnew file mode 100644 index 000000000000..f478d162f06a --- /dev/null +++ b/docs/html/images/training/basic-simple-screen-mock.graffle/image2.png diff --git a/docs/html/images/training/basic-simple-screen-mock.png b/docs/html/images/training/basic-simple-screen-mock.png Binary files differnew file mode 100644 index 000000000000..72af1d201125 --- /dev/null +++ b/docs/html/images/training/basic-simple-screen-mock.png diff --git a/docs/html/images/training/basics/basic-lifecycle-create.png b/docs/html/images/training/basics/basic-lifecycle-create.png Binary files differnew file mode 100644 index 000000000000..01d7328da8a4 --- /dev/null +++ b/docs/html/images/training/basics/basic-lifecycle-create.png diff --git a/docs/html/images/training/basics/basic-lifecycle-paused.png b/docs/html/images/training/basics/basic-lifecycle-paused.png Binary files differnew file mode 100644 index 000000000000..fcb8bd245fa9 --- /dev/null +++ b/docs/html/images/training/basics/basic-lifecycle-paused.png diff --git a/docs/html/images/training/basics/basic-lifecycle-savestate.png b/docs/html/images/training/basics/basic-lifecycle-savestate.png Binary files differnew file mode 100644 index 000000000000..d74f1baa3033 --- /dev/null +++ b/docs/html/images/training/basics/basic-lifecycle-savestate.png diff --git a/docs/html/images/training/basics/basic-lifecycle-stopped.png b/docs/html/images/training/basics/basic-lifecycle-stopped.png Binary files differnew file mode 100644 index 000000000000..26c22ee0cc33 --- /dev/null +++ b/docs/html/images/training/basics/basic-lifecycle-stopped.png diff --git a/docs/html/images/training/basics/basic-lifecycle.graffle/QuickLook/Preview.pdf b/docs/html/images/training/basics/basic-lifecycle.graffle/QuickLook/Preview.pdf Binary files differnew file mode 100644 index 000000000000..aa97f220afaa --- /dev/null +++ b/docs/html/images/training/basics/basic-lifecycle.graffle/QuickLook/Preview.pdf diff --git a/docs/html/images/training/basics/basic-lifecycle.graffle/QuickLook/Thumbnail.tiff b/docs/html/images/training/basics/basic-lifecycle.graffle/QuickLook/Thumbnail.tiff Binary files differnew file mode 100644 index 000000000000..55c1157c69d9 --- /dev/null +++ b/docs/html/images/training/basics/basic-lifecycle.graffle/QuickLook/Thumbnail.tiff diff --git a/docs/html/images/training/basics/basic-lifecycle.graffle/data.plist b/docs/html/images/training/basics/basic-lifecycle.graffle/data.plist new file mode 100644 index 000000000000..28c03f594fe5 --- /dev/null +++ b/docs/html/images/training/basics/basic-lifecycle.graffle/data.plist @@ -0,0 +1,4835 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>ActiveLayerIndex</key> + <integer>3</integer> + <key>ApplicationVersion</key> + <array> + <string>com.omnigroup.OmniGrafflePro</string> + <string>138.9.0.117994</string> + </array> + <key>AutoAdjust</key> + <true/> + <key>BackgroundGraphic</key> + <dict> + <key>Bounds</key> + <string>{{0, 0}, {1152, 733}}</string> + <key>Class</key> + <string>SolidGraphic</string> + <key>ID</key> + <integer>2</integer> + <key>Style</key> + <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> + </dict> + <key>CanvasOrigin</key> + <string>{0, 0}</string> + <key>ColumnAlign</key> + <integer>1</integer> + <key>ColumnSpacing</key> + <real>36</real> + <key>CreationDate</key> + <string>2012-04-12 14:32:59 -0700</string> + <key>Creator</key> + <string>Scott Main</string> + <key>DisplayScale</key> + <string>1 0/72 in = 1 0/72 in</string> + <key>GraphDocumentVersion</key> + <integer>6</integer> + <key>GraphicsList</key> + <array> + <dict> + <key>Bounds</key> + <string>{{178.858, 130.553}, {23.9998, 24}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>Helvetica-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37924</integer> + <key>Layer</key> + <integer>0</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>Circle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.938075</string> + <key>g</key> + <string>0.938269</string> + <key>r</key> + <string>0.938154</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.727869</string> + <key>g</key> + <string>0.728019</string> + <key>r</key> + <string>0.72793</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.472997</string> + <key>g</key> + <string>0.473094</string> + <key>r</key> + <string>0.473036</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 3}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{13.5321, 282.081}, {23.9998, 24}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>Helvetica-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37921</integer> + <key>Layer</key> + <integer>0</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>Circle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.938075</string> + <key>g</key> + <string>0.938269</string> + <key>r</key> + <string>0.938154</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.727869</string> + <key>g</key> + <string>0.728019</string> + <key>r</key> + <string>0.72793</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.472997</string> + <key>g</key> + <string>0.473094</string> + <key>r</key> + <string>0.473036</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 1}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{105.929, 216.712}, {23.9998, 24}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>Helvetica-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37920</integer> + <key>Layer</key> + <integer>0</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>Circle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.938075</string> + <key>g</key> + <string>0.938269</string> + <key>r</key> + <string>0.938154</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.727869</string> + <key>g</key> + <string>0.728019</string> + <key>r</key> + <string>0.72793</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.472997</string> + <key>g</key> + <string>0.473094</string> + <key>r</key> + <string>0.473036</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 2}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{26, 76}, {406, 301}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.65</string> + <key>w</key> + <string>0</string> + </dict> + <key>Font</key> + <string>DroidSans</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37925</integer> + <key>Layer</key> + <integer>0</integer> + <key>Magnets</key> + <array> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + </array> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.578326</string> + <key>g</key> + <string>0.578615</string> + <key>r</key> + <string>0.578453</string> + </dict> + <key>CornerRadius</key> + <real>15</real> + <key>Pattern</key> + <integer>1</integer> + </dict> + </dict> + <key>Text</key> + <dict> + <key>VerticalPad</key> + <integer>10</integer> + </dict> + <key>TextPlacement</key> + <integer>0</integer> + </dict> + <dict> + <key>Bounds</key> + <string>{{178.777, 131.562}, {23.9998, 24}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>Helvetica-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37923</integer> + <key>Layer</key> + <integer>1</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>Circle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.938075</string> + <key>g</key> + <string>0.938269</string> + <key>r</key> + <string>0.938154</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.727869</string> + <key>g</key> + <string>0.728019</string> + <key>r</key> + <string>0.72793</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.472997</string> + <key>g</key> + <string>0.473094</string> + <key>r</key> + <string>0.473036</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 4}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{221.214, 231.078}, {23.9998, 24}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>Helvetica-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37918</integer> + <key>Layer</key> + <integer>1</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>Circle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.938075</string> + <key>g</key> + <string>0.938269</string> + <key>r</key> + <string>0.938154</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.727869</string> + <key>g</key> + <string>0.728019</string> + <key>r</key> + <string>0.72793</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.472997</string> + <key>g</key> + <string>0.473094</string> + <key>r</key> + <string>0.473036</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 3}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{302.633, 267.492}, {23.9998, 24}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>Helvetica-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37916</integer> + <key>Layer</key> + <integer>1</integer> + <key>Line</key> + <dict> + <key>ID</key> + <integer>37896</integer> + <key>Position</key> + <real>0.58431947231292725</real> + <key>RotationType</key> + <integer>0</integer> + </dict> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>Circle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.938075</string> + <key>g</key> + <string>0.938269</string> + <key>r</key> + <string>0.938154</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.727869</string> + <key>g</key> + <string>0.728019</string> + <key>r</key> + <string>0.72793</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.472997</string> + <key>g</key> + <string>0.473094</string> + <key>r</key> + <string>0.473036</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 2}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{507.453, 217.065}, {23.9998, 24}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>Helvetica-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37917</integer> + <key>Layer</key> + <integer>1</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>Circle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.938075</string> + <key>g</key> + <string>0.938269</string> + <key>r</key> + <string>0.938154</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.727869</string> + <key>g</key> + <string>0.728019</string> + <key>r</key> + <string>0.72793</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.472997</string> + <key>g</key> + <string>0.473094</string> + <key>r</key> + <string>0.473036</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 1}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{194, 76}, {403, 238}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.65</string> + <key>w</key> + <string>0</string> + </dict> + <key>Font</key> + <string>DroidSans</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37915</integer> + <key>Layer</key> + <integer>1</integer> + <key>Magnets</key> + <array> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + </array> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.578326</string> + <key>g</key> + <string>0.578615</string> + <key>r</key> + <string>0.578453</string> + </dict> + <key>CornerRadius</key> + <real>15</real> + <key>Pattern</key> + <integer>1</integer> + </dict> + </dict> + <key>Text</key> + <dict> + <key>VerticalPad</key> + <integer>10</integer> + </dict> + <key>TextPlacement</key> + <integer>0</integer> + </dict> + <dict> + <key>Bounds</key> + <string>{{422, 131.562}, {23.9998, 24}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>Helvetica-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37835</integer> + <key>Layer</key> + <integer>2</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>Circle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.938075</string> + <key>g</key> + <string>0.938269</string> + <key>r</key> + <string>0.938154</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.727869</string> + <key>g</key> + <string>0.728019</string> + <key>r</key> + <string>0.72793</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.472997</string> + <key>g</key> + <string>0.473094</string> + <key>r</key> + <string>0.473036</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 1}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{298.238, 144.062}, {23.9998, 24}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>Helvetica-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37834</integer> + <key>Layer</key> + <integer>2</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>Circle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.938075</string> + <key>g</key> + <string>0.938269</string> + <key>r</key> + <string>0.938154</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.727869</string> + <key>g</key> + <string>0.728019</string> + <key>r</key> + <string>0.72793</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.472997</string> + <key>g</key> + <string>0.473094</string> + <key>r</key> + <string>0.473036</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 2}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{288, 76}, {230, 152}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.65</string> + <key>w</key> + <string>0</string> + </dict> + <key>Font</key> + <string>DroidSans</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37830</integer> + <key>Layer</key> + <integer>2</integer> + <key>Magnets</key> + <array> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + </array> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.578326</string> + <key>g</key> + <string>0.578615</string> + <key>r</key> + <string>0.578453</string> + </dict> + <key>CornerRadius</key> + <real>15</real> + <key>Pattern</key> + <integer>1</integer> + </dict> + </dict> + <key>Text</key> + <dict> + <key>VerticalPad</key> + <integer>10</integer> + </dict> + <key>TextPlacement</key> + <integer>0</integer> + </dict> + <dict> + <key>Bounds</key> + <string>{{385.187, 177.401}, {120.813, 35.3802}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>Helvetica-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37913</integer> + <key>Layer</key> + <integer>3</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>RoundRect</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.253268</string> + <key>g</key> + <string>0.930286</string> + <key>r</key> + <string>0.950739</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.238892</string> + <key>g</key> + <string>0.757587</string> + <key>r</key> + <string>0.782828</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.165602</string> + <key>g</key> + <string>0.586124</string> + <key>r</key> + <string>0.428309</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 Paused\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b0 \cf0 (partially visible)}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{618.773, 318.895}, {71.5931, 46.105}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>Helvetica-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37914</integer> + <key>Layer</key> + <integer>3</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.938075</string> + <key>g</key> + <string>0.938269</string> + <key>r</key> + <string>0.938154</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.727869</string> + <key>g</key> + <string>0.728019</string> + <key>r</key> + <string>0.72793</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.472997</string> + <key>g</key> + <string>0.473094</string> + <key>r</key> + <string>0.473036</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 Destroyed}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{203.073, 137.553}, {77, 14}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.65</string> + <key>w</key> + <string>0</string> + </dict> + <key>Font</key> + <string>DroidSans</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37909</integer> + <key>Layer</key> + <integer>3</integer> + <key>Line</key> + <dict> + <key>ID</key> + <integer>37892</integer> + <key>Position</key> + <real>0.26310518383979797</real> + <key>RotationType</key> + <integer>0</integer> + </dict> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> + <key>Text</key> + <dict> + <key>RTFD</key> + <data> + BAtzdHJlYW10eXBlZIHoA4QBQISEhBJOU0F0dHJpYnV0 + ZWRTdHJpbmcAhIQITlNPYmplY3QAhZKEhIQITlNTdHJp + bmcBlIQBKwpvblJlc3VtZSgphoQCaUkBCpKEhIQMTlNE + aWN0aW9uYXJ5AJSEAWkDkoSWlgdOU0NvbG9yhpKEhIQH + TlNDb2xvcgCUhAFjA4QCZmYAg2ZmJj+GkoSWlgZOU0Zv + bnSGkoSEhAZOU0ZvbnQelJkchAVbMjhjXQYAAAAUAAAA + //5IAGUAbAB2AGUAdABpAGMAYQCEAWYMmwCbAZsAmwCG + koSWlhBOU1BhcmFncmFwaFN0eWxlhpKEhIQQTlNQYXJh + Z3JhcGhTdHlsZQCUhARDQ0BTAgCEhIQHTlNBcnJheQCU + mQyShISECU5TVGV4dFRhYgCUhAJDZgAchpKEpaQAOIaS + hKWkAFSGkoSlpABwhpKEpaQAgYwAhpKEpaQAgagAhpKE + paQAgcQAhpKEpaQAgeAAhpKEpaQAgfwAhpKEpaQAgRgB + hpKEpaQAgTQBhpKEpaQAgVABhoYAhoaG + </data> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;\red0\green0\blue0;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural + +\f0\fs24 \cf2 onResume()}</string> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{44, 313.237}, {54.2626, 54.2626}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>ID</key> + <integer>37908</integer> + <key>ImageID</key> + <integer>1</integer> + <key>Layer</key> + <integer>3</integer> + <key>Magnets</key> + <array> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + </array> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{322.237, 149.062}, {77, 14}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.65</string> + <key>w</key> + <string>0</string> + </dict> + <key>Font</key> + <string>DroidSans</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37907</integer> + <key>Layer</key> + <integer>3</integer> + <key>Line</key> + <dict> + <key>ID</key> + <integer>37906</integer> + <key>Position</key> + <real>0.67048442363739014</real> + <key>RotationType</key> + <integer>0</integer> + </dict> + <key>Magnets</key> + <array> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + </array> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> + <key>Text</key> + <dict> + <key>RTFD</key> + <data> + BAtzdHJlYW10eXBlZIHoA4QBQISEhBJOU0F0dHJpYnV0 + ZWRTdHJpbmcAhIQITlNPYmplY3QAhZKEhIQITlNTdHJp + bmcBlIQBKwpvblJlc3VtZSgphoQCaUkBCpKEhIQMTlNE + aWN0aW9uYXJ5AJSEAWkDkoSWlgdOU0NvbG9yhpKEhIQH + TlNDb2xvcgCUhAFjA4QCZmYAg2ZmJj+GkoSWlgZOU0Zv + bnSGkoSEhAZOU0ZvbnQelJkchAVbMjhjXQYAAAAUAAAA + //5IAGUAbAB2AGUAdABpAGMAYQCEAWYMmwCbAZsAmwCG + koSWlhBOU1BhcmFncmFwaFN0eWxlhpKEhIQQTlNQYXJh + Z3JhcGhTdHlsZQCUhARDQ0BTAgCEhIQHTlNBcnJheQCU + mQyShISECU5TVGV4dFRhYgCUhAJDZgAchpKEpaQAOIaS + hKWkAFSGkoSlpABwhpKEpaQAgYwAhpKEpaQAgagAhpKE + paQAgcQAhpKEpaQAgeAAhpKEpaQAgfwAhpKEpaQAgRgB + hpKEpaQAgTQBhpKEpaQAgVABhoYAhoaG + </data> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;\red0\green0\blue0;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural + +\f0\fs24 \cf2 onResume()}</string> + </dict> + </dict> + <dict> + <key>Class</key> + <string>LineGraphic</string> + <key>FontInfo</key> + <dict> + <key>Font</key> + <string>DroidSans</string> + <key>Size</key> + <real>11</real> + </dict> + <key>Head</key> + <dict> + <key>ID</key> + <integer>37888</integer> + <key>Info</key> + <integer>5</integer> + </dict> + <key>ID</key> + <integer>37906</integer> + <key>Layer</key> + <integer>3</integer> + <key>OrthogonalBarAutomatic</key> + <false/> + <key>OrthogonalBarPosition</key> + <real>4.1290435791015625</real> + <key>Points</key> + <array> + <string>{385.187, 195.091}</string> + <string>{360.737, 125.38}</string> + </array> + <key>Style</key> + <dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.7</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>CornerRadius</key> + <real>4</real> + <key>HeadArrow</key> + <string>FilledArrow</string> + <key>LineType</key> + <integer>2</integer> + <key>TailArrow</key> + <string>0</string> + </dict> + </dict> + <key>Tail</key> + <dict> + <key>ID</key> + <integer>37913</integer> + <key>Info</key> + <integer>8</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{246.213, 236.078}, {57, 14}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.65</string> + <key>w</key> + <string>0</string> + </dict> + <key>Font</key> + <string>DroidSans</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37905</integer> + <key>Layer</key> + <integer>3</integer> + <key>Line</key> + <dict> + <key>ID</key> + <integer>37896</integer> + <key>Position</key> + <real>0.88071924448013306</real> + <key>RotationType</key> + <integer>0</integer> + </dict> + <key>Magnets</key> + <array> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + </array> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> + <key>Text</key> + <dict> + <key>RTFD</key> + <data> + BAtzdHJlYW10eXBlZIHoA4QBQISEhBJOU0F0dHJpYnV0 + ZWRTdHJpbmcAhIQITlNPYmplY3QAhZKEhIQITlNTdHJp + bmcBlIQBKwlvblN0YXJ0KCmGhAJpSQEJkoSEhAxOU0Rp + Y3Rpb25hcnkAlIQBaQOShJaWB05TQ29sb3KGkoSEhAdO + U0NvbG9yAJSEAWMDhAJmZgCDZmYmP4aShJaWBk5TRm9u + dIaShISEBk5TRm9udB6UmRyEBVsyOGNdBgAAABQAAAD/ + /kgAZQBsAHYAZQB0AGkAYwBhAIQBZgybAJsBmwCbAIaS + hJaWEE5TUGFyYWdyYXBoU3R5bGWGkoSEhBBOU1BhcmFn + cmFwaFN0eWxlAJSEBENDQFMCAISEhAdOU0FycmF5AJSZ + DJKEhIQJTlNUZXh0VGFiAJSEAkNmAByGkoSlpAA4hpKE + paQAVIaShKWkAHCGkoSlpACBjACGkoSlpACBqACGkoSl + pACBxACGkoSlpACB4ACGkoSlpACB/ACGkoSlpACBGAGG + koSlpACBNAGGkoSlpACBUAGGhgCGhoY= + </data> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;\red0\green0\blue0;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural + +\f0\fs24 \cf2 onStart()}</string> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{42.1313, 287.256}, {58, 14}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FitText</key> + <string>YES</string> + <key>Flow</key> + <string>Resize</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.65</string> + <key>w</key> + <string>0</string> + </dict> + </dict> + <key>ID</key> + <integer>37904</integer> + <key>Layer</key> + <integer>3</integer> + <key>Line</key> + <dict> + <key>ID</key> + <integer>37893</integer> + <key>Position</key> + <real>0.20424844324588776</real> + <key>RotationType</key> + <integer>0</integer> + </dict> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Pad</key> + <integer>0</integer> + <key>RTFD</key> + <data> + BAtzdHJlYW10eXBlZIHoA4QBQISEhBJOU0F0dHJpYnV0 + ZWRTdHJpbmcAhIQITlNPYmplY3QAhZKEhIQITlNTdHJp + bmcBlIQBKwpvbkNyZWF0ZSgphoQCaUkBCpKEhIQMTlNE + aWN0aW9uYXJ5AJSEAWkDkoSWlgdOU0NvbG9yhpKEhIQH + TlNDb2xvcgCUhAFjA4QCZmYAg2ZmJj+GkoSWlgZOU0Zv + bnSGkoSEhAZOU0ZvbnQelJkchAVbMjhjXQYAAAAUAAAA + //5IAGUAbAB2AGUAdABpAGMAYQCEAWYMmwCbAZsAmwCG + koSWlhBOU1BhcmFncmFwaFN0eWxlhpKEhIQQTlNQYXJh + Z3JhcGhTdHlsZQCUhARDQ0BTAgCEhIQHTlNBcnJheQCU + mQyShISECU5TVGV4dFRhYgCUhAJDZgAchpKEpaQAOIaS + hKWkAFSGkoSlpABwhpKEpaQAgYwAhpKEpaQAgagAhpKE + paQAgcQAhpKEpaQAgeAAhpKEpaQAgfwAhpKEpaQAgRgB + hpKEpaQAgTQBhpKEpaQAgVABhoYAhoaG + </data> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;\red0\green0\blue0;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural + +\f0\fs24 \cf2 onCreate()}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + <key>Wrap</key> + <string>NO</string> + </dict> + <dict> + <key>Bounds</key> + <string>{{135.136, 222.065}, {47, 14}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FitText</key> + <string>YES</string> + <key>Flow</key> + <string>Resize</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.65</string> + <key>w</key> + <string>0</string> + </dict> + </dict> + <key>ID</key> + <integer>37903</integer> + <key>Layer</key> + <integer>3</integer> + <key>Line</key> + <dict> + <key>ID</key> + <integer>37898</integer> + <key>Position</key> + <real>0.27529767155647278</real> + <key>RotationType</key> + <integer>0</integer> + </dict> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Pad</key> + <integer>0</integer> + <key>RTFD</key> + <data> + BAtzdHJlYW10eXBlZIHoA4QBQISEhBJOU0F0dHJpYnV0 + ZWRTdHJpbmcAhIQITlNPYmplY3QAhZKEhIQITlNTdHJp + bmcBlIQBKwlvblN0YXJ0KCmGhAJpSQEJkoSEhAxOU0Rp + Y3Rpb25hcnkAlIQBaQOShJaWB05TQ29sb3KGkoSEhAdO + U0NvbG9yAJSEAWMDhAJmZgCDZmYmP4aShJaWBk5TRm9u + dIaShISEBk5TRm9udB6UmRyEBVsyOGNdBgAAABQAAAD/ + /kgAZQBsAHYAZQB0AGkAYwBhAIQBZgybAJsBmwCbAIaS + hJaWEE5TUGFyYWdyYXBoU3R5bGWGkoSEhBBOU1BhcmFn + cmFwaFN0eWxlAJSEBENDQFMCAISEhAdOU0FycmF5AJSZ + DJKEhIQJTlNUZXh0VGFiAJSEAkNmAByGkoSlpAA4hpKE + paQAVIaShKWkAHCGkoSlpACBjACGkoSlpACBqACGkoSl + pACBxACGkoSlpACB4ACGkoSlpACB/ACGkoSlpACBGAGG + koSlpACBNAGGkoSlpACBUAGGhgCGhoY= + </data> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;\red0\green0\blue0;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural + +\f0\fs24 \cf2 onStart()}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + <key>Wrap</key> + <string>NO</string> + </dict> + <dict> + <key>Bounds</key> + <string>{{624.069, 287.081}, {63, 14}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FitText</key> + <string>YES</string> + <key>Flow</key> + <string>Resize</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.65</string> + <key>w</key> + <string>0</string> + </dict> + <key>Font</key> + <string>Helvetica</string> + <key>Size</key> + <real>12</real> + </dict> + <key>ID</key> + <integer>37902</integer> + <key>Layer</key> + <integer>3</integer> + <key>Line</key> + <dict> + <key>ID</key> + <integer>37895</integer> + <key>Offset</key> + <real>1</real> + <key>Position</key> + <real>0.772480309009552</real> + <key>RotationType</key> + <integer>0</integer> + </dict> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Pad</key> + <integer>0</integer> + <key>RTFD</key> + <data> + BAtzdHJlYW10eXBlZIHoA4QBQISEhBJOU0F0dHJpYnV0 + ZWRTdHJpbmcAhIQITlNPYmplY3QAhZKEhIQITlNTdHJp + bmcBlIQBKwtvbkRlc3Ryb3koKYaEAmlJAQuShISEDE5T + RGljdGlvbmFyeQCUhAFpA5KElpYHTlNDb2xvcoaShISE + B05TQ29sb3IAlIQBYwOEAmZmAINmZiY/hpKElpYGTlNG + b250hpKEhIQGTlNGb250HpSZHIQFWzI4Y10GAAAAFAAA + AP/+SABlAGwAdgBlAHQAaQBjAGEAhAFmDJsAmwGbAJsA + hpKElpYQTlNQYXJhZ3JhcGhTdHlsZYaShISEEE5TUGFy + YWdyYXBoU3R5bGUAlIQEQ0NAUwIAhISEB05TQXJyYXkA + lJkMkoSEhAlOU1RleHRUYWIAlIQCQ2YAHIaShKWkADiG + koSlpABUhpKEpaQAcIaShKWkAIGMAIaShKWkAIGoAIaS + hKWkAIHEAIaShKWkAIHgAIaShKWkAIH8AIaShKWkAIEY + AYaShKWkAIE0AYaShKWkAIFQAYaGAIaGhg== + </data> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;\red0\green0\blue0;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural + +\f0\fs24 \cf2 onDestroy()}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + <key>Wrap</key> + <string>NO</string> + </dict> + <dict> + <key>Bounds</key> + <string>{{332.284, 272.492}, {61, 14}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FitText</key> + <string>YES</string> + <key>Flow</key> + <string>Resize</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.65</string> + <key>w</key> + <string>0</string> + </dict> + </dict> + <key>ID</key> + <integer>37901</integer> + <key>Layer</key> + <integer>3</integer> + <key>Line</key> + <dict> + <key>ID</key> + <integer>37896</integer> + <key>Position</key> + <real>0.39474391937255859</real> + <key>RotationType</key> + <integer>0</integer> + </dict> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Pad</key> + <integer>0</integer> + <key>RTFD</key> + <data> + BAtzdHJlYW10eXBlZIHoA4QBQISEhBJOU0F0dHJpYnV0 + ZWRTdHJpbmcAhIQITlNPYmplY3QAhZKEhIQITlNTdHJp + bmcBlIQBKwtvblJlc3RhcnQoKYaEAmlJAQuShISEDE5T + RGljdGlvbmFyeQCUhAFpA5KElpYHTlNDb2xvcoaShISE + B05TQ29sb3IAlIQBYwOEAmZmAINmZiY/hpKElpYGTlNG + b250hpKEhIQGTlNGb250HpSZHIQFWzI4Y10GAAAAFAAA + AP/+SABlAGwAdgBlAHQAaQBjAGEAhAFmDJsAmwGbAJsA + hpKElpYQTlNQYXJhZ3JhcGhTdHlsZYaShISEEE5TUGFy + YWdyYXBoU3R5bGUAlIQEQ0NAUwIAhISEB05TQXJyYXkA + lJkMkoSEhAlOU1RleHRUYWIAlIQCQ2YAHIaShKWkADiG + koSlpABUhpKEpaQAcIaShKWkAIGMAIaShKWkAIGoAIaS + hKWkAIHEAIaShKWkAIHgAIaShKWkAIH8AIaShKWkAIEY + AYaShKWkAIE0AYaShKWkAIFQAYaGAIaGhg== + </data> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;\red0\green0\blue0;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural + +\f0\fs24 \cf2 onRestart()}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + <key>Wrap</key> + <string>NO</string> + </dict> + <dict> + <key>Bounds</key> + <string>{{451.395, 136.562}, {56, 14}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FitText</key> + <string>YES</string> + <key>Flow</key> + <string>Resize</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.65</string> + <key>w</key> + <string>0</string> + </dict> + </dict> + <key>ID</key> + <integer>37900</integer> + <key>Layer</key> + <integer>3</integer> + <key>Line</key> + <dict> + <key>ID</key> + <integer>37885</integer> + <key>Position</key> + <real>0.72899174690246582</real> + <key>RotationType</key> + <integer>0</integer> + </dict> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Pad</key> + <integer>0</integer> + <key>RTFD</key> + <data> + BAtzdHJlYW10eXBlZIHoA4QBQISEhBJOU0F0dHJpYnV0 + ZWRTdHJpbmcAhIQITlNPYmplY3QAhZKEhIQITlNTdHJp + bmcBlIQBKwlvblBhdXNlKCmGhAJpSQEJkoSEhAxOU0Rp + Y3Rpb25hcnkAlIQBaQOShJaWB05TQ29sb3KGkoSEhAdO + U0NvbG9yAJSEAWMDhAJmZgCDZmYmP4aShJaWBk5TRm9u + dIaShISEBk5TRm9udB6UmRyEBVsyOGNdBgAAABQAAAD/ + /kgAZQBsAHYAZQB0AGkAYwBhAIQBZgybAJsBmwCbAIaS + hJaWEE5TUGFyYWdyYXBoU3R5bGWGkoSEhBBOU1BhcmFn + cmFwaFN0eWxlAJSEBENDQFMCAISEhAdOU0FycmF5AJSZ + DJKEhIQJTlNUZXh0VGFiAJSEAkNmAByGkoSlpAA4hpKE + paQAVIaShKWkAHCGkoSlpACBjACGkoSlpACBqACGkoSl + pACBxACGkoSlpACB4ACGkoSlpACB/ACGkoSlpACBGAGG + koSlpACBNAGGkoSlpACBUAGGhgCGhoY= + </data> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;\red0\green0\blue0;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural + +\f0\fs24 \cf2 onPause()}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + <key>Wrap</key> + <string>NO</string> + </dict> + <dict> + <key>Bounds</key> + <string>{{531.254, 220.712}, {56, 14}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.65</string> + <key>w</key> + <string>0</string> + </dict> + <key>Font</key> + <string>DroidSans</string> + <key>Size</key> + <real>12</real> + </dict> + <key>ID</key> + <integer>37899</integer> + <key>Layer</key> + <integer>3</integer> + <key>Line</key> + <dict> + <key>ID</key> + <integer>37894</integer> + <key>Offset</key> + <real>2</real> + <key>Position</key> + <real>0.70384049415588379</real> + <key>RotationType</key> + <integer>0</integer> + </dict> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> + <key>Text</key> + <dict> + <key>RTFD</key> + <data> + BAtzdHJlYW10eXBlZIHoA4QBQISEhBJOU0F0dHJpYnV0 + ZWRTdHJpbmcAhIQITlNPYmplY3QAhZKEhIQITlNTdHJp + bmcBlIQBKwhvblN0b3AoKYaEAmlJAQiShISEDE5TRGlj + dGlvbmFyeQCUhAFpA5KElpYHTlNDb2xvcoaShISEB05T + Q29sb3IAlIQBYwOEAmZmAINmZiY/hpKElpYQTlNQYXJh + Z3JhcGhTdHlsZYaShISEEE5TUGFyYWdyYXBoU3R5bGUA + lIQEQ0NAUwIAhISEB05TQXJyYXkAlJkMkoSEhAlOU1Rl + eHRUYWIAlIQCQ2YAHIaShKKhADiGkoSioQBUhpKEoqEA + cIaShKKhAIGMAIaShKKhAIGoAIaShKKhAIHEAIaShKKh + AIHgAIaShKKhAIH8AIaShKKhAIEYAYaShKKhAIE0AYaS + hKKhAIFQAYaGAIaShJaWBk5TRm9udIaShISEBk5TRm9u + dB6UmRyEBVsyOGNdBgAAABQAAAD//kQAcgBvAGkAZABT + AGEAbgBzAIQBZgybAJsBmwCbAIaGhg== + </data> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fnil\fcharset0 DroidSans;} +{\colortbl;\red255\green255\blue255;\red0\green0\blue0;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural + +\f0\fs24 \cf2 onStop()}</string> + </dict> + </dict> + <dict> + <key>Class</key> + <string>LineGraphic</string> + <key>FontInfo</key> + <dict> + <key>Font</key> + <string>DroidSans</string> + <key>Size</key> + <real>11</real> + </dict> + <key>Head</key> + <dict> + <key>ID</key> + <integer>37887</integer> + <key>Info</key> + <integer>8</integer> + </dict> + <key>ID</key> + <integer>37898</integer> + <key>Layer</key> + <integer>3</integer> + <key>OrthogonalBarAutomatic</key> + <false/> + <key>OrthogonalBarPosition</key> + <real>4.1290435791015625</real> + <key>Points</key> + <array> + <string>{158.636, 262.721}</string> + <string>{214.307, 195.091}</string> + </array> + <key>Style</key> + <dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.7</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>CornerRadius</key> + <real>4</real> + <key>HeadArrow</key> + <string>FilledArrow</string> + <key>LineType</key> + <integer>2</integer> + <key>TailArrow</key> + <string>0</string> + </dict> + </dict> + <key>Tail</key> + <dict> + <key>ID</key> + <integer>37890</integer> + <key>Info</key> + <integer>13</integer> + </dict> + </dict> + <dict> + <key>Class</key> + <string>LineGraphic</string> + <key>FontInfo</key> + <dict> + <key>Font</key> + <string>DroidSans</string> + <key>Size</key> + <real>11</real> + </dict> + <key>Head</key> + <dict> + <key>ID</key> + <integer>37887</integer> + <key>Info</key> + <integer>5</integer> + </dict> + <key>ID</key> + <integer>37896</integer> + <key>Layer</key> + <integer>3</integer> + <key>OrthogonalBarAutomatic</key> + <false/> + <key>OrthogonalBarPosition</key> + <real>25</real> + <key>Points</key> + <array> + <string>{463.047, 279.492}</string> + <string>{274.713, 212.781}</string> + </array> + <key>Style</key> + <dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.7</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>CornerRadius</key> + <real>4</real> + <key>HeadArrow</key> + <string>FilledArrow</string> + <key>LineType</key> + <integer>2</integer> + <key>TailArrow</key> + <string>0</string> + </dict> + </dict> + <key>Tail</key> + <dict> + <key>ID</key> + <integer>37889</integer> + <key>Info</key> + <integer>8</integer> + </dict> + </dict> + <dict> + <key>Class</key> + <string>LineGraphic</string> + <key>FontInfo</key> + <dict> + <key>Font</key> + <string>DroidSans</string> + <key>Size</key> + <real>11</real> + </dict> + <key>Head</key> + <dict> + <key>ID</key> + <integer>37914</integer> + <key>Info</key> + <integer>6</integer> + </dict> + <key>ID</key> + <integer>37895</integer> + <key>Layer</key> + <integer>3</integer> + <key>OrthogonalBarAutomatic</key> + <false/> + <key>OrthogonalBarPosition</key> + <real>4.1290435791015625</real> + <key>Points</key> + <array> + <string>{583.86, 279.492}</string> + <string>{654.569, 318.895}</string> + </array> + <key>Style</key> + <dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.7</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>CornerRadius</key> + <real>4</real> + <key>HeadArrow</key> + <string>FilledArrow</string> + <key>LineType</key> + <integer>2</integer> + <key>TailArrow</key> + <string>0</string> + </dict> + </dict> + <key>Tail</key> + <dict> + <key>ID</key> + <integer>37889</integer> + <key>Info</key> + <integer>7</integer> + </dict> + </dict> + <dict> + <key>Class</key> + <string>LineGraphic</string> + <key>FontInfo</key> + <dict> + <key>Font</key> + <string>DroidSans</string> + <key>Size</key> + <real>11</real> + </dict> + <key>Head</key> + <dict> + <key>ID</key> + <integer>37889</integer> + <key>Info</key> + <integer>14</integer> + </dict> + <key>ID</key> + <integer>37894</integer> + <key>Layer</key> + <integer>3</integer> + <key>OrthogonalBarAutomatic</key> + <false/> + <key>OrthogonalBarPosition</key> + <real>4.1290435791015625</real> + <key>Points</key> + <array> + <string>{506, 195.091}</string> + <string>{557.254, 262.563}</string> + </array> + <key>Style</key> + <dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.7</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>CornerRadius</key> + <real>4</real> + <key>HeadArrow</key> + <string>FilledArrow</string> + <key>LineType</key> + <integer>2</integer> + <key>TailArrow</key> + <string>0</string> + </dict> + </dict> + <key>Tail</key> + <dict> + <key>ID</key> + <integer>37913</integer> + <key>Info</key> + <integer>7</integer> + </dict> + </dict> + <dict> + <key>Class</key> + <string>LineGraphic</string> + <key>FontInfo</key> + <dict> + <key>Font</key> + <string>DroidSans</string> + <key>Size</key> + <real>11</real> + </dict> + <key>Head</key> + <dict> + <key>ID</key> + <integer>37890</integer> + <key>Info</key> + <integer>8</integer> + </dict> + <key>ID</key> + <integer>37893</integer> + <key>Layer</key> + <integer>3</integer> + <key>OrthogonalBarAutomatic</key> + <false/> + <key>OrthogonalBarPosition</key> + <real>4.1290435791015625</real> + <key>Points</key> + <array> + <string>{71.1313, 313.237}</string> + <string>{131.37, 279.492}</string> + </array> + <key>Style</key> + <dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.7</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>CornerRadius</key> + <real>4</real> + <key>HeadArrow</key> + <string>FilledArrow</string> + <key>LineType</key> + <integer>2</integer> + <key>TailArrow</key> + <string>0</string> + </dict> + </dict> + <key>Tail</key> + <dict> + <key>ID</key> + <integer>37908</integer> + <key>Info</key> + <integer>2</integer> + </dict> + </dict> + <dict> + <key>Class</key> + <string>LineGraphic</string> + <key>FontInfo</key> + <dict> + <key>Font</key> + <string>DroidSans</string> + <key>Size</key> + <real>11</real> + </dict> + <key>Head</key> + <dict> + <key>ID</key> + <integer>37888</integer> + <key>Info</key> + <integer>8</integer> + </dict> + <key>ID</key> + <integer>37892</integer> + <key>Layer</key> + <integer>3</integer> + <key>OrthogonalBarAutomatic</key> + <false/> + <key>OrthogonalBarPosition</key> + <real>4.1290435791015625</real> + <key>Points</key> + <array> + <string>{241.573, 178.32}</string> + <string>{300.331, 107.69}</string> + </array> + <key>Style</key> + <dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.7</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>CornerRadius</key> + <real>4</real> + <key>HeadArrow</key> + <string>FilledArrow</string> + <key>LineType</key> + <integer>2</integer> + <key>TailArrow</key> + <string>0</string> + </dict> + </dict> + <key>Tail</key> + <dict> + <key>ID</key> + <integer>37887</integer> + <key>Info</key> + <integer>13</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{131.37, 261.802}, {120.813, 35.3802}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>Helvetica-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37890</integer> + <key>Layer</key> + <integer>3</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>RoundRect</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.274119</string> + <key>g</key> + <string>0.950739</string> + <key>r</key> + <string>0.787494</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.223529</string> + <key>g</key> + <string>0.776471</string> + <key>r</key> + <string>0.643137</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.165602</string> + <key>g</key> + <string>0.586124</string> + <key>r</key> + <string>0.428309</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 Created}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{463.047, 261.802}, {120.813, 35.3802}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>DroidSans-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37889</integer> + <key>Layer</key> + <integer>3</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>RoundRect</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.628571</string> + <key>g</key> + <string>0.768599</string> + <key>r</key> + <string>1</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.236788</string> + <key>g</key> + <string>0.532236</string> + <key>r</key> + <string>0.990271</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.131021</string> + <key>g</key> + <string>0.363196</string> + <key>r</key> + <string>0.725948</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 Stopped\ +( +\b0 hidden)}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{300.331, 90}, {120.813, 35.3802}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>Helvetica-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37888</integer> + <key>Layer</key> + <integer>3</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>RoundRect</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.274119</string> + <key>g</key> + <string>0.950739</string> + <key>r</key> + <string>0.787494</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.223529</string> + <key>g</key> + <string>0.776471</string> + <key>r</key> + <string>0.643137</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.165602</string> + <key>g</key> + <string>0.586124</string> + <key>r</key> + <string>0.428309</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 Resumed\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b0 \cf0 (visible)}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{214.307, 177.401}, {120.813, 35.3802}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>Helvetica-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37887</integer> + <key>Layer</key> + <integer>3</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>RoundRect</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.274119</string> + <key>g</key> + <string>0.950739</string> + <key>r</key> + <string>0.787494</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.223529</string> + <key>g</key> + <string>0.776471</string> + <key>r</key> + <string>0.643137</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.165602</string> + <key>g</key> + <string>0.586124</string> + <key>r</key> + <string>0.428309</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 Started\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b0 \cf0 (visible)}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Class</key> + <string>LineGraphic</string> + <key>FontInfo</key> + <dict> + <key>Font</key> + <string>DroidSans</string> + <key>Size</key> + <real>11</real> + </dict> + <key>Head</key> + <dict> + <key>ID</key> + <integer>37913</integer> + <key>Info</key> + <integer>14</integer> + </dict> + <key>ID</key> + <integer>37885</integer> + <key>Layer</key> + <integer>3</integer> + <key>OrthogonalBarAutomatic</key> + <false/> + <key>OrthogonalBarPosition</key> + <real>4.1290435791015625</real> + <key>Points</key> + <array> + <string>{421.144, 107.69}</string> + <string>{479.395, 178.162}</string> + </array> + <key>Style</key> + <dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.7</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>CornerRadius</key> + <real>4</real> + <key>HeadArrow</key> + <string>FilledArrow</string> + <key>LineType</key> + <integer>2</integer> + <key>TailArrow</key> + <string>0</string> + </dict> + </dict> + <key>Tail</key> + <dict> + <key>ID</key> + <integer>37888</integer> + <key>Info</key> + <integer>7</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{231.032, 115.791}, {123, 14}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FitText</key> + <string>YES</string> + <key>Flow</key> + <string>Resize</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.65</string> + <key>w</key> + <string>0</string> + </dict> + </dict> + <key>ID</key> + <integer>37928</integer> + <key>Layer</key> + <integer>4</integer> + <key>Line</key> + <dict> + <key>ID</key> + <integer>37869</integer> + <key>Position</key> + <real>0.56808090209960938</real> + <key>RotationType</key> + <integer>0</integer> + </dict> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Pad</key> + <integer>0</integer> + <key>RTFD</key> + <data> + BAtzdHJlYW10eXBlZIHoA4QBQISEhBJOU0F0dHJpYnV0 + ZWRTdHJpbmcAhIQITlNPYmplY3QAhZKEhIQITlNTdHJp + bmcBlIQBKxVvblNhdmVJbnN0YW5jZVN0YXRlKCmGhAJp + SQEVkoSEhAxOU0RpY3Rpb25hcnkAlIQBaQOShJaWB05T + Q29sb3KGkoSEhAdOU0NvbG9yAJSEAWMDhAJmZgCDZmYm + P4aShJaWBk5TRm9udIaShISEBk5TRm9udB6UmRyEBVsy + OGNdBgAAABQAAAD//kgAZQBsAHYAZQB0AGkAYwBhAIQB + ZgybAJsBmwCbAIaShJaWEE5TUGFyYWdyYXBoU3R5bGWG + koSEhBBOU1BhcmFncmFwaFN0eWxlAJSEBENDQFMCAISE + hAdOU0FycmF5AJSZDJKEhIQJTlNUZXh0VGFiAJSEAkNm + AByGkoSlpAA4hpKEpaQAVIaShKWkAHCGkoSlpACBjACG + koSlpACBqACGkoSlpACBxACGkoSlpACB4ACGkoSlpACB + /ACGkoSlpACBGAGGkoSlpACBNAGGkoSlpACBUAGGhgCG + hoY= + </data> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;\red0\green0\blue0;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural + +\f0\fs24 \cf2 onSaveInstanceState()}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + <key>Wrap</key> + <string>NO</string> + </dict> + <dict> + <key>Bounds</key> + <string>{{87.191, 169.914}, {54.2626, 54.2626}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>ID</key> + <integer>37884</integer> + <key>ImageID</key> + <integer>1</integer> + <key>Layer</key> + <integer>4</integer> + <key>Magnets</key> + <array> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + </array> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{85.3224, 232.867}, {58, 14}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FitText</key> + <string>YES</string> + <key>Flow</key> + <string>Resize</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.65</string> + <key>w</key> + <string>0</string> + </dict> + </dict> + <key>ID</key> + <integer>37883</integer> + <key>Layer</key> + <integer>4</integer> + <key>Line</key> + <dict> + <key>ID</key> + <integer>37882</integer> + <key>Position</key> + <real>0.35843163728713989</real> + <key>RotationType</key> + <integer>0</integer> + </dict> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Pad</key> + <integer>0</integer> + <key>RTFD</key> + <data> + BAtzdHJlYW10eXBlZIHoA4QBQISEhBJOU0F0dHJpYnV0 + ZWRTdHJpbmcAhIQITlNPYmplY3QAhZKEhIQITlNTdHJp + bmcBlIQBKwpvbkNyZWF0ZSgphoQCaUkBCpKEhIQMTlNE + aWN0aW9uYXJ5AJSEAWkDkoSWlgdOU0NvbG9yhpKEhIQH + TlNDb2xvcgCUhAFjA4QCZmYAg2ZmJj+GkoSWlgZOU0Zv + bnSGkoSEhAZOU0ZvbnQelJkchAVbMjhjXQYAAAAUAAAA + //5IAGUAbAB2AGUAdABpAGMAYQCEAWYMmwCbAZsAmwCG + koSWlhBOU1BhcmFncmFwaFN0eWxlhpKEhIQQTlNQYXJh + Z3JhcGhTdHlsZQCUhARDQ0BTAgCEhIQHTlNBcnJheQCU + mQyShISECU5TVGV4dFRhYgCUhAJDZgAchpKEpaQAOIaS + hKWkAFSGkoSlpABwhpKEpaQAgYwAhpKEpaQAgagAhpKE + paQAgcQAhpKEpaQAgeAAhpKEpaQAgfwAhpKEpaQAgRgB + hpKEpaQAgTQBhpKEpaQAgVABhoYAhoaG + </data> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;\red0\green0\blue0;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural + +\f0\fs24 \cf2 onCreate()}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + <key>Wrap</key> + <string>NO</string> + </dict> + <dict> + <key>Class</key> + <string>LineGraphic</string> + <key>FontInfo</key> + <dict> + <key>Font</key> + <string>DroidSans</string> + <key>Size</key> + <real>11</real> + </dict> + <key>ID</key> + <integer>37882</integer> + <key>Layer</key> + <integer>4</integer> + <key>OrthogonalBarAutomatic</key> + <false/> + <key>OrthogonalBarPosition</key> + <real>4.1290435791015625</real> + <key>Points</key> + <array> + <string>{114.322, 224.177}</string> + <string>{114.323, 267.951}</string> + </array> + <key>Style</key> + <dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.7</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>CornerRadius</key> + <real>4</real> + <key>HeadArrow</key> + <string>FilledArrow</string> + <key>LineType</key> + <integer>2</integer> + <key>TailArrow</key> + <string>0</string> + </dict> + </dict> + <key>Tail</key> + <dict> + <key>ID</key> + <integer>37884</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{188, 277.661}, {23.9998, 24}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>Helvetica-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37879</integer> + <key>Layer</key> + <integer>4</integer> + <key>Line</key> + <dict> + <key>ID</key> + <integer>37872</integer> + <key>Position</key> + <real>0.1218617856502533</real> + <key>RotationType</key> + <integer>0</integer> + </dict> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>Circle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.938075</string> + <key>g</key> + <string>0.938269</string> + <key>r</key> + <string>0.938154</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.727869</string> + <key>g</key> + <string>0.728019</string> + <key>r</key> + <string>0.72793</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.472997</string> + <key>g</key> + <string>0.473094</string> + <key>r</key> + <string>0.473036</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 3}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{54, 227.803}, {23.9998, 24}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>Helvetica-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37878</integer> + <key>Layer</key> + <integer>4</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>Circle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.938075</string> + <key>g</key> + <string>0.938269</string> + <key>r</key> + <string>0.938154</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.727869</string> + <key>g</key> + <string>0.728019</string> + <key>r</key> + <string>0.72793</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.472997</string> + <key>g</key> + <string>0.473094</string> + <key>r</key> + <string>0.473036</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 2}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{199.077, 110.791}, {23.9998, 24}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>Helvetica-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37877</integer> + <key>Layer</key> + <integer>4</integer> + <key>Line</key> + <dict> + <key>ID</key> + <integer>37869</integer> + <key>Position</key> + <real>0.17527788877487183</real> + <key>RotationType</key> + <integer>0</integer> + </dict> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>Circle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.938075</string> + <key>g</key> + <string>0.938269</string> + <key>r</key> + <string>0.938154</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.727869</string> + <key>g</key> + <string>0.728019</string> + <key>r</key> + <string>0.72793</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.472997</string> + <key>g</key> + <string>0.473094</string> + <key>r</key> + <string>0.473036</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 1}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{382.099, 272.231}, {120.813, 35.3802}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>Helvetica-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37876</integer> + <key>Layer</key> + <integer>4</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>RoundRect</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.274119</string> + <key>g</key> + <string>0.950739</string> + <key>r</key> + <string>0.787494</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.223529</string> + <key>g</key> + <string>0.776471</string> + <key>r</key> + <string>0.643137</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.165602</string> + <key>g</key> + <string>0.586124</string> + <key>r</key> + <string>0.428309</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 Resumed\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b0 \cf0 (visible)}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Class</key> + <string>LineGraphic</string> + <key>FontInfo</key> + <dict> + <key>Font</key> + <string>DroidSans</string> + <key>Size</key> + <real>11</real> + </dict> + <key>Head</key> + <dict> + <key>ID</key> + <integer>37851</integer> + </dict> + <key>ID</key> + <integer>37869</integer> + <key>Layer</key> + <integer>4</integer> + <key>OrthogonalBarAutomatic</key> + <false/> + <key>OrthogonalBarPosition</key> + <real>4.1290435791015625</real> + <key>Points</key> + <array> + <string>{174.729, 122.791}</string> + <string>{382.099, 122.791}</string> + </array> + <key>Style</key> + <dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.7</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>CornerRadius</key> + <real>4</real> + <key>HeadArrow</key> + <string>FilledArrow</string> + <key>LineType</key> + <integer>2</integer> + <key>TailArrow</key> + <string>0</string> + </dict> + </dict> + <key>Tail</key> + <dict> + <key>ID</key> + <integer>37848</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{221.032, 282.798}, {137, 14}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FitText</key> + <string>YES</string> + <key>Flow</key> + <string>Resize</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.65</string> + <key>w</key> + <string>0</string> + </dict> + </dict> + <key>ID</key> + <integer>37873</integer> + <key>Layer</key> + <integer>4</integer> + <key>Line</key> + <dict> + <key>ID</key> + <integer>37872</integer> + <key>Position</key> + <real>0.55361413955688477</real> + <key>RotationType</key> + <integer>0</integer> + </dict> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Pad</key> + <integer>0</integer> + <key>RTFD</key> + <data> + BAtzdHJlYW10eXBlZIHoA4QBQISEhBJOU0F0dHJpYnV0 + ZWRTdHJpbmcAhIQITlNPYmplY3QAhZKEhIQITlNTdHJp + bmcBlIQBKxhvblJlc3RvcmVJbnN0YW5jZVN0YXRlKCmG + hAJpSQEYkoSEhAxOU0RpY3Rpb25hcnkAlIQBaQOShJaW + B05TQ29sb3KGkoSEhAdOU0NvbG9yAJSEAWMDhAJmZgCD + ZmYmP4aShJaWBk5TRm9udIaShISEBk5TRm9udB6UmRyE + BVsyOGNdBgAAABQAAAD//kgAZQBsAHYAZQB0AGkAYwBh + AIQBZgybAJsBmwCbAIaShJaWEE5TUGFyYWdyYXBoU3R5 + bGWGkoSEhBBOU1BhcmFncmFwaFN0eWxlAJSEBENDQFMC + AISEhAdOU0FycmF5AJSZDJKEhIQJTlNUZXh0VGFiAJSE + AkNmAByGkoSlpAA4hpKEpaQAVIaShKWkAHCGkoSlpACB + jACGkoSlpACBqACGkoSlpACBxACGkoSlpACB4ACGkoSl + pACB/ACGkoSlpACBGAGGkoSlpACBNAGGkoSlpACBUAGG + hgCGhoY= + </data> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;\red0\green0\blue0;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural + +\f0\fs24 \cf2 onRestoreInstanceState()}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + <key>Wrap</key> + <string>NO</string> + </dict> + <dict> + <key>Class</key> + <string>LineGraphic</string> + <key>FontInfo</key> + <dict> + <key>Font</key> + <string>DroidSans</string> + <key>Size</key> + <real>11</real> + </dict> + <key>Head</key> + <dict> + <key>ID</key> + <integer>37876</integer> + <key>Info</key> + <integer>8</integer> + </dict> + <key>ID</key> + <integer>37872</integer> + <key>Layer</key> + <integer>4</integer> + <key>OrthogonalBarAutomatic</key> + <false/> + <key>OrthogonalBarPosition</key> + <real>4.1290435791015625</real> + <key>Points</key> + <array> + <string>{174.729, 289.641}</string> + <string>{382.099, 289.921}</string> + </array> + <key>Style</key> + <dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.7</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>CornerRadius</key> + <real>4</real> + <key>HeadArrow</key> + <string>FilledArrow</string> + <key>LineType</key> + <integer>2</integer> + <key>TailArrow</key> + <string>0</string> + </dict> + </dict> + <key>Tail</key> + <dict> + <key>ID</key> + <integer>37850</integer> + <key>Info</key> + <integer>7</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{382.099, 105.101}, {120.813, 35.3802}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>DroidSans-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37851</integer> + <key>Layer</key> + <integer>4</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>RoundRect</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.628571</string> + <key>g</key> + <string>0.768599</string> + <key>r</key> + <string>1</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.236788</string> + <key>g</key> + <string>0.532236</string> + <key>r</key> + <string>0.990271</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.131021</string> + <key>g</key> + <string>0.363196</string> + <key>r</key> + <string>0.725948</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 Destroyed}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{53.9165, 271.951}, {120.813, 35.3802}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>Helvetica-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37850</integer> + <key>Layer</key> + <integer>4</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>RoundRect</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.274119</string> + <key>g</key> + <string>0.950739</string> + <key>r</key> + <string>0.787494</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.223529</string> + <key>g</key> + <string>0.776471</string> + <key>r</key> + <string>0.643137</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.165602</string> + <key>g</key> + <string>0.586124</string> + <key>r</key> + <string>0.428309</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 Created}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{53.9165, 105.101}, {120.813, 35.3802}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>Helvetica-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>37848</integer> + <key>Layer</key> + <integer>4</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>RoundRect</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.274119</string> + <key>g</key> + <string>0.950739</string> + <key>r</key> + <string>0.787494</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.223529</string> + <key>g</key> + <string>0.776471</string> + <key>r</key> + <string>0.643137</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.165602</string> + <key>g</key> + <string>0.586124</string> + <key>r</key> + <string>0.428309</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\b\fs24 \cf0 Resumed\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b0 \cf0 (visible)}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + </array> + <key>GridInfo</key> + <dict/> + <key>GuidesLocked</key> + <string>NO</string> + <key>GuidesVisible</key> + <string>YES</string> + <key>HPages</key> + <integer>2</integer> + <key>ImageCounter</key> + <integer>2</integer> + <key>ImageLinkBack</key> + <array> + <dict/> + </array> + <key>ImageList</key> + <array> + <string>image1.png</string> + </array> + <key>KeepToScale</key> + <false/> + <key>Layers</key> + <array> + <dict> + <key>Lock</key> + <string>NO</string> + <key>Name</key> + <string>Create</string> + <key>Print</key> + <string>YES</string> + <key>View</key> + <string>NO</string> + </dict> + <dict> + <key>Lock</key> + <string>NO</string> + <key>Name</key> + <string>Stopped</string> + <key>Print</key> + <string>YES</string> + <key>View</key> + <string>NO</string> + </dict> + <dict> + <key>Lock</key> + <string>NO</string> + <key>Name</key> + <string>Paused</string> + <key>Print</key> + <string>YES</string> + <key>View</key> + <string>NO</string> + </dict> + <dict> + <key>Lock</key> + <string>NO</string> + <key>Name</key> + <string>Base</string> + <key>Print</key> + <string>YES</string> + <key>View</key> + <string>NO</string> + </dict> + <dict> + <key>Lock</key> + <string>NO</string> + <key>Name</key> + <string>SaveState</string> + <key>Print</key> + <string>YES</string> + <key>View</key> + <string>YES</string> + </dict> + </array> + <key>LayoutInfo</key> + <dict> + <key>Animate</key> + <string>NO</string> + <key>circoMinDist</key> + <real>18</real> + <key>circoSeparation</key> + <real>0.0</real> + <key>layoutEngine</key> + <string>dot</string> + <key>neatoSeparation</key> + <real>0.0</real> + <key>twopiSeparation</key> + <real>0.0</real> + </dict> + <key>LinksVisible</key> + <string>NO</string> + <key>MagnetsVisible</key> + <string>NO</string> + <key>MasterSheets</key> + <array/> + <key>ModificationDate</key> + <string>2012-04-13 14:55:43 -0700</string> + <key>Modifier</key> + <string>Scott Main</string> + <key>NotesVisible</key> + <string>NO</string> + <key>Orientation</key> + <integer>2</integer> + <key>OriginVisible</key> + <string>NO</string> + <key>PageBreaks</key> + <string>YES</string> + <key>PrintInfo</key> + <dict> + <key>NSBottomMargin</key> + <array> + <string>float</string> + <string>41</string> + </array> + <key>NSLeftMargin</key> + <array> + <string>float</string> + <string>18</string> + </array> + <key>NSPaperSize</key> + <array> + <string>size</string> + <string>{612, 792}</string> + </array> + <key>NSRightMargin</key> + <array> + <string>float</string> + <string>18</string> + </array> + <key>NSTopMargin</key> + <array> + <string>float</string> + <string>18</string> + </array> + </dict> + <key>PrintOnePage</key> + <false/> + <key>ReadOnly</key> + <string>NO</string> + <key>RowAlign</key> + <integer>1</integer> + <key>RowSpacing</key> + <real>36</real> + <key>SheetTitle</key> + <string>Canvas 1</string> + <key>SmartAlignmentGuidesActive</key> + <string>YES</string> + <key>SmartDistanceGuidesActive</key> + <string>YES</string> + <key>UniqueID</key> + <integer>1</integer> + <key>UseEntirePage</key> + <false/> + <key>VPages</key> + <integer>1</integer> + <key>WindowInfo</key> + <dict> + <key>CurrentSheet</key> + <integer>0</integer> + <key>ExpandedCanvases</key> + <array> + <dict> + <key>name</key> + <string>Canvas 1</string> + </dict> + </array> + <key>Frame</key> + <string>{{231, 4}, {950, 874}}</string> + <key>ListView</key> + <true/> + <key>OutlineWidth</key> + <integer>142</integer> + <key>RightSidebar</key> + <false/> + <key>ShowRuler</key> + <true/> + <key>Sidebar</key> + <true/> + <key>SidebarWidth</key> + <integer>120</integer> + <key>VisibleRegion</key> + <string>{{0, 0}, {801, 705}}</string> + <key>Zoom</key> + <real>1</real> + <key>ZoomValues</key> + <array> + <array> + <string>Canvas 1</string> + <real>1</real> + <real>1</real> + </array> + </array> + </dict> + <key>saveQuickLookFiles</key> + <string>YES</string> +</dict> +</plist> diff --git a/docs/html/images/training/basics/basic-lifecycle.graffle/image1.png b/docs/html/images/training/basics/basic-lifecycle.graffle/image1.png Binary files differnew file mode 100644 index 000000000000..cc606c9e1fbf --- /dev/null +++ b/docs/html/images/training/basics/basic-lifecycle.graffle/image1.png diff --git a/docs/html/images/training/basics/basic-lifecycle.png b/docs/html/images/training/basics/basic-lifecycle.png Binary files differnew file mode 100644 index 000000000000..61eb422de9ba --- /dev/null +++ b/docs/html/images/training/basics/basic-lifecycle.png diff --git a/docs/html/images/training/basics/fragments-screen-mock.graffle/QuickLook/Preview.pdf b/docs/html/images/training/basics/fragments-screen-mock.graffle/QuickLook/Preview.pdf Binary files differnew file mode 100644 index 000000000000..19ccd0f78b8e --- /dev/null +++ b/docs/html/images/training/basics/fragments-screen-mock.graffle/QuickLook/Preview.pdf diff --git a/docs/html/images/training/basics/fragments-screen-mock.graffle/QuickLook/Thumbnail.tiff b/docs/html/images/training/basics/fragments-screen-mock.graffle/QuickLook/Thumbnail.tiff Binary files differnew file mode 100644 index 000000000000..8d5c9c6c65df --- /dev/null +++ b/docs/html/images/training/basics/fragments-screen-mock.graffle/QuickLook/Thumbnail.tiff diff --git a/docs/html/images/training/basics/fragments-screen-mock.graffle/data.plist b/docs/html/images/training/basics/fragments-screen-mock.graffle/data.plist new file mode 100644 index 000000000000..5602c1684641 --- /dev/null +++ b/docs/html/images/training/basics/fragments-screen-mock.graffle/data.plist @@ -0,0 +1,848 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>ActiveLayerIndex</key> + <integer>0</integer> + <key>ApplicationVersion</key> + <array> + <string>com.omnigroup.OmniGrafflePro</string> + <string>138.9.0.117994</string> + </array> + <key>AutoAdjust</key> + <true/> + <key>BackgroundGraphic</key> + <dict> + <key>Bounds</key> + <string>{{0, 0}, {1152, 733}}</string> + <key>Class</key> + <string>SolidGraphic</string> + <key>ID</key> + <integer>2</integer> + <key>Style</key> + <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> + </dict> + <key>CanvasOrigin</key> + <string>{0, 0}</string> + <key>ColumnAlign</key> + <integer>1</integer> + <key>ColumnSpacing</key> + <real>36</real> + <key>CreationDate</key> + <string>2012-03-20 17:38:46 -0700</string> + <key>Creator</key> + <string>Billy Rutledge</string> + <key>DisplayScale</key> + <string>1 0/72 in = 1.0000 in</string> + <key>GraphDocumentVersion</key> + <integer>6</integer> + <key>GraphicsList</key> + <array> + <dict> + <key>Class</key> + <string>LineGraphic</string> + <key>FontInfo</key> + <dict> + <key>Font</key> + <string>DroidSans</string> + <key>Size</key> + <real>11</real> + </dict> + <key>Head</key> + <dict> + <key>ID</key> + <integer>1205</integer> + </dict> + <key>ID</key> + <integer>196</integer> + <key>OrthogonalBarAutomatic</key> + <false/> + <key>OrthogonalBarPosition</key> + <real>4.1290435791015625</real> + <key>Points</key> + <array> + <string>{457.98, 171.696}</string> + <string>{490.023, 171.696}</string> + </array> + <key>Style</key> + <dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.7</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>CornerRadius</key> + <real>4</real> + <key>HeadArrow</key> + <string>FilledArrow</string> + <key>LineType</key> + <integer>2</integer> + <key>TailArrow</key> + <string>0</string> + </dict> + </dict> + <key>Tail</key> + <dict> + <key>ID</key> + <integer>1202</integer> + <key>Info</key> + <integer>3</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{500.158, 103.347}, {73.0685, 120.722}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>DroidSans-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>1206</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.628571</string> + <key>g</key> + <string>0.768599</string> + <key>r</key> + <string>1</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.236788</string> + <key>g</key> + <string>0.532236</string> + <key>r</key> + <string>0.990271</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.131021</string> + <key>g</key> + <string>0.363196</string> + <key>r</key> + <string>0.725948</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\fs24 \cf0 Fragment B}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{490.023, 82.3917}, {93.3371, 178.608}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>ID</key> + <integer>1205</integer> + <key>ImageID</key> + <integer>2</integer> + <key>Magnets</key> + <array> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + </array> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{99.4737, 58.4729}, {223.971, 183.465}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>DroidSans-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>200</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.628571</string> + <key>g</key> + <string>0.768599</string> + <key>r</key> + <string>1</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>0.236788</string> + <key>g</key> + <string>0.532236</string> + <key>r</key> + <string>0.990271</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.131021</string> + <key>g</key> + <string>0.363196</string> + <key>r</key> + <string>0.725948</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\fs24 \cf0 Fragment B}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{24.8166, 58.4729}, {73.0685, 183.465}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>DroidSans-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>1203</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>1</string> + <key>g</key> + <string>0.874135</string> + <key>r</key> + <string>0.71718</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>1</string> + <key>g</key> + <string>0.662438</string> + <key>r</key> + <string>0.464468</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.93512</string> + <key>g</key> + <string>0.472602</string> + <key>r</key> + <string>0.333854</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\fs24 \cf0 Fragment A}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{374.205, 103.347}, {73.0685, 120.722}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>FontInfo</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Font</key> + <string>DroidSans-Bold</string> + <key>Size</key> + <real>10</real> + </dict> + <key>ID</key> + <integer>157</integer> + <key>Magnets</key> + <array> + <string>{1, 1}</string> + <string>{1, -1}</string> + <string>{-1, -1}</string> + <string>{-1, 1}</string> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + <string>{-0.5, -0.233518}</string> + <string>{-0.491442, 0.260063}</string> + <string>{0.507118, -0.224086}</string> + <string>{0.507118, 0.267179}</string> + <string>{-0.27431, -0.474028}</string> + <string>{0.27978, -0.478478}</string> + <string>{0.293938, 0.543044}</string> + <string>{-0.286232, 0.553804}</string> + </array> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>1</string> + <key>g</key> + <string>0.874135</string> + <key>r</key> + <string>0.71718</string> + </dict> + <key>FillType</key> + <integer>2</integer> + <key>GradientAngle</key> + <real>90</real> + <key>GradientColor</key> + <dict> + <key>b</key> + <string>1</string> + <key>g</key> + <string>0.662438</string> + <key>r</key> + <string>0.464468</string> + </dict> + </dict> + <key>shadow</key> + <dict> + <key>Color</key> + <dict> + <key>a</key> + <string>0.35</string> + <key>b</key> + <string>0</string> + <key>g</key> + <string>0</string> + <key>r</key> + <string>0</string> + </dict> + <key>Fuzziness</key> + <real>2.3972222805023193</real> + <key>ShadowVector</key> + <string>{0, 1}</string> + </dict> + <key>stroke</key> + <dict> + <key>Color</key> + <dict> + <key>b</key> + <string>0.93512</string> + <key>g</key> + <string>0.472602</string> + <key>r</key> + <string>0.333854</string> + </dict> + <key>CornerRadius</key> + <real>3</real> + </dict> + </dict> + <key>Text</key> + <dict> + <key>Text</key> + <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\fs24 \cf0 Fragment A}</string> + <key>VerticalPad</key> + <integer>0</integer> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{364.643, 82.3917}, {93.3371, 178.608}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>ID</key> + <integer>1202</integer> + <key>ImageID</key> + <integer>2</integer> + <key>Magnets</key> + <array> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + </array> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> + </dict> + <dict> + <key>Bounds</key> + <string>{{6.54947, 41}, {335.776, 220}}</string> + <key>Class</key> + <string>ShapedGraphic</string> + <key>ID</key> + <integer>1201</integer> + <key>ImageID</key> + <integer>1</integer> + <key>Magnets</key> + <array> + <string>{0, 1}</string> + <string>{0, -1}</string> + <string>{1, 0}</string> + <string>{-1, 0}</string> + </array> + <key>Shape</key> + <string>Rectangle</string> + <key>Style</key> + <dict> + <key>fill</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + <key>stroke</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> + </dict> + </array> + <key>GridInfo</key> + <dict/> + <key>GuidesLocked</key> + <string>NO</string> + <key>GuidesVisible</key> + <string>YES</string> + <key>HPages</key> + <integer>2</integer> + <key>ImageCounter</key> + <integer>3</integer> + <key>ImageLinkBack</key> + <array> + <dict/> + <dict/> + </array> + <key>ImageList</key> + <array> + <string>image2.png</string> + <string>image1.png</string> + </array> + <key>KeepToScale</key> + <false/> + <key>Layers</key> + <array> + <dict> + <key>Lock</key> + <string>NO</string> + <key>Name</key> + <string>Layer 1</string> + <key>Print</key> + <string>YES</string> + <key>View</key> + <string>YES</string> + </dict> + </array> + <key>LayoutInfo</key> + <dict> + <key>Animate</key> + <string>NO</string> + <key>circoMinDist</key> + <real>18</real> + <key>circoSeparation</key> + <real>0.0</real> + <key>layoutEngine</key> + <string>dot</string> + <key>neatoSeparation</key> + <real>0.0</real> + <key>twopiSeparation</key> + <real>0.0</real> + </dict> + <key>LinksVisible</key> + <string>NO</string> + <key>MagnetsVisible</key> + <string>NO</string> + <key>MasterSheets</key> + <array/> + <key>ModificationDate</key> + <string>2012-04-17 18:01:13 -0700</string> + <key>Modifier</key> + <string>Scott Main</string> + <key>NotesVisible</key> + <string>NO</string> + <key>Orientation</key> + <integer>2</integer> + <key>OriginVisible</key> + <string>NO</string> + <key>PageBreaks</key> + <string>YES</string> + <key>PrintInfo</key> + <dict> + <key>NSBottomMargin</key> + <array> + <string>float</string> + <string>41</string> + </array> + <key>NSLeftMargin</key> + <array> + <string>float</string> + <string>18</string> + </array> + <key>NSPaperSize</key> + <array> + <string>size</string> + <string>{612, 792}</string> + </array> + <key>NSRightMargin</key> + <array> + <string>float</string> + <string>18</string> + </array> + <key>NSTopMargin</key> + <array> + <string>float</string> + <string>18</string> + </array> + </dict> + <key>PrintOnePage</key> + <false/> + <key>ReadOnly</key> + <string>NO</string> + <key>RowAlign</key> + <integer>1</integer> + <key>RowSpacing</key> + <real>36</real> + <key>SheetTitle</key> + <string>Canvas 1</string> + <key>SmartAlignmentGuidesActive</key> + <string>YES</string> + <key>SmartDistanceGuidesActive</key> + <string>YES</string> + <key>UniqueID</key> + <integer>1</integer> + <key>UseEntirePage</key> + <false/> + <key>VPages</key> + <integer>1</integer> + <key>WindowInfo</key> + <dict> + <key>CurrentSheet</key> + <integer>0</integer> + <key>ExpandedCanvases</key> + <array> + <dict> + <key>name</key> + <string>Canvas 1</string> + </dict> + </array> + <key>Frame</key> + <string>{{189, -8}, {1214, 874}}</string> + <key>ListView</key> + <true/> + <key>OutlineWidth</key> + <integer>142</integer> + <key>RightSidebar</key> + <false/> + <key>ShowRuler</key> + <true/> + <key>Sidebar</key> + <true/> + <key>SidebarWidth</key> + <integer>120</integer> + <key>VisibleRegion</key> + <string>{{0, 2}, {1065, 705}}</string> + <key>Zoom</key> + <real>1</real> + <key>ZoomValues</key> + <array> + <array> + <string>Canvas 1</string> + <real>1</real> + <real>1</real> + </array> + </array> + </dict> + <key>saveQuickLookFiles</key> + <string>YES</string> +</dict> +</plist> diff --git a/docs/html/images/training/basics/fragments-screen-mock.graffle/image1.png b/docs/html/images/training/basics/fragments-screen-mock.graffle/image1.png Binary files differnew file mode 100644 index 000000000000..80baf143138d --- /dev/null +++ b/docs/html/images/training/basics/fragments-screen-mock.graffle/image1.png diff --git a/docs/html/images/training/basics/fragments-screen-mock.graffle/image2.png b/docs/html/images/training/basics/fragments-screen-mock.graffle/image2.png Binary files differnew file mode 100644 index 000000000000..f478d162f06a --- /dev/null +++ b/docs/html/images/training/basics/fragments-screen-mock.graffle/image2.png diff --git a/docs/html/images/training/basics/fragments-screen-mock.png b/docs/html/images/training/basics/fragments-screen-mock.png Binary files differnew file mode 100644 index 000000000000..b170921c2308 --- /dev/null +++ b/docs/html/images/training/basics/fragments-screen-mock.png diff --git a/docs/html/images/training/basics/sdk-manager.png b/docs/html/images/training/basics/sdk-manager.png Binary files differnew file mode 100644 index 000000000000..282318dc0651 --- /dev/null +++ b/docs/html/images/training/basics/sdk-manager.png diff --git a/docs/html/live/index.jd b/docs/html/live/index.jd index 70559e7f55c1..3885725eb5c2 100644 --- a/docs/html/live/index.jd +++ b/docs/html/live/index.jd @@ -9,7 +9,7 @@ page.title=Live livecasts on YouTube and videos of past sessions or follow us on <a href="https://plus.google.com/108967384991768947849/posts">+Android Developers</a> for updates.</p> - <div id="interviewBlock" style="border-top:1px solid #ddd;margin-top:2em;padding-top:1em;clear:both;"> + <div id="interviewBlock" id="pocketgems" style="border-top:1px solid #ddd;margin-top:2em;padding-top:1em;clear:both;"> <div id="mainBodyLeft" class="videoPlayer"> @@ -26,7 +26,7 @@ livecasts on YouTube and videos of past sessions or follow us on developers joining on air via the moderator queue. </p> <div id="objectWrapper"> - <img width="560" height="315" src="{@docRoot}images/LivePocketGemsTitleCard.png" frameborder="0" allowfullscreen></iframe> + <iframe width="560" height="315" src="http://www.youtube.com/embed/-wkXan-xNqA" frameborder="0" allowfullscreen></iframe> </div> </div><!-- end mainBodyLeft --> @@ -50,7 +50,7 @@ livecasts on YouTube and videos of past sessions or follow us on <h3 style="color:#000;font-size:12px;">Join</h3> <p style="line-height:1.5em;"> - <a style="text-decoration:none" href="http://www.youtube.com/user/androiddevelopers">Watch live on YouTube</a><br /> + <a style="text-decoration:none" href="http://youtu.be/-wkXan-xNqA">Watch on YouTube</a><br /> <a style="text-decoration:none" href="http://www.google.com/moderator/#15/e=1fd27e&t=1fd27e.40">Submit a question</a><br /> <a style="text-decoration:none" href="https://www.google.com/calendar/ical/g2ilcr0iki4olp10aluid7gl70%40group.calendar.google.com/public/basic.ics">Add to calendar</a> (iCal) </p> diff --git a/docs/html/resources/resources_toc.cs b/docs/html/resources/resources_toc.cs index a21708ce283c..9752d994b318 100644 --- a/docs/html/resources/resources_toc.cs +++ b/docs/html/resources/resources_toc.cs @@ -1,7 +1,7 @@ <ul> <li> <span class="heading"> - <span class="en">Android Training</span> + <span class="en">Basic Training</span> </span> <ul> @@ -11,6 +11,148 @@ </li> <li class="toggle-list"> + <div><a href="<?cs var:toroot ?>training/basics/firstapp/index.html"> + <span class="en">Building Your First App<span class="new"> new!</span></span> + </a></div> + <ul> + <li><a href="<?cs var:toroot ?>training/basics/firstapp/creating-project.html"> + <span class="en">Creating an Android Project</span> + </a> + </li> + <li><a href="<?cs var:toroot ?>training/basics/firstapp/running-app.html"> + <span class="en">Running Your Application</span> + </a> + </li> + <li><a href="<?cs var:toroot ?>training/basics/firstapp/building-ui.html"> + <span class="en">Building a Simple User Interface</span> + </a> + </li> + <li><a href="<?cs var:toroot ?>training/basics/firstapp/starting-activity.html"> + <span class="en">Starting Another Activity</span> + </a> + </li> + </ul> + </li> + + <li class="toggle-list"> + <div><a href="<?cs var:toroot ?>training/basics/activity-lifecycle/index.html"> + <span class="en">Managing the Activity Lifecycle<span class="new"> new!</span></span> + </a></div> + <ul> + <li><a href="<?cs var:toroot ?>training/basics/activity-lifecycle/starting.html"> + <span class="en">Starting an Activity</span> + </a> + </li> + <li><a href="<?cs var:toroot ?>training/basics/activity-lifecycle/pausing.html"> + <span class="en">Pausing and Resuming an Activity</span> + </a> + </li> + <li><a href="<?cs var:toroot ?>training/basics/activity-lifecycle/stopping.html"> + <span class="en">Stopping and Restarting an Activity</span> + </a> + </li> + <li><a href="<?cs var:toroot ?>training/basics/activity-lifecycle/recreating.html"> + <span class="en">Recreating an Activity</span> + </a> + </li> + </ul> + </li> + + <li class="toggle-list"> + <div><a href="<?cs var:toroot ?>training/basics/supporting-devices/index.html"> + <span class="en">Supporting Different Devices<span class="new"> new!</span></span> + </a></div> + <ul> + <li><a href="<?cs var:toroot ?>training/basics/supporting-devices/languages.html"> + <span class="en">Supporting Different Languages</span> + </a> + </li> + <li><a href="<?cs var:toroot ?>training/basics/supporting-devices/screens.html"> + <span class="en">Supporting Different Screens</span> + </a> + </li> + <li><a href="<?cs var:toroot ?>training/basics/supporting-devices/platforms.html"> + <span class="en">Supporting Different Platform Versions</span> + </a> + </li> + </ul> + </li> + + <li class="toggle-list"> + <div><a href="<?cs var:toroot ?>training/basics/fragments/index.html"> + <span class="en">Building a Dynamic UI with Fragments<span class="new"> new!</span></span> + </a></div> + <ul> + <li><a href="<?cs var:toroot ?>training/basics/fragments/support-lib.html"> + <span class="en">Using the Support Library</span> + </a> + </li> + <li><a href="<?cs var:toroot ?>training/basics/fragments/creating.html"> + <span class="en">Creating a Fragment</span> + </a> + </li> + <li><a href="<?cs var:toroot ?>training/basics/fragments/fragment-ui.html"> + <span class="en">Building a Flexible UI</span> + </a> + </li> + <li><a href="<?cs var:toroot ?>training/basics/fragments/communicating.html"> + <span class="en">Communicating with Other Fragments</span> + </a> + </li> + </ul> + </li> + + <li class="toggle-list"> + <div><a href="<?cs var:toroot ?>training/basics/intents/index.html"> + <span class="en">Interacting with Other Apps<span class="new"> new!</span></span> + </a></div> + <ul> + <li><a href="<?cs var:toroot ?>training/basics/intents/sending.html"> + <span class="en">Sending the User to Another App</span> + </a> + </li> + <li><a href="<?cs var:toroot ?>training/basics/intents/result.html"> + <span class="en">Getting a Result from the Activity</span> + </a> + </li> + <li><a href="<?cs var:toroot ?>training/basics/intents/filters.html"> + <span class="en">Allowing Other Apps to Start Your Activity</span> + </a> + </li> + </ul> + </li> + + <li class="toggle-list"> + <div><a href="<?cs var:toroot ?>training/basics/location/index.html"> + <span class="en">Making Your App Location Aware<span class="new"> new!</span></span> + </a></div> + <ul> + <li><a href="<?cs var:toroot ?>training/basics/location/locationmanager.html"> + <span class="en">Using the Location Manager</span> + </a> + </li> + <li><a href="<?cs var:toroot ?>training/basics/location/currentlocation.html"> + <span class="en">Obtaining the Current Location</span> + </a> + </li> + <li><a href="<?cs var:toroot ?>training/basics/location/geocoding.html"> + <span class="en">Displaying a Location Address</span> + </a> + </li> + </ul> + </li> + + </ul> + </li> + + + <li> + <span class="heading"> + <span class="en">Advanced Training</span> + </span> + <ul> + + <li class="toggle-list"> <div><a href="<?cs var:toroot ?>training/multiscreen/index.html"> <span class="en">Designing for Multiple Screens</span> </a></div> @@ -386,8 +528,8 @@ class="new"> new!</span></span> </li> <li><a href="<?cs var:toroot ?>training/displaying-bitmaps/display-bitmap.html"> <span class="en">Displaying Bitmaps in Your UI</span> - </li> - <ul> + </a></li> + </ul> </li> diff --git a/docs/html/shareables/training/ActivityLifecycle.zip b/docs/html/shareables/training/ActivityLifecycle.zip Binary files differnew file mode 100644 index 000000000000..1cbed448b2bb --- /dev/null +++ b/docs/html/shareables/training/ActivityLifecycle.zip diff --git a/docs/html/shareables/training/FragmentBasics.zip b/docs/html/shareables/training/FragmentBasics.zip Binary files differnew file mode 100644 index 000000000000..ff5b7f120ca1 --- /dev/null +++ b/docs/html/shareables/training/FragmentBasics.zip diff --git a/docs/html/training/accessibility/accessible-app.jd b/docs/html/training/accessibility/accessible-app.jd index f4087b828bfd..dd26febf0949 100644 --- a/docs/html/training/accessibility/accessible-app.jd +++ b/docs/html/training/accessibility/accessible-app.jd @@ -50,11 +50,14 @@ cues are needed.</p> <p>Fortunately, it's easy to add labels to UI elements in your application that can be read out loud to your user by a speech-based accessibility service like <a - href="https://market.android.com/details?id=com.google.android.marvin.talkback">TalkBack</a>. +href="https://play.google.com/store/apps/details?id=com.google.android.marvin.talkback">TalkBack</a> +. If you have a label that's likely not to change during the lifecycle of the application (such as "Pause" or "Purchase"), you can add it via the XML layout, by setting a UI element's <a - href="{@docRoot}reference/android/view.View#attr_android:contentDescription">android:contentDescription</a> attribute, like in this + +href="{@docRoot}reference/android/view/View.html#attr_android:contentDescription" +>{@code android:contentDescription}</a> attribute, like in this example:</p> <pre> <Button @@ -83,7 +86,7 @@ the noise a user needs to navigate in order to pull useful information from your interface.</p> <p>Try it out! Download <a - href="https://market.android.com/details?id=com.google.android.marvin.talkback">TalkBack</a> +href="https://play.google.com/store/apps/details?id=com.google.android.marvin.talkback">TalkBack</a> (an accessibility service published by Google) and enable it in <strong>Settings > Accessibility > TalkBack</strong>. Then navigate around your own application and listen for the audible cues provided by TalkBack.</p> @@ -101,21 +104,21 @@ modification can be done at runtime using the {@link android.view.View#setFocusable View.setFocusable()} method on that UI control, or by setting the <a - href="{@docRoot}android.view.View#attr_android:focusable">{@code + href="{@docRoot}reference/android/view/View.html#attr_android:focusable">{@code android:focusable}</a> attrubute in your XML layout files.</p> <p>Also, each UI control has 4 attributes, -<a href="{@docRoot}reference/android/view/View#attr_android:nextFocusUp">{@code +<a href="{@docRoot}reference/android/view/View.html#attr_android:nextFocusUp">{@code android:nextFocusUp}</a>, <a - href="{@docRoot}reference/android/view/View#attr_android:nextFocusDown">{@code + href="{@docRoot}reference/android/view/View.html#attr_android:nextFocusDown">{@code android:nextFocusDown}</a>, <a - href="{@docRoot}reference/android/view/View#attr_android:nextFocusLeft">{@code + href="{@docRoot}reference/android/view/View.html#attr_android:nextFocusLeft">{@code android:nextFocusLeft}</a>, and <a - href="{@docRoot}reference/android/view/View#attr_android:nextFocusRight">{@code + href="{@docRoot}reference/android/view/View.html#attr_android:nextFocusRight">{@code android:nextFocusRight}</a>, which you can use to designate the next view to receive focus when the user navigates in that direction. While @@ -178,7 +181,8 @@ public void onTextChanged(String before, String after) { <p>Be sure to test the accessibility functionality as you add it to your application. In order to test the content descriptions and Accessibility events, install and enable an accessibility service. One option is <a - href="https://play.google.com/store/details?id=com.google.android.marvin.talkback">Talkback</a>, +href="https://play.google.com/store/apps/details?id=com.google.android.marvin.talkback">Talkback</a> +, a free, open source screen reader available on Google Play. With the service enabled, test all the navigation flows through your application and listen to the spoken feedback.</p> diff --git a/docs/html/training/basics/activity-lifecycle/index.jd b/docs/html/training/basics/activity-lifecycle/index.jd new file mode 100644 index 000000000000..d278f042e839 --- /dev/null +++ b/docs/html/training/basics/activity-lifecycle/index.jd @@ -0,0 +1,74 @@ +page.title=Managing the Activity Lifecycle + +trainingnavtop=true +startpage=true +next.title=Launching an Activity +next.link=starting.html + +@jd:body + +<div id="tb-wrapper"> +<div id="tb"> + + +<h2>Dependencies and prerequisites</h2> +<ul> + <li>How to create an Android project (see <a +href="{@docRoot}training/basics/firstapp/creating-project.html">Creating an Android +Project</a>)</li> +</ul> + + +<h2>You should also read</h2> +<ul> + <li><a href="{@docRoot}guide/topics/fundamentals/activities.html">Activities</a></li> +</ul> + + +<h2>Try it out</h2> + +<div class="download-box"> + <a href="http://developer.android.com/shareables/training/ActivityLifecycle.zip" +class="button">Download the demo</a> + <p class="filename">ActivityLifecycle.zip</p> +</div> + +</div> +</div> + +<p>As a user navigates through, out of, and back to your app, the +{@link android.app.Activity} instances in your app transition between different states in their +lifecycle. For instance, when your +activity starts for the first time, it comes to the foreground of the system and receives user +focus. During this process, the Android system calls a series of lifecycle methods on the +activity in which you set up the user interface and other components. If the user performs an +action that starts another activity or switches to another app, the system calls another set of +lifecycle methods on your activity as it moves into the background (where the activity is no +longer visible, but the instance and its state remains intact).</p> + +<p>Within the lifecycle callback methods, you can declare how your activity behaves when the +user leaves and re-enters the activity. For example, if you're building a streaming video player, +you might pause the video and terminate the network connection when the user switches to another +app. When the user returns, you can reconnect to the network and allow the user to resume the video +from the same spot.</p> + +<p>This class explains important lifecycle callback methods that each {@link +android.app.Activity} instance receives and how you can use them so your activity does what the +user expects and does not consume system resources when your activity doesn't need them.</p> + +<h2>Lessons</h2> + +<dl> + <dt><b><a href="starting.html">Starting an Activity</a></b></dt> + <dd>Learn the basics about the activity lifecycle, how the user can launch your app, and how +to perform basic activity creation.</dd> + <dt><b><a href="pausing.html">Pausing and Resuming an Activity</a></b></dt> + <dd>Learn what happens when your activity is paused (partially obscured) and resumed and what you +should do during these state changes.</dd> + <dt><b><a href="stopping.html">Stopping and Restarting an Activity</a></b></dt> + <dd>Learn what happens when the user completely leaves your activity and returns to it.</dd> + <dt><b><a href="recreating.html">Recreating an Activity</a></b></dt> + <dd>Learn what happens when your activity is destroyed and how you can rebuild the activity +state when necessary.</dd> +</dl> + diff --git a/docs/html/training/basics/activity-lifecycle/pausing.jd b/docs/html/training/basics/activity-lifecycle/pausing.jd new file mode 100644 index 000000000000..216d55e1d87a --- /dev/null +++ b/docs/html/training/basics/activity-lifecycle/pausing.jd @@ -0,0 +1,152 @@ +page.title=Pausing and Resuming an Activity +parent.title=Managing the Activity Lifecycle +parent.link=index.html + +trainingnavtop=true +previous.title=Starting an Activity +previous.link=starting.html +next.title=Stopping and Restarting an Activity +next.link=stopping.html + +@jd:body + +<div id="tb-wrapper"> + <div id="tb"> + + <h2>This lesson teaches you to</h2> + <ol> + <li><a href="#Pause">Pause Your Activity</a></li> + <li><a href="#Resume">Resume Your Activity</a></li> + </ol> + + <h2>You should also read</h2> + <ul> + <li><a href="{@docRoot}guide/topics/fundamentals/activities.html">Activities</a> + </li> + </ul> + +<h2>Try it out</h2> + +<div class="download-box"> + <a href="http://developer.android.com/shareables/training/ActivityLifecycle.zip" +class="button">Download the demo</a> + <p class="filename">ActivityLifecycle.zip</p> +</div> + + </div> +</div> + +<p>During normal app use, the foreground activity is sometimes obstructed by other +visual components that cause the activity to <em>pause</em>. For example, when a semi-transparent +activity opens (such as one in the style of a dialog), the previous activity pauses. As long as the +activity is still partially visible but currently not the activity in focus, it remains paused.</p> + +<p>However, once the activity is fully-obstructed and not visible, it <em>stops</em> (which is +discussed in the next lesson).</p> + +<p>As your activity enters the paused state, the system calls the {@link +android.app.Activity#onPause onPause()} method on your {@link android.app.Activity}, which allows +you to stop ongoing actions that should not continue while paused (such as a video) or persist +any information that should be permanently saved in case the user continues to leave your app. If +the user returns to your activity from the paused state, the system resumes it and calls the +{@link android.app.Activity#onResume onResume()} method.</p> + +<p class="note"><strong>Note:</strong> When your activity receives a call to {@link +android.app.Activity#onPause()}, it may be an indication that the activity will be paused for a +moment and the user may return focus to your activity. However, it's usually the first indication +that the user is leaving your activity.</p> + +<img src="{@docRoot}images/training/basics/basic-lifecycle-paused.png" /> +<p class="img-caption"><strong>Figure 1.</strong> When a semi-transparent activity obscures +your activity, the system calls {@link android.app.Activity#onPause onPause()} and the activity +waits in the Paused state (1). If the user returns to the activity while it's still paused, the +system calls {@link android.app.Activity#onResume onResume()} (2).</p> + + +<h2 id="Pause">Pause Your Activity</h2> + +<p>When the system calls {@link android.app.Activity#onPause()} for your activity, it +technically means your activity is still partially visible, but most often is an indication that +the user is leaving the activity and it will soon enter the Stopped state. You should usually use +the {@link android.app.Activity#onPause()} callback to:</p> + +<ul> + <li>Stop animations or other ongoing actions that could consume CPU.</li> + <li>Commit unsaved changes, but only if users expect such changes to be permanently saved when +they leave (such as a draft email).</li> + <li>Release system resources, such as broadcast receivers, handles to sensors (like +GPS), or any resources that may affect battery life while your activity is paused and the user +does not need them.</li> +</ul> + +<p>For example, if your application uses the {@link android.hardware.Camera}, the +{@link android.app.Activity#onPause()} method is a good place to release it.</p> + +<pre> +@Override +public void onPause() { + super.onPause(); // Always call the superclass method first + + // Release the Camera because we don't need it when paused + // and other activities might need to use it. + if (mCamera != null) { + mCamera.release() + mCamera = null; + } +} +</pre> + +<p>Generally, you should <strong>not</strong> use {@link android.app.Activity#onPause()} to store +user changes (such as personal information entered into a form) to permanent storage. The only time +you should persist user changes to permanent storage within {@link android.app.Activity#onPause()} +is when you're certain users expect the changes to be auto-saved (such as when drafting an email). +However, you should avoid performing CPU-intensive work during {@link +android.app.Activity#onPause()}, such as writing to a database, because it can slow the visible +transition to the next activity (you should instead perform heavy-load shutdown operations during +{@link android.app.Activity#onStop onStop()}).</p> + +<p>You should keep the amount of operations done in the {@link android.app.Activity#onPause +onPause()} method relatively simple in order to allow for a speedy transition to the user's next +destination if your activity is actually being stopped.</p> + +<p class="note"><strong>Note:</strong> When your activity is paused, the {@link +android.app.Activity} instance is kept resident in memory and is recalled when the activity resumes. +You don’t need to re-initialize components that were created during any of the callback methods +leading up to the Resumed state.</p> + + + +<h2 id="Resume">Resume Your Activity</h2> + +<p>When the user resumes your activity from the Paused state, the system calls the {@link +android.app.Activity#onResume()} method.</p> + +<p>Be aware that the system calls this method every time your activity comes into the foreground, +including when it's created for the first time. As such, you should implement {@link +android.app.Activity#onResume()} to initialize components that you release during {@link +android.app.Activity#onPause()} and perform any other initializations that must occur each time the +activity enters the Resumed state (such as begin animations and initialize components only used +while the actiivty has user focus).</p> + +<p>The following example of {@link android.app.Activity#onResume()} is the counterpart to +the {@link android.app.Activity#onPause()} example above, so it initializes the camera that's +released when the activity pauses.</p> + +<pre> +@Override +public void onResume() { + super.onResume(); // Always call the superclass method first + + // Get the Camera instance as the activity achieves full user focus + if (mCamera == null) { + initializeCamera(); // Local method to handle camera init + } +} +</pre> + + + + + + + diff --git a/docs/html/training/basics/activity-lifecycle/recreating.jd b/docs/html/training/basics/activity-lifecycle/recreating.jd new file mode 100644 index 000000000000..941f1fd11c37 --- /dev/null +++ b/docs/html/training/basics/activity-lifecycle/recreating.jd @@ -0,0 +1,177 @@ +page.title=Recreating an Activity +parent.title=Managing the Activity Lifecycle +parent.link=index.html + +trainingnavtop=true +previous.title=Stopping and Restarting an Activity +previous.link=stopping.html + +@jd:body + +<div id="tb-wrapper"> + <div id="tb"> + + <h2>This lesson teaches you to</h2> + <ol> + <li><a href="#SaveState">Save Your Activity State</a></li> + <li><a href="#RestoreState">Restore Your Activity State</a></li> + </ol> + + <h2>You should also read</h2> + <ul> + <li><a href="{@docRoot}training/basics/supporting-devices/screens.html">Supporting +Different Screens</a></li> + <li><a +href="{@docRoot}guide/topics/resources/runtime-changes.html">Handling Runtime Changes</a></li> + <li><a href="{@docRoot}guide/topics/fundamentals/activities.html">Activities</a> + </li> + </ul> + + </div> +</div> + +<p>There are a few scenarios in which your activity is destroyed due to normal app behavior, such as +when the user presses the <em>Back</em> button or your activity signals its own destruction by +calling {@link android.app.Activity#finish()}. The system may also destory your activity if it's +currently stopped and hasn't been used in a long time or the foreground activity requires more +resources so the system must shut down background processes to recover memory.</p> + +<p>When your activity is destroyed because the user presses <em>Back</em> or the activity finishes +itself, the system's concept of that {@link android.app.Activity} instance is gone forever because +the behavior indicates the activity is no longer needed. However, if the system destroys +the activity due to system constraints (rather than normal app behavior), then althought the actual +{@link android.app.Activity} instance is gone, the system remembers that it existed such that if +the user navigates back to it, the system creates a new instance of the activity using a set of +saved data that describes the state of the activity when it was destroyed. The saved data that the +system uses to restore the previous state is called the "instance state" and is a collection of +key-value pairs stored in a {@link android.os.Bundle} object.</p> + +<p class="caution"><strong>Caution:</strong> Your activity will be destroyed and recreated each time +the user rotates the screen. When the screen changes orientation, the system destroys and recreates +the foreground activity because the screen configuration has changed and your activity might need to +load alternative resources (such as the layout).</p> + +<p>By default, the system uses the {@link android.os.Bundle} instance state to saves information +about each {@link android.view.View} object in your activity layout (such as the text value entered +into an {@link android.widget.EditText} object). So, if your activity instance is destroyed and +recreated, the state of the layout is automatically restored to its previous state. However, your +activity might have more state information that you'd like to restore, such as member variables that +track the user's progress in the activity.</p> + +<p>In order for you to add additional data to the saved instance state for your activity, there's an +additional callback method in the activity lifecycle that's not shown in the illustration from +previous lessons. The method is {@link android.app.Activity#onSaveInstanceState +onSaveInstanceState()} and the system calls it when the user is leaving your activity. When the +system calls this method, it passes the {@link android.os.Bundle} object that will be saved in the +event that your activity is destroyed unexpectedly so you can add additional information to it. Then +if the system must recreate the activity instance after it was destroyed, it passes the same {@link +android.os.Bundle} object to your activity's {@link android.app.Activity#onRestoreInstanceState +onRestoreInstanceState()} method and also to your {@link android.app.Activity#onCreate onCreate()} +method.</p> + +<img src="{@docRoot}images/training/basics/basic-lifecycle-savestate.png" /> +<p class="img-caption"><strong>Figure 2.</strong> As the system begins to stop your activity, it +calls {@link android.app.Activity#onSaveInstanceState onSaveInstanceState()} (1) so you can specify +additional state data you'd like to save in case the {@link android.app.Activity} instance must be +recreated. +If the activity is destroyed and the same instance must be recreated, the system passes the state +data defined at (1) to both the {@link android.app.Activity#onCreate onCreate()} method +(2) and the {@link android.app.Activity#onRestoreInstanceState onRestoreInstanceState()} method +(3).</p> + + + +<h2 id="SaveState">Save Your Activity State</h2> + +<p>As your activity begins to stop, the system calls {@link android.app.Activity#onSaveInstanceState +onSaveInstanceState()} so your activity can save state information with a collection of key-value +pairs. The default implementation of this method saves information about the state of the activity's +view hierarchy, such as the text in an {@link android.widget.EditText} widget or the scroll position +of a {@link android.widget.ListView}.</p> + +<p>To save additional state information for your activity, you must +implement {@link android.app.Activity#onSaveInstanceState onSaveInstanceState()} and add +key-value pairs to the {@link android.os.Bundle} object. For example:</p> + +<pre> +static final String STATE_SCORE = "playerScore"; +static final String STATE_LEVEL = "playerLevel"; +... + +@Override +public void onSaveInstanceState(Bundle savedInstanceState) { + // Save the user's current game state + savedInstanceState.putInt(STATE_SCORE, mCurrentScore); + savedInstanceState.putInt(STATE_LEVEL, mCurrentLevel); + + // Always call the superclass so it can save the view hierarchy state + super.onSaveInstanceState(savedInstanceState); +} +</pre> + +<p class="caution"><strong>Caution:</strong> Always call the superclass implementation of {@link +android.app.Activity#onSaveInstanceState onSaveInstanceState()} so the default implementation +can save the state of the view hierarchy.</p> + + + +<h2 id="RestoreState">Restore Your Activity State</h2> + +<p>When your activity is recreated after it was previously destroyed, you can recover your saved +state from the {@link android.os.Bundle} that the system +passes your activity. Both the {@link android.app.Activity#onCreate onCreate()} and {@link +android.app.Activity#onRestoreInstanceState onRestoreInstanceState()} callback methods receive +the same {@link android.os.Bundle} that containes the instance state information.</p> + +<p>Because the {@link android.app.Activity#onCreate onCreate()} method is called whether the +system is creating a new instance of your activity or recreating a previous one, you must check +whether the state {@link android.os.Bundle} is null before you attempt to read it. If it is null, +then the system is creating a new instance of the activity, instead of restoring a previous one +that was destroyed.</p> + +<p>For example, here's how you can restore some state data in {@link android.app.Activity#onCreate +onCreate()}:</p> + +<pre> +@Override +protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); // Always call the superclass first + + // Check whether we're recreating a previously destroyed instance + if (savedInstanceState != null) { + // Restore value of members from saved state + mCurrentScore = savedInstanceState.getInt(STATE_SCORE); + mCurrentLevel = savedInstanceState.getInt(STATE_LEVEL); + } else { + // Probably initialize members with default values for a new instance + } + ... +} +</pre> + +<p>Instead of restoring the state during {@link android.app.Activity#onCreate onCreate()} you +may choose to implement {@link +android.app.Activity#onRestoreInstanceState onRestoreInstanceState()}, which the system calls +after the {@link android.app.Activity#onStart()} method. The system calls {@link +android.app.Activity#onRestoreInstanceState onRestoreInstanceState()} only if there is a saved +state to restore, so you do not need to check whether the {@link android.os.Bundle} is null:</p> + +<pre> +public void onRestoreInstanceState(Bundle savedInstanceState) { + // Always call the superclass so it can restore the view hierarchy + super.onRestoreInstanceState(savedInstanceState); + + // Restore state members from saved instance + mCurrentScore = savedInstanceState.getInt(STATE_SCORE); + mCurrentLevel = savedInstanceState.getInt(STATE_LEVEL); +} +</pre> + +<p class="caution"><strong>Caution:</strong> Always call the superclass implementation of {@link +android.app.Activity#onRestoreInstanceState onRestoreInstanceState()} so the default implementation +can restore the state of the view hierarchy.</p> + +<p>To learn more about recreating your activity due to a +restart event at runtime (such as when the screen rotates), read <a +href="{@docRoot}guide/topics/resources/runtime-changes.html">Handling Runtime Changes</a>.</p> + diff --git a/docs/html/training/basics/activity-lifecycle/starting.jd b/docs/html/training/basics/activity-lifecycle/starting.jd new file mode 100644 index 000000000000..d3266aef1718 --- /dev/null +++ b/docs/html/training/basics/activity-lifecycle/starting.jd @@ -0,0 +1,290 @@ +page.title=Starting an Activity +parent.title=Managing the Activity Lifecycle +parent.link=index.html + +trainingnavtop=true +next.title=Pausing and Resuming an Activity +next.link=pausing.html + +@jd:body + + +<div id="tb-wrapper"> + <div id="tb"> + + <h2>This lesson teaches you to</h2> +<ol> + <li><a href="#lifecycle-states">Understand the Lifecycle Callbacks</a></li> + <li><a href="#launching-activity">Specify Your App's Launcher Activity</a></li> + <li><a href="#Create">Create a New Instance</a></li> + <li><a href="#Destroy">Destroy the Activity</a></li> +</ol> + + <h2>You should also read</h2> + <ul> + <li><a href="{@docRoot}guide/topics/fundamentals/activities.html">Activities</a></li> + </ul> + +<h2>Try it out</h2> + +<div class="download-box"> + <a href="http://developer.android.com/shareables/training/ActivityLifecycle.zip" +class="button">Download the demo</a> + <p class="filename">ActivityLifecycle.zip</p> +</div> + + </div> +</div> + +<p>Unlike other programming paradigms in which apps are launched with a {@code main()} method, the +Android system initiates code in an {@link android.app.Activity} instance by invoking specific +callback methods that correspond to specific stages of its +lifecycle. There is a sequence of callback methods that start up an activity and a sequence of +callback methods that tear down an activity.</p> + +<p>This lesson provides an overview of the most important lifecycle methods and shows you how to +handle the first lifecycle callback that creates a new instance of your activity.</p> + + + +<h2 id="lifecycle-states">Understand the Lifecycle Callbacks</h2> + +<p>During the life of an activity, the system calls a core set of lifecycle methods in +a sequence similar to a step pyramid. That is, each stage of the +activity lifecycle is a separate step on the pyramid. As the system creates a new activity instance, +each callback method moves the activity state one step toward the top. The top of the pyramid is the +point at which the activity is running in the foreground and the user can interact with it.</p> + +<p>As the user begins to leave the activity, the system calls other methods that move the activity +state back down the pyramid in order to dismantle the activity. In some cases, the activity will +move only part way down the pyramid and wait (such as when the user switches to another app), from +which point the activity can move back to the top (if the user returns to the activity) and +resume where the user left off.</p> + + +<img src="{@docRoot}images/training/basics/basic-lifecycle.png" /> +<p class="img-caption"><strong>Figure 1.</strong> A simplified illustration of the Activity +lifecycle, expressed as a step pyramid. This shows how, for every callback used to take +the activity a step toward the Resumed state at the top, there's a callback method +that takes the activity a step down. The activity can also return to the resumed state from the +Paused and Stopped state.</p> + + +<p>Depending on the complexity of your activity, you probably don't need to implement all the +lifecycle methods. However, it's important that you understand each one and implement those that +ensure your app behaves the way users expect. Implementing your activity lifecycle methods properly +ensures your app behaves well in several ways, including that it:</p> +<ul> + <li>Does not crash if the user receives a phone call or switches to another app +while using your app.</li> + <li>Does not consume valuable system resources when the user is not actively using +it.</li> + <li>Does not loose the user's progress if they leave your app and return to it at a +later time.</li> + <li>Does not crash of loose the user's progress when the screen rotates between +landscape and portrait orientation.</li> +</ul> + +<!-- +<p class="table-caption"><strong>Table 1.</strong> Activity lifecycle state pairs and callback +methods.</p> +<table> + <tr> + <th scope="col">Lifecycle State</th> + <th scope="col">Startup Method</th> + <th scope="col">Teardown Method</th> + </tr> + <tr> + <td>Created / Destroyed</td> + <td>{@link android.app.Activity#onCreate onCreate()}</td> + <td>{@link android.app.Activity#onDestroy()}</td> + </tr> + <tr> + <td>Started / Stopped</td> + <td>{@link android.app.Activity#onStart()}</td> + <td>{@link android.app.Activity#onStop()}</td> + </tr> + <tr> + <td>Resumed / Resumed</td> + <td>{@link android.app.Activity#onResume()}</td> + <td>{@link android.app.Activity#onPause()}</td> + </tr> +</table> +--> + +<p>As you'll learn in the following lessons, there are several situtations in which an activity +transitions between different states that are illustrated in figure 1. However, only three of +these states can be static. That is, the activity can exist in one of only three states for an +extended period of time:</p> +<dl> + <dt>Resumed</dt> + <dd>In this state, the activity is in the foreground and the user can interact with it. +(Also sometimes referred to as the "running" state.)</dd> + <dt>Paused</dt> + <dd>In this state, the activity is partially obscured by another activity—the +other activity that's in the foreground is semi-transparent or doesn't cover the entire screen. The +paused activity does not receive user input and cannot execute any code. + <dt>Stopped</dt> + <dd>In this state, the activity is completely hidden and not visible to the user; it is +considered to be in the background. While stopped, the activity instance and all its state +information such as member variables is retained, but it cannot execute any code.</dd> +</dl> + +<p>The other states (Created and Started) are transient and the system quickly moves from them to +the next state by calling the next lifecycle callback method. That is, after the system calls +{@link android.app.Activity#onCreate onCreate()}, it quickly calls {@link +android.app.Activity#onStart()}, which is quickly followed by {@link +android.app.Activity#onResume()}.</p> + +<p>That's it for the basic activity lifecycle. Now you'll start learning about some of the +specific lifecycle behaviors.</p> + + + +<h2 id="launching-activity">Specify Your App's Launcher Activity</h2> + +<p>When the user selects your app icon from the Home screen, the system calls the {@link +android.app.Activity#onCreate onCreate()} method for the {@link android.app.Activity} in your app +that you've declared to be the "launcher" (or "main") activity. This is the activity that serves as +the main entry point to your app's user interface.</p> + +<p>You can define which activity to use as the main activity in the Android manifest file, <a +href="{@docRoot}guide/topics/manifest/manifest-intro.html">{@code AndroidManifest.xml}</a>, which is +at the root of your project directory.</p> + +<p>The main activity for your app must be declared in the manifest with an <a +href="{@docRoot}guide/topics/manifest/intent-filter-element.html">{@code +<intent-filter>}</a> that includes the {@link +android.content.Intent#ACTION_MAIN MAIN} action and +{@link android.content.Intent#CATEGORY_LAUNCHER LAUNCHER} category. For example:</p> + +<pre> +<activity android:name=".MainActivity" android:label="@string/app_name"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> +</activity> +</pre> + +<p class="note"><strong>Note:</strong> When you create a new Android project with the Android SDK +tools, the default project files include an {@link android.app.Activity} class that's declared in +the manifest with this filter.</p> + +<p>If either the {@link android.content.Intent#ACTION_MAIN MAIN} action or +{@link android.content.Intent#CATEGORY_LAUNCHER LAUNCHER} category are not declared for one of your +activities, then your app icon will not appear in the Home screen's list of apps.</p> + + + +<h2 id="Create">Create a New Instance</h2> + +<p>Most apps include several different activities that allow the user to perform different actions. +Whether an activity is the main activity that's created when the user clicks your app icon or a +different activity that your app starts in response to a user action, the system creates +every new instance of {@link android.app.Activity} by calling its {@link +android.app.Activity#onCreate onCreate()} method.</p> + +<p>You must implement the {@link android.app.Activity#onCreate onCreate()} method to perform basic +application startup logic that should happen only once for the entire life of the activity. For +example, your implementation of {@link android.app.Activity#onCreate onCreate()} should define the +user interface and possibly instantiate some class-scope variables.</p> + +<p>For example, the following example of the {@link android.app.Activity#onCreate onCreate()} +method shows some code that performs some fundamental setup for the activity, such as +declaring the user interface (defined in an XML layout file), defining member variables, +and configuring some of the UI.</p> + +<pre> +TextView mTextView; // Member variable for text view in the layout + +@Override +public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + // Set the user interface layout for this Activity + // The layout file is defined in the project res/layout/main_activity.xml file + setContentView(R.layout.main_activity); + + // Initialize member TextView so we can manipulate it later + mTextView = (TextView) findViewById(R.id.text_message); + + // Make sure we're running on Honeycomb or higher to use ActionBar APIs + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { + // For the main activity, make sure the app icon in the action bar + // does not behave as a button + ActionBar actionBar = getActionBar(); + actionBar.setHomeButtonEnabled(false); + } +} +</pre> + +<p class="caution"><strong>Caution:</strong> Using the {@link android.os.Build.VERSION#SDK_INT} to +prevent older system's from executing new APIs works in this way on Android 2.0 (API level +5) and higher only. Older versions will encounter a runtime exception.</p> + +<p>Once the {@link android.app.Activity#onCreate onCreate()} finishes execution, the system +calls the {@link android.app.Activity#onStart()} and {@link android.app.Activity#onResume()} methods +in quick succession. Your activity never resides in the Created or Started states. Technically, the +activity becomes visible to the user when {@link android.app.Activity#onStart()} is called, but +{@link android.app.Activity#onResume()} quickly follows and the activity remains in the Resumed +state until something occurs to change that, such as when a phone call is received, the user +navigates to another activity, or the device screen turns off.</p> + +<p>In the other lessons that follow, you'll see how the other start up methods, {@link +android.app.Activity#onStart()} and {@link android.app.Activity#onResume()}, are useful during your +activity's lifecycle when used to resume the activity from the Paused or Stopped states.</p> + +<p class="note"><strong>Note:</strong> The {@link android.app.Activity#onCreate onCreate()} +method includes a parameter called <code>savedInstanceState</code> that's discussed in the +latter lesson about <a href="recreating.html">Recreating an Activity</a>.</p> + + +<img src="{@docRoot}images/training/basics/basic-lifecycle-create.png" /> +<p class="img-caption"><strong>Figure 2.</strong> Another illustration of the activity lifecycle +structure with an emphasis on the three main callbacks that the system calls in sequence when +creating a new instance of the activity: {@link android.app.Activity#onCreate onCreate()}, {@link +android.app.Activity#onStart()}, and {@link android.app.Activity#onResume()}. Once this sequence of +callbacks complete, the activity reaches the Resumed state where users can interact with the +activity until they switch to a different activity.</p> + + + + + + + +<h2 id="Destroy">Destroy the Activity</h2> + +<p>While the activity's first lifecycle callback is {@link android.app.Activity#onCreate +onCreate()}, it's very last callback is {@link android.app.Activity#onDestroy}. The system calls +this method on your activity as the final +signal that your activity instance is being completely removed from the system memory.</p> + +<p>Most apps don't need to implement this method because local class references are destroyed +with the activity and your activity should perform most cleanup during {@link +android.app.Activity#onPause} and {@link android.app.Activity#onStop}. However, if your +activity includes background threads that you created during {@link +android.app.Activity#onCreate onCreate()} or other other long-running resources that could +potentially leak memory if not properly closed, you should kill them during {@link +android.app.Activity#onDestroy}.</p> + +<pre> +@Override +public void onDestroy() { + super.onDestroy(); // Always call the superclass + + // Stop method tracing that the activity started during onCreate() + android.os.Debug.stopMethodTracing(); +} +</pre> + +<p class="note"><strong>Note:</strong> The system calls {@link android.app.Activity#onDestroy} +after it has already called {@link android.app.Activity#onPause} and {@link +android.app.Activity#onStop} in all situations except one: when you call {@link +android.app.Activity#finish()} from within the {@link android.app.Activity#onCreate onCreate()} +method. In some cases, such as when your activity operates as a temporary decision maker to +launch another activity, you might call {@link android.app.Activity#finish()} from within {@link +android.app.Activity#onCreate onCreate()} to destory the activity. In this case, the system +immediately calls {@link android.app.Activity#onDestroy} without calling any of the other +lifecycle methods.</p> diff --git a/docs/html/training/basics/activity-lifecycle/stopping.jd b/docs/html/training/basics/activity-lifecycle/stopping.jd new file mode 100644 index 000000000000..7dfc6d322aa9 --- /dev/null +++ b/docs/html/training/basics/activity-lifecycle/stopping.jd @@ -0,0 +1,193 @@ +page.title=Stopping and Restarting an Activity +parent.title=Managing the Activity Lifecycle +parent.link=index.html + +trainingnavtop=true +previous.title=Pausing and Resuming an Activity +previous.link=pausing.html +next.title=Recreating an Activity +next.link=recreating.html + +@jd:body + +<div id="tb-wrapper"> + <div id="tb"> + + <h2>This lesson teaches you to</h2> + <ol> + <li><a href="#Stop">Stop Your Activity</a></li> + <li><a href="#Start">Start/Restart Your Activity</a></li> + </ol> + + <h2>You should also read</h2> + <ul> + <li><a href="{@docRoot}guide/topics/fundamentals/activities.html">Activities</a> + </li> + </ul> + +<h2>Try it out</h2> + +<div class="download-box"> + <a href="http://developer.android.com/shareables/training/ActivityLifecycle.zip" +class="button">Download the demo</a> + <p class="filename">ActivityLifecycle.zip</p> +</div> + + </div> +</div> + +<p>Properly stopping and restarting your activity is an important process in the activity lifecycle +that ensures your users perceive that your app is always alive and doesn't loose their progress. +There are a few of key scenarios in which your activity is stopped and restarted:</p> + +<ul> + <li>The user opens the Recent Apps window and switches from your app to another app. The +activity in your app that's currently in the foreground is stopped. If the user returns to your +app from the Home screen launcher icon or the Recent Apps window, the activity restarts.</li> + <li>The user performs an action in your app that starts a new activity. The current activity +is stopped when the second activity is created. If the user then presses the <em>Back</em> +button, the first activity is restarted.</li> + <li>The user receives a phone call while using your app on his or her phone.</li> +</ul> + +<p>The {@link android.app.Activity} class provides two lifecycle methods, {@link +android.app.Activity#onStop()} and {@link android.app.Activity#onRestart()}, which allow you to +specifically handle how your activity handles being stopped and restarted. Unlike the paused state, +which identifies a partial UI obstruction, the stopped state guarantees that the UI is no longer +visible and the user's focus is in a separate activity (or an entirely separate app).</p> + +<p class="note"><strong>Note:</strong> Because the system retains your {@link android.app.Activity} +instance in system memory when it is stopped, it's possible that you don't need to implement the +{@link android.app.Activity#onStop()} and {@link android.app.Activity#onRestart()} (or even {@link +android.app.Activity#onStart()} methods at all. For most activities that are relatively simple, the +activity will stop and restart just fine and you might only need to use {@link +android.app.Activity#onPause()} to pause ongoing actions and disconnect from system resources.</p> + +<img src="{@docRoot}images/training/basics/basic-lifecycle-stopped.png" /> +<p class="img-caption"><strong>Figure 1.</strong> When the user leaves your activity, the system +calls {@link android.app.Activity#onStop onStop()} to stop the activity (1). If the user returns +while the activity is stopped, the system calls {@link android.app.Activity#onRestart onRestart()} +(2), quickly followed by {@link android.app.Activity#onStart onStart()} (3) and {@link +android.app.Activity#onResume()} (4). Notice that no matter what scenario causes the activity to +stop, the system always calls {@link android.app.Activity#onPause onPause()} before calling {@link +android.app.Activity#onStop onStop()}.</p> + + + +<h2 id="Stop">Stop Your Activity</h2> + +<p>When your activity receives a call to the {@link android.app.Activity#onStop()} method, it's no +longer visible and should release almost all resources that aren't needed while the user is not +using it. Once your activity is stopped, the system might destroy the instance if it needs to +recover system memory. In extreme cases, the system might simply kill your app process without +calling the activity's final {@link android.app.Activity#onDestroy()} callback, so it's important +you use {@link android.app.Activity#onStop()} to release resources that might leak memory.</p> + +<p>Although the {@link android.app.Activity#onPause onPause()} method is called before +{@link android.app.Activity#onStop()}, you should use {@link android.app.Activity#onStop onStop()} +to perform larger, more CPU intensive shut-down operations, such as writing information to a +database.</p> + +<p>For example, here's an implementation of {@link android.app.Activity#onStop onStop()} that +saves the contents of a draft note to persistent storage:</p> + +<!-- TODO: Find a better example for onStop, because this kind of thing should probably use a +separate thread but that's too complicated to show here. --> +<pre> +@Override +protected void onStop() { + super.onStop(); // Always call the superclass method first + + // Save the note's current draft, because the activity is stopping + // and we want to be sure the current note progress isn't lost. + ContentValues values = new ContentValues(); + values.put(NotePad.Notes.COLUMN_NAME_NOTE, getCurrentNoteText()); + values.put(NotePad.Notes.COLUMN_NAME_TITLE, getCurrentNoteTitle()); + + getContentResolver().update( + mUri, // The URI for the note to update. + values, // The map of column names and new values to apply to them. + null, // No SELECT criteria are used. + null // No WHERE columns are used. + ); +} +</pre> + +<p>When your activity is stopped, the {@link android.app.Activity} object is kept resident in memory +and is recalled when the activity resumes. You don’t need to re-initialize components that were +created during any of the callback methods leading up to the Resumed state. The system also +keeps track of the current state for each {@link android.view.View} in the layout, so if the user +entered text into an {@link android.widget.EditText} widget, that content is retained so you don't +need to save and restore it.</p> + +<p class="note"><strong>Note:</strong> Even if the system destroys your activity while it's stopped, +it still retains the state of the {@link android.view.View} objects (such as text in an {@link +android.widget.EditText}) in a {@link android.os.Bundle} (a blob of key-value pairs) and restores +them if the user navigates back to the same instance of the activity (the <a +href="recreating.html">next lesson</a> talks more about using a {@link android.os.Bundle} to save +other state data in case your activity is destroyed and recreated).</p> + + + +<h2 id="Start">Start/Restart Your Activity</h2> + +<p>When your activity comes back to the foreground from the stopped state, it receives a call to +{@link android.app.Activity#onRestart()}. The system also calls the {@link +android.app.Activity#onStart()} method, which happens every time your activity becomes visible +(whether being restarted or created for the first time). The {@link +android.app.Activity#onRestart()} method, however, is called only when the activity resumes from the +stopped state, so you can use it to perform special restoration work that might be necessary only if +the activity was previously stopped, but not destroyed.</p> + +<p>It's uncommon that an app needs to use {@link android.app.Activity#onRestart()} to restore +the activity's state, so there aren't any guidelines for this method that apply to +the general population of apps. However, because your {@link android.app.Activity#onStop()} +method should essentially clean up all your activity's resources, you'll need to re-instantiate them +when the activity restarts. Yet, you also need to instantiate them when your activity is created +for the first time (when there's no existing instance of the activity). For this reason, you +should usually use the {@link android.app.Activity#onStart()} callback method as the counterpart +to the {@link android.app.Activity#onStop()} method, because the system calls {@link +android.app.Activity#onStart()} both when it creates your activity and when it restarts the +activity from the stopped state.</p> + +<p>For example, because the user might have been away from your app for a long time before +coming back it, the {@link android.app.Activity#onStart()} method is a good place to verify that +required system features are enabled:</p> + +<pre> +@Override +protected void onStart() { + super.onStart(); // Always call the superclass method first + + // The activity is either being restarted or started for the first time + // so this is where we should make sure that GPS is enabled + LocationManager locationManager = + (LocationManager) getSystemService(Context.LOCATION_SERVICE); + boolean gpsEnabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER); + + if (!gpsEnabled) { + // Create a dialog here that requests the user to enable GPS, and use an intent + // with the android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS action + // to take the user to the Settings screen to enable GPS when they click "OK" + } +} + +@Override +protected void onRestart() { + super.onRestart(); // Always call the superclass method first + + // Activity being restarted from stopped state +} +</pre> + + + + +<p>When the system destroys your activity, it calls the {@link android.app.Activity#onDestroy()} +method for your {@link android.app.Activity}. Because you should generally have released most of +your resources with {@link android.app.Activity#onStop()}, by the time you receive a call to {@link +android.app.Activity#onDestroy()}, there's not much that most apps need to do. This method is your +last chance to clean out resources that could lead to a memory leak, so you should be sure that +additional threads are destroyed and other long-running actions like method tracing are also +stopped.</p> + diff --git a/docs/html/training/basics/firstapp/building-ui.jd b/docs/html/training/basics/firstapp/building-ui.jd index 847163a7acff..dae70a227d1c 100644 --- a/docs/html/training/basics/firstapp/building-ui.jd +++ b/docs/html/training/basics/firstapp/building-ui.jd @@ -56,7 +56,8 @@ but it's especially important on Android because it allows you to define alterna different screen sizes. For example, you can create two versions of a layout and tell the system to use one on "small" screens and the other on "large" screens. For more information, see the class about <a -href="{@docRoot}training/supporting-hardware/index.html">Supporting Various Hardware</a>.</p> +href="{@docRoot}training/basics/supporting-devices/index.html">Supporting Different +Hardware</a>.</p> </div> </div> diff --git a/docs/html/training/basics/firstapp/index.jd b/docs/html/training/basics/firstapp/index.jd index a95ed8e7f879..9ff5b18867d3 100644 --- a/docs/html/training/basics/firstapp/index.jd +++ b/docs/html/training/basics/firstapp/index.jd @@ -1,4 +1,5 @@ page.title=Building Your First App +page.metaDescription=If you're new to Android app development, this where you should begin. This series of lessons shows you how to create a new project, build a simple app, and run it on a device or emulator. trainingnavtop=true startpage=true diff --git a/docs/html/training/basics/firstapp/running-app.jd b/docs/html/training/basics/firstapp/running-app.jd index 2398fa0895e8..43b898396475 100644 --- a/docs/html/training/basics/firstapp/running-app.jd +++ b/docs/html/training/basics/firstapp/running-app.jd @@ -35,7 +35,7 @@ next.link=building-ui.html </div> -<p>If you followed the <a href="{@docRoot}creating-project.html">previous lesson</a> to create an +<p>If you followed the <a href="creating-project.html">previous lesson</a> to create an Android project, it includes a default set of "Hello World" source files that allow you to run the app right away.</p> diff --git a/docs/html/training/basics/firstapp/starting-activity.jd b/docs/html/training/basics/firstapp/starting-activity.jd index 16a6fd82436e..c548c1de259e 100644 --- a/docs/html/training/basics/firstapp/starting-activity.jd +++ b/docs/html/training/basics/firstapp/starting-activity.jd @@ -128,7 +128,7 @@ can also be <em>implicit</em>, in which case the {@link android.content.Intent} the desired component, but allows any app installed on the device to respond to the intent as long as it satisfies the meta-data specifications for the action that's specified in various {@link android.content.Intent} parameters. For more informations, see the class about <a -href="{@docRoot}training/intents/index.html">Interacting with Other Apps</a>.</p> +href="{@docRoot}training/basics/intents/index.html">Interacting with Other Apps</a>.</p> </div> </div> @@ -301,7 +301,8 @@ on Android 4.0. <p>To learn more about building Android apps, continue to follow the basic training classes. The next class is <a -href="{@docRoot}training/activity-lifecycle/index.html">Managing the Activity Lifecycle</a>.</p> +href="{@docRoot}training/basics/activity-lifecycle/index.html">Managing the Activity +Lifecycle</a>.</p> diff --git a/docs/html/training/basics/fragments/communicating.jd b/docs/html/training/basics/fragments/communicating.jd new file mode 100644 index 000000000000..e3e308f1bd31 --- /dev/null +++ b/docs/html/training/basics/fragments/communicating.jd @@ -0,0 +1,179 @@ +page.title=Communicating with Other Fragments +parent.title=Building a Dynamic UI with Fragments +parent.link=index.html + +trainingnavtop=true +previous.title=Building a Flexible UI +previous.link=fragment-ui.html + +@jd:body + +<div id="tb-wrapper"> + <div id="tb"> + <h2>This lesson teaches you to</h2> +<ol> + <li><a href="#DefineInterface">Define an Interface</a></li> + <li><a href="#Implement">Implement the Interface</a></li> + <li><a href="#Deliver">Deliver a Message to a Fragment</a></li> +</ol> + + <h2>You should also read</h2> + <ul> + <li><a href="{@docRoot}guide/topics/fundamentals/fragments.html">Fragments</a></li> + </ul> + +<h2>Try it out</h2> + +<div class="download-box"> + <a href="http://developer.android.com/shareables/training/FragmentBasics.zip" +class="button">Download the sample</a> + <p class="filename">FragmentBasics.zip</p> +</div> + + </div> +</div> + +<p>In order to reuse the Fragment UI components, you should build each as a completely +self-contained, modular component that defines its own layout and behavior. Once you +have defined these reusable Fragments, you can associate them with an Activity and +connect them with the application logic to realize the overall composite UI.</p> + +<p>Often you will want one Fragment to communicate with another, for example to change +the content based on a user event. All Fragment-to-Fragment communication is done +through the associated Activity. Two Fragments should never communicate directly.</p> + + +<h2 id="DefineInterface">Define an Interface</h2> + +<p>To allow a Fragment to communicate up to its Activity, you can define an interface +in the Fragment class and implement it within the Activity. The Fragment captures +the interface implementation during its onAttach() lifecycle method and can then call +the Interface methods in order to communicate with the Activity.</p> + +<p>Here is an example of Fragment to Activity communication:</p> + +<pre> +public class HeadlinesFragment extends ListFragment { + OnHeadlineSelectedListener mCallback; + + // Container Activity must implement this interface + public interface OnHeadlineSelectedListener { + public void onArticleSelected(int position); + } + + @Override + public void onAttach(Activity activity) { + super.onAttach(activity); + + // This makes sure that the container activity has implemented + // the callback interface. If not, it throws an exception + try { + mCallback = (OnHeadlineSelectedListener) activity; + } catch (ClassCastException e) { + throw new ClassCastException(activity.toString() + + " must implement OnHeadlineSelectedListener"); + } + } + + ... +} +</pre> + +<p>Now the fragment can deliver messages to the activity by calling the {@code +onArticleSelected()} method (or other methods in the interface) using the {@code mCallback} +instance of the {@code OnHeadlineSelectedListener} interface.</p> + +<p>For example, the following method in the fragment is called when the user clicks on a list +item. The fragment uses the callback interface to deliver the event to the parent activity.</p> + +<pre> + @Override + public void onListItemClick(ListView l, View v, int position, long id) { + // Send the event to the host activity + mCallback.onArticleSelected(position); + } +</pre> + + + +<h2 id="Implement">Implement the Interface</h2> + +<p>In order to receive event callbacks from the fragment, the activity that hosts it must +implement the interface defined in the fragment class.</p> + +<p>For example, the following activity implements the interface from the above example.</p> + +<pre> +public static class MainActivity extends Activity + implements HeadlinesFragment.OnHeadlineSelectedListener{ + ... + + public void onArticleSelected(Uri articleUri) { + // The user selected the headline of an article from the HeadlinesFragment + // Do something here to display that article + } +} +</pre> + + + +<h2 id="Deliver">Deliver a Message to a Fragment</h2> + +<p>The host activity can deliver messages to a fragment by capturing the {@link +android.support.v4.app.Fragment} instance +with {@link android.support.v4.app.FragmentManager#findFragmentById findFragmentById()}, then +directly call the fragment's public methods.</p> + +<p>For instance, imagine that the activity shown above may contain another fragment that's used to +display the item specified by the data returned in the above callback method. In this case, +the activity can pass the information received in the callback method to the other fragment that +will display the item:</p> + +<pre> +public static class MainActivity extends Activity + implements HeadlinesFragment.OnHeadlineSelectedListener{ + ... + + public void onArticleSelected(int position) { + // The user selected the headline of an article from the HeadlinesFragment + // Do something here to display that article + + ArticleFragment articleFrag = (ArticleFragment) + getSupportFragmentManager().findFragmentById(R.id.article_fragment); + + if (articleFrag != null) { + // If article frag is available, we're in two-pane layout... + + // Call a method in the ArticleFragment to update its content + articleFrag.updateArticleView(position); + } else { + // Otherwise, we're in the one-pane layout and must swap frags... + + // Create fragment and give it an argument for the selected article + ArticleFragment newFragment = new ArticleFragment(); + Bundle args = new Bundle(); + args.putInt(ArticleFragment.ARG_POSITION, position); + newFragment.setArguments(args); + + FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + + // Replace whatever is in the fragment_container view with this fragment, + // and add the transaction to the back stack so the user can navigate back + transaction.replace(R.id.fragment_container, newFragment); + transaction.addToBackStack(null); + + // Commit the transaction + transaction.commit(); + } + } +} +</pre> + + + + + + + + + diff --git a/docs/html/training/basics/fragments/creating.jd b/docs/html/training/basics/fragments/creating.jd new file mode 100644 index 000000000000..c4a9b4686c2c --- /dev/null +++ b/docs/html/training/basics/fragments/creating.jd @@ -0,0 +1,155 @@ +page.title=Creating a Fragment +parent.title=Building a Dynamic UI with Fragments +parent.link=index.html + +trainingnavtop=true +previous.title=Using the Android Support Library +previous.link=support-lib.html +next.title=Building a Flexible UI +next.link=fragment-ui.html + +@jd:body + +<div id="tb-wrapper"> + <div id="tb"> + + <h2>This lesson teaches you to</h2> +<ol> + <li><a href="#Create">Create a Fragment Class</a></li> + <li><a href="#AddInLayout">Add a Fragment to an Activity using XML</a></li> +</ol> + + <h2>You should also read</h2> + <ul> + <li><a href="{@docRoot}guide/topics/fundamentals/fragments.html">Fragments</a></li> + </ul> + +<h2>Try it out</h2> + +<div class="download-box"> + <a href="http://developer.android.com/shareables/training/FragmentBasics.zip" +class="button">Download the sample</a> + <p class="filename">FragmentBasics.zip</p> +</div> + + </div> +</div> + +<p>You can think of a fragment as a modular section of an activity, which has its own lifecycle, +receives its own input events, and which you can add or remove while the activity is running (sort +of like a "sub activity" that you can reuse in different activities). This lesson shows how to +extend the {@link android.support.v4.app.Fragment} class using the Support Library so your app +remains compatible with devices running system versions as old as Android 1.6.</p> + +<p class="note"><strong>Note:</strong> If you decide for other reasons that the minimum +API level your app requires is 11 or higher, you don't need to use the Support +Library and can instead use the framework's built in {@link android.app.Fragment} class and related +APIs. Just be aware that this lesson is focused on using the APIs from the Support Library, which +use a specific package signature and sometimes slightly different API names than the versions +included in the platform.</p> + + + +<h2 id="Create">Create a Fragment Class</h2> + +<p>To create a fragment, extend the {@link android.support.v4.app.Fragment} class, then override +key lifecycle methods to insert your app logic, similar to the way you would with an {@link +android.app.Activity} class.</p> + +<p>One difference when creating a {@link android.support.v4.app.Fragment} is that you must use the +{@link android.support.v4.app.Fragment#onCreateView onCreateView()} callback to define the layout. +In fact, this is the only callback you need in order to get a fragment running. For +example, here's a simple fragment that specifies its own layout:</p> + +<pre> +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.ViewGroup; + +public class ArticleFragment extends Fragment { + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.article_view, container, false); + } +} +</pre> + +<p>Just like an activity, a fragment should implement other lifecycle callbacks that allow you to +manage its state as it is added or removed from the activity and as the activity transitions +between its lifecycle states. For instance, when the activity's {@link +android.app.Activity#onPause()} method is called, any fragments in the activity also receive a call +to {@link android.support.v4.app.Fragment#onPause()}.</p> + +<p>More information about the fragment lifecycle and callback methods is available in the <a +href="{@docRoot}guide/topics/fundamentals/fragments.html">Fragments</a> developer guide.</p> + + + +<h2 id="AddInLayout">Add a Fragment to an Activity using XML</h2> + +<p>While fragments are reusable, modular UI components, each instance of a {@link +android.support.v4.app.Fragment} class must be associated with a parent {@link +android.support.v4.app.FragmentActivity}. You can achieve this association by defining each +fragment within your activity layout XML file.</p> + +<p class="note"><strong>Note:</strong> {@link android.support.v4.app.FragmentActivity} is a +special activity provided in the Support Library to handle fragments on system versions older than +API level 11. If the lowest system version you support is API level 11 or higher, then you can use a +regular {@link android.app.Activity}.</p> + +<p>Here is an example layout file that adds two fragments to an activity when the device +screen is considered "large" (specified by the <code>large</code> qualifier in the directory +name).</p> + +<p><code>res/layout-large/news_articles.xml:</code></p> +<pre> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + + <fragment android:name="com.example.android.fragments.HeadlinesFragment" + android:id="@+id/headlines_fragment" + android:layout_weight="1" + android:layout_width="0dp" + android:layout_height="match_parent" /> + + <fragment android:name="com.example.android.fragments.ArticleFragment" + android:id="@+id/article_fragment" + android:layout_weight="2" + android:layout_width="0dp" + android:layout_height="match_parent" /> + +</LinearLayout> +</pre> + +<p class="note"><strong>Tip:</strong> For more information about creating layouts for different +screen sizes, read <a href="{@docRoot}training/multiscreen/screensizes.html">Supporting Different +Screen Sizes</a>.</p> + +<p>Here's how an activity applies this layout:</p> + +<pre> +import android.os.Bundle; +import android.support.v4.app.FragmentActivity; + +public class MainActivity extends FragmentActivity { + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.news_articles); + } +} +</pre> + + +<p class="note"><strong>Note:</strong> When you add a fragment to an activity layout by defining +the fragment in the layout XML file, you <em>cannot</em> remove the fragment at runtime. If you plan +to swap your fragments in and out during user interaction, you must add the fragment to the activity +when the activity first starts, as shown in the next lesson.</p> + + + diff --git a/docs/html/training/basics/fragments/fragment-ui.jd b/docs/html/training/basics/fragments/fragment-ui.jd new file mode 100644 index 000000000000..f906f468971f --- /dev/null +++ b/docs/html/training/basics/fragments/fragment-ui.jd @@ -0,0 +1,196 @@ +page.title=Building a Flexible UI +parent.title=Building a Dynamic UI with Fragments +parent.link=index.html + +trainingnavtop=true +previous.title=Create a Fragment +previous.link=creating.html +next.title=Communicating with Other Fragments +next.link=communicating.html + +@jd:body + +<div id="tb-wrapper"> + <div id="tb"> + <h2>This lesson teaches you to</h2> +<ol> + <li><a href="#AddAtRuntime">Add a Fragment to an Activity at Runtime</a></li> + <li><a href="#Replace">Replace One Fragment with Another</a></li> +</ol> + + <h2>You should also read</h2> + <ul> + <li><a href="{@docRoot}guide/topics/fundamentals/fragments.html">Fragments</a></li> + <li><a href="{@docRoot}guide/practices/tablets-and-handsets.html">Supporting Tablets and +Handsets</a></li> + </ul> + +<h2>Try it out</h2> + +<div class="download-box"> + <a href="http://developer.android.com/shareables/training/FragmentBasics.zip" +class="button">Download the sample</a> + <p class="filename">FragmentBasics.zip</p> +</div> + + </div> +</div> + + +<p>When designing your application to support a wide range of screen sizes, you can reuse your +fragments in different layout configurations to optimize the user experience based on the available +screen space.</p> + +<p>For example, on a handset device it might be appropriate to display just one fragment at a time +for a single-pane user interface. Conversely, you may want to set fragments side-by-side on a +tablet which has a wider screen size to display more information to the user.</p> + +<img src="{@docRoot}images/training/basics/fragments-screen-mock.png" alt="" /> +<p class="img-caption"><strong>Figure 1.</strong> Two fragments, displayed in different +configurations for the same activity on different screen sizes. On a large screen, both fragment +fit side by side, but on a handset device, only one fragment fits at a time so the fragments must +replace each other as the user navigates.</p> + +<p>The {@link android.support.v4.app.FragmentManager} class provides methods that allow you to add, +remove, and replace fragments to an activity at runtime in order to create a dynamic experience.</p> + + + +<h2 id="AddAtRuntime">Add a Fragment to an Activity at Runtime</h2> + +<p>Rather than defining the fragments for an activity in the layout file—as shown in the +<a href="creating.html">previous lesson</a> with the {@code <fragment>} element—you can add +a fragment to the activity during the activity runtime. This is necessary +if you plan to change fragments during the life of the activity.</p> + +<p>To perform a transaction such as add or +remove a fragment, you must use the {@link android.support.v4.app.FragmentManager} to create a +{@link android.support.v4.app.FragmentTransaction}, which provides APIs to add, remove, replace, +and perform other fragment transactions.</p> + +<p>If your activity allows the fragments to be removed and replaced, you should add the +initial fragment(s) to the activity during the activity's +{@link android.app.Activity#onCreate onCreate()} method.</p> + +<p>An important rule when dealing with fragments—especially those that you add at +runtime—is that the fragment must have a container {@link android.view.View} in the layout in +which the fragment's layout will reside.</p> + +<p>The following layout is an alternative to the layout shown in the <a +href="creating.html">previous lesson</a> that shows only one fragment at a time. In order to replace +one fragment with another, the activity's layout +includes an empty {@link android.widget.FrameLayout} that acts as the fragment container.</p> + +<p>Notice that the filename is the same as the layout file in the previous lesson, but the layout +directory does <em>not</em> have the <code>large</code> qualifier, so this layout is used when the +device screen is smaller than <em>large</em> because the screen does not fit both fragments at +the same time.</p> + +<p><code>res/layout/news_articles.xml:</code></p> +<pre> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/fragment_container" + android:layout_width="match_parent" + android:layout_height="match_parent" /> +</pre> + +<p>Inside your activity, call {@link +android.support.v4.app.FragmentActivity#getSupportFragmentManager()} to get a {@link +android.support.v4.app.FragmentManager} using the Support Library APIs. Then call {@link +android.support.v4.app.FragmentManager#beginTransaction} to create a {@link +android.support.v4.app.FragmentTransaction} and call {@link +android.support.v4.app.FragmentTransaction#add add()} to add a fragment.</p> + +<p>You can perform multiple fragment transaction for the activity using the same {@link +android.support.v4.app.FragmentTransaction}. When you're ready to make the changes, you must call +{@link android.support.v4.app.FragmentTransaction#commit()}.</p> + +<p>For example, here's how to add a fragment to the previous layout:</p> + +<pre> +import android.os.Bundle; +import android.support.v4.app.FragmentActivity; + +public class MainActivity extends FragmentActivity { + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.news_articles); + + // Check that the activity is using the layout version with + // the fragment_container FrameLayout + if (findViewById(R.id.fragment_container) != null) { + + // However, if we're being restored from a previous state, + // then we don't need to do anything and should return or else + // we could end up with overlapping fragments. + if (savedInstanceState != null) { + return; + } + + // Create an instance of ExampleFragment + HeadlinesFragment firstFragment = new HeadlinesFragment(); + + // In case this activity was started with special instructions from an Intent, + // pass the Intent's extras to the fragment as arguments + firstFragment.setArguments(getIntent().getExtras()); + + // Add the fragment to the 'fragment_container' FrameLayout + getSupportFragmentManager().beginTransaction() + .add(R.id.fragment_container, firstFragment).commit(); + } + } +} +</pre> + +<p>Because the fragment has been added to the {@link android.widget.FrameLayout} container at +runtime—instead of defining it in the activity's layout with a {@code <fragment>} +element—the activity can remove the fragment and replace it with a different one.</p> + + + +<h2 id="Replace">Replace One Fragment with Another</h2> + +<p>The procedure to replace a fragment is similar to adding one, but requires the {@link +android.support.v4.app.FragmentTransaction#replace replace()} method instead of {@link +android.support.v4.app.FragmentTransaction#add add()}.</p> + +<p>Keep in mind that when you perform fragment transactions, such as replace or remove one, it's +often appropriate to allow the user to navigate backward and "undo" the change. To allow the user +to navigate backward through the fragment transactions, you must call {@link +android.support.v4.app.FragmentTransaction#addToBackStack addToBackStack()} before you commit the +{@link android.support.v4.app.FragmentTransaction}.</p> + +<p class="note"><strong>Note:</strong> When you remove or replace a fragment and add the transaction +to the back stack, the fragment that is removed is stopped (not destroyed). If the user navigates +back to restore the fragment, it restarts. If you <em>do not</em> add the transaction to the back +stack, then the fragment is destroyed when removed or replaced.</p> + +<p>Example of replacing one fragment with another:</p> + +<pre> +// Create fragment and give it an argument specifying the article it should show +ArticleFragment newFragment = new ArticleFragment(); +Bundle args = new Bundle(); +args.putInt(ArticleFragment.ARG_POSITION, position); +newFragment.setArguments(args); + +FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + +// Replace whatever is in the fragment_container view with this fragment, +// and add the transaction to the back stack so the user can navigate back +transaction.replace(R.id.fragment_container, newFragment); +transaction.addToBackStack(null); + +// Commit the transaction +transaction.commit(); +</pre> + +<p>The {@link android.support.v4.app.FragmentTransaction#addToBackStack addToBackStack()} method +takes an optional string parameter that specifies a unique name for the transaction. The name isn't +needed unless you plan to perform advanced fragment operations using the {@link +android.support.v4.app.FragmentManager.BackStackEntry} APIs.</p> + + + + diff --git a/docs/html/training/basics/fragments/index.jd b/docs/html/training/basics/fragments/index.jd new file mode 100644 index 000000000000..dcdcd3174cd8 --- /dev/null +++ b/docs/html/training/basics/fragments/index.jd @@ -0,0 +1,74 @@ +page.title=Building a Dynamic UI with Fragments + +trainingnavtop=true +startpage=true +next.title=Using the Android Support Library +next.link=support-lib.html + +@jd:body + +<div id="tb-wrapper"> +<div id="tb"> + + +<h2>Dependencies and prerequisites</h2> +<ul> + <li>Basic knowledge of the Activity lifecycle (see <a +href="{@docRoot}training/basics/activity-lifecycle/index.html">Managing the Activity +Lifecycle</a>)</li> + <li>Experience building <a href="{@docRoot}guide/topics/ui/declaring-layout.html">XML +layouts</a></li> +</ul> + + +<h2>You should also read</h2> +<ul> + <li><a href="{@docRoot}guide/topics/fundamentals/fragments.html">Fragments</a></li> + <li><a href="{@docRoot}guide/practices/tablets-and-handsets.html">Supporting Tablets and +Handsets</a></li> +</ul> + + +<h2>Try it out</h2> + +<div class="download-box"> + <a href="http://developer.android.com/shareables/training/FragmentBasics.zip" +class="button">Download the sample</a> + <p class="filename">FragmentBasics.zip</p> +</div> + +</div> +</div> + +<p>To create a dynamic and multi-pane user interface on Android, you need to encapsulate +UI components and activity behaviors into modules that you can swap into and out of +your activities. You can create these modules with the {@link android.app.Fragment} class, which +behaves somewhat like a nested activity that can define its own layout and manage its own +lifecycle.</p> + +<p>When a fragment specifies its own layout, it can be configured in different combinations with +other fragments inside an activity to modify your layout configuration for different screen +sizes (a small screen might show one fragment at a time, but a large screen can show two or +more).</p> + +<p>This class shows you how to create a dynamic user experience with fragments and optimize your +app's user experience for devices with different screen sizes, all while continuing to support +devices running versions as old as Android 1.6.</p> + +<h2>Lessons</h2> + +<dl> + <dt><b><a href="support-lib.html">Using the Android Support Library</a></b></dt> + <dd>Learn how to use more recent framework APIs in earlier versions of Android by bundling +the Android Support Library into your app.</dd> + <dt><b><a href="creating.html">Creating a Fragment</a></b></dt> + <dd>Learn how to build a fragment and implement basic behaviors within its callback +methods.</dd> + <dt><b><a href="fragment-ui.html">Building a Flexible UI</a></b></dt> + <dd>Learn how to build your app with layouts that provide different fragment configurations for +different screens.</dd> + <dt><b><a href="communicating.html">Communicating with Other Fragments</a></b></dt> + <dd>Learn how to set up communication paths from a fragment to the activity and other +fragments.</dd> +</dl> + diff --git a/docs/html/training/basics/fragments/support-lib.jd b/docs/html/training/basics/fragments/support-lib.jd new file mode 100644 index 000000000000..e2166f5db8ff --- /dev/null +++ b/docs/html/training/basics/fragments/support-lib.jd @@ -0,0 +1,85 @@ +page.title=Using the Support Library +parent.title=Building a Dynamic UI with Fragments +parent.link=index.html + +trainingnavtop=true +next.title=Creating a Fragment +next.link=creating.html + +@jd:body + +<div id="tb-wrapper"> + <div id="tb"> + <h2>This lesson teaches you to</h2> + <ol> + <li><a href="#Setup">Set Up Your Project With the Support Library</a></li> + <li><a href="#Apis">Import the Support Library APIs</a></li> + </ol> + <h2>You should also read</h2> + <ul> + <li><a href="{@docRoot}sdk/compatibility-library.html">Support Library</a></li> + </ul> + </div> +</div> + +<p>The Android <a href="{@docRoot}sdk/compatibility-library.html">Support Library</a> provides a JAR +file with an API library that allow you to use some of the more recent Android APIs in your app +while running on earlier versions of Android. For instance, the Support Library provides a version +of the {@link android.app.Fragment} APIs that you can use on Android 1.6 (API level 4) and +higher.</p> + +<p>This lesson shows how to set up your app to use the Support Library in order to use fragments +to build a dynamic app UI.</p> + + +<h2 id="Setup">Set Up Your Project With the Support Library</h2> + +<div class="figure" style="width:527px"> +<img src="{@docRoot}images/training/basics/sdk-manager.png" alt="" /> +<p class="img-caption"><strong>Figure 1.</strong> The Android SDK Manager with the +Android Support package selected.</p> +</div> + +<p>To set up your project:</p> + +<ol> + <li>Downlad the Android Support package using the SDK Manager</li> + + <li>Create a <code>libs</code> directory at the top level of your Android project.</li> + <li>Locate the JAR file for the library you want to use and copy it into the <code>libs/</code> +directory. +<p>For example, the library that supports API level 4 and up is located at +<code><sdk>/extras/android/support/v4/android-support-v4.jar</code>.</p></li> + <li>Update your manifest file to set the minimum API level to <code>4</code> and the target +API level to the latest release: + <pre><uses-sdk android:minSdkVersion="4" android:targetSdkVersion="15" /></pre> + </li> +</ol> + + +<h2 id="Apis">Import the Support Library APIs</h2> + +<p>The Support Library includes a variety of APIs that were either added in recent versions of +Android or don't exist in the platform at all and merely provide additional support to you when +developing specific application features.</p> + +<p>You can find all the API reference documentation for the Support Library in the +platform docs at {@link android.support.v4.app android.support.v4.*}.</p> + +<div class="warning"><p><strong>Warning:</strong> To be sure that you don't accidentally use new +APIs on an older system version, be certain that you import the {@link +android.support.v4.app.Fragment} class and related APIs from the {@link android.support.v4.app} +package:</p> +<pre> +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +... +</pre> +</div> + + +<p>When creating an activity that hosts fragments while using the Support Library, you must also +extend the {@link android.support.v4.app.FragmentActivity} class instead of the traditional {@link +android.app.Activity} class. You'll see sample code for the fragment and activity in the next +lesson.</p> + diff --git a/docs/html/training/basics/location/currentlocation.jd b/docs/html/training/basics/location/currentlocation.jd index 4692530e5e98..29b0fa6d20d4 100644 --- a/docs/html/training/basics/location/currentlocation.jd +++ b/docs/html/training/basics/location/currentlocation.jd @@ -143,7 +143,15 @@ private boolean isSameProvider(String provider1, String provider2) { <h2 id="TaskTerminateUpdates">Terminate Location Updates</h2> -<p>When you are done with using location data, you should terminate location update to reduce unnecessary consumption of power and network bandwidth. For example, if the user navigates away from an activity where location updates are displayed, you should stop location update by calling {@link android.location.LocationManager#removeUpdates(android.location.LocationListener) removeUpdates()} in {@link android.app.Activity#onStop()}. ({@link android.app.Activity#onStop()} is called when the activity is no longer visible. If you want to learn more about activity lifecycle, read up on the <a href="/training/basic-activity-lifecycle/stopping.html">Starting and Stopping an Activity</a> lesson.</p> +<p>When you are done with using location data, you should terminate location update to reduce +unnecessary consumption of power and network bandwidth. For example, if the user navigates away +from an activity where location updates are displayed, you should stop location update by calling +{@link android.location.LocationManager#removeUpdates(android.location.LocationListener) +removeUpdates()} in {@link android.app.Activity#onStop()}. ({@link android.app.Activity#onStop()} +is called when the activity is no longer visible. If you want to learn more about activity +lifecycle, read up on the <a +href="{@docRoot}training/basics/activity-lifecycle/stopping.html">Stopping and Restarting an +Activity</a> lesson.</p> <pre> protected void onStop() { diff --git a/docs/html/training/displaying-bitmaps/display-bitmap.jd b/docs/html/training/displaying-bitmaps/display-bitmap.jd index 7a93313cb998..5eac04cbd7f7 100644 --- a/docs/html/training/displaying-bitmaps/display-bitmap.jd +++ b/docs/html/training/displaying-bitmaps/display-bitmap.jd @@ -315,7 +315,8 @@ additional processing needs to be done, your UI grinds to a halt.</p> <p>The same asynchronous processing and caching methods from the previous section can be implemented here. However, you also need to wary of concurrency issues as the {@link android.widget.GridView} recycles its children views. To handle this, use the techniques discussed in the <a -href="process-bitmap#concurrency">Processing Bitmaps Off the UI Thread</a> lesson. Here is the updated +href="process-bitmap.html#concurrency">Processing Bitmaps Off the UI Thread</a> lesson. Here is the +updated solution:</p> <pre> diff --git a/docs/html/training/index.jd b/docs/html/training/index.jd index 5e8592436f93..8bf32bbb5d48 100644 --- a/docs/html/training/index.jd +++ b/docs/html/training/index.jd @@ -1,4 +1,5 @@ page.title=Orientation to Android Training +page.metaDescription=Android Training provides a collection of classes that aim to help you build great apps for Android. Each class explains the steps required to solve a problem or implement a feature using code snippets and sample code for you to use in your apps. @jd:body diff --git a/docs/html/training/search/backward-compat.jd b/docs/html/training/search/backward-compat.jd index 0894fa98e10f..11473a03890a 100644 --- a/docs/html/training/search/backward-compat.jd +++ b/docs/html/training/search/backward-compat.jd @@ -1,7 +1,7 @@ page.title=Remaining Backward Compatible trainingnavtop=true previous.title=Storing and Searching for Data -previous.link=search.html +previous.link=search.html @jd:body diff --git a/docs/html/training/sharing/receive.jd b/docs/html/training/sharing/receive.jd index a0a5bc8fc615..9c932b107d44 100644 --- a/docs/html/training/sharing/receive.jd +++ b/docs/html/training/sharing/receive.jd @@ -34,7 +34,7 @@ Intent Filters</a></li> from applications. Think about how users interact with your application, and what data types you want to receive from other applications. For example, a social networking application would likely be interested in receiving text content, like an interesting web URL, from another app. The -<a href="https://play.google.com/store/details?id=com.google.android.apps.plus">Google+ Android +<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.plus">Google+ Android application</a> accepts both text <em>and</em> single or multiple images. With this app, a user can easily start a new Google+ post with photos from the Android Gallery app.</p> diff --git a/docs/html/training/tv/optimizing-layouts-tv.jd b/docs/html/training/tv/optimizing-layouts-tv.jd index e4a8e6932491..49c278c47213 100644 --- a/docs/html/training/tv/optimizing-layouts-tv.jd +++ b/docs/html/training/tv/optimizing-layouts-tv.jd @@ -186,8 +186,8 @@ cause out-of-memory errors in your app. To avoid this, follow these tips: {@link android.graphics.Bitmap} views that are no longer needed. </li> <li>Use {@link java.lang.ref.WeakReference} for storing references - to {@link android.graphics.Bitmap} objects in a in-memory - <a href="{@link java.util.Collection}.</li> + to {@link android.graphics.Bitmap} objects in an in-memory + {@link java.util.Collection}.</li> <li>If you fetch images from the network, use {@link android.os.AsyncTask} to fetch them and store them on the SD card for faster access. Never do network transactions on the application's UI thread. diff --git a/docs/html/training/tv/unsupported-features-tv.jd b/docs/html/training/tv/unsupported-features-tv.jd index 6b0f8c8989a2..a9f090bfe1e2 100644 --- a/docs/html/training/tv/unsupported-features-tv.jd +++ b/docs/html/training/tv/unsupported-features-tv.jd @@ -82,8 +82,9 @@ Android doesn't support touchscreen interaction for TV devices, most TVs don't h and interacting with a TV using a touchscreen is not consistent with the 10 foot environment. For these reasons, users interact with Android-powered TVs using a remote. In consideration of this, ensure that every control in your app can be accessed with the D-pad. Refer back to the previous two lessons -<a href="{@docRoot}training/tv/optimizing-layouts-tv">Optimizing Layouts for TV</a> and -<a href="{@docRoot}training/tv/optimizing-navigation-tv">Optimize Navigation for TV</a> for more details +<a href="{@docRoot}training/tv/optimizing-layouts-tv.html">Optimizing Layouts for TV</a> and +<a href="{@docRoot}training/tv/optimizing-navigation-tv.html">Optimize Navigation for TV</a> for +more details on this topic. The Android system assumes that a device has a touchscreen, so if you want your application to run on a TV, you must <strong>explicitly</strong> disable the touchscreen requirement in your manifest file: <pre> diff --git a/graphics/java/android/renderscript/Allocation.java b/graphics/java/android/renderscript/Allocation.java index 10ccb87407ad..6b1d66f2afe1 100644 --- a/graphics/java/android/renderscript/Allocation.java +++ b/graphics/java/android/renderscript/Allocation.java @@ -27,7 +27,7 @@ import android.graphics.SurfaceTexture; import android.util.Log; import android.util.TypedValue; -/** +/** @deprecated renderscript is deprecated in J * <p> * Memory allocation class for renderscript. An allocation combines a * {@link android.renderscript.Type} with the memory to provide storage for user data and objects. @@ -93,7 +93,7 @@ public class Allocation extends BaseObj { int mCurrentCount; - /** + /** @deprecated renderscript is deprecated in J * The usage of the allocation. These signal to renderscript * where to place the allocation in memory. * @@ -102,14 +102,14 @@ public class Allocation extends BaseObj { */ public static final int USAGE_SCRIPT = 0x0001; - /** + /** @deprecated renderscript is deprecated in J * GRAPHICS_TEXTURE The allocation will be used as a texture * source by one or more graphics programs. * */ public static final int USAGE_GRAPHICS_TEXTURE = 0x0002; - /** + /** @deprecated renderscript is deprecated in J * GRAPHICS_VERTEX The allocation will be used as a graphics * mesh. * @@ -117,21 +117,21 @@ public class Allocation extends BaseObj { public static final int USAGE_GRAPHICS_VERTEX = 0x0004; - /** + /** @deprecated renderscript is deprecated in J * GRAPHICS_CONSTANTS The allocation will be used as the source * of shader constants by one or more programs. * */ public static final int USAGE_GRAPHICS_CONSTANTS = 0x0008; - /** + /** @deprecated renderscript is deprecated in J * USAGE_GRAPHICS_RENDER_TARGET The allocation will be used as a * target for offscreen rendering * */ public static final int USAGE_GRAPHICS_RENDER_TARGET = 0x0010; - /** + /** @hide renderscript is deprecated in J * USAGE_IO_INPUT The allocation will be used as SurfaceTexture * consumer. This usage will cause the allocation to be created * read only. @@ -139,7 +139,7 @@ public class Allocation extends BaseObj { */ public static final int USAGE_IO_INPUT = 0x0020; - /** + /** @hide renderscript is deprecated in J * USAGE_IO_OUTPUT The allocation will be used as a * SurfaceTexture producer. The dimensions and format of the * SurfaceTexture will be forced to those of the allocation. @@ -147,25 +147,25 @@ public class Allocation extends BaseObj { */ public static final int USAGE_IO_OUTPUT = 0x0040; - /** + /** @deprecated renderscript is deprecated in J * Controls mipmap behavior when using the bitmap creation and * update functions. */ public enum MipmapControl { - /** + /** @deprecated renderscript is deprecated in J * No mipmaps will be generated and the type generated from the * incoming bitmap will not contain additional LODs. */ MIPMAP_NONE(0), - /** + /** @deprecated renderscript is deprecated in J * A Full mipmap chain will be created in script memory. The * type of the allocation will contain a full mipmap chain. On * upload to graphics the full chain will be transfered. */ MIPMAP_FULL(1), - /** + /** @deprecated renderscript is deprecated in J * The type of the allocation will be the same as MIPMAP_NONE. * It will not contain mipmaps. On upload to graphics the * graphics copy of the allocation data will contain a full @@ -188,7 +188,7 @@ public class Allocation extends BaseObj { } - /** + /** @hide renderscript is deprecated in J * Get the element of the type of the Allocation. * * @return Element that describes the structure of data in the @@ -199,7 +199,7 @@ public class Allocation extends BaseObj { return mType.getElement(); } - /** + /** @hide renderscript is deprecated in J * Get the usage flags of the Allocation. * * @return usage flags associated with the allocation. e.g. @@ -210,7 +210,7 @@ public class Allocation extends BaseObj { return mUsage; } - /** + /** @hide renderscript is deprecated in J * Get the size of the Allocation in bytes. * * @return size of the Allocation in bytes. @@ -326,7 +326,7 @@ public class Allocation extends BaseObj { } } - /** + /** @deprecated renderscript is deprecated in J * Get the type of the Allocation. * * @return Type @@ -336,7 +336,7 @@ public class Allocation extends BaseObj { return mType; } - /** + /** @deprecated renderscript is deprecated in J * Propagate changes from one usage of the allocation to the * remaining usages of the allocation. * @@ -355,7 +355,7 @@ public class Allocation extends BaseObj { mRS.nAllocationSyncAll(getIDSafe(), srcLocation); } - /** + /** @hide renderscript is deprecated in J * Send a buffer to the output stream. The contents of the * Allocation will be undefined after this operation. * @@ -369,7 +369,7 @@ public class Allocation extends BaseObj { mRS.nAllocationIoSend(getID(mRS)); } - /** + /** @deprecated renderscript is deprecated in J * Delete once code is updated. * @hide */ @@ -377,7 +377,7 @@ public class Allocation extends BaseObj { ioSend(); } - /** + /** @hide renderscript is deprecated in J * Receive the latest input into the Allocation. * */ @@ -390,7 +390,7 @@ public class Allocation extends BaseObj { mRS.nAllocationIoReceive(getID(mRS)); } - /** + /** @deprecated renderscript is deprecated in J * Copy an array of RS objects to the allocation. * * @param d Source array. @@ -461,7 +461,7 @@ public class Allocation extends BaseObj { } } - /** + /** @deprecated renderscript is deprecated in J * Copy an allocation from an array. This variant is not type * checked which allows an application to fill in structured * data from an array. @@ -472,7 +472,7 @@ public class Allocation extends BaseObj { mRS.validate(); copy1DRangeFromUnchecked(0, mCurrentCount, d); } - /** + /** @deprecated renderscript is deprecated in J * Copy an allocation from an array. This variant is not type * checked which allows an application to fill in structured * data from an array. @@ -483,7 +483,7 @@ public class Allocation extends BaseObj { mRS.validate(); copy1DRangeFromUnchecked(0, mCurrentCount, d); } - /** + /** @deprecated renderscript is deprecated in J * Copy an allocation from an array. This variant is not type * checked which allows an application to fill in structured * data from an array. @@ -494,7 +494,7 @@ public class Allocation extends BaseObj { mRS.validate(); copy1DRangeFromUnchecked(0, mCurrentCount, d); } - /** + /** @deprecated renderscript is deprecated in J * Copy an allocation from an array. This variant is not type * checked which allows an application to fill in structured * data from an array. @@ -506,7 +506,7 @@ public class Allocation extends BaseObj { copy1DRangeFromUnchecked(0, mCurrentCount, d); } - /** + /** @deprecated renderscript is deprecated in J * Copy an allocation from an array. This variant is type * checked and will generate exceptions if the Allocation type * is not a 32 bit integer type. @@ -518,7 +518,7 @@ public class Allocation extends BaseObj { copy1DRangeFrom(0, mCurrentCount, d); } - /** + /** @deprecated renderscript is deprecated in J * Copy an allocation from an array. This variant is type * checked and will generate exceptions if the Allocation type * is not a 16 bit integer type. @@ -530,7 +530,7 @@ public class Allocation extends BaseObj { copy1DRangeFrom(0, mCurrentCount, d); } - /** + /** @deprecated renderscript is deprecated in J * Copy an allocation from an array. This variant is type * checked and will generate exceptions if the Allocation type * is not a 8 bit integer type. @@ -542,7 +542,7 @@ public class Allocation extends BaseObj { copy1DRangeFrom(0, mCurrentCount, d); } - /** + /** @deprecated renderscript is deprecated in J * Copy an allocation from an array. This variant is type * checked and will generate exceptions if the Allocation type * is not a 32 bit float type. @@ -554,7 +554,7 @@ public class Allocation extends BaseObj { copy1DRangeFrom(0, mCurrentCount, d); } - /** + /** @deprecated renderscript is deprecated in J * Copy an allocation from a bitmap. The height, width, and * format of the bitmap must match the existing allocation. * @@ -567,7 +567,7 @@ public class Allocation extends BaseObj { mRS.nAllocationCopyFromBitmap(getID(mRS), b); } - /** + /** @deprecated renderscript is deprecated in J * This is only intended to be used by auto-generate code reflected from the * renderscript script files. * @@ -587,7 +587,7 @@ public class Allocation extends BaseObj { copy1DRangeFromUnchecked(xoff, count, data); } - /** + /** @deprecated renderscript is deprecated in J * This is only intended to be used by auto-generate code reflected from the * renderscript script files. * @@ -634,7 +634,7 @@ public class Allocation extends BaseObj { } } - /** + /** @deprecated renderscript is deprecated in J * Generate a mipmap chain. Requires the type of the allocation * include mipmaps. * @@ -648,7 +648,7 @@ public class Allocation extends BaseObj { mRS.nAllocationGenerateMipmaps(getID(mRS)); } - /** + /** @deprecated renderscript is deprecated in J * Copy part of an allocation from an array. This variant is * not type checked which allows an application to fill in * structured data from an array. @@ -662,7 +662,7 @@ public class Allocation extends BaseObj { data1DChecks(off, count, d.length * 4, dataSize); mRS.nAllocationData1D(getIDSafe(), off, mSelectedLOD, count, d, dataSize); } - /** + /** @deprecated renderscript is deprecated in J * Copy part of an allocation from an array. This variant is * not type checked which allows an application to fill in * structured data from an array. @@ -676,7 +676,7 @@ public class Allocation extends BaseObj { data1DChecks(off, count, d.length * 2, dataSize); mRS.nAllocationData1D(getIDSafe(), off, mSelectedLOD, count, d, dataSize); } - /** + /** @deprecated renderscript is deprecated in J * Copy part of an allocation from an array. This variant is * not type checked which allows an application to fill in * structured data from an array. @@ -690,7 +690,7 @@ public class Allocation extends BaseObj { data1DChecks(off, count, d.length, dataSize); mRS.nAllocationData1D(getIDSafe(), off, mSelectedLOD, count, d, dataSize); } - /** + /** @deprecated renderscript is deprecated in J * Copy part of an allocation from an array. This variant is * not type checked which allows an application to fill in * structured data from an array. @@ -705,7 +705,7 @@ public class Allocation extends BaseObj { mRS.nAllocationData1D(getIDSafe(), off, mSelectedLOD, count, d, dataSize); } - /** + /** @deprecated renderscript is deprecated in J * Copy part of an allocation from an array. This variant is * type checked and will generate exceptions if the Allocation * type is not a 32 bit integer type. @@ -719,7 +719,7 @@ public class Allocation extends BaseObj { copy1DRangeFromUnchecked(off, count, d); } - /** + /** @deprecated renderscript is deprecated in J * Copy part of an allocation from an array. This variant is * type checked and will generate exceptions if the Allocation * type is not a 16 bit integer type. @@ -733,7 +733,7 @@ public class Allocation extends BaseObj { copy1DRangeFromUnchecked(off, count, d); } - /** + /** @deprecated renderscript is deprecated in J * Copy part of an allocation from an array. This variant is * type checked and will generate exceptions if the Allocation * type is not a 8 bit integer type. @@ -747,7 +747,7 @@ public class Allocation extends BaseObj { copy1DRangeFromUnchecked(off, count, d); } - /** + /** @deprecated renderscript is deprecated in J * Copy part of an allocation from an array. This variant is * type checked and will generate exceptions if the Allocation * type is not a 32 bit float type. @@ -761,7 +761,7 @@ public class Allocation extends BaseObj { copy1DRangeFromUnchecked(off, count, d); } - /** + /** @deprecated renderscript is deprecated in J * Copy part of an allocation from another allocation. * * @param off The offset of the first element to be copied. @@ -794,7 +794,7 @@ public class Allocation extends BaseObj { } } - /** + /** @deprecated renderscript is deprecated in J * Copy a rectangular region from the array into the allocation. * The incoming array is assumed to be tightly packed. * @@ -811,6 +811,8 @@ public class Allocation extends BaseObj { w, h, data, data.length); } + /** @deprecated renderscript is deprecated in J + */ public void copy2DRangeFrom(int xoff, int yoff, int w, int h, short[] data) { mRS.validate(); validate2DRange(xoff, yoff, w, h); @@ -818,6 +820,8 @@ public class Allocation extends BaseObj { w, h, data, data.length * 2); } + /** @deprecated renderscript is deprecated in J + */ public void copy2DRangeFrom(int xoff, int yoff, int w, int h, int[] data) { mRS.validate(); validate2DRange(xoff, yoff, w, h); @@ -825,6 +829,8 @@ public class Allocation extends BaseObj { w, h, data, data.length * 4); } + /** @deprecated renderscript is deprecated in J + */ public void copy2DRangeFrom(int xoff, int yoff, int w, int h, float[] data) { mRS.validate(); validate2DRange(xoff, yoff, w, h); @@ -832,7 +838,7 @@ public class Allocation extends BaseObj { w, h, data, data.length * 4); } - /** + /** @deprecated renderscript is deprecated in J * Copy a rectangular region into the allocation from another * allocation. * @@ -854,7 +860,7 @@ public class Allocation extends BaseObj { data.mSelectedLOD, data.mSelectedFace.mID); } - /** + /** @deprecated renderscript is deprecated in J * Copy a bitmap into an allocation. The height and width of * the update will use the height and width of the incoming * bitmap. @@ -871,7 +877,7 @@ public class Allocation extends BaseObj { } - /** + /** @deprecated renderscript is deprecated in J * Copy from the Allocation into a Bitmap. The bitmap must * match the dimensions of the Allocation. * @@ -884,7 +890,7 @@ public class Allocation extends BaseObj { mRS.nAllocationCopyToBitmap(getID(mRS), b); } - /** + /** @deprecated renderscript is deprecated in J * Copy from the Allocation into a byte array. The array must * be at least as large as the Allocation. The allocation must * be of an 8 bit elemental type. @@ -897,7 +903,7 @@ public class Allocation extends BaseObj { mRS.nAllocationRead(getID(mRS), d); } - /** + /** @deprecated renderscript is deprecated in J * Copy from the Allocation into a short array. The array must * be at least as large as the Allocation. The allocation must * be of an 16 bit elemental type. @@ -910,7 +916,7 @@ public class Allocation extends BaseObj { mRS.nAllocationRead(getID(mRS), d); } - /** + /** @deprecated renderscript is deprecated in J * Copy from the Allocation into a int array. The array must be * at least as large as the Allocation. The allocation must be * of an 32 bit elemental type. @@ -923,7 +929,7 @@ public class Allocation extends BaseObj { mRS.nAllocationRead(getID(mRS), d); } - /** + /** @deprecated renderscript is deprecated in J * Copy from the Allocation into a float array. The array must * be at least as large as the Allocation. The allocation must * be of an 32 bit float elemental type. @@ -936,7 +942,7 @@ public class Allocation extends BaseObj { mRS.nAllocationRead(getID(mRS), d); } - /** + /** @deprecated renderscript is deprecated in J * Resize a 1D allocation. The contents of the allocation are * preserved. If new elements are allocated objects are created * with null contents and the new region is otherwise undefined. @@ -961,7 +967,7 @@ public class Allocation extends BaseObj { updateCacheInfo(mType); } - /** + /** @deprecated renderscript is deprecated in J * Resize a 2D allocation. The contents of the allocation are * preserved. If new elements are allocated objects are created * with null contents and the new region is otherwise undefined. @@ -1002,7 +1008,7 @@ public class Allocation extends BaseObj { mBitmapOptions.inScaled = false; } - /** + /** @deprecated renderscript is deprecated in J * * @param type renderscript type describing data layout * @param mips specifies desired mipmap behaviour for the @@ -1022,7 +1028,7 @@ public class Allocation extends BaseObj { return new Allocation(id, rs, type, usage); } - /** + /** @deprecated renderscript is deprecated in J * Creates a renderscript allocation with the size specified by * the type and no mipmaps generated by default * @@ -1037,7 +1043,7 @@ public class Allocation extends BaseObj { return createTyped(rs, type, MipmapControl.MIPMAP_NONE, usage); } - /** + /** @deprecated renderscript is deprecated in J * Creates a renderscript allocation for use by the script with * the size specified by the type and no mipmaps generated by * default @@ -1051,7 +1057,7 @@ public class Allocation extends BaseObj { return createTyped(rs, type, MipmapControl.MIPMAP_NONE, USAGE_SCRIPT); } - /** + /** @deprecated renderscript is deprecated in J * Creates a renderscript allocation with a specified number of * given elements * @@ -1077,7 +1083,7 @@ public class Allocation extends BaseObj { return new Allocation(id, rs, t, usage); } - /** + /** @deprecated renderscript is deprecated in J * Creates a renderscript allocation with a specified number of * given elements * @@ -1118,7 +1124,7 @@ public class Allocation extends BaseObj { return tb.create(); } - /** + /** @deprecated renderscript is deprecated in J * Creates a renderscript allocation from a bitmap * * @param rs Context to which the allocation will belong. @@ -1144,7 +1150,7 @@ public class Allocation extends BaseObj { return new Allocation(id, rs, t, usage); } - /** + /** @deprecated renderscript is deprecated in J * * * @hide @@ -1162,7 +1168,7 @@ public class Allocation extends BaseObj { return st; } - /** + /** @hide renderscript is deprecated in J * For allocations used with io operations, returns the handle * onto a raw buffer that is being managed by the screen * compositor. @@ -1174,7 +1180,7 @@ public class Allocation extends BaseObj { return new Surface(getSurfaceTexture()); } - /** + /** @hide renderscript is deprecated in J * Associate a surface for io output with this allocation * * @param sur Surface to associate with allocation @@ -1188,7 +1194,7 @@ public class Allocation extends BaseObj { mRS.nAllocationSetSurface(getID(mRS), sur); } - /** + /** @deprecated renderscript is deprecated in J * @hide */ public void setSurfaceTexture(SurfaceTexture st) { @@ -1201,7 +1207,7 @@ public class Allocation extends BaseObj { mRS.nAllocationSetSurface(getID(mRS), s); } - /** + /** @deprecated renderscript is deprecated in J * Creates a non-mipmapped renderscript allocation to use as a * graphics texture * @@ -1216,7 +1222,7 @@ public class Allocation extends BaseObj { USAGE_GRAPHICS_TEXTURE); } - /** + /** @deprecated renderscript is deprecated in J * Creates a cubemap allocation from a bitmap containing the * horizontal list of cube faces. Each individual face must be * the same size and power of 2 @@ -1264,7 +1270,7 @@ public class Allocation extends BaseObj { return new Allocation(id, rs, t, usage); } - /** + /** @deprecated renderscript is deprecated in J * Creates a non-mipmapped cubemap allocation for use as a * graphics texture from a bitmap containing the horizontal list * of cube faces. Each individual face must be the same size and @@ -1283,7 +1289,7 @@ public class Allocation extends BaseObj { USAGE_GRAPHICS_TEXTURE); } - /** + /** @deprecated renderscript is deprecated in J * Creates a cubemap allocation from 6 bitmaps containing * the cube faces. All the faces must be the same size and * power of 2 @@ -1350,7 +1356,7 @@ public class Allocation extends BaseObj { return cubemap; } - /** + /** @deprecated renderscript is deprecated in J * Creates a non-mipmapped cubemap allocation for use as a * graphics texture from 6 bitmaps containing * the cube faces. All the faces must be the same size and @@ -1379,7 +1385,7 @@ public class Allocation extends BaseObj { USAGE_GRAPHICS_TEXTURE); } - /** + /** @deprecated renderscript is deprecated in J * Creates a renderscript allocation from the bitmap referenced * by resource id * @@ -1407,7 +1413,7 @@ public class Allocation extends BaseObj { return alloc; } - /** + /** @deprecated renderscript is deprecated in J * Creates a non-mipmapped renderscript allocation to use as a * graphics texture from the bitmap referenced by resource id * @@ -1426,7 +1432,7 @@ public class Allocation extends BaseObj { USAGE_GRAPHICS_TEXTURE); } - /** + /** @deprecated renderscript is deprecated in J * Creates a renderscript allocation containing string data * encoded in UTF-8 format * diff --git a/graphics/java/android/renderscript/AllocationAdapter.java b/graphics/java/android/renderscript/AllocationAdapter.java index 85d86e5c1bf7..3b5993aedc20 100644 --- a/graphics/java/android/renderscript/AllocationAdapter.java +++ b/graphics/java/android/renderscript/AllocationAdapter.java @@ -21,7 +21,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.util.TypedValue; -/** +/** @deprecated renderscript is deprecated in J * **/ public class AllocationAdapter extends Allocation { @@ -129,7 +129,7 @@ public class AllocationAdapter extends Allocation { mSelectedZ = 0; } - /** + /** @deprecated renderscript is deprecated in J * Set the active LOD. The LOD must be within the range for the * type being adapted. The base allocation must have mipmaps. * @@ -149,7 +149,7 @@ public class AllocationAdapter extends Allocation { initLOD(lod); } - /** + /** @deprecated renderscript is deprecated in J * Set the active Face. The base allocation must be of a type * that includes faces. * @@ -169,7 +169,7 @@ public class AllocationAdapter extends Allocation { mSelectedFace = cf; } - /** + /** @deprecated renderscript is deprecated in J * Set the active Y. The y value must be within the range for * the allocation being adapted. The base allocation must * contain the Y dimension. @@ -190,7 +190,7 @@ public class AllocationAdapter extends Allocation { mSelectedY = y; } - /** + /** @deprecated renderscript is deprecated in J * Set the active Z. The z value must be within the range for * the allocation being adapted. The base allocation must * contain the Z dimension. @@ -211,6 +211,8 @@ public class AllocationAdapter extends Allocation { mSelectedZ = z; } + /** @deprecated renderscript is deprecated in J + */ static public AllocationAdapter create1D(RenderScript rs, Allocation a) { rs.validate(); AllocationAdapter aa = new AllocationAdapter(0, rs, a); @@ -222,6 +224,8 @@ public class AllocationAdapter extends Allocation { return aa; } + /** @deprecated renderscript is deprecated in J + */ static public AllocationAdapter create2D(RenderScript rs, Allocation a) { android.util.Log.e("rs", "create2d " + a); rs.validate(); @@ -235,7 +239,7 @@ public class AllocationAdapter extends Allocation { } - /** + /** @deprecated renderscript is deprecated in J * Override the Allocation resize. Resizing adapters is not * allowed and will throw a RSInvalidStateException. * diff --git a/graphics/java/android/renderscript/BaseObj.java b/graphics/java/android/renderscript/BaseObj.java index f464f9bb1025..0d7421269965 100644 --- a/graphics/java/android/renderscript/BaseObj.java +++ b/graphics/java/android/renderscript/BaseObj.java @@ -18,7 +18,7 @@ package android.renderscript; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * BaseObj is the base class for interfacing with native renderscript objects. * It primarly contains code for tracking the native object ID and forcably * disconecting the object from the native allocation for early cleanup. @@ -39,7 +39,7 @@ public class BaseObj { mID = id; } - /** + /** @deprecated renderscript is deprecated in J * Lookup the native object ID for this object. Primarily used by the * generated reflected code. * @@ -73,7 +73,7 @@ public class BaseObj { private String mName; RenderScript mRS; - /** + /** @deprecated renderscript is deprecated in J * setName assigns a name to an object. This object can later be looked up * by this name. This name will also be retained if the object is written * to an A3D file. @@ -103,7 +103,7 @@ public class BaseObj { } } - /** + /** @deprecated renderscript is deprecated in J * @return name of the renderscript object */ public String getName() { @@ -124,7 +124,7 @@ public class BaseObj { super.finalize(); } - /** + /** @deprecated renderscript is deprecated in J * destroy disconnects the object from the native object effectively * rendering this java object dead. The primary use is to force immediate * cleanup of resources when it is believed the GC will not respond quickly @@ -138,7 +138,7 @@ public class BaseObj { mRS.nObjDestroy(mID); } - /** + /** @deprecated renderscript is deprecated in J * If an object came from an a3d file, java fields need to be * created with objects from the native layer */ @@ -147,7 +147,7 @@ public class BaseObj { mName = mRS.nGetName(getID(mRS)); } - /** + /** @deprecated renderscript is deprecated in J * Calculates the hash code value for a BaseObj. * * @return int @@ -157,7 +157,7 @@ public class BaseObj { return mID; } - /** + /** @deprecated renderscript is deprecated in J * Compare the current BaseObj with another BaseObj for equality. * * @param obj The object to check equality with. diff --git a/graphics/java/android/renderscript/Byte2.java b/graphics/java/android/renderscript/Byte2.java index 7df5f2ee866a..163b8bdf62f3 100644 --- a/graphics/java/android/renderscript/Byte2.java +++ b/graphics/java/android/renderscript/Byte2.java @@ -20,7 +20,7 @@ import java.lang.Math; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * Class for exposing the native Renderscript byte2 type back to the Android system. * **/ diff --git a/graphics/java/android/renderscript/Byte3.java b/graphics/java/android/renderscript/Byte3.java index 02a01c16c697..eaa1d5f9b212 100644 --- a/graphics/java/android/renderscript/Byte3.java +++ b/graphics/java/android/renderscript/Byte3.java @@ -20,7 +20,7 @@ import java.lang.Math; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * Class for exposing the native Renderscript byte3 type back to the Android system. * **/ diff --git a/graphics/java/android/renderscript/Byte4.java b/graphics/java/android/renderscript/Byte4.java index a55a696bda50..e162f9d73620 100644 --- a/graphics/java/android/renderscript/Byte4.java +++ b/graphics/java/android/renderscript/Byte4.java @@ -20,7 +20,7 @@ import java.lang.Math; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * Class for exposing the native Renderscript byte4 type back to the Android system. * **/ diff --git a/graphics/java/android/renderscript/Double2.java b/graphics/java/android/renderscript/Double2.java index 9f4f328c389b..0ef2f2bba761 100644 --- a/graphics/java/android/renderscript/Double2.java +++ b/graphics/java/android/renderscript/Double2.java @@ -20,7 +20,7 @@ import java.lang.Math; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * Class for exposing the native Renderscript double2 type back * to the Android system. * diff --git a/graphics/java/android/renderscript/Double3.java b/graphics/java/android/renderscript/Double3.java index eb55142711bd..09aba188f660 100644 --- a/graphics/java/android/renderscript/Double3.java +++ b/graphics/java/android/renderscript/Double3.java @@ -20,7 +20,7 @@ import java.lang.Math; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * Class for exposing the native Renderscript double3 type back * to the Android system. * diff --git a/graphics/java/android/renderscript/Double4.java b/graphics/java/android/renderscript/Double4.java index 4755a76d35a0..c5211be4013b 100644 --- a/graphics/java/android/renderscript/Double4.java +++ b/graphics/java/android/renderscript/Double4.java @@ -20,7 +20,7 @@ import java.lang.Math; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * Class for exposing the native Renderscript double4 type back * to the Android system. * diff --git a/graphics/java/android/renderscript/Element.java b/graphics/java/android/renderscript/Element.java index 28914ce1a3bf..babe57ec23f1 100644 --- a/graphics/java/android/renderscript/Element.java +++ b/graphics/java/android/renderscript/Element.java @@ -19,7 +19,7 @@ package android.renderscript; import java.lang.reflect.Field; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * <p>The most basic data type. An element represents one cell of a memory allocation. * Element is the basic data type of Renderscript. An element can be of two forms: Basic elements or Complex forms. * Examples of basic elements are:</p> @@ -84,12 +84,12 @@ public class Element extends BaseObj { } } - /** + /** @hide renderscript is deprecated in J * @return element size in bytes */ public int getBytesSize() {return mSize;} - /** + /** @hide renderscript is deprecated in J * Returns the number of vector components. 2 for float2, 4 for * float4, etc. * @return element vector size @@ -97,7 +97,7 @@ public class Element extends BaseObj { public int getVectorSize() {return mVectorSize;} - /** + /** @deprecated renderscript is deprecated in J * DataType represents the basic type information for a basic element. The * naming convention follows. For numeric types it is FLOAT, * SIGNED, or UNSIGNED followed by the _BITS where BITS is the @@ -114,6 +114,8 @@ public class Element extends BaseObj { * RS_* objects. 32 bit opaque handles. */ public enum DataType { + /** @hide + */ NONE (0, 0), //FLOAT_16 (1, 2), FLOAT_32 (2, 4), @@ -147,6 +149,8 @@ public class Element extends BaseObj { RS_PROGRAM_VERTEX (1007, 4), RS_PROGRAM_RASTER (1008, 4), RS_PROGRAM_STORE (1009, 4), + /** @hide + */ RS_FONT (1010, 4); int mID; @@ -157,7 +161,7 @@ public class Element extends BaseObj { } } - /** + /** @deprecated renderscript is deprecated in J * The special interpretation of the data if required. This is primarly * useful for graphical data. USER indicates no special interpretation is * expected. PIXEL is used in conjunction with the standard data types for @@ -179,7 +183,7 @@ public class Element extends BaseObj { } } - /** + /** @deprecated renderscript is deprecated in J * Return if a element is too complex for use as a data source for a Mesh or * a Program. * @@ -197,7 +201,7 @@ public class Element extends BaseObj { return false; } - /** + /** @hide renderscript is deprecated in J * Elements could be simple, such as an int or a float, or a * structure with multiple sub elements, such as a collection of * floats, float2, float4. This function returns zero for simple @@ -211,7 +215,7 @@ public class Element extends BaseObj { return mVisibleElementMap.length; } - /** + /** @hide renderscript is deprecated in J * For complex elements, this function will return the * sub-element at index * @param index index of the sub-element to return @@ -227,7 +231,7 @@ public class Element extends BaseObj { return mElements[mVisibleElementMap[index]]; } - /** + /** @hide renderscript is deprecated in J * For complex elements, this function will return the * sub-element name at index * @param index index of the sub-element @@ -243,7 +247,7 @@ public class Element extends BaseObj { return mElementNames[mVisibleElementMap[index]]; } - /** + /** @hide renderscript is deprecated in J * For complex elements, some sub-elements could be statically * sized arrays. This function will return the array size for * sub-element at index @@ -260,7 +264,7 @@ public class Element extends BaseObj { return mArraySizes[mVisibleElementMap[index]]; } - /** + /** @hide renderscript is deprecated in J * This function specifies the location of a sub-element within * the element * @param index index of the sub-element @@ -276,21 +280,21 @@ public class Element extends BaseObj { return mOffsetInBytes[mVisibleElementMap[index]]; } - /** + /** @hide renderscript is deprecated in J * @return element data type */ public DataType getDataType() { return mType; } - /** + /** @hide renderscript is deprecated in J * @return element data kind */ public DataKind getDataKind() { return mKind; } - /** + /** @deprecated renderscript is deprecated in J * Utility function for returning an Element containing a single Boolean. * * @param rs Context to which the element will belong. @@ -304,7 +308,7 @@ public class Element extends BaseObj { return rs.mElement_BOOLEAN; } - /** + /** @deprecated renderscript is deprecated in J * Utility function for returning an Element containing a single UNSIGNED_8. * * @param rs Context to which the element will belong. @@ -318,7 +322,7 @@ public class Element extends BaseObj { return rs.mElement_U8; } - /** + /** @deprecated renderscript is deprecated in J * Utility function for returning an Element containing a single SIGNED_8. * * @param rs Context to which the element will belong. @@ -332,6 +336,8 @@ public class Element extends BaseObj { return rs.mElement_I8; } + /** @deprecated renderscript is deprecated in J + */ public static Element U16(RenderScript rs) { if(rs.mElement_U16 == null) { rs.mElement_U16 = createUser(rs, DataType.UNSIGNED_16); @@ -339,6 +345,8 @@ public class Element extends BaseObj { return rs.mElement_U16; } + /** @deprecated renderscript is deprecated in J + */ public static Element I16(RenderScript rs) { if(rs.mElement_I16 == null) { rs.mElement_I16 = createUser(rs, DataType.SIGNED_16); @@ -346,6 +354,8 @@ public class Element extends BaseObj { return rs.mElement_I16; } + /** @deprecated renderscript is deprecated in J + */ public static Element U32(RenderScript rs) { if(rs.mElement_U32 == null) { rs.mElement_U32 = createUser(rs, DataType.UNSIGNED_32); @@ -353,6 +363,8 @@ public class Element extends BaseObj { return rs.mElement_U32; } + /** @deprecated renderscript is deprecated in J + */ public static Element I32(RenderScript rs) { if(rs.mElement_I32 == null) { rs.mElement_I32 = createUser(rs, DataType.SIGNED_32); @@ -360,6 +372,8 @@ public class Element extends BaseObj { return rs.mElement_I32; } + /** @deprecated renderscript is deprecated in J + */ public static Element U64(RenderScript rs) { if(rs.mElement_U64 == null) { rs.mElement_U64 = createUser(rs, DataType.UNSIGNED_64); @@ -367,6 +381,8 @@ public class Element extends BaseObj { return rs.mElement_U64; } + /** @deprecated renderscript is deprecated in J + */ public static Element I64(RenderScript rs) { if(rs.mElement_I64 == null) { rs.mElement_I64 = createUser(rs, DataType.SIGNED_64); @@ -374,6 +390,8 @@ public class Element extends BaseObj { return rs.mElement_I64; } + /** @deprecated renderscript is deprecated in J + */ public static Element F32(RenderScript rs) { if(rs.mElement_F32 == null) { rs.mElement_F32 = createUser(rs, DataType.FLOAT_32); @@ -381,6 +399,8 @@ public class Element extends BaseObj { return rs.mElement_F32; } + /** @deprecated renderscript is deprecated in J + */ public static Element F64(RenderScript rs) { if(rs.mElement_F64 == null) { rs.mElement_F64 = createUser(rs, DataType.FLOAT_64); @@ -388,6 +408,8 @@ public class Element extends BaseObj { return rs.mElement_F64; } + /** @deprecated renderscript is deprecated in J + */ public static Element ELEMENT(RenderScript rs) { if(rs.mElement_ELEMENT == null) { rs.mElement_ELEMENT = createUser(rs, DataType.RS_ELEMENT); @@ -395,6 +417,8 @@ public class Element extends BaseObj { return rs.mElement_ELEMENT; } + /** @deprecated renderscript is deprecated in J + */ public static Element TYPE(RenderScript rs) { if(rs.mElement_TYPE == null) { rs.mElement_TYPE = createUser(rs, DataType.RS_TYPE); @@ -402,6 +426,8 @@ public class Element extends BaseObj { return rs.mElement_TYPE; } + /** @deprecated renderscript is deprecated in J + */ public static Element ALLOCATION(RenderScript rs) { if(rs.mElement_ALLOCATION == null) { rs.mElement_ALLOCATION = createUser(rs, DataType.RS_ALLOCATION); @@ -409,6 +435,8 @@ public class Element extends BaseObj { return rs.mElement_ALLOCATION; } + /** @deprecated renderscript is deprecated in J + */ public static Element SAMPLER(RenderScript rs) { if(rs.mElement_SAMPLER == null) { rs.mElement_SAMPLER = createUser(rs, DataType.RS_SAMPLER); @@ -416,6 +444,8 @@ public class Element extends BaseObj { return rs.mElement_SAMPLER; } + /** @deprecated renderscript is deprecated in J + */ public static Element SCRIPT(RenderScript rs) { if(rs.mElement_SCRIPT == null) { rs.mElement_SCRIPT = createUser(rs, DataType.RS_SCRIPT); @@ -423,6 +453,8 @@ public class Element extends BaseObj { return rs.mElement_SCRIPT; } + /** @deprecated renderscript is deprecated in J + */ public static Element MESH(RenderScript rs) { if(rs.mElement_MESH == null) { rs.mElement_MESH = createUser(rs, DataType.RS_MESH); @@ -430,6 +462,8 @@ public class Element extends BaseObj { return rs.mElement_MESH; } + /** @deprecated renderscript is deprecated in J + */ public static Element PROGRAM_FRAGMENT(RenderScript rs) { if(rs.mElement_PROGRAM_FRAGMENT == null) { rs.mElement_PROGRAM_FRAGMENT = createUser(rs, DataType.RS_PROGRAM_FRAGMENT); @@ -437,6 +471,8 @@ public class Element extends BaseObj { return rs.mElement_PROGRAM_FRAGMENT; } + /** @deprecated renderscript is deprecated in J + */ public static Element PROGRAM_VERTEX(RenderScript rs) { if(rs.mElement_PROGRAM_VERTEX == null) { rs.mElement_PROGRAM_VERTEX = createUser(rs, DataType.RS_PROGRAM_VERTEX); @@ -444,6 +480,8 @@ public class Element extends BaseObj { return rs.mElement_PROGRAM_VERTEX; } + /** @deprecated renderscript is deprecated in J + */ public static Element PROGRAM_RASTER(RenderScript rs) { if(rs.mElement_PROGRAM_RASTER == null) { rs.mElement_PROGRAM_RASTER = createUser(rs, DataType.RS_PROGRAM_RASTER); @@ -451,6 +489,8 @@ public class Element extends BaseObj { return rs.mElement_PROGRAM_RASTER; } + /** @deprecated renderscript is deprecated in J + */ public static Element PROGRAM_STORE(RenderScript rs) { if(rs.mElement_PROGRAM_STORE == null) { rs.mElement_PROGRAM_STORE = createUser(rs, DataType.RS_PROGRAM_STORE); @@ -458,6 +498,8 @@ public class Element extends BaseObj { return rs.mElement_PROGRAM_STORE; } + /** @hide + */ public static Element FONT(RenderScript rs) { if(rs.mElement_FONT == null) { rs.mElement_FONT = createUser(rs, DataType.RS_FONT); @@ -465,7 +507,8 @@ public class Element extends BaseObj { return rs.mElement_FONT; } - + /** @deprecated renderscript is deprecated in J + */ public static Element A_8(RenderScript rs) { if(rs.mElement_A_8 == null) { rs.mElement_A_8 = createPixel(rs, DataType.UNSIGNED_8, DataKind.PIXEL_A); @@ -473,6 +516,8 @@ public class Element extends BaseObj { return rs.mElement_A_8; } + /** @deprecated renderscript is deprecated in J + */ public static Element RGB_565(RenderScript rs) { if(rs.mElement_RGB_565 == null) { rs.mElement_RGB_565 = createPixel(rs, DataType.UNSIGNED_5_6_5, DataKind.PIXEL_RGB); @@ -480,6 +525,8 @@ public class Element extends BaseObj { return rs.mElement_RGB_565; } + /** @deprecated renderscript is deprecated in J + */ public static Element RGB_888(RenderScript rs) { if(rs.mElement_RGB_888 == null) { rs.mElement_RGB_888 = createPixel(rs, DataType.UNSIGNED_8, DataKind.PIXEL_RGB); @@ -487,6 +534,8 @@ public class Element extends BaseObj { return rs.mElement_RGB_888; } + /** @deprecated renderscript is deprecated in J + */ public static Element RGBA_5551(RenderScript rs) { if(rs.mElement_RGBA_5551 == null) { rs.mElement_RGBA_5551 = createPixel(rs, DataType.UNSIGNED_5_5_5_1, DataKind.PIXEL_RGBA); @@ -494,6 +543,8 @@ public class Element extends BaseObj { return rs.mElement_RGBA_5551; } + /** @deprecated renderscript is deprecated in J + */ public static Element RGBA_4444(RenderScript rs) { if(rs.mElement_RGBA_4444 == null) { rs.mElement_RGBA_4444 = createPixel(rs, DataType.UNSIGNED_4_4_4_4, DataKind.PIXEL_RGBA); @@ -501,6 +552,8 @@ public class Element extends BaseObj { return rs.mElement_RGBA_4444; } + /** @deprecated renderscript is deprecated in J + */ public static Element RGBA_8888(RenderScript rs) { if(rs.mElement_RGBA_8888 == null) { rs.mElement_RGBA_8888 = createPixel(rs, DataType.UNSIGNED_8, DataKind.PIXEL_RGBA); @@ -508,6 +561,8 @@ public class Element extends BaseObj { return rs.mElement_RGBA_8888; } + /** @deprecated renderscript is deprecated in J + */ public static Element F32_2(RenderScript rs) { if(rs.mElement_FLOAT_2 == null) { rs.mElement_FLOAT_2 = createVector(rs, DataType.FLOAT_32, 2); @@ -515,6 +570,8 @@ public class Element extends BaseObj { return rs.mElement_FLOAT_2; } + /** @deprecated renderscript is deprecated in J + */ public static Element F32_3(RenderScript rs) { if(rs.mElement_FLOAT_3 == null) { rs.mElement_FLOAT_3 = createVector(rs, DataType.FLOAT_32, 3); @@ -522,6 +579,8 @@ public class Element extends BaseObj { return rs.mElement_FLOAT_3; } + /** @deprecated renderscript is deprecated in J + */ public static Element F32_4(RenderScript rs) { if(rs.mElement_FLOAT_4 == null) { rs.mElement_FLOAT_4 = createVector(rs, DataType.FLOAT_32, 4); @@ -529,6 +588,8 @@ public class Element extends BaseObj { return rs.mElement_FLOAT_4; } + /** @deprecated renderscript is deprecated in J + */ public static Element F64_2(RenderScript rs) { if(rs.mElement_DOUBLE_2 == null) { rs.mElement_DOUBLE_2 = createVector(rs, DataType.FLOAT_64, 2); @@ -536,6 +597,8 @@ public class Element extends BaseObj { return rs.mElement_DOUBLE_2; } + /** @deprecated renderscript is deprecated in J + */ public static Element F64_3(RenderScript rs) { if(rs.mElement_DOUBLE_3 == null) { rs.mElement_DOUBLE_3 = createVector(rs, DataType.FLOAT_64, 3); @@ -543,6 +606,8 @@ public class Element extends BaseObj { return rs.mElement_DOUBLE_3; } + /** @deprecated renderscript is deprecated in J + */ public static Element F64_4(RenderScript rs) { if(rs.mElement_DOUBLE_4 == null) { rs.mElement_DOUBLE_4 = createVector(rs, DataType.FLOAT_64, 4); @@ -550,6 +615,8 @@ public class Element extends BaseObj { return rs.mElement_DOUBLE_4; } + /** @deprecated renderscript is deprecated in J + */ public static Element U8_2(RenderScript rs) { if(rs.mElement_UCHAR_2 == null) { rs.mElement_UCHAR_2 = createVector(rs, DataType.UNSIGNED_8, 2); @@ -557,6 +624,8 @@ public class Element extends BaseObj { return rs.mElement_UCHAR_2; } + /** @deprecated renderscript is deprecated in J + */ public static Element U8_3(RenderScript rs) { if(rs.mElement_UCHAR_3 == null) { rs.mElement_UCHAR_3 = createVector(rs, DataType.UNSIGNED_8, 3); @@ -564,6 +633,8 @@ public class Element extends BaseObj { return rs.mElement_UCHAR_3; } + /** @deprecated renderscript is deprecated in J + */ public static Element U8_4(RenderScript rs) { if(rs.mElement_UCHAR_4 == null) { rs.mElement_UCHAR_4 = createVector(rs, DataType.UNSIGNED_8, 4); @@ -571,6 +642,8 @@ public class Element extends BaseObj { return rs.mElement_UCHAR_4; } + /** @deprecated renderscript is deprecated in J + */ public static Element I8_2(RenderScript rs) { if(rs.mElement_CHAR_2 == null) { rs.mElement_CHAR_2 = createVector(rs, DataType.SIGNED_8, 2); @@ -578,6 +651,8 @@ public class Element extends BaseObj { return rs.mElement_CHAR_2; } + /** @deprecated renderscript is deprecated in J + */ public static Element I8_3(RenderScript rs) { if(rs.mElement_CHAR_3 == null) { rs.mElement_CHAR_3 = createVector(rs, DataType.SIGNED_8, 3); @@ -585,6 +660,8 @@ public class Element extends BaseObj { return rs.mElement_CHAR_3; } + /** @deprecated renderscript is deprecated in J + */ public static Element I8_4(RenderScript rs) { if(rs.mElement_CHAR_4 == null) { rs.mElement_CHAR_4 = createVector(rs, DataType.SIGNED_8, 4); @@ -592,6 +669,8 @@ public class Element extends BaseObj { return rs.mElement_CHAR_4; } + /** @deprecated renderscript is deprecated in J + */ public static Element U16_2(RenderScript rs) { if(rs.mElement_USHORT_2 == null) { rs.mElement_USHORT_2 = createVector(rs, DataType.UNSIGNED_16, 2); @@ -599,6 +678,8 @@ public class Element extends BaseObj { return rs.mElement_USHORT_2; } + /** @deprecated renderscript is deprecated in J + */ public static Element U16_3(RenderScript rs) { if(rs.mElement_USHORT_3 == null) { rs.mElement_USHORT_3 = createVector(rs, DataType.UNSIGNED_16, 3); @@ -606,6 +687,8 @@ public class Element extends BaseObj { return rs.mElement_USHORT_3; } + /** @deprecated renderscript is deprecated in J + */ public static Element U16_4(RenderScript rs) { if(rs.mElement_USHORT_4 == null) { rs.mElement_USHORT_4 = createVector(rs, DataType.UNSIGNED_16, 4); @@ -613,6 +696,8 @@ public class Element extends BaseObj { return rs.mElement_USHORT_4; } + /** @deprecated renderscript is deprecated in J + */ public static Element I16_2(RenderScript rs) { if(rs.mElement_SHORT_2 == null) { rs.mElement_SHORT_2 = createVector(rs, DataType.SIGNED_16, 2); @@ -620,6 +705,8 @@ public class Element extends BaseObj { return rs.mElement_SHORT_2; } + /** @deprecated renderscript is deprecated in J + */ public static Element I16_3(RenderScript rs) { if(rs.mElement_SHORT_3 == null) { rs.mElement_SHORT_3 = createVector(rs, DataType.SIGNED_16, 3); @@ -627,6 +714,8 @@ public class Element extends BaseObj { return rs.mElement_SHORT_3; } + /** @deprecated renderscript is deprecated in J + */ public static Element I16_4(RenderScript rs) { if(rs.mElement_SHORT_4 == null) { rs.mElement_SHORT_4 = createVector(rs, DataType.SIGNED_16, 4); @@ -634,6 +723,8 @@ public class Element extends BaseObj { return rs.mElement_SHORT_4; } + /** @deprecated renderscript is deprecated in J + */ public static Element U32_2(RenderScript rs) { if(rs.mElement_UINT_2 == null) { rs.mElement_UINT_2 = createVector(rs, DataType.UNSIGNED_32, 2); @@ -641,6 +732,8 @@ public class Element extends BaseObj { return rs.mElement_UINT_2; } + /** @deprecated renderscript is deprecated in J + */ public static Element U32_3(RenderScript rs) { if(rs.mElement_UINT_3 == null) { rs.mElement_UINT_3 = createVector(rs, DataType.UNSIGNED_32, 3); @@ -648,6 +741,8 @@ public class Element extends BaseObj { return rs.mElement_UINT_3; } + /** @deprecated renderscript is deprecated in J + */ public static Element U32_4(RenderScript rs) { if(rs.mElement_UINT_4 == null) { rs.mElement_UINT_4 = createVector(rs, DataType.UNSIGNED_32, 4); @@ -655,6 +750,8 @@ public class Element extends BaseObj { return rs.mElement_UINT_4; } + /** @deprecated renderscript is deprecated in J + */ public static Element I32_2(RenderScript rs) { if(rs.mElement_INT_2 == null) { rs.mElement_INT_2 = createVector(rs, DataType.SIGNED_32, 2); @@ -662,6 +759,8 @@ public class Element extends BaseObj { return rs.mElement_INT_2; } + /** @deprecated renderscript is deprecated in J + */ public static Element I32_3(RenderScript rs) { if(rs.mElement_INT_3 == null) { rs.mElement_INT_3 = createVector(rs, DataType.SIGNED_32, 3); @@ -669,6 +768,8 @@ public class Element extends BaseObj { return rs.mElement_INT_3; } + /** @deprecated renderscript is deprecated in J + */ public static Element I32_4(RenderScript rs) { if(rs.mElement_INT_4 == null) { rs.mElement_INT_4 = createVector(rs, DataType.SIGNED_32, 4); @@ -676,6 +777,8 @@ public class Element extends BaseObj { return rs.mElement_INT_4; } + /** @deprecated renderscript is deprecated in J + */ public static Element U64_2(RenderScript rs) { if(rs.mElement_ULONG_2 == null) { rs.mElement_ULONG_2 = createVector(rs, DataType.UNSIGNED_64, 2); @@ -683,6 +786,8 @@ public class Element extends BaseObj { return rs.mElement_ULONG_2; } + /** @deprecated renderscript is deprecated in J + */ public static Element U64_3(RenderScript rs) { if(rs.mElement_ULONG_3 == null) { rs.mElement_ULONG_3 = createVector(rs, DataType.UNSIGNED_64, 3); @@ -690,6 +795,8 @@ public class Element extends BaseObj { return rs.mElement_ULONG_3; } + /** @deprecated renderscript is deprecated in J + */ public static Element U64_4(RenderScript rs) { if(rs.mElement_ULONG_4 == null) { rs.mElement_ULONG_4 = createVector(rs, DataType.UNSIGNED_64, 4); @@ -697,6 +804,8 @@ public class Element extends BaseObj { return rs.mElement_ULONG_4; } + /** @deprecated renderscript is deprecated in J + */ public static Element I64_2(RenderScript rs) { if(rs.mElement_LONG_2 == null) { rs.mElement_LONG_2 = createVector(rs, DataType.SIGNED_64, 2); @@ -704,6 +813,8 @@ public class Element extends BaseObj { return rs.mElement_LONG_2; } + /** @deprecated renderscript is deprecated in J + */ public static Element I64_3(RenderScript rs) { if(rs.mElement_LONG_3 == null) { rs.mElement_LONG_3 = createVector(rs, DataType.SIGNED_64, 3); @@ -711,6 +822,8 @@ public class Element extends BaseObj { return rs.mElement_LONG_3; } + /** @deprecated renderscript is deprecated in J + */ public static Element I64_4(RenderScript rs) { if(rs.mElement_LONG_4 == null) { rs.mElement_LONG_4 = createVector(rs, DataType.SIGNED_64, 4); @@ -718,16 +831,22 @@ public class Element extends BaseObj { return rs.mElement_LONG_4; } + /** @deprecated renderscript is deprecated in J + */ public static Element MATRIX_4X4(RenderScript rs) { if(rs.mElement_MATRIX_4X4 == null) { rs.mElement_MATRIX_4X4 = createUser(rs, DataType.MATRIX_4X4); } return rs.mElement_MATRIX_4X4; } + /** @deprecated renderscript is deprecated in J + */ public static Element MATRIX4X4(RenderScript rs) { return MATRIX_4X4(rs); } + /** @deprecated renderscript is deprecated in J + */ public static Element MATRIX_3X3(RenderScript rs) { if(rs.mElement_MATRIX_3X3 == null) { rs.mElement_MATRIX_3X3 = createUser(rs, DataType.MATRIX_3X3); @@ -735,6 +854,8 @@ public class Element extends BaseObj { return rs.mElement_MATRIX_3X3; } + /** @deprecated renderscript is deprecated in J + */ public static Element MATRIX_2X2(RenderScript rs) { if(rs.mElement_MATRIX_2X2 == null) { rs.mElement_MATRIX_2X2 = createUser(rs, DataType.MATRIX_2X2); @@ -824,7 +945,7 @@ public class Element extends BaseObj { updateVisibleSubElements(); } - /** + /** @deprecated renderscript is deprecated in J * Create a custom Element of the specified DataType. The DataKind will be * set to USER and the vector size to 1 indicating non-vector. * @@ -840,7 +961,7 @@ public class Element extends BaseObj { return new Element(id, rs, dt, dk, norm, vecSize); } - /** + /** @deprecated renderscript is deprecated in J * Create a custom vector element of the specified DataType and vector size. * DataKind will be set to USER. Only primitive types (FLOAT_32, FLOAT_64, * SIGNED_8, SIGNED_16, SIGNED_32, SIGNED_64, UNSIGNED_8, UNSIGNED_16, @@ -884,7 +1005,7 @@ public class Element extends BaseObj { } } - /** + /** @deprecated renderscript is deprecated in J * Create a new pixel Element type. A matching DataType and DataKind must * be provided. The DataType and DataKind must contain the same number of * components. Vector size will be set to 1. @@ -947,7 +1068,7 @@ public class Element extends BaseObj { return new Element(id, rs, dt, dk, norm, size); } - /** + /** @deprecated renderscript is deprecated in J * Check if the current Element is compatible with another Element. * Primitive Elements are compatible if they share the same underlying * size and type (i.e. U8 is compatible with A_8). User-defined Elements @@ -974,7 +1095,7 @@ public class Element extends BaseObj { (mVectorSize == e.mVectorSize)); } - /** + /** @deprecated renderscript is deprecated in J * Builder class for producing complex elements with matching field and name * pairs. The builder starts empty. The order in which elements are added * is retained for the layout in memory. @@ -988,7 +1109,7 @@ public class Element extends BaseObj { int mCount; int mSkipPadding; - /** + /** @deprecated renderscript is deprecated in J * Create a builder object. * * @param rs @@ -1001,7 +1122,7 @@ public class Element extends BaseObj { mArraySizes = new int[8]; } - /** + /** @deprecated renderscript is deprecated in J * Add an array of elements to this element. * * @param element @@ -1045,7 +1166,7 @@ public class Element extends BaseObj { return this; } - /** + /** @deprecated renderscript is deprecated in J * Add a single element to this Element. * * @param element @@ -1055,7 +1176,7 @@ public class Element extends BaseObj { return add(element, name, 1); } - /** + /** @deprecated renderscript is deprecated in J * Create the element from this builder. * * diff --git a/graphics/java/android/renderscript/FieldPacker.java b/graphics/java/android/renderscript/FieldPacker.java index a215a57269fe..9d36e33ec1bc 100644 --- a/graphics/java/android/renderscript/FieldPacker.java +++ b/graphics/java/android/renderscript/FieldPacker.java @@ -17,7 +17,7 @@ package android.renderscript; -/** +/** @deprecated renderscript is deprecated in J * Utility class for packing arguments and structures from Android system objects to * Renderscript objects. * diff --git a/graphics/java/android/renderscript/FileA3D.java b/graphics/java/android/renderscript/FileA3D.java index 617931715c1f..1158061b459a 100644 --- a/graphics/java/android/renderscript/FileA3D.java +++ b/graphics/java/android/renderscript/FileA3D.java @@ -27,7 +27,7 @@ import android.graphics.BitmapFactory; import android.util.Log; import android.util.TypedValue; -/** +/** @deprecated renderscript is deprecated in J * FileA3D allows users to load Renderscript objects from files * or resources stored on disk. It could be used to load items * such as 3D geometry data converted to a Renderscript format from @@ -40,17 +40,17 @@ import android.util.TypedValue; **/ public class FileA3D extends BaseObj { - /** + /** @deprecated renderscript is deprecated in J * Specifies what renderscript object type is contained within * the FileA3D IndexEntry **/ public enum EntryType { - /** + /** @deprecated renderscript is deprecated in J * Unknown or or invalid object, nothing will be loaded **/ UNKNOWN (0), - /** + /** @deprecated renderscript is deprecated in J * Renderscript Mesh object **/ MESH (1); @@ -65,7 +65,7 @@ public class FileA3D extends BaseObj { } } - /** + /** @deprecated renderscript is deprecated in J * IndexEntry contains information about one of the Renderscript * objects inside the file's index. It could be used to query the * object's type and also name and load the object itself if @@ -79,7 +79,7 @@ public class FileA3D extends BaseObj { EntryType mEntryType; BaseObj mLoadedObj; - /** + /** @deprecated renderscript is deprecated in J * Returns the name of a renderscript object the index entry * describes * @@ -91,7 +91,7 @@ public class FileA3D extends BaseObj { return mName; } - /** + /** @deprecated renderscript is deprecated in J * Returns the type of a renderscript object the index entry * describes * @return type of a renderscript object the index entry @@ -101,7 +101,7 @@ public class FileA3D extends BaseObj { return mEntryType; } - /** + /** @deprecated renderscript is deprecated in J * Used to load the object described by the index entry * @return base renderscript object described by the entry */ @@ -111,7 +111,7 @@ public class FileA3D extends BaseObj { return obj; } - /** + /** @deprecated renderscript is deprecated in J * Used to load the mesh described by the index entry, object * described by the index entry must be a renderscript mesh * @@ -181,7 +181,7 @@ public class FileA3D extends BaseObj { } } - /** + /** @deprecated renderscript is deprecated in J * Returns the number of objects stored inside the a3d file * * @return the number of objects stored inside the a3d file @@ -193,7 +193,7 @@ public class FileA3D extends BaseObj { return mFileEntries.length; } - /** + /** @deprecated renderscript is deprecated in J * Returns an index entry from the list of all objects inside * FileA3D * @@ -208,7 +208,7 @@ public class FileA3D extends BaseObj { return mFileEntries[index]; } - /** + /** @deprecated renderscript is deprecated in J * Creates a FileA3D object from an asset stored on disk * * @param rs Context to which the object will belong. @@ -229,7 +229,7 @@ public class FileA3D extends BaseObj { return fa3d; } - /** + /** @deprecated renderscript is deprecated in J * Creates a FileA3D object from a file stored on disk * * @param rs Context to which the object will belong. @@ -248,7 +248,7 @@ public class FileA3D extends BaseObj { return fa3d; } - /** + /** @deprecated renderscript is deprecated in J * Creates a FileA3D object from a file stored on disk * * @param rs Context to which the object will belong. @@ -260,7 +260,7 @@ public class FileA3D extends BaseObj { return createFromFile(rs, path.getAbsolutePath()); } - /** + /** @deprecated renderscript is deprecated in J * Creates a FileA3D object from an application resource * * @param rs Context to which the object will belong. diff --git a/graphics/java/android/renderscript/Float2.java b/graphics/java/android/renderscript/Float2.java index 1d4ce3612d0e..a89a5df927da 100644 --- a/graphics/java/android/renderscript/Float2.java +++ b/graphics/java/android/renderscript/Float2.java @@ -20,7 +20,7 @@ import java.lang.Math; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * Class for exposing the native Renderscript float2 type back to the Android system. * **/ diff --git a/graphics/java/android/renderscript/Float3.java b/graphics/java/android/renderscript/Float3.java index ffd11350fbf6..909a897cd316 100644 --- a/graphics/java/android/renderscript/Float3.java +++ b/graphics/java/android/renderscript/Float3.java @@ -20,7 +20,7 @@ import java.lang.Math; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * Class for exposing the native Renderscript float2 type back to the Android system. * **/ diff --git a/graphics/java/android/renderscript/Float4.java b/graphics/java/android/renderscript/Float4.java index c7cc3ae8ecc9..3be6dbca2ecc 100644 --- a/graphics/java/android/renderscript/Float4.java +++ b/graphics/java/android/renderscript/Float4.java @@ -20,7 +20,7 @@ import java.lang.Math; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * Class for exposing the native Renderscript float2 type back to the Android system. * **/ diff --git a/graphics/java/android/renderscript/Font.java b/graphics/java/android/renderscript/Font.java index 18dacac3ff3b..cd1010c7e497 100644 --- a/graphics/java/android/renderscript/Font.java +++ b/graphics/java/android/renderscript/Font.java @@ -29,8 +29,8 @@ import android.content.res.Resources; import android.util.Log; import android.util.TypedValue; -/** - * <p>This class gives users a simple way to draw hardware accelerated text. +/** @deprecated renderscript is deprecated in J + * <p>This class gives users a simple way to draw hardware accelerated text. * Internally, the glyphs are rendered using the Freetype library and an internal cache of * rendered glyph bitmaps is maintained. Each font object represents a combination of a typeface, * and point size. You can create multiple font objects to represent styles such as bold or italic text, @@ -42,7 +42,7 @@ import android.util.TypedValue; * render large batches of text in sequence. It is also more efficient to render multiple * characters at once instead of one by one to improve draw call batching.</p> * <p>Font color and transparency are not part of the font object and you can freely modify - * them in the script to suit the user's rendering needs. Font colors work as a state machine. + * them in the script to suit the user's rendering needs. Font colors work as a state machine. * Every new call to draw text uses the last color set in the script.</p> **/ public class Font extends BaseObj { @@ -71,10 +71,20 @@ public class Font extends BaseObj { private static Map<String, FontFamily> sFontFamilyMap; + /** @deprecated renderscript is deprecated in J + */ public enum Style { + /** @deprecated renderscript is deprecated in J + */ NORMAL, + /** @deprecated renderscript is deprecated in J + */ BOLD, + /** @deprecated renderscript is deprecated in J + */ ITALIC, + /** @deprecated renderscript is deprecated in J + */ BOLD_ITALIC; } @@ -138,7 +148,7 @@ public class Font extends BaseObj { super(id, rs); } - /** + /** @deprecated renderscript is deprecated in J * Takes a specific file name as an argument */ static public Font createFromFile(RenderScript rs, Resources res, String path, float pointSize) { @@ -154,10 +164,14 @@ public class Font extends BaseObj { return rsFont; } + /** @deprecated renderscript is deprecated in J + */ static public Font createFromFile(RenderScript rs, Resources res, File path, float pointSize) { return createFromFile(rs, res, path.getAbsolutePath(), pointSize); } + /** @deprecated renderscript is deprecated in J + */ static public Font createFromAsset(RenderScript rs, Resources res, String path, float pointSize) { rs.validate(); AssetManager mgr = res.getAssets(); @@ -171,6 +185,8 @@ public class Font extends BaseObj { return rsFont; } + /** @deprecated renderscript is deprecated in J + */ static public Font createFromResource(RenderScript rs, Resources res, int id, float pointSize) { String name = "R." + Integer.toString(id); @@ -199,7 +215,7 @@ public class Font extends BaseObj { return rsFont; } - /** + /** @deprecated renderscript is deprecated in J * Accepts one of the following family names as an argument * and will attempt to produce the best match with a system font: * diff --git a/graphics/java/android/renderscript/Int2.java b/graphics/java/android/renderscript/Int2.java index 434af2119c9e..4e2d344c6f17 100644 --- a/graphics/java/android/renderscript/Int2.java +++ b/graphics/java/android/renderscript/Int2.java @@ -20,7 +20,7 @@ import java.lang.Math; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * Class for exposing the native Renderscript int2 type back to the Android system. * **/ diff --git a/graphics/java/android/renderscript/Int3.java b/graphics/java/android/renderscript/Int3.java index 333ccf8dc9f1..1ffc129aae11 100644 --- a/graphics/java/android/renderscript/Int3.java +++ b/graphics/java/android/renderscript/Int3.java @@ -20,7 +20,7 @@ import java.lang.Math; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * Class for exposing the native Renderscript int3 type back to the Android system. * **/ diff --git a/graphics/java/android/renderscript/Int4.java b/graphics/java/android/renderscript/Int4.java index 8734c9520778..555d4313d070 100644 --- a/graphics/java/android/renderscript/Int4.java +++ b/graphics/java/android/renderscript/Int4.java @@ -20,7 +20,7 @@ import java.lang.Math; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * Class for exposing the native Renderscript int4 type back to the Android system. * **/ diff --git a/graphics/java/android/renderscript/Long2.java b/graphics/java/android/renderscript/Long2.java index 95ea18cd2f3e..aad6bd6d76d7 100644 --- a/graphics/java/android/renderscript/Long2.java +++ b/graphics/java/android/renderscript/Long2.java @@ -20,7 +20,7 @@ import java.lang.Math; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * Class for exposing the native Renderscript long2 type back to the Android system. **/ public class Long2 { diff --git a/graphics/java/android/renderscript/Long3.java b/graphics/java/android/renderscript/Long3.java index 96ee885ec82b..9c03d5ca75eb 100644 --- a/graphics/java/android/renderscript/Long3.java +++ b/graphics/java/android/renderscript/Long3.java @@ -20,7 +20,7 @@ import java.lang.Math; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * Class for exposing the native Renderscript long3 type back to the Android system. **/ public class Long3 { diff --git a/graphics/java/android/renderscript/Long4.java b/graphics/java/android/renderscript/Long4.java index 50e664cf8591..6611cdf68984 100644 --- a/graphics/java/android/renderscript/Long4.java +++ b/graphics/java/android/renderscript/Long4.java @@ -20,7 +20,7 @@ import java.lang.Math; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * Class for exposing the native Renderscript long4 type back to the Android system. **/ public class Long4 { diff --git a/graphics/java/android/renderscript/Matrix2f.java b/graphics/java/android/renderscript/Matrix2f.java index acc5bd8d8fb4..38b5316e29c0 100644 --- a/graphics/java/android/renderscript/Matrix2f.java +++ b/graphics/java/android/renderscript/Matrix2f.java @@ -20,13 +20,13 @@ import java.lang.Math; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * Class for exposing the native Renderscript rs_matrix2x2 type back to the Android system. * **/ public class Matrix2f { - /** + /** @deprecated renderscript is deprecated in J * Creates a new identity 2x2 matrix */ public Matrix2f() { @@ -34,7 +34,7 @@ public class Matrix2f { loadIdentity(); } - /** + /** @deprecated renderscript is deprecated in J * Creates a new matrix and sets its values from the given * parameter * @@ -46,7 +46,7 @@ public class Matrix2f { System.arraycopy(dataArray, 0, mMat, 0, mMat.length); } - /** + /** @deprecated renderscript is deprecated in J * Return a reference to the internal array representing matrix * values. Modifying this array will also change the matrix * @@ -56,7 +56,7 @@ public class Matrix2f { return mMat; } - /** + /** @deprecated renderscript is deprecated in J * Returns the value for a given row and column * * @param i row of the value to return @@ -68,7 +68,7 @@ public class Matrix2f { return mMat[i*2 + j]; } - /** + /** @deprecated renderscript is deprecated in J * Sets the value for a given row and column * * @param i row of the value to set @@ -78,7 +78,7 @@ public class Matrix2f { mMat[i*2 + j] = v; } - /** + /** @deprecated renderscript is deprecated in J * Sets the matrix values to identity */ public void loadIdentity() { @@ -89,7 +89,7 @@ public class Matrix2f { mMat[3] = 1; } - /** + /** @deprecated renderscript is deprecated in J * Sets the values of the matrix to those of the parameter * * @param src matrix to load the values from @@ -98,7 +98,7 @@ public class Matrix2f { System.arraycopy(src.getArray(), 0, mMat, 0, mMat.length); } - /** + /** @deprecated renderscript is deprecated in J * Sets current values to be a rotation matrix of given angle * * @param rot rotation angle @@ -114,7 +114,7 @@ public class Matrix2f { mMat[3] = c; } - /** + /** @deprecated renderscript is deprecated in J * Sets current values to be a scale matrix of given dimensions * * @param x scale component x @@ -126,7 +126,7 @@ public class Matrix2f { mMat[3] = y; } - /** + /** @deprecated renderscript is deprecated in J * Sets current values to be the result of multiplying two given * matrices * @@ -147,7 +147,7 @@ public class Matrix2f { } } - /** + /** @deprecated renderscript is deprecated in J * Post-multiplies the current matrix by a given parameter * * @param rhs right hand side to multiply by @@ -157,7 +157,7 @@ public class Matrix2f { tmp.loadMultiply(this, rhs); load(tmp); } - /** + /** @deprecated renderscript is deprecated in J * Modifies the current matrix by post-multiplying it with a * rotation matrix of given angle * @@ -168,7 +168,7 @@ public class Matrix2f { tmp.loadRotate(rot); multiply(tmp); } - /** + /** @deprecated renderscript is deprecated in J * Modifies the current matrix by post-multiplying it with a * scale matrix of given dimensions * @@ -180,7 +180,7 @@ public class Matrix2f { tmp.loadScale(x, y); multiply(tmp); } - /** + /** @deprecated renderscript is deprecated in J * Sets the current matrix to its transpose */ public void transpose() { diff --git a/graphics/java/android/renderscript/Matrix3f.java b/graphics/java/android/renderscript/Matrix3f.java index 253506df993e..b821742dbb13 100644 --- a/graphics/java/android/renderscript/Matrix3f.java +++ b/graphics/java/android/renderscript/Matrix3f.java @@ -20,13 +20,13 @@ import java.lang.Math; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * Class for exposing the native Renderscript rs_matrix3x3 type back to the Android system. * **/ public class Matrix3f { - /** + /** @deprecated renderscript is deprecated in J * Creates a new identity 3x3 matrix */ public Matrix3f() { @@ -34,7 +34,7 @@ public class Matrix3f { loadIdentity(); } - /** + /** @deprecated renderscript is deprecated in J * Creates a new matrix and sets its values from the given * parameter * @@ -46,7 +46,7 @@ public class Matrix3f { System.arraycopy(dataArray, 0, mMat, 0, mMat.length); } - /** + /** @deprecated renderscript is deprecated in J * Return a reference to the internal array representing matrix * values. Modifying this array will also change the matrix * @@ -56,7 +56,7 @@ public class Matrix3f { return mMat; } - /** + /** @deprecated renderscript is deprecated in J * Returns the value for a given row and column * * @param i row of the value to return @@ -68,7 +68,7 @@ public class Matrix3f { return mMat[i*3 + j]; } - /** + /** @deprecated renderscript is deprecated in J * Sets the value for a given row and column * * @param i row of the value to set @@ -78,7 +78,7 @@ public class Matrix3f { mMat[i*3 + j] = v; } - /** + /** @deprecated renderscript is deprecated in J * Sets the matrix values to identity */ public void loadIdentity() { @@ -95,7 +95,7 @@ public class Matrix3f { mMat[8] = 1; } - /** + /** @deprecated renderscript is deprecated in J * Sets the values of the matrix to those of the parameter * * @param src matrix to load the values from @@ -104,7 +104,7 @@ public class Matrix3f { System.arraycopy(src.getArray(), 0, mMat, 0, mMat.length); } - /** + /** @deprecated renderscript is deprecated in J * Sets current values to be a rotation matrix of certain angle * about a given axis * @@ -144,7 +144,7 @@ public class Matrix3f { mMat[8] = z*z*nc + c; } - /** + /** @deprecated renderscript is deprecated in J * Makes the upper 2x2 a rotation matrix of the given angle * * @param rot rotation angle @@ -161,7 +161,7 @@ public class Matrix3f { mMat[4] = c; } - /** + /** @deprecated renderscript is deprecated in J * Makes the upper 2x2 a scale matrix of given dimensions * * @param x scale component x @@ -173,7 +173,7 @@ public class Matrix3f { mMat[4] = y; } - /** + /** @deprecated renderscript is deprecated in J * Sets current values to be a scale matrix of given dimensions * * @param x scale component x @@ -187,7 +187,7 @@ public class Matrix3f { mMat[8] = z; } - /** + /** @deprecated renderscript is deprecated in J * Sets current values to be a translation matrix of given * dimensions * @@ -200,7 +200,7 @@ public class Matrix3f { mMat[7] = y; } - /** + /** @deprecated renderscript is deprecated in J * Sets current values to be the result of multiplying two given * matrices * @@ -224,7 +224,7 @@ public class Matrix3f { } } - /** + /** @deprecated renderscript is deprecated in J * Post-multiplies the current matrix by a given parameter * * @param rhs right hand side to multiply by @@ -235,7 +235,7 @@ public class Matrix3f { load(tmp); } - /** + /** @deprecated renderscript is deprecated in J * Modifies the current matrix by post-multiplying it with a * rotation matrix of certain angle about a given axis * @@ -250,7 +250,7 @@ public class Matrix3f { multiply(tmp); } - /** + /** @deprecated renderscript is deprecated in J * Modifies the upper 2x2 of the current matrix by * post-multiplying it with a rotation matrix of given angle * @@ -262,7 +262,7 @@ public class Matrix3f { multiply(tmp); } - /** + /** @deprecated renderscript is deprecated in J * Modifies the upper 2x2 of the current matrix by * post-multiplying it with a scale matrix of given dimensions * @@ -275,7 +275,7 @@ public class Matrix3f { multiply(tmp); } - /** + /** @deprecated renderscript is deprecated in J * Modifies the current matrix by post-multiplying it with a * scale matrix of given dimensions * @@ -289,7 +289,7 @@ public class Matrix3f { multiply(tmp); } - /** + /** @deprecated renderscript is deprecated in J * Modifies the current matrix by post-multiplying it with a * translation matrix of given dimensions * @@ -302,7 +302,7 @@ public class Matrix3f { multiply(tmp); } - /** + /** @deprecated renderscript is deprecated in J * Sets the current matrix to its transpose */ public void transpose() { diff --git a/graphics/java/android/renderscript/Matrix4f.java b/graphics/java/android/renderscript/Matrix4f.java index adc180694916..8b7a0dfe8fe6 100644 --- a/graphics/java/android/renderscript/Matrix4f.java +++ b/graphics/java/android/renderscript/Matrix4f.java @@ -20,13 +20,13 @@ import java.lang.Math; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * Class for exposing the native Renderscript rs_matrix4x4 type back to the Android system. * **/ public class Matrix4f { - /** + /** @deprecated renderscript is deprecated in J * Creates a new identity 4x4 matrix */ public Matrix4f() { @@ -34,7 +34,7 @@ public class Matrix4f { loadIdentity(); } - /** + /** @deprecated renderscript is deprecated in J * Creates a new matrix and sets its values from the given * parameter * @@ -46,7 +46,7 @@ public class Matrix4f { System.arraycopy(dataArray, 0, mMat, 0, mMat.length); } - /** + /** @deprecated renderscript is deprecated in J * Return a reference to the internal array representing matrix * values. Modifying this array will also change the matrix * @@ -56,7 +56,7 @@ public class Matrix4f { return mMat; } - /** + /** @deprecated renderscript is deprecated in J * Returns the value for a given row and column * * @param i row of the value to return @@ -68,7 +68,7 @@ public class Matrix4f { return mMat[i*4 + j]; } - /** + /** @deprecated renderscript is deprecated in J * Sets the value for a given row and column * * @param i row of the value to set @@ -78,7 +78,7 @@ public class Matrix4f { mMat[i*4 + j] = v; } - /** + /** @deprecated renderscript is deprecated in J * Sets the matrix values to identity */ public void loadIdentity() { @@ -103,7 +103,7 @@ public class Matrix4f { mMat[15] = 1; } - /** + /** @deprecated renderscript is deprecated in J * Sets the values of the matrix to those of the parameter * * @param src matrix to load the values from @@ -112,7 +112,7 @@ public class Matrix4f { System.arraycopy(src.getArray(), 0, mMat, 0, mMat.length); } - /** + /** @deprecated renderscript is deprecated in J * Sets current values to be a rotation matrix of certain angle * about a given axis * @@ -159,7 +159,7 @@ public class Matrix4f { mMat[10] = z*z*nc + c; } - /** + /** @deprecated renderscript is deprecated in J * Sets current values to be a scale matrix of given dimensions * * @param x scale component x @@ -173,7 +173,7 @@ public class Matrix4f { mMat[10] = z; } - /** + /** @deprecated renderscript is deprecated in J * Sets current values to be a translation matrix of given * dimensions * @@ -188,7 +188,7 @@ public class Matrix4f { mMat[14] = z; } - /** + /** @deprecated renderscript is deprecated in J * Sets current values to be the result of multiplying two given * matrices * @@ -215,7 +215,7 @@ public class Matrix4f { } } - /** + /** @deprecated renderscript is deprecated in J * Set current values to be an orthographic projection matrix * * @param l location of the left vertical clipping plane @@ -235,7 +235,7 @@ public class Matrix4f { mMat[14]= -(f + n) / (f - n); } - /** + /** @deprecated renderscript is deprecated in J * Set current values to be an orthographic projection matrix * with the right and bottom clipping planes set to the given * values. Left and top clipping planes are set to 0. Near and @@ -249,7 +249,7 @@ public class Matrix4f { loadOrtho(0,w, h,0, -1,1); } - /** + /** @deprecated renderscript is deprecated in J * Sets current values to be a perspective projection matrix * * @param l location of the left vertical clipping plane @@ -272,7 +272,7 @@ public class Matrix4f { mMat[15]= 0; } - /** + /** @deprecated renderscript is deprecated in J * Sets current values to be a perspective projection matrix * * @param fovy vertical field of view angle in degrees @@ -288,7 +288,7 @@ public class Matrix4f { loadFrustum(left, right, bottom, top, near, far); } - /** + /** @deprecated renderscript is deprecated in J * Helper function to set the current values to a perspective * projection matrix with aspect ratio defined by the parameters * and (near, far), (bottom, top) mapping to (-1, 1) at z = 0 @@ -321,7 +321,7 @@ public class Matrix4f { load(m1); } - /** + /** @deprecated renderscript is deprecated in J * Post-multiplies the current matrix by a given parameter * * @param rhs right hand side to multiply by @@ -331,7 +331,7 @@ public class Matrix4f { tmp.loadMultiply(this, rhs); load(tmp); } - /** + /** @deprecated renderscript is deprecated in J * Modifies the current matrix by post-multiplying it with a * rotation matrix of certain angle about a given axis * @@ -346,7 +346,7 @@ public class Matrix4f { multiply(tmp); } - /** + /** @deprecated renderscript is deprecated in J * Modifies the current matrix by post-multiplying it with a * scale matrix of given dimensions * @@ -360,7 +360,7 @@ public class Matrix4f { multiply(tmp); } - /** + /** @deprecated renderscript is deprecated in J * Modifies the current matrix by post-multiplying it with a * translation matrix of given dimensions * @@ -392,7 +392,7 @@ public class Matrix4f { return cofactor; } - /** + /** @deprecated renderscript is deprecated in J * Sets the current matrix to its inverse */ public boolean inverse() { @@ -421,7 +421,7 @@ public class Matrix4f { return true; } - /** + /** @deprecated renderscript is deprecated in J * Sets the current matrix to its inverse transpose */ public boolean inverseTranspose() { @@ -449,7 +449,7 @@ public class Matrix4f { return true; } - /** + /** @deprecated renderscript is deprecated in J * Sets the current matrix to its transpose */ public void transpose() { diff --git a/graphics/java/android/renderscript/Mesh.java b/graphics/java/android/renderscript/Mesh.java index ffbb41df30de..bc32038eb4f5 100644 --- a/graphics/java/android/renderscript/Mesh.java +++ b/graphics/java/android/renderscript/Mesh.java @@ -20,7 +20,7 @@ import java.util.Vector; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * <p>This class is a container for geometric data displayed with * Renderscript. Internally, a mesh is a collection of allocations that * represent vertex data (positions, normals, texture @@ -39,34 +39,34 @@ import android.util.Log; **/ public class Mesh extends BaseObj { - /** + /** @deprecated renderscript is deprecated in J * Describes the way mesh vertex data is interpreted when rendering * **/ public enum Primitive { - /** + /** @deprecated renderscript is deprecated in J * Vertex data will be rendered as a series of points */ POINT (0), - /** + /** @deprecated renderscript is deprecated in J * Vertex pairs will be rendered as lines */ LINE (1), - /** + /** @deprecated renderscript is deprecated in J * Vertex data will be rendered as a connected line strip */ LINE_STRIP (2), - /** + /** @deprecated renderscript is deprecated in J * Vertices will be rendered as individual triangles */ TRIANGLE (3), - /** + /** @deprecated renderscript is deprecated in J * Vertices will be rendered as a connected triangle strip * defined by the first three vertices with each additional * triangle defined by a new vertex */ TRIANGLE_STRIP (4), - /** + /** @deprecated renderscript is deprecated in J * Vertices will be rendered as a sequence of triangles that all * share first vertex as the origin */ @@ -86,7 +86,7 @@ public class Mesh extends BaseObj { super(id, rs); } - /** + /** @deprecated renderscript is deprecated in J * @return number of allocations containing vertex data * **/ @@ -96,7 +96,7 @@ public class Mesh extends BaseObj { } return mVertexBuffers.length; } - /** + /** @deprecated renderscript is deprecated in J * @param slot index in the list of allocations to return * @return vertex data allocation at the given index * @@ -105,7 +105,7 @@ public class Mesh extends BaseObj { return mVertexBuffers[slot]; } - /** + /** @deprecated renderscript is deprecated in J * @return number of primitives or index sets in the mesh * **/ @@ -116,7 +116,7 @@ public class Mesh extends BaseObj { return mIndexBuffers.length; } - /** + /** @deprecated renderscript is deprecated in J * @param slot locaton within the list of index set allocation * @return allocation containing primtive index data or null if * the index data is not specified explicitly @@ -125,7 +125,7 @@ public class Mesh extends BaseObj { public Allocation getIndexSetAllocation(int slot) { return mIndexBuffers[slot]; } - /** + /** @deprecated renderscript is deprecated in J * @param slot locaiton within the list of index set primitives * @return index set primitive type * @@ -167,7 +167,7 @@ public class Mesh extends BaseObj { } } - /** + /** @deprecated renderscript is deprecated in J * Mesh builder object. It starts empty and requires you to * add the types necessary to create vertex and index * allocations. @@ -189,7 +189,7 @@ public class Mesh extends BaseObj { Entry[] mVertexTypes; Vector mIndexTypes; - /** + /** @deprecated renderscript is deprecated in J * Creates builder object * @param rs Context to which the mesh will belong. * @param usage specifies how the mesh allocations are to be @@ -204,7 +204,7 @@ public class Mesh extends BaseObj { mIndexTypes = new Vector(); } - /** + /** @deprecated renderscript is deprecated in J * @return internal index of the last vertex buffer type added to * builder **/ @@ -212,7 +212,7 @@ public class Mesh extends BaseObj { return mVertexTypeCount - 1; } - /** + /** @deprecated renderscript is deprecated in J * @return internal index of the last index set added to the * builder **/ @@ -220,7 +220,7 @@ public class Mesh extends BaseObj { return mIndexTypes.size() - 1; } - /** + /** @deprecated renderscript is deprecated in J * Adds a vertex data type to the builder object * * @param t type of the vertex data allocation to be created @@ -239,7 +239,7 @@ public class Mesh extends BaseObj { return this; } - /** + /** @deprecated renderscript is deprecated in J * Adds a vertex data type to the builder object * * @param e element describing the vertex data layout @@ -260,7 +260,7 @@ public class Mesh extends BaseObj { return this; } - /** + /** @deprecated renderscript is deprecated in J * Adds an index set data type to the builder object * * @param t type of the index set data, could be null @@ -278,7 +278,7 @@ public class Mesh extends BaseObj { return this; } - /** + /** @deprecated renderscript is deprecated in J * Adds an index set primitive type to the builder object * * @param p primitive type @@ -295,7 +295,7 @@ public class Mesh extends BaseObj { return this; } - /** + /** @deprecated renderscript is deprecated in J * Adds an index set data type to the builder object * * @param e element describing the index set data layout @@ -320,7 +320,7 @@ public class Mesh extends BaseObj { return tb.create(); } - /** + /** @deprecated renderscript is deprecated in J * Create a Mesh object from the current state of the builder * **/ @@ -372,7 +372,7 @@ public class Mesh extends BaseObj { } } - /** + /** @deprecated renderscript is deprecated in J * Mesh builder object. It starts empty and requires the user to * add all the vertex and index allocations that comprise the * mesh @@ -391,6 +391,8 @@ public class Mesh extends BaseObj { Vector mIndexTypes; + /** @deprecated renderscript is deprecated in J + */ public AllocationBuilder(RenderScript rs) { mRS = rs; mVertexTypeCount = 0; @@ -398,7 +400,7 @@ public class Mesh extends BaseObj { mIndexTypes = new Vector(); } - /** + /** @deprecated renderscript is deprecated in J * @return internal index of the last vertex buffer type added to * builder **/ @@ -406,7 +408,7 @@ public class Mesh extends BaseObj { return mVertexTypeCount - 1; } - /** + /** @deprecated renderscript is deprecated in J * @return internal index of the last index set added to the * builder **/ @@ -414,7 +416,7 @@ public class Mesh extends BaseObj { return mIndexTypes.size() - 1; } - /** + /** @deprecated renderscript is deprecated in J * Adds an allocation containing vertex buffer data to the * builder * @@ -433,7 +435,7 @@ public class Mesh extends BaseObj { return this; } - /** + /** @deprecated renderscript is deprecated in J * Adds an allocation containing index buffer data and index type * to the builder * @@ -450,7 +452,7 @@ public class Mesh extends BaseObj { return this; } - /** + /** @deprecated renderscript is deprecated in J * Adds an index set type to the builder * * @param p index set primitive type @@ -465,7 +467,7 @@ public class Mesh extends BaseObj { return this; } - /** + /** @deprecated renderscript is deprecated in J * Create a Mesh object from the current state of the builder * **/ @@ -506,7 +508,7 @@ public class Mesh extends BaseObj { } } - /** + /** @deprecated renderscript is deprecated in J * Builder that allows creation of a mesh object point by point * and triangle by triangle * @@ -533,11 +535,17 @@ public class Mesh extends BaseObj { int mVtxSize; int mFlags; + /** @deprecated renderscript is deprecated in J + */ public static final int COLOR = 0x0001; + /** @deprecated renderscript is deprecated in J + */ public static final int NORMAL = 0x0002; + /** @deprecated renderscript is deprecated in J + */ public static final int TEXTURE_0 = 0x0100; - /** + /** @deprecated renderscript is deprecated in J * @param rs Context to which the mesh will belong. * @param vtxSize specifies whether the vertex is a float2 or * float3 @@ -592,7 +600,7 @@ public class Mesh extends BaseObj { mMaxIndex ++; } - /** + /** @deprecated renderscript is deprecated in J * Adds a float2 vertex to the mesh * * @param x position x @@ -612,7 +620,7 @@ public class Mesh extends BaseObj { return this; } - /** + /** @deprecated renderscript is deprecated in J * Adds a float3 vertex to the mesh * * @param x position x @@ -635,7 +643,7 @@ public class Mesh extends BaseObj { return this; } - /** + /** @deprecated renderscript is deprecated in J * Sets the texture coordinate for the vertices that are added after this method call. * * @param s texture coordinate s @@ -652,7 +660,7 @@ public class Mesh extends BaseObj { return this; } - /** + /** @deprecated renderscript is deprecated in J * Sets the normal vector for the vertices that are added after this method call. * * @param x normal vector x @@ -671,7 +679,7 @@ public class Mesh extends BaseObj { return this; } - /** + /** @deprecated renderscript is deprecated in J * Sets the color for the vertices that are added after this method call. * * @param r red component @@ -692,7 +700,7 @@ public class Mesh extends BaseObj { return this; } - /** + /** @deprecated renderscript is deprecated in J * Adds a new triangle to the mesh builder * * @param idx1 index of the first vertex in the triangle @@ -718,7 +726,7 @@ public class Mesh extends BaseObj { return this; } - /** + /** @deprecated renderscript is deprecated in J * Creates the mesh object from the current state of the builder * * @param uploadToBufferObject specifies whether the vertex data diff --git a/graphics/java/android/renderscript/Path.java b/graphics/java/android/renderscript/Path.java index 9c4d41b0801d..ec34d7c60138 100644 --- a/graphics/java/android/renderscript/Path.java +++ b/graphics/java/android/renderscript/Path.java @@ -19,7 +19,7 @@ package android.renderscript; import java.util.Vector; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * @hide * */ diff --git a/graphics/java/android/renderscript/Program.java b/graphics/java/android/renderscript/Program.java index d9f64c62a40f..16186faaf3b0 100644 --- a/graphics/java/android/renderscript/Program.java +++ b/graphics/java/android/renderscript/Program.java @@ -25,7 +25,7 @@ import android.content.res.Resources; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * * Program is a base class for all the objects that modify * various stages of the graphics pipeline @@ -37,14 +37,18 @@ public class Program extends BaseObj { static final int MAX_CONSTANT = 8; static final int MAX_TEXTURE = 8; - /** + /** @deprecated renderscript is deprecated in J * * TextureType specifies what textures are attached to Program * objects * **/ public enum TextureType { + /** @deprecated renderscript is deprecated in J + */ TEXTURE_2D (0), + /** @deprecated renderscript is deprecated in J + */ TEXTURE_CUBE (1); int mID; @@ -77,7 +81,7 @@ public class Program extends BaseObj { super(id, rs); } - /** + /** @hide renderscript is deprecated in J * Program object can have zero or more constant allocations * associated with it. This method returns the total count. * @return number of constant input types @@ -86,7 +90,7 @@ public class Program extends BaseObj { return mConstants != null ? mConstants.length : 0; } - /** + /** @hide renderscript is deprecated in J * Returns the type of the constant buffer used in the program * object. It could be used to query internal elements or create * an allocation to store constant data. @@ -100,7 +104,7 @@ public class Program extends BaseObj { return mConstants[slot]; } - /** + /** @hide renderscript is deprecated in J * Returns the number of textures used in this program object * @return number of texture inputs */ @@ -108,7 +112,7 @@ public class Program extends BaseObj { return mTextureCount; } - /** + /** @hide renderscript is deprecated in J * Returns the type of texture at a given slot. e.g. 2D or Cube * @param slot index of the texture input * @return texture input type @@ -120,7 +124,7 @@ public class Program extends BaseObj { return mTextures[slot]; } - /** + /** @hide renderscript is deprecated in J * Returns the name of the texture input at a given slot. e.g. * tex0, diffuse, spec * @param slot index of the texture input @@ -133,7 +137,7 @@ public class Program extends BaseObj { return mTextureNames[slot]; } - /** + /** @deprecated renderscript is deprecated in J * Binds a constant buffer to be used as uniform inputs to the * program * @@ -153,7 +157,7 @@ public class Program extends BaseObj { mRS.nProgramBindConstants(getID(mRS), slot, id); } - /** + /** @deprecated renderscript is deprecated in J * Binds a texture to be used in the program * * @param va allocation containing texture data @@ -175,7 +179,7 @@ public class Program extends BaseObj { mRS.nProgramBindTexture(getID(mRS), slot, id); } - /** + /** @deprecated renderscript is deprecated in J * Binds an object that describes how a texture at the * corresponding location is sampled * @@ -210,7 +214,8 @@ public class Program extends BaseObj { int mTextureCount; String mShader; - + /** @deprecated renderscript is deprecated in J + */ protected BaseProgramBuilder(RenderScript rs) { mRS = rs; mInputs = new Element[MAX_INPUT]; @@ -224,7 +229,7 @@ public class Program extends BaseObj { mTextureNames = new String[MAX_TEXTURE]; } - /** + /** @deprecated renderscript is deprecated in J * Sets the GLSL shader code to be used in the program * * @param s GLSL shader string @@ -235,7 +240,7 @@ public class Program extends BaseObj { return this; } - /** + /** @deprecated renderscript is deprecated in J * Sets the GLSL shader code to be used in the program * * @param resources application resources @@ -281,7 +286,7 @@ public class Program extends BaseObj { return this; } - /** + /** @deprecated renderscript is deprecated in J * Queries the index of the last added constant buffer type * */ @@ -289,7 +294,7 @@ public class Program extends BaseObj { return mConstantCount - 1; } - /** + /** @deprecated renderscript is deprecated in J * Queries the index of the last added texture type * */ @@ -297,7 +302,7 @@ public class Program extends BaseObj { return mTextureCount - 1; } - /** + /** @deprecated renderscript is deprecated in J * Adds constant (uniform) inputs to the program * * @param t Type that describes the layout of the Allocation @@ -317,7 +322,7 @@ public class Program extends BaseObj { return this; } - /** + /** @deprecated renderscript is deprecated in J * Adds a texture input to the Program * * @param texType describes that the texture to append it (2D, @@ -329,7 +334,7 @@ public class Program extends BaseObj { return this; } - /** + /** @hide renderscript is deprecated in J * Adds a texture input to the Program * * @param texType describes that the texture to append it (2D, @@ -349,6 +354,8 @@ public class Program extends BaseObj { return this; } + /** @deprecated renderscript is deprecated in J + */ protected void initProgram(Program p) { p.mInputs = new Element[mInputCount]; System.arraycopy(mInputs, 0, p.mInputs, 0, mInputCount); diff --git a/graphics/java/android/renderscript/ProgramFragment.java b/graphics/java/android/renderscript/ProgramFragment.java index fa6e2d4c1847..0427c19babfc 100644 --- a/graphics/java/android/renderscript/ProgramFragment.java +++ b/graphics/java/android/renderscript/ProgramFragment.java @@ -20,7 +20,7 @@ package android.renderscript; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * <p>The Renderscript fragment program, also known as fragment shader is responsible * for manipulating pixel data in a user defined way. It's constructed from a GLSL * shader string containing the program body, textures inputs, and a Type object @@ -42,7 +42,7 @@ public class ProgramFragment extends Program { } public static class Builder extends BaseProgramBuilder { - /** + /** @deprecated renderscript is deprecated in J * Create a builder object. * * @param rs Context to which the program will belong. @@ -51,7 +51,7 @@ public class ProgramFragment extends Program { super(rs); } - /** + /** @deprecated renderscript is deprecated in J * Creates ProgramFragment from the current state of the builder * * @return ProgramFragment diff --git a/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java b/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java index 14f10f17b4d0..19fca5873b51 100644 --- a/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java +++ b/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java @@ -20,7 +20,7 @@ package android.renderscript; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * <p>ProgramFragmentFixedFunction is a helper class that provides * a way to make a simple fragment shader without writing any * GLSL code. This class allows for display of constant color, interpolated @@ -38,7 +38,7 @@ public class ProgramFragmentFixedFunction extends ProgramFragment { super(rs); } - /** + /** @deprecated renderscript is deprecated in J * Creates ProgramFragmentFixedFunction from the current state * of the builder * @@ -76,6 +76,8 @@ public class ProgramFragmentFixedFunction extends ProgramFragment { } public static class Builder { + /** @deprecated renderscript is deprecated in J + */ public static final int MAX_TEXTURE = 2; int mNumTextures; boolean mPointSpriteEnable; @@ -83,14 +85,20 @@ public class ProgramFragmentFixedFunction extends ProgramFragment { String mShader; RenderScript mRS; - /** + /** @deprecated renderscript is deprecated in J * EnvMode describes how textures are combined with the existing * color in the fixed function fragment shader * **/ public enum EnvMode { + /** @deprecated renderscript is deprecated in J + */ REPLACE (1), + /** @deprecated renderscript is deprecated in J + */ MODULATE (2), + /** @deprecated renderscript is deprecated in J + */ DECAL (3); int mID; @@ -99,15 +107,23 @@ public class ProgramFragmentFixedFunction extends ProgramFragment { } } - /** + /** @deprecated renderscript is deprecated in J * Format describes the pixel format of textures in the fixed * function fragment shader and how they are sampled * **/ public enum Format { + /** @deprecated renderscript is deprecated in J + */ ALPHA (1), + /** @deprecated renderscript is deprecated in J + */ LUMINANCE_ALPHA (2), + /** @deprecated renderscript is deprecated in J + */ RGB (3), + /** @deprecated renderscript is deprecated in J + */ RGBA (4); int mID; @@ -190,7 +206,7 @@ public class ProgramFragmentFixedFunction extends ProgramFragment { mShader += "}\n"; } - /** + /** @deprecated renderscript is deprecated in J * Creates a builder for fixed function fragment program * * @param rs Context to which the program will belong. @@ -201,7 +217,7 @@ public class ProgramFragmentFixedFunction extends ProgramFragment { mPointSpriteEnable = false; } - /** + /** @deprecated renderscript is deprecated in J * Adds a texture to be fetched as part of the fixed function * fragment program * @@ -223,7 +239,7 @@ public class ProgramFragmentFixedFunction extends ProgramFragment { return this; } - /** + /** @deprecated renderscript is deprecated in J * Specifies whether the texture coordinate passed from the * vertex program is replaced with an openGL internal point * sprite texture coordinate @@ -234,7 +250,7 @@ public class ProgramFragmentFixedFunction extends ProgramFragment { return this; } - /** + /** @deprecated renderscript is deprecated in J * Specifies whether the varying color passed from the vertex * program or the constant color set on the fragment program is * used in the final color calculation in the fixed function @@ -246,7 +262,7 @@ public class ProgramFragmentFixedFunction extends ProgramFragment { return this; } - /** + /** @deprecated renderscript is deprecated in J * Creates the fixed function fragment program from the current * state of the builder. * diff --git a/graphics/java/android/renderscript/ProgramRaster.java b/graphics/java/android/renderscript/ProgramRaster.java index e40751f43dc2..26fcafe79650 100644 --- a/graphics/java/android/renderscript/ProgramRaster.java +++ b/graphics/java/android/renderscript/ProgramRaster.java @@ -20,15 +20,23 @@ package android.renderscript; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * Program raster is primarily used to specify whether point sprites are enabled and to control * the culling mode. By default, back faces are culled. **/ public class ProgramRaster extends BaseObj { + /** @deprecated renderscript is deprecated in J + */ public enum CullMode { + /** @deprecated renderscript is deprecated in J + */ BACK (0), + /** @deprecated renderscript is deprecated in J + */ FRONT (1), + /** @deprecated renderscript is deprecated in J + */ NONE (2); int mID; @@ -47,7 +55,7 @@ public class ProgramRaster extends BaseObj { mCullMode = CullMode.BACK; } - /** + /** @hide renderscript is deprecated in J * Specifies whether vertices are rendered as screen aligned * elements of a specified size * @return whether point sprites are enabled @@ -56,7 +64,7 @@ public class ProgramRaster extends BaseObj { return mPointSprite; } - /** + /** @hide renderscript is deprecated in J * Specifies how triangles are culled based on their orientation * @return cull mode */ @@ -64,6 +72,8 @@ public class ProgramRaster extends BaseObj { return mCullMode; } + /** @deprecated renderscript is deprecated in J + */ public static ProgramRaster CULL_BACK(RenderScript rs) { if(rs.mProgramRaster_CULL_BACK == null) { ProgramRaster.Builder builder = new ProgramRaster.Builder(rs); @@ -73,6 +83,8 @@ public class ProgramRaster extends BaseObj { return rs.mProgramRaster_CULL_BACK; } + /** @deprecated renderscript is deprecated in J + */ public static ProgramRaster CULL_FRONT(RenderScript rs) { if(rs.mProgramRaster_CULL_FRONT == null) { ProgramRaster.Builder builder = new ProgramRaster.Builder(rs); @@ -82,6 +94,8 @@ public class ProgramRaster extends BaseObj { return rs.mProgramRaster_CULL_FRONT; } + /** @deprecated renderscript is deprecated in J + */ public static ProgramRaster CULL_NONE(RenderScript rs) { if(rs.mProgramRaster_CULL_NONE == null) { ProgramRaster.Builder builder = new ProgramRaster.Builder(rs); @@ -91,27 +105,37 @@ public class ProgramRaster extends BaseObj { return rs.mProgramRaster_CULL_NONE; } + /** @deprecated renderscript is deprecated in J + */ public static class Builder { RenderScript mRS; boolean mPointSprite; CullMode mCullMode; + /** @deprecated renderscript is deprecated in J + */ public Builder(RenderScript rs) { mRS = rs; mPointSprite = false; mCullMode = CullMode.BACK; } + /** @deprecated renderscript is deprecated in J + */ public Builder setPointSpriteEnabled(boolean enable) { mPointSprite = enable; return this; } + /** @deprecated renderscript is deprecated in J + */ public Builder setCullMode(CullMode m) { mCullMode = m; return this; } + /** @deprecated renderscript is deprecated in J + */ public ProgramRaster create() { mRS.validate(); int id = mRS.nProgramRasterCreate(mPointSprite, mCullMode.mID); diff --git a/graphics/java/android/renderscript/ProgramStore.java b/graphics/java/android/renderscript/ProgramStore.java index d0fd6e5184f8..20043f27a0b0 100644 --- a/graphics/java/android/renderscript/ProgramStore.java +++ b/graphics/java/android/renderscript/ProgramStore.java @@ -20,7 +20,7 @@ package android.renderscript; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * <p>ProgramStore contains a set of parameters that control how * the graphics hardware handles writes to the framebuffer. * It could be used to:</p> @@ -35,7 +35,7 @@ import android.util.Log; * **/ public class ProgramStore extends BaseObj { - /** + /** @deprecated renderscript is deprecated in J * Specifies the function used to determine whether a fragment * will be drawn during the depth testing stage in the rendering * pipeline by comparing its value with that already in the depth @@ -44,36 +44,36 @@ public class ProgramStore extends BaseObj { */ public enum DepthFunc { - /** + /** @deprecated renderscript is deprecated in J * Always drawn */ ALWAYS (0), - /** + /** @deprecated renderscript is deprecated in J * Drawn if the incoming depth value is less than that in the * depth buffer */ LESS (1), - /** + /** @deprecated renderscript is deprecated in J * Drawn if the incoming depth value is less or equal to that in * the depth buffer */ LESS_OR_EQUAL (2), - /** + /** @deprecated renderscript is deprecated in J * Drawn if the incoming depth value is greater than that in the * depth buffer */ GREATER (3), - /** + /** @deprecated renderscript is deprecated in J * Drawn if the incoming depth value is greater or equal to that * in the depth buffer */ GREATER_OR_EQUAL (4), - /** + /** @deprecated renderscript is deprecated in J * Drawn if the incoming depth value is equal to that in the * depth buffer */ EQUAL (5), - /** + /** @deprecated renderscript is deprecated in J * Drawn if the incoming depth value is not equal to that in the * depth buffer */ @@ -85,7 +85,7 @@ public class ProgramStore extends BaseObj { } } - /** + /** @deprecated renderscript is deprecated in J * Specifies the functions used to combine incoming pixels with * those already in the frame buffer. * @@ -94,14 +94,32 @@ public class ProgramStore extends BaseObj { * */ public enum BlendSrcFunc { + /** @deprecated renderscript is deprecated in J + */ ZERO (0), + /** @deprecated renderscript is deprecated in J + */ ONE (1), + /** @deprecated renderscript is deprecated in J + */ DST_COLOR (2), + /** @deprecated renderscript is deprecated in J + */ ONE_MINUS_DST_COLOR (3), + /** @deprecated renderscript is deprecated in J + */ SRC_ALPHA (4), + /** @deprecated renderscript is deprecated in J + */ ONE_MINUS_SRC_ALPHA (5), + /** @deprecated renderscript is deprecated in J + */ DST_ALPHA (6), + /** @deprecated renderscript is deprecated in J + */ ONE_MINUS_DST_ALPHA (7), + /** @deprecated renderscript is deprecated in J + */ SRC_ALPHA_SATURATE (8); int mID; @@ -110,7 +128,7 @@ public class ProgramStore extends BaseObj { } } - /** + /** @deprecated renderscript is deprecated in J * Specifies the functions used to combine incoming pixels with * those already in the frame buffer. * @@ -120,13 +138,29 @@ public class ProgramStore extends BaseObj { * */ public enum BlendDstFunc { + /** @deprecated renderscript is deprecated in J + */ ZERO (0), + /** @deprecated renderscript is deprecated in J + */ ONE (1), + /** @deprecated renderscript is deprecated in J + */ SRC_COLOR (2), + /** @deprecated renderscript is deprecated in J + */ ONE_MINUS_SRC_COLOR (3), + /** @deprecated renderscript is deprecated in J + */ SRC_ALPHA (4), + /** @deprecated renderscript is deprecated in J + */ ONE_MINUS_SRC_ALPHA (5), + /** @deprecated renderscript is deprecated in J + */ DST_ALPHA (6), + /** @deprecated renderscript is deprecated in J + */ ONE_MINUS_DST_ALPHA (7); int mID; @@ -149,7 +183,7 @@ public class ProgramStore extends BaseObj { super(id, rs); } - /** + /** @hide renderscript is deprecated in J * Returns the function used to test writing into the depth * buffer * @return depth function @@ -158,7 +192,7 @@ public class ProgramStore extends BaseObj { return mDepthFunc; } - /** + /** @hide renderscript is deprecated in J * Queries whether writes are enabled into the depth buffer * @return depth mask */ @@ -166,7 +200,7 @@ public class ProgramStore extends BaseObj { return mDepthMask; } - /** + /** @hide renderscript is deprecated in J * Queries whether red channel is written * @return red color channel mask */ @@ -174,7 +208,7 @@ public class ProgramStore extends BaseObj { return mColorMaskR; } - /** + /** @hide renderscript is deprecated in J * Queries whether green channel is written * @return green color channel mask */ @@ -182,7 +216,7 @@ public class ProgramStore extends BaseObj { return mColorMaskG; } - /** + /** @hide renderscript is deprecated in J * Queries whether blue channel is written * @return blue color channel mask */ @@ -190,7 +224,7 @@ public class ProgramStore extends BaseObj { return mColorMaskB; } - /** + /** @hide renderscript is deprecated in J * Queries whether alpha channel is written * @return alpha channel mask */ @@ -198,7 +232,7 @@ public class ProgramStore extends BaseObj { return mColorMaskA; } - /** + /** @hide renderscript is deprecated in J * Specifies how the source blending factor is computed * @return source blend function */ @@ -206,7 +240,7 @@ public class ProgramStore extends BaseObj { return mBlendSrc; } - /** + /** @hide renderscript is deprecated in J * Specifies how the destination blending factor is computed * @return destination blend function */ @@ -214,7 +248,7 @@ public class ProgramStore extends BaseObj { return mBlendDst; } - /** + /** @hide renderscript is deprecated in J * Specifies whether colors are dithered before writing into the * framebuffer * @return whether dither is enabled @@ -223,7 +257,7 @@ public class ProgramStore extends BaseObj { return mDither; } - /** + /** @deprecated renderscript is deprecated in J * Returns a pre-defined program store object with the following * characteristics: * - incoming pixels are drawn if their depth value is less than @@ -245,7 +279,7 @@ public class ProgramStore extends BaseObj { } return rs.mProgramStore_BLEND_NONE_DEPTH_TEST; } - /** + /** @deprecated renderscript is deprecated in J * Returns a pre-defined program store object with the following * characteristics: * - incoming pixels always pass the depth test and their value @@ -266,7 +300,7 @@ public class ProgramStore extends BaseObj { } return rs.mProgramStore_BLEND_NONE_DEPTH_NO_DEPTH; } - /** + /** @deprecated renderscript is deprecated in J * Returns a pre-defined program store object with the following * characteristics: * - incoming pixels are drawn if their depth value is less than @@ -290,7 +324,7 @@ public class ProgramStore extends BaseObj { } return rs.mProgramStore_BLEND_ALPHA_DEPTH_TEST; } - /** + /** @deprecated renderscript is deprecated in J * Returns a pre-defined program store object with the following * characteristics: * - incoming pixels always pass the depth test and their value @@ -313,7 +347,7 @@ public class ProgramStore extends BaseObj { return rs.mProgramStore_BLEND_ALPHA_DEPTH_NO_DEPTH; } - /** + /** @deprecated renderscript is deprecated in J * Builder class for ProgramStore object. If the builder is left * empty, the equivalent of BLEND_NONE_DEPTH_NONE would be * returned @@ -342,7 +376,7 @@ public class ProgramStore extends BaseObj { mBlendDst = BlendDstFunc.ZERO; } - /** + /** @deprecated renderscript is deprecated in J * Specifies the depth testing behavior * * @param func function used for depth testing @@ -354,7 +388,7 @@ public class ProgramStore extends BaseObj { return this; } - /** + /** @deprecated renderscript is deprecated in J * Enables writes into the depth buffer * * @param enable specifies whether depth writes are @@ -367,7 +401,7 @@ public class ProgramStore extends BaseObj { return this; } - /** + /** @deprecated renderscript is deprecated in J * Enables writes into the color buffer * * @param r specifies whether red channel is written @@ -385,7 +419,7 @@ public class ProgramStore extends BaseObj { return this; } - /** + /** @deprecated renderscript is deprecated in J * Specifies how incoming pixels are combined with the pixels * stored in the framebuffer * @@ -402,7 +436,7 @@ public class ProgramStore extends BaseObj { return this; } - /** + /** @deprecated renderscript is deprecated in J * Enables dithering * * @param enable specifies whether dithering is enabled or @@ -415,7 +449,7 @@ public class ProgramStore extends BaseObj { return this; } - /** + /** @deprecated renderscript is deprecated in J * Creates a program store from the current state of the builder */ public ProgramStore create() { diff --git a/graphics/java/android/renderscript/ProgramVertex.java b/graphics/java/android/renderscript/ProgramVertex.java index 74d666bd9a58..c13b9b08308d 100644 --- a/graphics/java/android/renderscript/ProgramVertex.java +++ b/graphics/java/android/renderscript/ProgramVertex.java @@ -14,7 +14,7 @@ * limitations under the License. */ - /** + /** @deprecated renderscript is deprecated in J * <p>The Renderscript vertex program, also known as a vertex shader, describes a stage in * the graphics pipeline responsible for manipulating geometric data in a user-defined way. * The object is constructed by providing the Renderscript system with the following data:</p> @@ -42,7 +42,7 @@ import android.graphics.Matrix; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * ProgramVertex, also know as a vertex shader, describes a * stage in the graphics pipeline responsible for manipulating * geometric data in a user-defined way. @@ -54,14 +54,14 @@ public class ProgramVertex extends Program { super(id, rs); } - /** + /** @hide renderscript is deprecated in J * @return number of input attribute elements */ public int getInputCount() { return mInputs != null ? mInputs.length : 0; } - /** + /** @hide renderscript is deprecated in J * @param slot location of the input to return * @return input attribute element */ @@ -72,7 +72,7 @@ public class ProgramVertex extends Program { return mInputs[slot]; } - /** + /** @deprecated renderscript is deprecated in J * Builder class for creating ProgramVertex objects. * The builder starts empty and the user must minimally provide * the GLSL shader code, and the varying inputs. Constant, or @@ -81,7 +81,7 @@ public class ProgramVertex extends Program { * **/ public static class Builder extends BaseProgramBuilder { - /** + /** @deprecated renderscript is deprecated in J * Create a builder object. * * @param rs Context to which the program will belong. @@ -90,7 +90,7 @@ public class ProgramVertex extends Program { super(rs); } - /** + /** @deprecated renderscript is deprecated in J * Add varying inputs to the program * * @param e element describing the layout of the varying input @@ -109,7 +109,7 @@ public class ProgramVertex extends Program { return this; } - /** + /** @deprecated renderscript is deprecated in J * Creates ProgramVertex from the current state of the builder * * @return ProgramVertex diff --git a/graphics/java/android/renderscript/ProgramVertexFixedFunction.java b/graphics/java/android/renderscript/ProgramVertexFixedFunction.java index 54f21b834efc..97444db610f2 100644 --- a/graphics/java/android/renderscript/ProgramVertexFixedFunction.java +++ b/graphics/java/android/renderscript/ProgramVertexFixedFunction.java @@ -21,7 +21,7 @@ import android.graphics.Matrix; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * ProgramVertexFixedFunction is a helper class that provides a * simple way to create a fixed function emulation vertex shader * without writing any GLSL code. @@ -33,7 +33,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex { super(id, rs); } - /** + /** @deprecated renderscript is deprecated in J * Binds the constant buffer containing fixed function emulation * matrices * @@ -61,7 +61,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex { return this; } - /** + /** @deprecated renderscript is deprecated in J * Creates ProgramVertexFixedFunction from the current state of * the builder * @@ -103,7 +103,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex { String mShader; RenderScript mRS; - /** + /** @deprecated renderscript is deprecated in J * Creates a builder for fixed function vertex program * * @param rs Context to which the program will belong. @@ -112,7 +112,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex { mRS = rs; } - /** + /** @deprecated renderscript is deprecated in J * Specifies whether texture matrix calculations are to be added * to the shader * @@ -152,7 +152,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex { mShader += "}\n"; } - /** + /** @deprecated renderscript is deprecated in J * Creates ProgramVertexFixedFunction from the current state of * the builder * @@ -176,7 +176,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex { } } - /** + /** @deprecated renderscript is deprecated in J * Helper class to store modelview, projection and texture * matrices for ProgramVertexFixedFunction * @@ -196,7 +196,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex { } private FieldPacker mIOBuffer; - /** + /** @deprecated renderscript is deprecated in J * Creates a buffer to store fixed function emulation matrices * * @param rs Context to which the allocation will belong. @@ -215,7 +215,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex { setTexture(new Matrix4f()); } - /** + /** @deprecated renderscript is deprecated in J * Forces deallocation of memory backing the contant matrices. * Normally, this is unnecessary and will be garbage collected * @@ -233,7 +233,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex { mAlloc.setFromFieldPacker(0, mIOBuffer); } - /** + /** @deprecated renderscript is deprecated in J * Sets the modelview matrix in the fixed function matrix buffer * * @param m modelview matrix @@ -243,7 +243,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex { addToBuffer(MODELVIEW_OFFSET*4, m); } - /** + /** @deprecated renderscript is deprecated in J * Sets the projection matrix in the fixed function matrix buffer * * @param m projection matrix @@ -253,7 +253,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex { addToBuffer(PROJECTION_OFFSET*4, m); } - /** + /** @deprecated renderscript is deprecated in J * Sets the texture matrix in the fixed function matrix buffer. * Texture matrix must be enabled in the * ProgramVertexFixedFunction builder for the shader to utilize diff --git a/graphics/java/android/renderscript/RSDriverException.java b/graphics/java/android/renderscript/RSDriverException.java index ce85b53e2817..17840874ba88 100644 --- a/graphics/java/android/renderscript/RSDriverException.java +++ b/graphics/java/android/renderscript/RSDriverException.java @@ -17,7 +17,7 @@ package android.renderscript; -/** +/** @deprecated renderscript is deprecated in J * Base class for all exceptions thrown by the Android * Renderscript */ diff --git a/graphics/java/android/renderscript/RSIllegalArgumentException.java b/graphics/java/android/renderscript/RSIllegalArgumentException.java index 954c0e82d6aa..039d8f531c33 100644 --- a/graphics/java/android/renderscript/RSIllegalArgumentException.java +++ b/graphics/java/android/renderscript/RSIllegalArgumentException.java @@ -17,11 +17,13 @@ package android.renderscript; -/** +/** @deprecated renderscript is deprecated in J * Base class for all exceptions thrown by the Android * Renderscript */ public class RSIllegalArgumentException extends RSRuntimeException { + /** @deprecated renderscript is deprecated in J + */ public RSIllegalArgumentException(String string) { super(string); } diff --git a/graphics/java/android/renderscript/RSInvalidStateException.java b/graphics/java/android/renderscript/RSInvalidStateException.java index 691aeba62ff4..ccbaea14e93f 100644 --- a/graphics/java/android/renderscript/RSInvalidStateException.java +++ b/graphics/java/android/renderscript/RSInvalidStateException.java @@ -17,11 +17,13 @@ package android.renderscript; -/** +/** @deprecated renderscript is deprecated in J * Base class for all exceptions thrown by the Android * Renderscript */ public class RSInvalidStateException extends RSRuntimeException { + /** @deprecated renderscript is deprecated in J + */ public RSInvalidStateException(String string) { super(string); } diff --git a/graphics/java/android/renderscript/RSRuntimeException.java b/graphics/java/android/renderscript/RSRuntimeException.java index 5a16478b7464..3fb1ea9d4a97 100644 --- a/graphics/java/android/renderscript/RSRuntimeException.java +++ b/graphics/java/android/renderscript/RSRuntimeException.java @@ -17,12 +17,14 @@ package android.renderscript; -/** +/** @deprecated renderscript is deprecated in J * Base class for all exceptions thrown by the Android * Renderscript */ public class RSRuntimeException extends java.lang.RuntimeException { + /** @deprecated renderscript is deprecated in J + */ public RSRuntimeException(String string) { super(string); } diff --git a/graphics/java/android/renderscript/RSSurfaceView.java b/graphics/java/android/renderscript/RSSurfaceView.java index 6756fd0d9225..997b7d0a6684 100644 --- a/graphics/java/android/renderscript/RSSurfaceView.java +++ b/graphics/java/android/renderscript/RSSurfaceView.java @@ -29,7 +29,7 @@ import android.view.Surface; import android.view.SurfaceHolder; import android.view.SurfaceView; -/** +/** @deprecated renderscript is deprecated in J * The Surface View for a graphics renderscript (RenderScriptGL) to draw on. * * <div class="special reference"> @@ -42,7 +42,7 @@ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback private SurfaceHolder mSurfaceHolder; private RenderScriptGL mRS; - /** + /** @deprecated renderscript is deprecated in J * Standard View constructor. In order to render something, you * must call {@link android.opengl.GLSurfaceView#setRenderer} to * register a renderer. @@ -53,7 +53,7 @@ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback //Log.v(RenderScript.LOG_TAG, "RSSurfaceView"); } - /** + /** @deprecated renderscript is deprecated in J * Standard View constructor. In order to render something, you * must call {@link android.opengl.GLSurfaceView#setRenderer} to * register a renderer. @@ -71,7 +71,7 @@ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback holder.addCallback(this); } - /** + /** @deprecated renderscript is deprecated in J * This method is part of the SurfaceHolder.Callback interface, and is * not normally called or subclassed by clients of RSSurfaceView. */ @@ -79,7 +79,7 @@ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback mSurfaceHolder = holder; } - /** + /** @deprecated renderscript is deprecated in J * This method is part of the SurfaceHolder.Callback interface, and is * not normally called or subclassed by clients of RSSurfaceView. */ @@ -92,7 +92,7 @@ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback } } - /** + /** @deprecated renderscript is deprecated in J * This method is part of the SurfaceHolder.Callback interface, and is * not normally called or subclassed by clients of RSSurfaceView. */ @@ -104,7 +104,7 @@ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback } } - /** + /** @deprecated renderscript is deprecated in J * Inform the view that the activity is paused. The owner of this view must * call this method when the activity is paused. Calling this method will * pause the rendering thread. @@ -116,7 +116,7 @@ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback } } - /** + /** @deprecated renderscript is deprecated in J * Inform the view that the activity is resumed. The owner of this view must * call this method when the activity is resumed. Calling this method will * recreate the OpenGL display and resume the rendering diff --git a/graphics/java/android/renderscript/RSTextureView.java b/graphics/java/android/renderscript/RSTextureView.java index 30b2f994d39c..b40f73c6e900 100644 --- a/graphics/java/android/renderscript/RSTextureView.java +++ b/graphics/java/android/renderscript/RSTextureView.java @@ -28,7 +28,7 @@ import android.util.AttributeSet; import android.util.Log; import android.view.TextureView; -/** +/** @deprecated renderscript is deprecated in J * The Texture View for a graphics renderscript (RenderScriptGL) * to draw on. * @@ -37,7 +37,7 @@ public class RSTextureView extends TextureView implements TextureView.SurfaceTex private RenderScriptGL mRS; private SurfaceTexture mSurfaceTexture; - /** + /** @deprecated renderscript is deprecated in J * Standard View constructor. In order to render something, you * must call {@link android.opengl.GLSurfaceView#setRenderer} to * register a renderer. @@ -48,7 +48,7 @@ public class RSTextureView extends TextureView implements TextureView.SurfaceTex //Log.v(RenderScript.LOG_TAG, "RSSurfaceView"); } - /** + /** @deprecated renderscript is deprecated in J * Standard View constructor. In order to render something, you * must call {@link android.opengl.GLSurfaceView#setRenderer} to * register a renderer. @@ -102,7 +102,7 @@ public class RSTextureView extends TextureView implements TextureView.SurfaceTex mSurfaceTexture = surface; } - /** + /** @deprecated renderscript is deprecated in J * Inform the view that the activity is paused. The owner of this view must * call this method when the activity is paused. Calling this method will * pause the rendering thread. @@ -114,7 +114,7 @@ public class RSTextureView extends TextureView implements TextureView.SurfaceTex } } - /** + /** @deprecated renderscript is deprecated in J * Inform the view that the activity is resumed. The owner of this view must * call this method when the activity is resumed. Calling this method will * recreate the OpenGL display and resume the rendering @@ -127,7 +127,7 @@ public class RSTextureView extends TextureView implements TextureView.SurfaceTex } } - /** + /** @deprecated renderscript is deprecated in J * Create a new RenderScriptGL object and attach it to the * TextureView if present. * @@ -145,7 +145,7 @@ public class RSTextureView extends TextureView implements TextureView.SurfaceTex return rs; } - /** + /** @deprecated renderscript is deprecated in J * Destroy the RenderScriptGL object associated with this * TextureView. */ @@ -154,7 +154,7 @@ public class RSTextureView extends TextureView implements TextureView.SurfaceTex mRS = null; } - /** + /** @deprecated renderscript is deprecated in J * Set a new RenderScriptGL object. This also will attach the * new object to the TextureView if present. * @@ -167,7 +167,7 @@ public class RSTextureView extends TextureView implements TextureView.SurfaceTex } } - /** + /** @deprecated renderscript is deprecated in J * Returns the previously set RenderScriptGL object. * * @return RenderScriptGL diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java index abbcdd99428e..9a5b3493c39f 100644 --- a/graphics/java/android/renderscript/RenderScript.java +++ b/graphics/java/android/renderscript/RenderScript.java @@ -32,7 +32,7 @@ import android.view.Surface; -/** +/** @deprecated renderscript is deprecated in J * Renderscript base master class. An instance of this class creates native * worker threads for processing commands from this object. This base class * does not provide any extended capabilities beyond simple data processing. @@ -736,7 +736,7 @@ public class RenderScript { /////////////////////////////////////////////////////////////////////////////////// // - /** + /** @deprecated renderscript is deprecated in J * Base class application should derive from for handling RS messages * coming from their scripts. When a script calls sendToClient the data * fields will be filled in and then the run method called by a message @@ -751,7 +751,7 @@ public class RenderScript { public void run() { } } - /** + /** @deprecated renderscript is deprecated in J * If an application is expecting messages it should set this field to an * instance of RSMessage. This instance will receive all the user messages * sent from sendToClient by scripts from this context. @@ -766,7 +766,7 @@ public class RenderScript { return mMessageCallback; } - /** + /** @deprecated renderscript is deprecated in J * Runtime error base class. An application should derive from this class * if it wishes to install an error handler. When errors occur at runtime * the fields in this class will be filled and the run method called. @@ -779,7 +779,7 @@ public class RenderScript { } } - /** + /** @deprecated renderscript is deprecated in J * Application Error handler. All runtime errors will be dispatched to the * instance of RSAsyncError set here. If this field is null a * RSRuntimeException will instead be thrown with details about the error. @@ -795,7 +795,7 @@ public class RenderScript { return mErrorCallback; } - /** + /** @deprecated renderscript is deprecated in J * RenderScript worker threads priority enumeration. The default value is * NORMAL. Applications wishing to do background processing such as * wallpapers should set their priority to LOW to avoid starving forground @@ -818,7 +818,7 @@ public class RenderScript { } - /** + /** @deprecated renderscript is deprecated in J * Change the priority of the worker threads for this context. * * @param p New priority to be set. @@ -915,7 +915,7 @@ public class RenderScript { } } - /** + /** @deprecated renderscript is deprecated in J * Gets the application context associated with the RenderScript context. * * @return The application context. @@ -924,7 +924,7 @@ public class RenderScript { return mApplicationContext; } - /** + /** @deprecated renderscript is deprecated in J * Create a basic RenderScript context. * * @hide @@ -944,7 +944,7 @@ public class RenderScript { return rs; } - /** + /** @deprecated renderscript is deprecated in J * Create a basic RenderScript context. * * @param ctx The context. @@ -955,7 +955,7 @@ public class RenderScript { return create(ctx, v); } - /** + /** @deprecated renderscript is deprecated in J * Print the currently available debugging information about the state of * the RS context to the log. * @@ -965,7 +965,7 @@ public class RenderScript { nContextDump(0); } - /** + /** @deprecated renderscript is deprecated in J * Wait for any commands in the fifo between the java bindings and native to * be processed. * @@ -974,7 +974,7 @@ public class RenderScript { nContextFinish(); } - /** + /** @deprecated renderscript is deprecated in J * Destroy this renderscript context. Once this function is called its no * longer legal to use this or any objects created by this context. * diff --git a/graphics/java/android/renderscript/RenderScriptGL.java b/graphics/java/android/renderscript/RenderScriptGL.java index 1b2ac90b3671..ac1a3922f553 100644 --- a/graphics/java/android/renderscript/RenderScriptGL.java +++ b/graphics/java/android/renderscript/RenderScriptGL.java @@ -28,7 +28,7 @@ import android.view.Surface; import android.view.SurfaceHolder; import android.view.SurfaceView; -/** +/** @deprecated renderscript is deprecated in J * The Graphics derivitive of Renderscript. Extends the basic context to add a * root script which is the display window for graphical output. When the * system needs to update the display the currently bound root script will be @@ -45,7 +45,7 @@ public class RenderScriptGL extends RenderScript { int mWidth; int mHeight; - /** + /** @deprecated renderscript is deprecated in J * Class which is used to describe a pixel format for a graphical buffer. * This is used to describe the intended format of the display surface. * @@ -92,7 +92,7 @@ public class RenderScriptGL extends RenderScript { } } - /** + /** @deprecated renderscript is deprecated in J * Set the per-component bit depth for color (red, green, blue). This * configures the surface for an unsigned integer buffer type. * @@ -105,7 +105,7 @@ public class RenderScriptGL extends RenderScript { mColorPref = preferred; } - /** + /** @deprecated renderscript is deprecated in J * Set the bit depth for alpha. This configures the surface for * an unsigned integer buffer type. * @@ -118,7 +118,7 @@ public class RenderScriptGL extends RenderScript { mAlphaPref = preferred; } - /** + /** @deprecated renderscript is deprecated in J * Set the bit depth for the depth buffer. This configures the * surface for an unsigned integer buffer type. If a minimum of 0 * is specified then its possible no depth buffer will be @@ -133,7 +133,7 @@ public class RenderScriptGL extends RenderScript { mDepthPref = preferred; } - /** + /** @deprecated renderscript is deprecated in J * Configure the multisample rendering. * * @param minimum The required number of samples, must be at least 1. @@ -156,7 +156,7 @@ public class RenderScriptGL extends RenderScript { SurfaceConfig mSurfaceConfig; - /** + /** @deprecated renderscript is deprecated in J * Construct a new RenderScriptGL context. * * @param ctx The context. @@ -186,7 +186,7 @@ public class RenderScriptGL extends RenderScript { mMessageThread.start(); } - /** + /** @deprecated renderscript is deprecated in J * Bind an os surface * * @@ -205,7 +205,7 @@ public class RenderScriptGL extends RenderScript { nContextSetSurface(w, h, s); } - /** + /** @deprecated renderscript is deprecated in J * Bind an os surface * * @param w @@ -221,7 +221,7 @@ public class RenderScriptGL extends RenderScript { nContextSetSurfaceTexture(w, h, sur); } - /** + /** @deprecated renderscript is deprecated in J * return the height of the last set surface. * * @return int @@ -230,7 +230,7 @@ public class RenderScriptGL extends RenderScript { return mHeight; } - /** + /** @deprecated renderscript is deprecated in J * return the width of the last set surface. * * @return int @@ -239,7 +239,7 @@ public class RenderScriptGL extends RenderScript { return mWidth; } - /** + /** @deprecated renderscript is deprecated in J * Temporarly halt calls to the root rendering script. * */ @@ -248,7 +248,7 @@ public class RenderScriptGL extends RenderScript { nContextPause(); } - /** + /** @deprecated renderscript is deprecated in J * Resume calls to the root rendering script. * */ @@ -258,7 +258,7 @@ public class RenderScriptGL extends RenderScript { } - /** + /** @deprecated renderscript is deprecated in J * Set the script to handle calls to render the primary surface. * * @param s Graphics script to process rendering requests. @@ -268,7 +268,7 @@ public class RenderScriptGL extends RenderScript { nContextBindRootScript(safeID(s)); } - /** + /** @deprecated renderscript is deprecated in J * Set the default ProgramStore object seen as the parent state by the root * rendering script. * @@ -279,7 +279,7 @@ public class RenderScriptGL extends RenderScript { nContextBindProgramStore(safeID(p)); } - /** + /** @deprecated renderscript is deprecated in J * Set the default ProgramFragment object seen as the parent state by the * root rendering script. * @@ -290,7 +290,7 @@ public class RenderScriptGL extends RenderScript { nContextBindProgramFragment(safeID(p)); } - /** + /** @deprecated renderscript is deprecated in J * Set the default ProgramRaster object seen as the parent state by the * root rendering script. * @@ -301,7 +301,7 @@ public class RenderScriptGL extends RenderScript { nContextBindProgramRaster(safeID(p)); } - /** + /** @deprecated renderscript is deprecated in J * Set the default ProgramVertex object seen as the parent state by the * root rendering script. * diff --git a/graphics/java/android/renderscript/Sampler.java b/graphics/java/android/renderscript/Sampler.java index 0df1012d7533..6b258aba0faf 100644 --- a/graphics/java/android/renderscript/Sampler.java +++ b/graphics/java/android/renderscript/Sampler.java @@ -27,18 +27,32 @@ import android.util.Log; import android.graphics.Bitmap; import android.graphics.BitmapFactory; -/** +/** @deprecated renderscript is deprecated in J * Sampler object which defines how data is extracted from textures. Samplers * are attached to Program objects (currently only ProgramFragment) when those objects * need to access texture data. **/ public class Sampler extends BaseObj { + /** @deprecated renderscript is deprecated in J + */ public enum Value { + /** @deprecated renderscript is deprecated in J + */ NEAREST (0), + /** @deprecated renderscript is deprecated in J + */ LINEAR (1), + /** @deprecated renderscript is deprecated in J + */ LINEAR_MIP_LINEAR (2), + /** @deprecated renderscript is deprecated in J + */ LINEAR_MIP_NEAREST (5), + /** @deprecated renderscript is deprecated in J + */ WRAP (3), + /** @deprecated renderscript is deprecated in J + */ CLAMP (4); int mID; @@ -58,42 +72,42 @@ public class Sampler extends BaseObj { super(id, rs); } - /** + /** @hide renderscript is deprecated in J * @return minification setting for the sampler */ public Value getMinification() { return mMin; } - /** + /** @hide renderscript is deprecated in J * @return magnification setting for the sampler */ public Value getMagnification() { return mMag; } - /** + /** @hide renderscript is deprecated in J * @return S wrapping mode for the sampler */ public Value getWrapS() { return mWrapS; } - /** + /** @hide renderscript is deprecated in J * @return T wrapping mode for the sampler */ public Value getWrapT() { return mWrapT; } - /** + /** @hide renderscript is deprecated in J * @return anisotropy setting for the sampler */ public float getAnisotropy() { return mAniso; } - /** + /** @deprecated renderscript is deprecated in J * Retrieve a sampler with min and mag set to nearest and wrap modes set to * clamp. * @@ -113,7 +127,7 @@ public class Sampler extends BaseObj { return rs.mSampler_CLAMP_NEAREST; } - /** + /** @deprecated renderscript is deprecated in J * Retrieve a sampler with min and mag set to linear and wrap modes set to * clamp. * @@ -133,7 +147,7 @@ public class Sampler extends BaseObj { return rs.mSampler_CLAMP_LINEAR; } - /** + /** @deprecated renderscript is deprecated in J * Retrieve a sampler with ag set to linear, min linear mipmap linear, and * to and wrap modes set to clamp. * @@ -153,7 +167,7 @@ public class Sampler extends BaseObj { return rs.mSampler_CLAMP_LINEAR_MIP_LINEAR; } - /** + /** @deprecated renderscript is deprecated in J * Retrieve a sampler with min and mag set to nearest and wrap modes set to * wrap. * @@ -173,7 +187,7 @@ public class Sampler extends BaseObj { return rs.mSampler_WRAP_NEAREST; } - /** + /** @deprecated renderscript is deprecated in J * Retrieve a sampler with min and mag set to nearest and wrap modes set to * wrap. * @@ -193,7 +207,7 @@ public class Sampler extends BaseObj { return rs.mSampler_WRAP_LINEAR; } - /** + /** @deprecated renderscript is deprecated in J * Retrieve a sampler with ag set to linear, min linear mipmap linear, and * to and wrap modes set to wrap. * @@ -214,7 +228,7 @@ public class Sampler extends BaseObj { } - /** + /** @deprecated renderscript is deprecated in J * Builder for creating non-standard samplers. Usefull if mix and match of * wrap modes is necesary or if anisotropic filtering is desired. * diff --git a/graphics/java/android/renderscript/Script.java b/graphics/java/android/renderscript/Script.java index 4f59ae3c2970..34d33a95db93 100644 --- a/graphics/java/android/renderscript/Script.java +++ b/graphics/java/android/renderscript/Script.java @@ -16,11 +16,11 @@ package android.renderscript; -/** +/** @deprecated renderscript is deprecated in J * **/ public class Script extends BaseObj { - /** + /** @deprecated renderscript is deprecated in J * Only intended for use by generated reflected code. * * @param slot @@ -29,7 +29,7 @@ public class Script extends BaseObj { mRS.nScriptInvoke(getID(mRS), slot); } - /** + /** @deprecated renderscript is deprecated in J * Only intended for use by generated reflected code. * * @param slot @@ -43,7 +43,7 @@ public class Script extends BaseObj { } } - /** + /** @deprecated renderscript is deprecated in J * Only intended for use by generated reflected code. * * @param slot @@ -77,7 +77,7 @@ public class Script extends BaseObj { } - /** + /** @deprecated renderscript is deprecated in J * Only intended for use by generated reflected code. * * @param va @@ -92,7 +92,7 @@ public class Script extends BaseObj { } } - /** + /** @deprecated renderscript is deprecated in J * Only intended for use by generated reflected code. * * @param index @@ -102,7 +102,7 @@ public class Script extends BaseObj { mRS.nScriptSetVarF(getID(mRS), index, v); } - /** + /** @deprecated renderscript is deprecated in J * Only intended for use by generated reflected code. * * @param index @@ -112,7 +112,7 @@ public class Script extends BaseObj { mRS.nScriptSetVarD(getID(mRS), index, v); } - /** + /** @deprecated renderscript is deprecated in J * Only intended for use by generated reflected code. * * @param index @@ -122,7 +122,7 @@ public class Script extends BaseObj { mRS.nScriptSetVarI(getID(mRS), index, v); } - /** + /** @deprecated renderscript is deprecated in J * Only intended for use by generated reflected code. * * @param index @@ -132,7 +132,7 @@ public class Script extends BaseObj { mRS.nScriptSetVarJ(getID(mRS), index, v); } - /** + /** @deprecated renderscript is deprecated in J * Only intended for use by generated reflected code. * * @param index @@ -142,7 +142,7 @@ public class Script extends BaseObj { mRS.nScriptSetVarI(getID(mRS), index, v ? 1 : 0); } - /** + /** @deprecated renderscript is deprecated in J * Only intended for use by generated reflected code. * * @param index @@ -152,7 +152,7 @@ public class Script extends BaseObj { mRS.nScriptSetVarObj(getID(mRS), index, (o == null) ? 0 : o.getID(mRS)); } - /** + /** @deprecated renderscript is deprecated in J * Only intended for use by generated reflected code. * * @param index @@ -162,6 +162,8 @@ public class Script extends BaseObj { mRS.nScriptSetVarV(getID(mRS), index, v.getData()); } + /** @deprecated renderscript is deprecated in J + */ public void setTimeZone(String timeZone) { mRS.validate(); try { diff --git a/graphics/java/android/renderscript/ScriptC.java b/graphics/java/android/renderscript/ScriptC.java index 108b230f1a5b..b1d1fa58f7be 100644 --- a/graphics/java/android/renderscript/ScriptC.java +++ b/graphics/java/android/renderscript/ScriptC.java @@ -29,13 +29,13 @@ import java.util.HashMap; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -/** +/** @deprecated renderscript is deprecated in J * **/ public class ScriptC extends Script { private static final String TAG = "ScriptC"; - /** + /** @deprecated renderscript is deprecated in J * Only intended for use by the generated derived classes. * * @param id @@ -45,7 +45,7 @@ public class ScriptC extends Script { super(id, rs); } - /** + /** @deprecated renderscript is deprecated in J * Only intended for use by the generated derived classes. * * diff --git a/graphics/java/android/renderscript/Short2.java b/graphics/java/android/renderscript/Short2.java index 617f1f5373c9..21c5f05319c3 100644 --- a/graphics/java/android/renderscript/Short2.java +++ b/graphics/java/android/renderscript/Short2.java @@ -20,7 +20,7 @@ import java.lang.Math; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * Class for exposing the native Renderscript Short2 type back to the Android system. * **/ diff --git a/graphics/java/android/renderscript/Short3.java b/graphics/java/android/renderscript/Short3.java index b9ca49b11c78..81a29540d966 100644 --- a/graphics/java/android/renderscript/Short3.java +++ b/graphics/java/android/renderscript/Short3.java @@ -20,7 +20,7 @@ import java.lang.Math; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * Class for exposing the native Renderscript short3 type back to the Android system. * **/ diff --git a/graphics/java/android/renderscript/Short4.java b/graphics/java/android/renderscript/Short4.java index d5f2db512ebb..861c3d73a96a 100644 --- a/graphics/java/android/renderscript/Short4.java +++ b/graphics/java/android/renderscript/Short4.java @@ -20,7 +20,7 @@ import java.lang.Math; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * Class for exposing the native Renderscript short4 type back to the Android system. * **/ diff --git a/graphics/java/android/renderscript/Type.java b/graphics/java/android/renderscript/Type.java index a707df2e2011..9f630e764e7b 100644 --- a/graphics/java/android/renderscript/Type.java +++ b/graphics/java/android/renderscript/Type.java @@ -20,7 +20,7 @@ package android.renderscript; import java.lang.reflect.Field; import android.util.Log; -/** +/** @deprecated renderscript is deprecated in J * <p>Type is an allocation template. It consists of an Element and one or more * dimensions. It describes only the layout of memory but does not allocate any * storage for the data that is described.</p> @@ -70,7 +70,7 @@ public class Type extends BaseObj { } } - /** + /** @deprecated renderscript is deprecated in J * Return the element associated with this Type. * * @return Element @@ -79,7 +79,7 @@ public class Type extends BaseObj { return mElement; } - /** + /** @deprecated renderscript is deprecated in J * Return the value of the X dimension. * * @return int @@ -88,7 +88,7 @@ public class Type extends BaseObj { return mDimX; } - /** + /** @deprecated renderscript is deprecated in J * Return the value of the Y dimension or 0 for a 1D allocation. * * @return int @@ -97,7 +97,7 @@ public class Type extends BaseObj { return mDimY; } - /** + /** @deprecated renderscript is deprecated in J * Return the value of the Z dimension or 0 for a 1D or 2D allocation. * * @return int @@ -106,7 +106,7 @@ public class Type extends BaseObj { return mDimZ; } - /** + /** @deprecated renderscript is deprecated in J * Return if the Type has a mipmap chain. * * @return boolean @@ -115,7 +115,7 @@ public class Type extends BaseObj { return mDimMipmaps; } - /** + /** @deprecated renderscript is deprecated in J * Return if the Type is a cube map. * * @return boolean @@ -124,7 +124,7 @@ public class Type extends BaseObj { return mDimFaces; } - /** + /** @deprecated renderscript is deprecated in J * Return the total number of accessable cells in the Type. * * @return int @@ -196,7 +196,7 @@ public class Type extends BaseObj { calcElementCount(); } - /** + /** @deprecated renderscript is deprecated in J * Builder class for Type. * */ @@ -210,7 +210,7 @@ public class Type extends BaseObj { Element mElement; - /** + /** @deprecated renderscript is deprecated in J * Create a new builder object. * * @param rs @@ -222,7 +222,7 @@ public class Type extends BaseObj { mElement = e; } - /** + /** @deprecated renderscript is deprecated in J * Add a dimension to the Type. * * @@ -255,7 +255,7 @@ public class Type extends BaseObj { } - /** + /** @deprecated renderscript is deprecated in J * Validate structure and create a new type. * * @return Type diff --git a/include/androidfw/InputDevice.h b/include/androidfw/InputDevice.h index 38203afac149..d6ecbf0712a7 100644 --- a/include/androidfw/InputDevice.h +++ b/include/androidfw/InputDevice.h @@ -66,13 +66,16 @@ public: float fuzz; }; - void initialize(int32_t id, int32_t generation, - const String8& name, const String8& descriptor); + void initialize(int32_t id, int32_t generation, const InputDeviceIdentifier& identifier, + const String8& alias); inline int32_t getId() const { return mId; } inline int32_t getGeneration() const { return mGeneration; } - inline const String8 getName() const { return mName; } - inline const String8 getDescriptor() const { return mDescriptor; } + inline const InputDeviceIdentifier& getIdentifier() const { return mIdentifier; } + inline const String8& getAlias() const { return mAlias; } + inline const String8& getDisplayName() const { + return mAlias.isEmpty() ? mIdentifier.name : mAlias; + } inline uint32_t getSources() const { return mSources; } const MotionRange* getMotionRange(int32_t axis, uint32_t source) const; @@ -103,8 +106,8 @@ public: private: int32_t mId; int32_t mGeneration; - String8 mName; - String8 mDescriptor; + InputDeviceIdentifier mIdentifier; + String8 mAlias; uint32_t mSources; int32_t mKeyboardType; sp<KeyCharacterMap> mKeyCharacterMap; diff --git a/libs/androidfw/InputDevice.cpp b/libs/androidfw/InputDevice.cpp index d6c49f711329..5237063a4e94 100644 --- a/libs/androidfw/InputDevice.cpp +++ b/libs/androidfw/InputDevice.cpp @@ -127,12 +127,11 @@ String8 getInputDeviceConfigurationFilePathByName( // --- InputDeviceInfo --- InputDeviceInfo::InputDeviceInfo() { - initialize(-1, -1, String8("uninitialized device info"), String8("unknown")); + initialize(-1, -1, InputDeviceIdentifier(), String8()); } InputDeviceInfo::InputDeviceInfo(const InputDeviceInfo& other) : - mId(other.mId), mGeneration(other.mGeneration), - mName(other.mName), mDescriptor(other.mDescriptor), + mId(other.mId), mGeneration(other.mGeneration), mIdentifier(other.mIdentifier), mSources(other.mSources), mKeyboardType(other.mKeyboardType), mKeyCharacterMap(other.mKeyCharacterMap), @@ -144,11 +143,11 @@ InputDeviceInfo::~InputDeviceInfo() { } void InputDeviceInfo::initialize(int32_t id, int32_t generation, - const String8& name, const String8& descriptor) { + const InputDeviceIdentifier& identifier, const String8& alias) { mId = id; mGeneration = generation; - mName = name; - mDescriptor = descriptor; + mIdentifier = identifier; + mAlias = alias; mSources = 0; mKeyboardType = AINPUT_KEYBOARD_TYPE_NONE; mHasVibrator = false; diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java index 2efacd877a59..258760f2ae96 100644 --- a/media/java/android/media/MediaCodec.java +++ b/media/java/android/media/MediaCodec.java @@ -280,6 +280,19 @@ final public class MediaCodec { */ public native final void flush(); + public final static class CryptoException extends RuntimeException { + public CryptoException(int errorCode, String detailMessage) { + super(detailMessage); + mErrorCode = errorCode; + } + + public int getErrorCode() { + return mErrorCode; + } + + private int mErrorCode; + } + /** After filling a range of the input buffer at the specified index * submit it to the component. * @@ -304,10 +317,13 @@ final public class MediaCodec { * @param presentationTimeUs The time at which this buffer should be rendered. * @param flags A bitmask of flags {@link #FLAG_SYNCFRAME}, * {@link #FLAG_CODECCONFIG} or {@link #FLAG_EOS}. + * @throws CryptoException if a crypto object has been specified in + * {@link #configure} */ public native final void queueInputBuffer( int index, - int offset, int size, long presentationTimeUs, int flags); + int offset, int size, long presentationTimeUs, int flags) + throws CryptoException; /** Metadata describing the structure of a (at least partially) encrypted * input sample. @@ -361,7 +377,7 @@ final public class MediaCodec { int offset, CryptoInfo info, long presentationTimeUs, - int flags); + int flags) throws CryptoException; /** Returns the index of an input buffer to be filled with valid data * or -1 if no such buffer is currently available. diff --git a/media/java/android/media/MediaExtractor.java b/media/java/android/media/MediaExtractor.java index 3b17a7d7703a..9fdb81fc240f 100644 --- a/media/java/android/media/MediaExtractor.java +++ b/media/java/android/media/MediaExtractor.java @@ -245,6 +245,20 @@ final public class MediaExtractor { */ public native boolean getSampleCryptoInfo(MediaCodec.CryptoInfo info); + /** Returns an estimate of how much data is presently cached in memory + expressed in microseconds. Returns -1 if that information is unavailable + or not applicable (no cache). + */ + public native long getCachedDuration(); + + /** Returns true iff we are caching data and the cache has reached the + * end of the data stream (for now, a future seek may of course restart + * the fetching of data). + * This API only returns a meaningful result if {link #getCachedDuration} + * indicates the presence of a cache, i.e. does NOT return -1. + */ + public native boolean hasCacheReachedEndOfStream(); + private static native final void native_init(); private native final void native_setup(); private native final void native_finalize(); diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index 545752c07d0b..fae7d0b44541 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -1577,26 +1577,39 @@ public class MediaPlayer /** * Returns an array of track information. + * If it is called in an invalid state, IllegalStateException will be thrown. * - * @return Array of track info. null if an error occured. + * @return Array of track info. The total number of tracks is the array length. + * Must be called again if an external source has been added after any of the + * addExternalSource methods are called. * {@hide} */ - // FIXME: It returns timed text tracks' information for now. Other types of tracks will be - // supported in future. public TrackInfo[] getTrackInfo() { Parcel request = Parcel.obtain(); Parcel reply = Parcel.obtain(); request.writeInterfaceToken(IMEDIA_PLAYER); request.writeInt(INVOKE_ID_GET_TRACK_INFO); - invoke(request, reply); + int status = invoke(request, reply); + if (status != 0) { + throw new IllegalStateException(); + } TrackInfo trackInfo[] = reply.createTypedArray(TrackInfo.CREATOR); return trackInfo; } + /* Do not change these values without updating their counterparts + * in include/media/stagefright/MediaDefs.h and media/libstagefright/MediaDefs.cpp! + */ + /** + * MIME type for SubRip (SRT) container. Used in addExternalSource APIs. + * {@hide} + */ + public static final String MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip"; + /* * A helper function to check if the mime type is supported by media framework. */ - private boolean availableMimeTypeForExternalSource(String mimeType) { + private static boolean availableMimeTypeForExternalSource(String mimeType) { if (mimeType == MEDIA_MIMETYPE_TEXT_SUBRIP) { return true; } @@ -1614,10 +1627,11 @@ public class MediaPlayer * additional tracks become available after this method call. * * @param path The file path of external source file. + * @param mimeType The mime type of the file. Must be one of the mime types listed above. + * @throws IOException if the file cannot be accessed or is corrupted. + * @throws IllegalArgumentException if the mimeType is not supported. * {@hide} */ - // FIXME: define error codes and throws exceptions according to the error codes. - // (IllegalStateException, IOException). public void addExternalSource(String path, String mimeType) throws IOException, IllegalArgumentException { if (!availableMimeTypeForExternalSource(mimeType)) { @@ -1647,10 +1661,11 @@ public class MediaPlayer * * @param context the Context to use when resolving the Uri * @param uri the Content URI of the data you want to play + * @param mimeType The mime type of the file. Must be one of the mime types listed above. + * @throws IOException if the file cannot be accessed or is corrupted. + * @throws IllegalArgumentException if the mimeType is not supported. * {@hide} */ - // FIXME: define error codes and throws exceptions according to the error codes. - // (IllegalStateException, IOException). public void addExternalSource(Context context, Uri uri, String mimeType) throws IOException, IllegalArgumentException { String scheme = uri.getScheme(); @@ -1677,15 +1692,6 @@ public class MediaPlayer } } - /* Do not change these values without updating their counterparts - * in include/media/stagefright/MediaDefs.h and media/libstagefright/MediaDefs.cpp! - */ - /** - * MIME type for SubRip (SRT) container. Used in {@link #addExternalSource()} APIs. - * {@hide} - */ - public static final String MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip"; - /** * Adds an external source file (FileDescriptor). * It is the caller's responsibility to close the file descriptor. @@ -1697,14 +1703,10 @@ public class MediaPlayer * additional tracks become available after this method call. * * @param fd the FileDescriptor for the file you want to play - * @param mimeType A MIME type for the content. It can be null. - * <ul> - * <li>{@link #MEDIA_MIMETYPE_TEXT_SUBRIP} - * </ul> + * @param mimeType The mime type of the file. Must be one of the mime types listed above. + * @throws IllegalArgumentException if the mimeType is not supported. * {@hide} */ - // FIXME: define error codes and throws exceptions according to the error codes. - // (IllegalStateException, IOException). public void addExternalSource(FileDescriptor fd, String mimeType) throws IllegalArgumentException { // intentionally less than LONG_MAX @@ -1724,11 +1726,10 @@ public class MediaPlayer * @param fd the FileDescriptor for the file you want to play * @param offset the offset into the file where the data to be played starts, in bytes * @param length the length in bytes of the data to be played - * @param mimeType A MIME type for the content. It can be null. + * @param mimeType The mime type of the file. Must be one of the mime types listed above. + * @throws IllegalArgumentException if the mimeType is not supported. * {@hide} */ - // FIXME: define error codes and throws exceptions according to the error codes. - // (IllegalStateException, IOException). public void addExternalSource(FileDescriptor fd, long offset, long length, String mimeType) throws IllegalArgumentException { if (!availableMimeTypeForExternalSource(mimeType)) { @@ -1749,8 +1750,8 @@ public class MediaPlayer /** * Selects a track. * <p> - * If a MediaPlayer is in invalid state, it throws exception. - * If a MediaPlayer is in Started state, the selected track will be presented immediately. + * If a MediaPlayer is in invalid state, it throws an IllegalStateException exception. + * If a MediaPlayer is in <em>Started</em> state, the selected track is presented immediately. * If a MediaPlayer is not in Started state, it just marks the track to be played. * </p> * <p> @@ -1758,38 +1759,58 @@ public class MediaPlayer * Audio, Timed Text), the most recent one will be chosen. * </p> * <p> - * The first audio and video tracks will be selected by default, even though this function is not - * called. However, no timed text track will be selected until this function is called. + * The first audio and video tracks are selected by default if available, even though + * this method is not called. However, no timed text track will be selected until + * this function is called. + * </p> + * <p> + * Currently, only timed text tracks or audio tracks can be selected via this method. + * In addition, the support for selecting an audio track at runtime is pretty limited + * in that an audio track can only be selected in the <em>Prepared</em> state. * </p> + * @param index the index of the track to be selected. The valid range of the index + * is 0..total number of track - 1. The total number of tracks as well as the type of + * each individual track can be found by calling {@link #getTrackInfo()} method. + * @see android.media.MediaPlayer.getTrackInfo * {@hide} */ - // FIXME: define error codes and throws exceptions according to the error codes. - // (IllegalStateException, IOException, IllegalArgumentException). public void selectTrack(int index) { - Parcel request = Parcel.obtain(); - Parcel reply = Parcel.obtain(); - request.writeInterfaceToken(IMEDIA_PLAYER); - request.writeInt(INVOKE_ID_SELECT_TRACK); - request.writeInt(index); - invoke(request, reply); + selectOrUnselectTrack(index, true /* select */); } /** * Unselect a track. - * If the track identified by index has not been selected before, it throws an exception. + * <p> + * Currently, the track must be a timed text track and no audio or video tracks can be + * unselected. If the timed text track identified by index has not been + * selected before, it throws an exception. + * </p> + * @param index the index of the track to be unselected. The valid range of the index + * is 0..total number of tracks - 1. The total number of tracks as well as the type of + * each individual track can be found by calling {@link #getTrackInfo()} method. + * + * @see android.media.MediaPlayer.getTrackInfo * {@hide} */ - // FIXME: define error codes and throws exceptions according to the error codes. - // (IllegalStateException, IOException, IllegalArgumentException). public void unselectTrack(int index) { + selectOrUnselectTrack(index, false /* select */); + } + + private void selectOrUnselectTrack(int index, boolean select) { Parcel request = Parcel.obtain(); Parcel reply = Parcel.obtain(); request.writeInterfaceToken(IMEDIA_PLAYER); - request.writeInt(INVOKE_ID_UNSELECT_TRACK); + request.writeInt(select? INVOKE_ID_SELECT_TRACK: INVOKE_ID_UNSELECT_TRACK); request.writeInt(index); - invoke(request, reply); + int status = invoke(request, reply); + if (status != 0) { + String msg = select? "selectTrack ": "unselectTrack "; + msg += "failed for track index: " + index; + throw new RuntimeException(msg); + } } + /** * @param reply Parcel with audio/video duration info for battery tracking usage diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp index a120a2f5cd42..8009fb5d73de 100644 --- a/media/jni/android_media_MediaCodec.cpp +++ b/media/jni/android_media_MediaCodec.cpp @@ -36,6 +36,7 @@ #include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/foundation/ALooper.h> #include <media/stagefright/foundation/AMessage.h> +#include <media/stagefright/foundation/AString.h> #include <media/stagefright/MediaErrors.h> namespace android { @@ -129,8 +130,10 @@ status_t JMediaCodec::flush() { status_t JMediaCodec::queueInputBuffer( size_t index, - size_t offset, size_t size, int64_t timeUs, uint32_t flags) { - return mCodec->queueInputBuffer(index, offset, size, timeUs, flags); + size_t offset, size_t size, int64_t timeUs, uint32_t flags, + AString *errorDetailMsg) { + return mCodec->queueInputBuffer( + index, offset, size, timeUs, flags, errorDetailMsg); } status_t JMediaCodec::queueSecureInputBuffer( @@ -142,10 +145,11 @@ status_t JMediaCodec::queueSecureInputBuffer( const uint8_t iv[16], CryptoPlugin::Mode mode, int64_t presentationTimeUs, - uint32_t flags) { + uint32_t flags, + AString *errorDetailMsg) { return mCodec->queueSecureInputBuffer( index, offset, subSamples, numSubSamples, key, iv, mode, - presentationTimeUs, flags); + presentationTimeUs, flags, errorDetailMsg); } status_t JMediaCodec::dequeueInputBuffer(size_t *index, int64_t timeoutUs) { @@ -251,7 +255,31 @@ static void android_media_MediaCodec_release(JNIEnv *env, jobject thiz) { setMediaCodec(env, thiz, NULL); } -static jint throwExceptionAsNecessary(JNIEnv *env, status_t err) { +static void throwCryptoException(JNIEnv *env, status_t err, const char *msg) { + jclass clazz = env->FindClass("android/media/MediaCodec$CryptoException"); + CHECK(clazz != NULL); + + jmethodID constructID = + env->GetMethodID(clazz, "<init>", "(ILjava/lang/String;)V"); + CHECK(constructID != NULL); + + jstring msgObj = env->NewStringUTF(msg != NULL ? msg : "Unknown Error"); + + jthrowable exception = + (jthrowable)env->NewObject(clazz, constructID, err, msgObj); + + env->Throw(exception); +} + +static jint throwExceptionAsNecessary( + JNIEnv *env, status_t err, const char *msg = NULL) { + if (err >= ERROR_DRM_WV_VENDOR_MIN && err <= ERROR_DRM_WV_VENDOR_MAX) { + // We'll throw our custom MediaCodec.CryptoException + + throwCryptoException(env, err, msg); + return 0; + } + switch (err) { case OK: return 0; @@ -383,10 +411,13 @@ static void android_media_MediaCodec_queueInputBuffer( return; } + AString errorDetailMsg; + status_t err = codec->queueInputBuffer( - index, offset, size, timestampUs, flags); + index, offset, size, timestampUs, flags, &errorDetailMsg); - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary( + env, err, errorDetailMsg.empty() ? NULL : errorDetailMsg.c_str()); } static void android_media_MediaCodec_queueSecureInputBuffer( @@ -497,13 +528,17 @@ static void android_media_MediaCodec_queueSecureInputBuffer( } } + AString errorDetailMsg; + if (err == OK) { err = codec->queueSecureInputBuffer( index, offset, subSamples, numSubSamples, (const uint8_t *)key, (const uint8_t *)iv, (CryptoPlugin::Mode)mode, - timestampUs, flags); + timestampUs, + flags, + &errorDetailMsg); } if (iv != NULL) { @@ -519,7 +554,8 @@ static void android_media_MediaCodec_queueSecureInputBuffer( delete[] subSamples; subSamples = NULL; - throwExceptionAsNecessary(env, err); + throwExceptionAsNecessary( + env, err, errorDetailMsg.empty() ? NULL : errorDetailMsg.c_str()); } static jint android_media_MediaCodec_dequeueInputBuffer( diff --git a/media/jni/android_media_MediaCodec.h b/media/jni/android_media_MediaCodec.h index 570c33bbbdda..e2688bec3746 100644 --- a/media/jni/android_media_MediaCodec.h +++ b/media/jni/android_media_MediaCodec.h @@ -28,6 +28,7 @@ namespace android { struct ALooper; struct AMessage; +struct AString; struct ICrypto; struct ISurfaceTexture; struct MediaCodec; @@ -52,7 +53,8 @@ struct JMediaCodec : public RefBase { status_t queueInputBuffer( size_t index, - size_t offset, size_t size, int64_t timeUs, uint32_t flags); + size_t offset, size_t size, int64_t timeUs, uint32_t flags, + AString *errorDetailMsg); status_t queueSecureInputBuffer( size_t index, @@ -63,7 +65,8 @@ struct JMediaCodec : public RefBase { const uint8_t iv[16], CryptoPlugin::Mode mode, int64_t presentationTimeUs, - uint32_t flags); + uint32_t flags, + AString *errorDetailMsg); status_t dequeueInputBuffer(size_t *index, int64_t timeoutUs); diff --git a/media/jni/android_media_MediaExtractor.cpp b/media/jni/android_media_MediaExtractor.cpp index bf3d44aaec21..051833161c23 100644 --- a/media/jni/android_media_MediaExtractor.cpp +++ b/media/jni/android_media_MediaExtractor.cpp @@ -198,6 +198,10 @@ status_t JMediaExtractor::getSampleMeta(sp<MetaData> *sampleMeta) { return mImpl->getSampleMeta(sampleMeta); } +bool JMediaExtractor::getCachedDuration(int64_t *durationUs, bool *eos) const { + return mImpl->getCachedDuration(durationUs, eos); +} + } // namespace android //////////////////////////////////////////////////////////////////////////////// @@ -593,6 +597,42 @@ static void android_media_MediaExtractor_setDataSourceFd( } } +static jlong android_media_MediaExtractor_getCachedDurationUs( + JNIEnv *env, jobject thiz) { + sp<JMediaExtractor> extractor = getMediaExtractor(env, thiz); + + if (extractor == NULL) { + jniThrowException(env, "java/lang/IllegalStateException", NULL); + return -1ll; + } + + int64_t cachedDurationUs; + bool eos; + if (!extractor->getCachedDuration(&cachedDurationUs, &eos)) { + return -1ll; + } + + return cachedDurationUs; +} + +static jboolean android_media_MediaExtractor_hasCacheReachedEOS( + JNIEnv *env, jobject thiz) { + sp<JMediaExtractor> extractor = getMediaExtractor(env, thiz); + + if (extractor == NULL) { + jniThrowException(env, "java/lang/IllegalStateException", NULL); + return true; + } + + int64_t cachedDurationUs; + bool eos; + if (!extractor->getCachedDuration(&cachedDurationUs, &eos)) { + return true; + } + + return eos; +} + static void android_media_MediaExtractor_native_finalize( JNIEnv *env, jobject thiz) { android_media_MediaExtractor_release(env, thiz); @@ -641,6 +681,12 @@ static JNINativeMethod gMethods[] = { { "setDataSource", "(Ljava/io/FileDescriptor;JJ)V", (void *)android_media_MediaExtractor_setDataSourceFd }, + + { "getCachedDuration", "()J", + (void *)android_media_MediaExtractor_getCachedDurationUs }, + + { "hasCacheReachedEndOfStream", "()Z", + (void *)android_media_MediaExtractor_hasCacheReachedEOS }, }; int register_android_media_MediaExtractor(JNIEnv *env) { diff --git a/media/jni/android_media_MediaExtractor.h b/media/jni/android_media_MediaExtractor.h index f7ce2ff5f9fd..ef0c48b3a3c4 100644 --- a/media/jni/android_media_MediaExtractor.h +++ b/media/jni/android_media_MediaExtractor.h @@ -53,6 +53,8 @@ struct JMediaExtractor : public RefBase { status_t getSampleFlags(uint32_t *sampleFlags); status_t getSampleMeta(sp<MetaData> *sampleMeta); + bool getCachedDuration(int64_t *durationUs, bool *eos) const; + protected: virtual ~JMediaExtractor(); diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index e937587c62eb..39fb2b4b1bb6 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -1,15 +1,44 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.systemui" - coreApp="true" - android:sharedUserId="android.uid.system" - android:process="system" - > + coreApp="true"> + + <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> + + <uses-permission android:name="android.permission.INJECT_EVENTS" /> + <uses-permission android:name="android.permission.WRITE_SETTINGS" /> <uses-permission android:name="android.permission.STATUS_BAR_SERVICE" /> + <uses-permission android:name="android.permission.STATUS_BAR" /> + <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" /> + + <!-- Networking and telephony --> <uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> - <uses-permission android:name="android.permission.GET_TASKS" /> + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> + <uses-permission android:name="android.permission.READ_PHONE_STATE" /> + <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> + <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> + + <!-- Physical hardware --> <uses-permission android:name="android.permission.MANAGE_USB" /> + <uses-permission android:name="android.permission.DEVICE_POWER" /> + <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" /> + <uses-permission android:name="android.permission.UPDATE_DEVICE_STATS" /> + + <!-- ActivityManager --> + <uses-permission android:name="android.permission.GET_TASKS" /> + <uses-permission android:name="android.permission.REORDER_TASKS" /> + <uses-permission android:name="android.permission.REMOVE_TASKS" /> + <uses-permission android:name="android.permission.STOP_APP_SWITCHES" /> + <uses-permission android:name="android.permission.SET_SCREEN_COMPATIBILITY" /> + <uses-permission android:name="android.permission.START_ANY_ACTIVITY" /> + + <!-- WindowManager --> + <uses-permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW" /> + <uses-permission android:name="android.permission.READ_FRAME_BUFFER" /> + <uses-permission android:name="android.permission.MANAGE_APP_TOKENS" /> + <uses-permission android:name="android.permission.SET_ORIENTATION" /> + <uses-permission android:name="android.permission.DISABLE_KEYGUARD" /> <application android:persistent="true" diff --git a/packages/SystemUI/res/drawable-hdpi/bottom_divider_glow.png b/packages/SystemUI/res/drawable-hdpi/bottom_divider_glow.png Binary files differnew file mode 100644 index 000000000000..e8cfc0f61f2a --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/bottom_divider_glow.png diff --git a/packages/SystemUI/res/drawable-hdpi/top_divider_glow.png b/packages/SystemUI/res/drawable-hdpi/top_divider_glow.png Binary files differnew file mode 100644 index 000000000000..89cd10ef92cc --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/top_divider_glow.png diff --git a/packages/SystemUI/res/drawable-mdpi/bottom_divider_glow.png b/packages/SystemUI/res/drawable-mdpi/bottom_divider_glow.png Binary files differnew file mode 100644 index 000000000000..7d7868d2b9e7 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/bottom_divider_glow.png diff --git a/packages/SystemUI/res/drawable-mdpi/top_divider_glow.png b/packages/SystemUI/res/drawable-mdpi/top_divider_glow.png Binary files differnew file mode 100644 index 000000000000..f93da095dda8 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/top_divider_glow.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_ime_default.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/ic_sysbar_ime_default.png Binary files differindex 47f0745caa20..47f0745caa20 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_ime_default.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/ic_sysbar_ime_default.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_ime_pressed.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/ic_sysbar_ime_pressed.png Binary files differindex 490504edbaa7..490504edbaa7 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_ime_pressed.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/ic_sysbar_ime_pressed.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_zoom_default.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/ic_sysbar_zoom_default.png Binary files differindex 348afb540c16..348afb540c16 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_zoom_default.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/ic_sysbar_zoom_default.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_zoom_pressed.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/ic_sysbar_zoom_pressed.png Binary files differindex 2f20d676492c..2f20d676492c 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_zoom_pressed.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/ic_sysbar_zoom_pressed.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/notify_panel_clock_bg_normal.9.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/notify_panel_clock_bg_normal.9.png Binary files differindex 88137e863068..88137e863068 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/notify_panel_clock_bg_normal.9.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/notify_panel_clock_bg_normal.9.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/notify_panel_clock_bg_pressed.9.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/notify_panel_clock_bg_pressed.9.png Binary files differindex 6507a518ab21..6507a518ab21 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/notify_panel_clock_bg_pressed.9.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/notify_panel_clock_bg_pressed.9.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/notify_panel_notify_bg.9.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/notify_panel_notify_bg.9.png Binary files differindex 6cb76649b284..6cb76649b284 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/notify_panel_notify_bg.9.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/notify_panel_notify_bg.9.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/recents_bg_protect_tile.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/recents_bg_protect_tile.png Binary files differindex a57c27a1e3bd..a57c27a1e3bd 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/recents_bg_protect_tile.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/recents_bg_protect_tile.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/recents_blue_glow.9.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/recents_blue_glow.9.png Binary files differindex 4ac131a62231..4ac131a62231 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/recents_blue_glow.9.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/recents_blue_glow.9.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_alarm.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_alarm.png Binary files differindex 2f4cf9d98ea7..2f4cf9d98ea7 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_alarm.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_alarm.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_0.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_0.png Binary files differindex 80184abdf3b0..80184abdf3b0 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_0.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_0.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_100.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_100.png Binary files differindex f33f00e72a01..f33f00e72a01 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_100.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_100.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_15.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_15.png Binary files differindex 7f16039e14cf..7f16039e14cf 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_15.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_15.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_28.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_28.png Binary files differindex 83bfd39b18b7..83bfd39b18b7 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_28.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_28.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_43.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_43.png Binary files differindex 2c85bcfc2956..2c85bcfc2956 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_43.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_43.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_57.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_57.png Binary files differindex ce1acbdcf814..ce1acbdcf814 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_57.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_57.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_71.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_71.png Binary files differindex df53bb0b7701..df53bb0b7701 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_71.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_71.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_85.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_85.png Binary files differindex 44d8726cd8a9..44d8726cd8a9 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_85.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_85.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim0.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_anim0.png Binary files differindex 1a060e77fcf3..1a060e77fcf3 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim0.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_anim0.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim100.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_anim100.png Binary files differindex 02fd0131257a..02fd0131257a 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim100.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_anim100.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim15.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_anim15.png Binary files differindex 496c5aff8f76..496c5aff8f76 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim15.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_anim15.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim28.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_anim28.png Binary files differindex e371412824cc..e371412824cc 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim28.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_anim28.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim43.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_anim43.png Binary files differindex 13a0141fafc9..13a0141fafc9 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim43.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_anim43.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim57.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_anim57.png Binary files differindex bc6344a0eb33..bc6344a0eb33 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim57.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_anim57.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim71.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_anim71.png Binary files differindex 3a1bc962a895..3a1bc962a895 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim71.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_anim71.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim85.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_anim85.png Binary files differindex 12f5b99ab673..12f5b99ab673 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim85.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_anim85.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_bluetooth.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_bluetooth.png Binary files differindex 31762a27ebfb..31762a27ebfb 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_bluetooth.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_bluetooth.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_bluetooth_connected.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_bluetooth_connected.png Binary files differindex c4376a27a923..c4376a27a923 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_bluetooth_connected.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_bluetooth_connected.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_connected_1x.png Binary files differindex 569142762e6c..569142762e6c 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_1x.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_connected_1x.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_connected_3g.png Binary files differindex 2464d9e25075..2464d9e25075 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_3g.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_connected_3g.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_connected_4g.png Binary files differindex ffe90bc7066f..ffe90bc7066f 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_4g.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_connected_4g.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_connected_e.png Binary files differindex 823b3fa37a6e..823b3fa37a6e 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_e.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_connected_e.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_connected_g.png Binary files differindex 1ac455cdec58..1ac455cdec58 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_g.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_connected_g.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_connected_h.png Binary files differindex 7a38b12349cc..7a38b12349cc 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_h.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_connected_h.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_connected_roam.png Binary files differindex 3861bfe4a41a..3861bfe4a41a 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_roam.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_connected_roam.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_1x.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_fully_connected_1x.png Binary files differindex 2eb6246e0c3c..2eb6246e0c3c 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_1x.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_fully_connected_1x.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_3g.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_fully_connected_3g.png Binary files differindex 0ce5ec3dd020..0ce5ec3dd020 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_3g.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_fully_connected_3g.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_4g.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_fully_connected_4g.png Binary files differindex 6bf24123ebc8..6bf24123ebc8 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_4g.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_fully_connected_4g.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_fully_connected_e.png Binary files differindex 791de4d460af..791de4d460af 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_e.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_fully_connected_e.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_g.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_fully_connected_g.png Binary files differindex 0712aa6e86d8..0712aa6e86d8 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_g.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_fully_connected_g.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_h.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_fully_connected_h.png Binary files differindex 2886e55cdc29..2886e55cdc29 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_h.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_fully_connected_h.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_0.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_0.png Binary files differindex ac322baf3608..ac322baf3608 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_0.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_0.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_0_fully.png Binary files differindex ac322baf3608..ac322baf3608 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_0_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_0_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_1.png Binary files differindex f139bbe5d60e..f139bbe5d60e 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_1.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_1.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_1_fully.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_1_fully.png Binary files differindex af670185f682..af670185f682 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_1_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_1_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_2.png Binary files differindex fe404e2a162f..fe404e2a162f 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_2.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_2.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_2_fully.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_2_fully.png Binary files differindex 1ffa9b6ce9e5..1ffa9b6ce9e5 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_2_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_2_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_3.png Binary files differindex 75cd8eee303b..75cd8eee303b 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_3.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_3.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_3_fully.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_3_fully.png Binary files differindex 666d1f644e43..666d1f644e43 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_3_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_3_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_4.png Binary files differindex da9607b0951c..da9607b0951c 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_4.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_4.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_4_fully.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_4_fully.png Binary files differindex d05297fe3923..d05297fe3923 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_4_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_4_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_flightmode.png Binary files differindex 64d4e602f90d..64d4e602f90d 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_flightmode.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_flightmode.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_in.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_in.png Binary files differindex 3d6776611d86..3d6776611d86 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_in.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_in.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_inout.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_inout.png Binary files differindex b74e070e4378..b74e070e4378 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_inout.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_inout.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_null.png Binary files differindex 3733a3817fcd..3733a3817fcd 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_null.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_null.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_out.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_out.png Binary files differindex 24485e1c076c..24485e1c076c 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_out.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_signal_out.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_in.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_in.png Binary files differindex 390d500d5181..390d500d5181 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_in.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_in.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_inout.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_inout.png Binary files differindex 78998f9fee9e..78998f9fee9e 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_inout.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_inout.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_out.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_out.png Binary files differindex c539615c0e88..c539615c0e88 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_out.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_out.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_0.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_signal_0.png Binary files differindex 57675a2b8d85..57675a2b8d85 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_0.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_signal_0.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_1.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_signal_1.png Binary files differindex eec039060888..eec039060888 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_1.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_signal_1.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_1_fully.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_signal_1_fully.png Binary files differindex 900867a2c4ff..900867a2c4ff 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_1_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_signal_1_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_2.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_signal_2.png Binary files differindex 253bdacc39f9..253bdacc39f9 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_2.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_signal_2.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_2_fully.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_signal_2_fully.png Binary files differindex b50576ca8e07..b50576ca8e07 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_2_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_signal_2_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_3.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_signal_3.png Binary files differindex d69a1711e745..d69a1711e745 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_3.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_signal_3.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_3_fully.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_signal_3_fully.png Binary files differindex 47df06f7658f..47df06f7658f 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_3_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_signal_3_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_4.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_signal_4.png Binary files differindex 99184f0c19d9..99184f0c19d9 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_4.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_signal_4.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_4_fully.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_signal_4_fully.png Binary files differindex 4a2ac51d92fb..4a2ac51d92fb 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_4_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_wifi_signal_4_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_ime_default.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/ic_sysbar_ime_default.png Binary files differindex 33edce00137c..33edce00137c 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_ime_default.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/ic_sysbar_ime_default.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_ime_pressed.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/ic_sysbar_ime_pressed.png Binary files differindex 8bab6cf338f7..8bab6cf338f7 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_ime_pressed.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/ic_sysbar_ime_pressed.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_zoom_default.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/ic_sysbar_zoom_default.png Binary files differindex 89d486f391de..89d486f391de 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_zoom_default.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/ic_sysbar_zoom_default.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_zoom_pressed.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/ic_sysbar_zoom_pressed.png Binary files differindex b13443607255..b13443607255 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_zoom_pressed.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/ic_sysbar_zoom_pressed.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/notify_panel_clock_bg_normal.9.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/notify_panel_clock_bg_normal.9.png Binary files differindex 798f5895947c..798f5895947c 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/notify_panel_clock_bg_normal.9.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/notify_panel_clock_bg_normal.9.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/notify_panel_clock_bg_pressed.9.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/notify_panel_clock_bg_pressed.9.png Binary files differindex 73247e53dc81..73247e53dc81 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/notify_panel_clock_bg_pressed.9.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/notify_panel_clock_bg_pressed.9.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/notify_panel_notify_bg.9.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/notify_panel_notify_bg.9.png Binary files differindex e4c9dc176c2b..e4c9dc176c2b 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/notify_panel_notify_bg.9.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/notify_panel_notify_bg.9.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/recents_bg_protect_tile.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/recents_bg_protect_tile.png Binary files differindex 87c7be69a357..87c7be69a357 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/recents_bg_protect_tile.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/recents_bg_protect_tile.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/recents_blue_glow.9.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/recents_blue_glow.9.png Binary files differindex 436283618f54..436283618f54 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/recents_blue_glow.9.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/recents_blue_glow.9.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_alarm.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_alarm.png Binary files differindex 9b7c5d61c3a2..9b7c5d61c3a2 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_alarm.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_alarm.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_0.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_0.png Binary files differindex ea2918ffaa0d..ea2918ffaa0d 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_0.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_0.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_100.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_100.png Binary files differindex 906c81803011..906c81803011 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_100.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_100.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_15.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_15.png Binary files differindex c855fa599d7c..c855fa599d7c 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_15.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_15.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_28.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_28.png Binary files differindex cafa16fdf79b..cafa16fdf79b 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_28.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_28.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_43.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_43.png Binary files differindex 400c2ca2cf9e..400c2ca2cf9e 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_43.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_43.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_57.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_57.png Binary files differindex 1aa0d82f9933..1aa0d82f9933 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_57.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_57.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_71.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_71.png Binary files differindex ac0bca1e55bc..ac0bca1e55bc 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_71.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_71.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_85.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_85.png Binary files differindex 2e76eee89e2c..2e76eee89e2c 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_85.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_85.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim0.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_charge_anim0.png Binary files differindex 8d54b97b443e..8d54b97b443e 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim0.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_charge_anim0.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim100.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_charge_anim100.png Binary files differindex 784c4e70cbce..784c4e70cbce 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim100.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_charge_anim100.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim15.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_charge_anim15.png Binary files differindex 6bc543c3d619..6bc543c3d619 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim15.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_charge_anim15.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim28.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_charge_anim28.png Binary files differindex ba449acc3cc3..ba449acc3cc3 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim28.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_charge_anim28.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim43.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_charge_anim43.png Binary files differindex 13399f4622a1..13399f4622a1 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim43.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_charge_anim43.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim57.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_charge_anim57.png Binary files differindex e2a95ef3dea0..e2a95ef3dea0 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim57.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_charge_anim57.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim71.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_charge_anim71.png Binary files differindex 4c8ac28eedff..4c8ac28eedff 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim71.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_charge_anim71.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim85.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_charge_anim85.png Binary files differindex b3b9f522b85f..b3b9f522b85f 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim85.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_battery_charge_anim85.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_bluetooth.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_bluetooth.png Binary files differindex c4f0d78dfe2a..c4f0d78dfe2a 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_bluetooth.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_bluetooth.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_bluetooth_connected.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_bluetooth_connected.png Binary files differindex 3034a47a3729..3034a47a3729 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_bluetooth_connected.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_bluetooth_connected.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_connected_1x.png Binary files differindex 5287c0f268ed..5287c0f268ed 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_1x.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_connected_1x.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_connected_3g.png Binary files differindex d8a5ee8611e9..d8a5ee8611e9 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_3g.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_connected_3g.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_connected_4g.png Binary files differindex 11737ee3dd4f..11737ee3dd4f 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_4g.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_connected_4g.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_connected_e.png Binary files differindex 842faacd6c9a..842faacd6c9a 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_e.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_connected_e.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_connected_g.png Binary files differindex 0548dd3dad78..0548dd3dad78 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_g.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_connected_g.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_connected_h.png Binary files differindex be79e0db8a58..be79e0db8a58 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_h.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_connected_h.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_connected_roam.png Binary files differindex ee2e99e0e07b..ee2e99e0e07b 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_roam.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_connected_roam.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_1x.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_fully_connected_1x.png Binary files differindex ee43332d3242..ee43332d3242 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_1x.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_fully_connected_1x.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_3g.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_fully_connected_3g.png Binary files differindex 4e38c5d7b1fc..4e38c5d7b1fc 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_3g.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_fully_connected_3g.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_4g.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_fully_connected_4g.png Binary files differindex 6c08aa9046cd..6c08aa9046cd 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_4g.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_fully_connected_4g.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_fully_connected_e.png Binary files differindex 2e7c46dedd2c..2e7c46dedd2c 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_e.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_fully_connected_e.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_g.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_fully_connected_g.png Binary files differindex 57f48fbf9e73..57f48fbf9e73 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_g.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_fully_connected_g.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_h.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_fully_connected_h.png Binary files differindex f751a31797e3..f751a31797e3 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_h.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_fully_connected_h.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_0.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_0.png Binary files differindex f931c60d6393..f931c60d6393 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_0.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_0.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_0_fully.png Binary files differindex f931c60d6393..f931c60d6393 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_0_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_0_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_1.png Binary files differindex 398f4d55c4f0..398f4d55c4f0 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_1.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_1.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_1_fully.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_1_fully.png Binary files differindex a0fc3f21dc88..a0fc3f21dc88 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_1_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_1_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_2.png Binary files differindex 5fe96a3198df..5fe96a3198df 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_2.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_2.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_2_fully.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_2_fully.png Binary files differindex 8a66255d3899..8a66255d3899 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_2_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_2_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_3.png Binary files differindex e785a7a2d136..e785a7a2d136 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_3.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_3.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_3_fully.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_3_fully.png Binary files differindex 63be95d760c6..63be95d760c6 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_3_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_3_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_4.png Binary files differindex 533bcdc010c9..533bcdc010c9 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_4.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_4.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_4_fully.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_4_fully.png Binary files differindex 566172e93b10..566172e93b10 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_4_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_4_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_flightmode.png Binary files differindex f61c058a3903..f61c058a3903 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_flightmode.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_flightmode.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_in.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_in.png Binary files differindex 5c38d45b2989..5c38d45b2989 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_in.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_in.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_inout.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_inout.png Binary files differindex 6a7969572f3f..6a7969572f3f 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_inout.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_inout.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_null.png Binary files differindex ab718ad05a38..ab718ad05a38 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_null.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_null.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_out.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_out.png Binary files differindex 99dbe1b9bb4b..99dbe1b9bb4b 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_out.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_signal_out.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_in.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_in.png Binary files differindex 6a73a89b7dc7..6a73a89b7dc7 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_in.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_in.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_inout.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_inout.png Binary files differindex 7042f2b6d8d2..7042f2b6d8d2 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_inout.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_inout.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_out.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_out.png Binary files differindex 3da781e8e120..3da781e8e120 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_out.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_out.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_0.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_signal_0.png Binary files differindex 1570dd245e93..1570dd245e93 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_0.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_signal_0.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_1.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_signal_1.png Binary files differindex 80a7a4a7e6cf..80a7a4a7e6cf 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_1.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_signal_1.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_1_fully.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_signal_1_fully.png Binary files differindex 9db1a8483f2b..9db1a8483f2b 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_1_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_signal_1_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_2.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_signal_2.png Binary files differindex f9720f245204..f9720f245204 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_2.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_signal_2.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_2_fully.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_signal_2_fully.png Binary files differindex 8567d11e4fce..8567d11e4fce 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_2_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_signal_2_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_3.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_signal_3.png Binary files differindex 5ee6d07974c4..5ee6d07974c4 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_3.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_signal_3.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_3_fully.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_signal_3_fully.png Binary files differindex b38f7eb2eef4..b38f7eb2eef4 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_3_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_signal_3_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_4.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_signal_4.png Binary files differindex ec6e8050b45d..ec6e8050b45d 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_4.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_signal_4.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_4_fully.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_signal_4_fully.png Binary files differindex 9a79c54c935a..9a79c54c935a 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_4_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_wifi_signal_4_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_ime_default.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/ic_sysbar_ime_default.png Binary files differindex d6701778e1ff..d6701778e1ff 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_ime_default.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/ic_sysbar_ime_default.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_ime_pressed.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/ic_sysbar_ime_pressed.png Binary files differindex c9f03024f086..c9f03024f086 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_ime_pressed.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/ic_sysbar_ime_pressed.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_zoom_default.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/ic_sysbar_zoom_default.png Binary files differindex dd8c49835154..dd8c49835154 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_zoom_default.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/ic_sysbar_zoom_default.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_zoom_pressed.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/ic_sysbar_zoom_pressed.png Binary files differindex dc421579dd18..dc421579dd18 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_zoom_pressed.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/ic_sysbar_zoom_pressed.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/notify_panel_clock_bg_normal.9.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/notify_panel_clock_bg_normal.9.png Binary files differindex 2b46c891eedb..2b46c891eedb 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/notify_panel_clock_bg_normal.9.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/notify_panel_clock_bg_normal.9.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/notify_panel_clock_bg_pressed.9.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/notify_panel_clock_bg_pressed.9.png Binary files differindex dd476b7afad0..dd476b7afad0 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/notify_panel_clock_bg_pressed.9.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/notify_panel_clock_bg_pressed.9.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/notify_panel_notify_bg.9.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/notify_panel_notify_bg.9.png Binary files differindex 1f02714e789e..1f02714e789e 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/notify_panel_notify_bg.9.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/notify_panel_notify_bg.9.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/recents_bg_protect_tile.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/recents_bg_protect_tile.png Binary files differindex 59908ad70736..59908ad70736 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/recents_bg_protect_tile.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/recents_bg_protect_tile.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/recents_blue_glow.9.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/recents_blue_glow.9.png Binary files differindex 393850286817..393850286817 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/recents_blue_glow.9.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/recents_blue_glow.9.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_alarm.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_alarm.png Binary files differindex 0f83f7a71bf0..0f83f7a71bf0 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_alarm.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_alarm.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_0.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_0.png Binary files differindex 511923c68f4b..511923c68f4b 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_0.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_0.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_100.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_100.png Binary files differindex 61fa30009d60..61fa30009d60 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_100.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_100.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_15.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_15.png Binary files differindex daefb7c43dbe..daefb7c43dbe 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_15.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_15.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_28.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_28.png Binary files differindex bc8c467db8b2..bc8c467db8b2 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_28.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_28.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_43.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_43.png Binary files differindex a16c979dcf0e..a16c979dcf0e 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_43.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_43.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_57.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_57.png Binary files differindex 4778dc1632a3..4778dc1632a3 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_57.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_57.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_71.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_71.png Binary files differindex 81693b63c61a..81693b63c61a 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_71.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_71.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_85.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_85.png Binary files differindex e81bb8df878d..e81bb8df878d 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_85.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_85.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim0.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_anim0.png Binary files differindex 9834f5ac23ac..9834f5ac23ac 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim0.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_anim0.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim100.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_anim100.png Binary files differindex b314f8b15c32..b314f8b15c32 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim100.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_anim100.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim15.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_anim15.png Binary files differindex 59de3f250fc0..59de3f250fc0 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim15.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_anim15.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim28.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_anim28.png Binary files differindex 91397edf9a4e..91397edf9a4e 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim28.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_anim28.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim43.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_anim43.png Binary files differindex 268fea4d872d..268fea4d872d 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim43.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_anim43.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim57.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_anim57.png Binary files differindex 15ee476e89c0..15ee476e89c0 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim57.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_anim57.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim71.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_anim71.png Binary files differindex 4dead31d09c6..4dead31d09c6 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim71.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_anim71.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim85.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_anim85.png Binary files differindex 8b4563f122db..8b4563f122db 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim85.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_anim85.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_bluetooth.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_bluetooth.png Binary files differindex 29843947a20f..29843947a20f 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_bluetooth.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_bluetooth.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_bluetooth_connected.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_bluetooth_connected.png Binary files differindex 4b904b4df362..4b904b4df362 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_bluetooth_connected.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_bluetooth_connected.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_connected_1x.png Binary files differindex 31af3c2f7aa9..31af3c2f7aa9 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_1x.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_connected_1x.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_connected_3g.png Binary files differindex 4f5fa7073179..4f5fa7073179 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_3g.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_connected_3g.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_connected_4g.png Binary files differindex e7eb85e51276..e7eb85e51276 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_4g.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_connected_4g.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_connected_e.png Binary files differindex 79038f7317a9..79038f7317a9 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_e.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_connected_e.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_connected_g.png Binary files differindex c554b23e63b5..c554b23e63b5 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_g.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_connected_g.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_connected_h.png Binary files differindex e5c0780f07c9..e5c0780f07c9 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_h.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_connected_h.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_connected_roam.png Binary files differindex 0edc9b53b09d..0edc9b53b09d 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_roam.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_connected_roam.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_1x.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_fully_connected_1x.png Binary files differindex de934317496e..de934317496e 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_1x.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_fully_connected_1x.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_3g.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_fully_connected_3g.png Binary files differindex 9b01f30d729c..9b01f30d729c 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_3g.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_fully_connected_3g.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_4g.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_fully_connected_4g.png Binary files differindex a44d3a274959..a44d3a274959 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_4g.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_fully_connected_4g.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_fully_connected_e.png Binary files differindex a4a93e302826..a4a93e302826 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_e.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_fully_connected_e.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_g.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_fully_connected_g.png Binary files differindex 4f6f1bace029..4f6f1bace029 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_g.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_fully_connected_g.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_h.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_fully_connected_h.png Binary files differindex bc135c345a69..bc135c345a69 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_h.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_fully_connected_h.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_0.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_0.png Binary files differindex ccf1ba11ec46..ccf1ba11ec46 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_0.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_0.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_0_fully.png Binary files differindex ccf1ba11ec46..ccf1ba11ec46 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_0_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_0_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_1.png Binary files differindex 07937fe49056..07937fe49056 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_1.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_1.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_1_fully.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_1_fully.png Binary files differindex ba1b077cd9f1..ba1b077cd9f1 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_1_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_1_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_2.png Binary files differindex a705a89595f6..a705a89595f6 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_2.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_2.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_2_fully.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_2_fully.png Binary files differindex 0187d12581d1..0187d12581d1 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_2_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_2_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_3.png Binary files differindex 0ed7d6f4de0e..0ed7d6f4de0e 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_3.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_3.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_3_fully.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_3_fully.png Binary files differindex 24a6e5a7631e..24a6e5a7631e 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_3_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_3_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_4.png Binary files differindex 1a478017e11c..1a478017e11c 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_4.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_4.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_4_fully.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_4_fully.png Binary files differindex d9648b6f739c..d9648b6f739c 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_4_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_4_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_flightmode.png Binary files differindex 620da770d95e..620da770d95e 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_flightmode.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_flightmode.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_in.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_in.png Binary files differindex cf63e2416e34..cf63e2416e34 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_in.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_in.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_inout.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_inout.png Binary files differindex 8f68e1f288d5..8f68e1f288d5 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_inout.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_inout.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_null.png Binary files differindex 023bbe61132e..023bbe61132e 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_null.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_null.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_out.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_out.png Binary files differindex 894c63baa9de..894c63baa9de 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_out.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_signal_out.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_in.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_in.png Binary files differindex 1ec5b4907e1e..1ec5b4907e1e 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_in.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_in.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_inout.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_inout.png Binary files differindex 9ca3ca831111..9ca3ca831111 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_inout.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_inout.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_out.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_out.png Binary files differindex 74241e0a1709..74241e0a1709 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_out.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_out.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_0.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_signal_0.png Binary files differindex 95532419b0f9..95532419b0f9 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_0.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_signal_0.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_1.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_signal_1.png Binary files differindex 4d70eb3580c6..4d70eb3580c6 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_1.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_signal_1.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_1_fully.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_signal_1_fully.png Binary files differindex bfa3ad78366c..bfa3ad78366c 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_1_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_signal_1_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_2.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_signal_2.png Binary files differindex f7e78d072887..f7e78d072887 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_2.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_signal_2.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_2_fully.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_signal_2_fully.png Binary files differindex fc903857216f..fc903857216f 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_2_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_signal_2_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_3.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_signal_3.png Binary files differindex 931905e33969..931905e33969 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_3.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_signal_3.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_3_fully.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_signal_3_fully.png Binary files differindex f1fa45bbe947..f1fa45bbe947 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_3_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_signal_3_fully.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_4.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_signal_4.png Binary files differindex 0dd11a2af301..0dd11a2af301 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_4.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_signal_4.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_4_fully.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_signal_4_fully.png Binary files differindex 20991eb3bcea..20991eb3bcea 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_4_fully.png +++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_wifi_signal_4_fully.png diff --git a/packages/SystemUI/res/drawable-xhdpi/bottom_divider_glow.png b/packages/SystemUI/res/drawable-xhdpi/bottom_divider_glow.png Binary files differnew file mode 100644 index 000000000000..bbcea9eb30f1 --- /dev/null +++ b/packages/SystemUI/res/drawable-xhdpi/bottom_divider_glow.png diff --git a/packages/SystemUI/res/drawable-xhdpi/top_divider_glow.png b/packages/SystemUI/res/drawable-xhdpi/top_divider_glow.png Binary files differnew file mode 100644 index 000000000000..56b63d0ee7a5 --- /dev/null +++ b/packages/SystemUI/res/drawable-xhdpi/top_divider_glow.png diff --git a/packages/SystemUI/res/drawable/notification_row_legacy_bg.xml b/packages/SystemUI/res/drawable/notification_row_legacy_bg.xml index ce3372ee0f9b..0e1bdd3f966c 100644 --- a/packages/SystemUI/res/drawable/notification_row_legacy_bg.xml +++ b/packages/SystemUI/res/drawable/notification_row_legacy_bg.xml @@ -17,6 +17,6 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_mediumAnimTime"> - <item android:state_pressed="true" android:drawable="@drawable/notification_item_background_color_pressed" /> + <item android:state_pressed="true" android:drawable="@*android:drawable/notification_item_background_color_pressed" /> <item android:state_pressed="false" android:drawable="@drawable/notification_item_background_legacy_color" /> </selector> diff --git a/packages/SystemUI/res/drawable/status_bar_item_background.xml b/packages/SystemUI/res/drawable/status_bar_item_background.xml index 3a50aa957b03..b82fed9758f0 100644 --- a/packages/SystemUI/res/drawable/status_bar_item_background.xml +++ b/packages/SystemUI/res/drawable/status_bar_item_background.xml @@ -19,7 +19,7 @@ android:opacity="translucent" > <item - android:drawable="@drawable/notification_item_background_color" + android:drawable="@*android:drawable/notification_item_background_color" /> </layer-list> diff --git a/packages/SystemUI/res/drawable/system_bar_ticker_background.xml b/packages/SystemUI/res/drawable/system_bar_ticker_background.xml new file mode 100644 index 000000000000..7cb64c016050 --- /dev/null +++ b/packages/SystemUI/res/drawable/system_bar_ticker_background.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<bitmap + xmlns:android="http://schemas.android.com/apk/res/android" + android:tileMode="repeat" + android:src="@*android:drawable/notify_panel_notification_icon_bg" + /> diff --git a/packages/SystemUI/res/drawable/ticker_background.xml b/packages/SystemUI/res/drawable/ticker_background.xml index 7320fa0de803..07b44cac080e 100644 --- a/packages/SystemUI/res/drawable/ticker_background.xml +++ b/packages/SystemUI/res/drawable/ticker_background.xml @@ -20,7 +20,7 @@ > <!-- the large icon extends 12dp beyond the edge of the status bar --> <item - android:drawable="@drawable/notification_item_background_color" + android:drawable="@*android:drawable/notification_item_background_color" android:top="12dp" /> </layer-list> 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 dba1dd96246b..fcdd56c07eec 100644 --- a/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml +++ b/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml @@ -20,9 +20,12 @@ <com.android.systemui.recent.RecentsPanelView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" android:id="@+id/recents_root" android:layout_height="match_parent" - android:layout_width="match_parent"> + android:layout_width="match_parent" + systemui:recentItemLayout="@layout/status_bar_recent_item" + > <FrameLayout android:id="@+id/recents_bg_protect" 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 73c3da5bd8e0..216dcb066a27 100644 --- a/packages/SystemUI/res/layout-port/status_bar_recent_panel.xml +++ b/packages/SystemUI/res/layout-port/status_bar_recent_panel.xml @@ -20,9 +20,12 @@ <com.android.systemui.recent.RecentsPanelView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" android:id="@+id/recents_root" android:layout_height="match_parent" - android:layout_width="match_parent"> + android:layout_width="match_parent" + systemui:recentItemLayout="@layout/status_bar_recent_item" + > <FrameLayout android:id="@+id/recents_bg_protect" diff --git a/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml b/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml new file mode 100644 index 000000000000..1faebe83507c --- /dev/null +++ b/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml @@ -0,0 +1,313 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +** +** Copyright 2012, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +--> + +<!-- navigation bar for sw600dp (small tablets) --> +<com.android.systemui.statusbar.phone.NavigationBarView + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:background="#FF000000" + > + + <FrameLayout android:id="@+id/rot0" + android:layout_height="match_parent" + android:layout_width="match_parent" + > + + <LinearLayout + android:layout_height="match_parent" + android:layout_width="match_parent" + android:orientation="horizontal" + android:clipChildren="false" + android:clipToPadding="false" + android:id="@+id/nav_buttons" + android:animateLayoutChanges="true" + > + + <!-- navigation controls --> + <Space + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" + /> + <View + android:layout_width="48dp" + android:layout_height="match_parent" + android:layout_weight="0" + android:visibility="invisible" + /> + <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back" + android:layout_width="78dp" + android:layout_height="match_parent" + android:src="@drawable/ic_sysbar_back" + systemui:keyCode="4" + android:layout_weight="0" + systemui:glowBackground="@drawable/ic_sysbar_highlight" + android:contentDescription="@string/accessibility_back" + /> + <Space + android:layout_width="50dp" + android:layout_height="match_parent" + /> + <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home" + android:layout_width="78dp" + android:layout_height="match_parent" + android:src="@drawable/ic_sysbar_home" + systemui:keyCode="3" + systemui:keyRepeat="true" + android:layout_weight="0" + systemui:glowBackground="@drawable/ic_sysbar_highlight" + android:contentDescription="@string/accessibility_home" + /> + <Space + android:layout_width="50dp" + android:layout_height="match_parent" + /> + <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/recent_apps" + android:layout_width="78dp" + android:layout_height="match_parent" + android:src="@drawable/ic_sysbar_recent" + android:layout_weight="0" + systemui:glowBackground="@drawable/ic_sysbar_highlight" + android:contentDescription="@string/accessibility_recent" + /> + <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/menu" + android:layout_width="48dp" + android:layout_height="match_parent" + android:src="@drawable/ic_sysbar_menu" + systemui:keyCode="82" + android:layout_weight="0" + android:visibility="invisible" + android:contentDescription="@string/accessibility_menu" + systemui:glowBackground="@drawable/ic_sysbar_highlight" + /> + <Space + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" + /> + </LinearLayout> + + <!-- lights out layout to match exactly --> + <LinearLayout + android:layout_height="match_parent" + android:layout_width="match_parent" + android:orientation="horizontal" + android:id="@+id/lights_out" + android:visibility="gone" + > + <Space + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" + /> + <ImageView + android:layout_width="78dp" + android:layout_height="match_parent" + android:layout_marginLeft="40dp" + android:src="@drawable/ic_sysbar_lights_out_dot_small" + android:scaleType="center" + android:layout_weight="0" + /> + <Space + android:layout_width="50dp" + android:layout_height="match_parent" + /> + <ImageView + android:layout_width="78dp" + android:layout_height="match_parent" + android:src="@drawable/ic_sysbar_lights_out_dot_large" + android:scaleType="center" + android:layout_weight="0" + /> + <Space + android:layout_width="50dp" + android:layout_height="match_parent" + /> + <ImageView + android:layout_width="78dp" + android:layout_marginRight="40dp" + android:layout_height="match_parent" + android:src="@drawable/ic_sysbar_lights_out_dot_small" + android:scaleType="center" + android:layout_weight="0" + /> + <Space + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" + /> + </LinearLayout> + + <com.android.systemui.statusbar.policy.DeadZone + android:id="@+id/deadzone" + android:layout_height="@dimen/navigation_bar_deadzone_size" + android:layout_width="match_parent" + android:layout_gravity="top" + /> + </FrameLayout> + + <FrameLayout android:id="@+id/rot90" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:visibility="gone" + android:paddingTop="0dp" + > + + <LinearLayout + android:layout_height="match_parent" + android:layout_width="match_parent" + android:orientation="horizontal" + android:clipChildren="false" + android:clipToPadding="false" + android:id="@+id/nav_buttons" + android:animateLayoutChanges="true" + > + + <!-- navigation controls --> + <Space + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" + /> + <View + android:layout_width="48dp" + android:layout_height="match_parent" + android:layout_weight="0" + android:visibility="invisible" + /> + <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back" + android:layout_width="78dp" + android:layout_height="match_parent" + android:src="@drawable/ic_sysbar_back" + systemui:keyCode="4" + android:layout_weight="0" + systemui:glowBackground="@drawable/ic_sysbar_highlight" + android:contentDescription="@string/accessibility_back" + /> + <Space + android:layout_width="84dp" + android:layout_height="match_parent" + /> + <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home" + android:layout_width="78dp" + android:layout_height="match_parent" + android:src="@drawable/ic_sysbar_home" + systemui:keyCode="3" + systemui:keyRepeat="true" + android:layout_weight="0" + systemui:glowBackground="@drawable/ic_sysbar_highlight" + android:contentDescription="@string/accessibility_home" + /> + <Space + android:layout_width="84dp" + android:layout_height="match_parent" + /> + <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/recent_apps" + android:layout_width="78dp" + android:layout_height="match_parent" + android:src="@drawable/ic_sysbar_recent" + android:layout_weight="0" + systemui:glowBackground="@drawable/ic_sysbar_highlight" + android:contentDescription="@string/accessibility_recent" + /> + <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/menu" + android:layout_width="48dp" + android:layout_height="match_parent" + android:src="@drawable/ic_sysbar_menu" + systemui:keyCode="82" + android:layout_weight="0" + android:visibility="invisible" + android:contentDescription="@string/accessibility_menu" + systemui:glowBackground="@drawable/ic_sysbar_highlight" + /> + <Space + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" + /> + </LinearLayout> + + <!-- lights out layout to match exactly --> + <LinearLayout + android:layout_height="match_parent" + android:layout_width="match_parent" + android:orientation="horizontal" + android:id="@+id/lights_out" + android:visibility="gone" + > + <Space + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" + /> + <ImageView + android:layout_width="78dp" + android:layout_height="match_parent" + android:layout_marginLeft="40dp" + android:src="@drawable/ic_sysbar_lights_out_dot_small" + android:scaleType="center" + android:layout_weight="0" + /> + <Space + android:layout_width="84dp" + android:layout_height="match_parent" + /> + <ImageView + android:layout_width="78dp" + android:layout_height="match_parent" + android:src="@drawable/ic_sysbar_lights_out_dot_large" + android:scaleType="center" + android:layout_weight="0" + /> + <Space + android:layout_width="84dp" + android:layout_height="match_parent" + /> + <ImageView + android:layout_width="78dp" + android:layout_marginRight="40dp" + android:layout_height="match_parent" + android:src="@drawable/ic_sysbar_lights_out_dot_small" + android:scaleType="center" + android:layout_weight="0" + /> + <Space + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" + /> + </LinearLayout> + + <com.android.systemui.statusbar.policy.DeadZone + android:id="@+id/deadzone" + android:layout_height="@dimen/navigation_bar_deadzone_size" + android:layout_width="match_parent" + android:layout_gravity="top" + /> + </FrameLayout> + + <!-- not used --> + <View android:id="@+id/rot270" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:visibility="gone" + /> + +</com.android.systemui.statusbar.phone.NavigationBarView> diff --git a/packages/SystemUI/res/layout-sw600dp/compat_mode_help.xml b/packages/SystemUI/res/layout/compat_mode_help.xml index a354336e4a2c..a354336e4a2c 100644 --- a/packages/SystemUI/res/layout-sw600dp/compat_mode_help.xml +++ b/packages/SystemUI/res/layout/compat_mode_help.xml diff --git a/packages/SystemUI/res/layout/status_bar_notification_row.xml b/packages/SystemUI/res/layout/status_bar_notification_row.xml index a0d1b08642ad..e69cd8aca881 100644 --- a/packages/SystemUI/res/layout/status_bar_notification_row.xml +++ b/packages/SystemUI/res/layout/status_bar_notification_row.xml @@ -1,8 +1,18 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" + android:background="@*android:drawable/notification_bg" > + <View + android:id="@+id/top_glow" + android:alpha="0" + android:layout_width="match_parent" + android:layout_height="@dimen/notification_divider_height" + android:layout_gravity="top|center_horizontal" + android:background="@drawable/top_divider_glow" + /> + <Button android:id="@+id/veto" android:layout_width="48dp" @@ -18,23 +28,25 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/notification_divider_height" + android:layout_marginTop="@dimen/notification_divider_height" android:focusable="true" android:clickable="true" - android:background="@drawable/notification_row_bg" > <com.android.internal.widget.SizeAdaptiveLayout android:id="@+id/adaptive" - android:background="@android:color/background_dark" + android:background="@*android:drawable/notification_bg" android:layout_width="match_parent" android:layout_height="wrap_content" /> </com.android.systemui.statusbar.LatestItemView> <View + android:id="@+id/bottom_glow" + android:alpha="0" android:layout_width="match_parent" android:layout_height="@dimen/notification_divider_height" - android:gravity="bottom" - android:background="@drawable/status_bar_notification_row_background_color" + android:layout_gravity="bottom|center_horizontal" + android:background="@drawable/bottom_divider_glow" /> </FrameLayout> diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar.xml b/packages/SystemUI/res/layout/system_bar.xml index 2308bf0c4a1f..a33d638805bc 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar.xml +++ b/packages/SystemUI/res/layout/system_bar.xml @@ -19,13 +19,13 @@ <com.android.systemui.statusbar.tablet.TabletStatusBarView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" - android:background="@drawable/status_bar_background" + android:background="@drawable/system_bar_background" > <FrameLayout android:id="@+id/bar_contents_holder" android:layout_width="match_parent" - android:layout_height="@*android:dimen/status_bar_height" + android:layout_height="@*android:dimen/system_bar_height" android:layout_gravity="bottom" > <RelativeLayout @@ -36,7 +36,7 @@ > <!-- notification icons & panel access --> - <include layout="@layout/status_bar_notification_area" + <include layout="@layout/system_bar_notification_area" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentRight="true" diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_compat_mode_panel.xml b/packages/SystemUI/res/layout/system_bar_compat_mode_panel.xml index a33741e86477..a33741e86477 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_compat_mode_panel.xml +++ b/packages/SystemUI/res/layout/system_bar_compat_mode_panel.xml diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_input_methods_item.xml b/packages/SystemUI/res/layout/system_bar_input_methods_item.xml index 41a20fb039c9..5515559843c1 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_input_methods_item.xml +++ b/packages/SystemUI/res/layout/system_bar_input_methods_item.xml @@ -102,4 +102,4 @@ android:layout_width="match_parent" android:layout_height="1dip" android:background="@android:drawable/divider_horizontal_dark" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_input_methods_panel.xml b/packages/SystemUI/res/layout/system_bar_input_methods_panel.xml index b712dba2d317..8dede50df50f 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_input_methods_panel.xml +++ b/packages/SystemUI/res/layout/system_bar_input_methods_panel.xml @@ -114,4 +114,4 @@ android:ellipsize="marquee" /> </LinearLayout> </FrameLayout> -</com.android.systemui.statusbar.tablet.InputMethodsPanel>
\ No newline at end of file +</com.android.systemui.statusbar.tablet.InputMethodsPanel> diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_no_recent_apps.xml b/packages/SystemUI/res/layout/system_bar_no_recent_apps.xml index bc89281190de..bc89281190de 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_no_recent_apps.xml +++ b/packages/SystemUI/res/layout/system_bar_no_recent_apps.xml diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_notification_area.xml b/packages/SystemUI/res/layout/system_bar_notification_area.xml index 739f3aa25fe2..739f3aa25fe2 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_notification_area.xml +++ b/packages/SystemUI/res/layout/system_bar_notification_area.xml diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_notification_panel.xml b/packages/SystemUI/res/layout/system_bar_notification_panel.xml index 2947bfb1bb07..42af14790675 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_notification_panel.xml +++ b/packages/SystemUI/res/layout/system_bar_notification_panel.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<!-- android:background="@drawable/status_bar_closed_default_background" --> +<!-- android:background="@drawable/system_bar_closed_default_background" --> <com.android.systemui.statusbar.tablet.NotificationPanel xmlns:android="http://schemas.android.com/apk/res/android" xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" @@ -26,7 +26,7 @@ <ImageView android:id="@+id/clear_all_button" android:layout_width="wrap_content" - android:layout_height="@*android:dimen/status_bar_height" + android:layout_height="@*android:dimen/system_bar_height" android:layout_alignParentRight="true" android:layout_alignParentBottom="true" android:layout_marginRight="20dp" @@ -46,7 +46,7 @@ android:layout_marginBottom="8dp" > - <include layout="@layout/status_bar_notification_panel_title" + <include layout="@layout/system_bar_notification_panel_title" android:layout_width="478dp" android:layout_height="224dp" android:layout_alignParentTop="true" diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_notification_panel_title.xml b/packages/SystemUI/res/layout/system_bar_notification_panel_title.xml index b985aaf81ba1..b985aaf81ba1 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_notification_panel_title.xml +++ b/packages/SystemUI/res/layout/system_bar_notification_panel_title.xml diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_notification_peek.xml b/packages/SystemUI/res/layout/system_bar_notification_peek.xml index 02f9a90c1b01..3cff47b91ad9 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_notification_peek.xml +++ b/packages/SystemUI/res/layout/system_bar_notification_peek.xml @@ -18,7 +18,7 @@ */ --> -<!-- android:background="@drawable/status_bar_closed_default_background" --> +<!-- android:background="@drawable/system_bar_closed_default_background" --> <com.android.systemui.statusbar.tablet.NotificationPeekPanel xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content" @@ -34,7 +34,7 @@ android:gravity="center_horizontal|bottom" android:animationCache="false" android:orientation="vertical" - android:background="@drawable/status_bar_background" + android:background="@drawable/system_bar_background" android:clickable="true" android:focusable="true" android:descendantFocusability="afterDescendants" diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_pocket_panel.xml b/packages/SystemUI/res/layout/system_bar_pocket_panel.xml index e4a6da473374..e4a6da473374 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_pocket_panel.xml +++ b/packages/SystemUI/res/layout/system_bar_pocket_panel.xml diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_recent_item.xml b/packages/SystemUI/res/layout/system_bar_recent_item.xml index 7d639eccfd1e..7d639eccfd1e 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_recent_item.xml +++ b/packages/SystemUI/res/layout/system_bar_recent_item.xml diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_recent_panel.xml b/packages/SystemUI/res/layout/system_bar_recent_panel.xml index 8e231d0a845c..c2b9e51c19d4 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_recent_panel.xml +++ b/packages/SystemUI/res/layout/system_bar_recent_panel.xml @@ -20,11 +20,14 @@ <com.android.systemui.recent.RecentsPanelView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" android:id="@+id/recents_root" android:layout_height="match_parent" android:layout_width="wrap_content" android:clipToPadding="false" - android:clipChildren="false"> + android:clipChildren="false" + systemui:recentItemLayout="@layout/system_bar_recent_item" + > <FrameLayout android:id="@+id/recents_bg_protect" @@ -32,7 +35,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentBottom="true" - android:layout_marginBottom="@*android:dimen/status_bar_height" + android:layout_marginBottom="@*android:dimen/system_bar_height" android:clipToPadding="false" android:clipChildren="false"> @@ -59,7 +62,7 @@ </com.android.systemui.recent.RecentsVerticalScrollView> - <include layout="@layout/status_bar_no_recent_apps" + <include layout="@layout/system_bar_no_recent_apps" android:id="@+id/recents_no_apps" android:layout_width="match_parent" android:layout_height="match_parent" @@ -72,7 +75,7 @@ <com.android.systemui.recent.StatusBarTouchProxy android:id="@+id/status_bar_touch_proxy" android:layout_width="match_parent" - android:layout_height="@*android:dimen/status_bar_height" + android:layout_height="@*android:dimen/system_bar_height" android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" /> diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_recent_panel_footer.xml b/packages/SystemUI/res/layout/system_bar_recent_panel_footer.xml index 4d14d1fb9fe2..4d14d1fb9fe2 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_recent_panel_footer.xml +++ b/packages/SystemUI/res/layout/system_bar_recent_panel_footer.xml diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_settings_view.xml b/packages/SystemUI/res/layout/system_bar_settings_view.xml index 677988d96a53..677988d96a53 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_settings_view.xml +++ b/packages/SystemUI/res/layout/system_bar_settings_view.xml diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_ticker_compat.xml b/packages/SystemUI/res/layout/system_bar_ticker_compat.xml index d963de163f51..0d255e7f279d 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_ticker_compat.xml +++ b/packages/SystemUI/res/layout/system_bar_ticker_compat.xml @@ -33,9 +33,9 @@ <LinearLayout android:layout_width="wrap_content" - android:layout_height="@*android:dimen/status_bar_height" + android:layout_height="@*android:dimen/system_bar_height" android:layout_weight="1" - android:background="@drawable/status_bar_ticker_background" + android:background="@drawable/system_bar_ticker_background" > <ImageView android:id="@+id/left_icon" diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_ticker_panel.xml b/packages/SystemUI/res/layout/system_bar_ticker_panel.xml index d51f9c839f54..1738b48c9212 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_ticker_panel.xml +++ b/packages/SystemUI/res/layout/system_bar_ticker_panel.xml @@ -22,9 +22,9 @@ > <View - android:layout_height="@*android:dimen/status_bar_height" + android:layout_height="@*android:dimen/system_bar_height" android:layout_width="match_parent" - android:background="@drawable/status_bar_ticker_background" + android:background="@drawable/system_bar_ticker_background" android:layout_alignParentLeft="true" android:layout_alignParentBottom="true" android:clickable="false" @@ -43,7 +43,7 @@ <FrameLayout android:id="@+id/ticker_expanded" android:layout_weight="1" - android:layout_height="@*android:dimen/status_bar_height" + android:layout_height="@*android:dimen/system_bar_height" android:layout_width="match_parent" android:layout_toRightOf="@id/large_icon" android:layout_alignParentBottom="true" diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index 1654ecaae156..a9810d167238 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -139,4 +139,5 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Ligging deur GPS gestel"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Verwyder alle kennisgewings."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Aktiveer sluimerskerm"</string> + <string name="status_bar_notification_inspect_item_title" msgid="1163547729015390250">"Programinligting"</string> </resources> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index 42eef1312314..873dd652e5d6 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -118,7 +118,7 @@ <string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"ብሉቱዝ ማያያዝ።"</string> <string name="accessibility_airplane_mode" msgid="834748999790763092">"የአውሮፕላን ሁነታ።"</string> <string name="accessibility_battery_level" msgid="7451474187113371965">"የባትሪ <xliff:g id="NUMBER">%d</xliff:g> መቶኛ።"</string> - <string name="accessibility_settings_button" msgid="799583911231893380">"የስርዓት ቅንጅቶች"</string> + <string name="accessibility_settings_button" msgid="799583911231893380">"የስርዓት ቅንብሮች"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"ማሳወቂያዎች"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"ማሳወቂያ አጥራ"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS ነቅቷል።"</string> @@ -139,4 +139,5 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"በ GPS የተዘጋጀ ሥፍራ"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"ሁሉንም ማሳወቂያዎች አጽዳ"</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">" ገፁማያ ማቆያ አንቃ"</string> + <string name="status_bar_notification_inspect_item_title" msgid="1163547729015390250">"የመተግበሪያ መረጃ"</string> </resources> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index 9d6051e4b13d..7f1b81676367 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"تم تعيين الموقع بواسطة GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"محو جميع الإشعارات."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"تنشيط شاشة التوقف"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml index 433c1246bdd0..8ce52db6ef56 100644 --- a/packages/SystemUI/res/values-be/strings.xml +++ b/packages/SystemUI/res/values-be/strings.xml @@ -141,4 +141,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Месца задана праз GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Выдалiць усе апавяшчэннi."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Актывацыя экраннай застаўкі"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index 429f246a670b..b78dbc944e66 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Местоположението е зададено от GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Изчистване на всички известия."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Активиране на скрийнсейвъра"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 427abce8f51f..e5f87764f57d 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -141,4 +141,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"S\'ha establert la ubicació per GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Esborra totes les notificacions."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Activa el protector de pantalla"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index 9c9674a58bea..f5a12e49d677 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -141,4 +141,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Poloha nastavena pomocí systému GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Vymazat všechna oznámení."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Aktivovat spořič obrazovky"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index 6c614cd8fdd7..62f69ff4551c 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Placeringen er angivet ved hjælp af GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Ryd alle meddelelser."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Aktiver pauseskærm"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index e3d82b1b4d17..3b06f064d1b1 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -141,4 +141,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Standort durch GPS festgelegt"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Alle Benachrichtigungen löschen"</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Bildschirmschoner aktivieren"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index 5511b1aace02..351c5067c627 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -141,4 +141,5 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Ρύθμιση τοποθεσίας με GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Εκκαθάριση όλων των ειδοποιήσεων."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Ενεργοποίηση προφύλαξης οθόνης"</string> + <string name="status_bar_notification_inspect_item_title" msgid="1163547729015390250">"Πληροφορίες εφαρμογής"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index b20a5f3344c4..7061148df58e 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Location set by GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Clear all notifications."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Activate screen saver"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 96c8c23b9cc1..7a5b853a6108 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -141,4 +141,5 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"La ubicación se estableció por GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Eliminar todas las notificaciones"</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Activar el protector de pantalla"</string> + <string name="status_bar_notification_inspect_item_title" msgid="1163547729015390250">"Información de la aplicación"</string> </resources> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 0b3e4e401186..20a6dee7c765 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -139,4 +139,5 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Ubicación definida por GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Borrar todas las notificaciones"</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Activar salvapantallas"</string> + <string name="status_bar_notification_inspect_item_title" msgid="1163547729015390250">"Información de la aplicación"</string> </resources> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index 055e3ee7cdeb..8ebd2a5a16ed 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS-i määratud asukoht"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Kustuta kõik teatised."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Aktiveeri ekraanisäästja"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index df25d5ee8712..736d16438ae5 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"مکان تنظیم شده توسط GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"پاک کردن تمام اعلانها"</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"فعال کردن محافظ صفحه نمایش"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index 370d2348294a..698e59c054d4 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Sijainti määritetty GPS:n avulla"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Tyhjennä kaikki ilmoitukset."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Ota näytönsäästäjä käyttöön"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index c7f307ca6741..5c5658d2f810 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -141,4 +141,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Position définie par GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Supprimer toutes les notifications"</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Activer l\'économiseur d\'écran"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-hdpi/dimens.xml b/packages/SystemUI/res/values-hdpi/dimens.xml index 6b6fd4d63736..7cd318cc5cbe 100644 --- a/packages/SystemUI/res/values-hdpi/dimens.xml +++ b/packages/SystemUI/res/values-hdpi/dimens.xml @@ -18,9 +18,9 @@ <resources> <!-- thickness (height) of each notification row, including any separators or padding --> <!-- Note: this is 64dip + 1px divider = 97px. --> - <dimen name="notification_height">97px</dimen> + <dimen name="notification_height">99px</dimen> <!-- thickness (height) of dividers between each notification row; see math for notification_height above --> - <dimen name="notification_divider_height">1px</dimen> + <dimen name="notification_divider_height">4px</dimen> </resources> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 9805f90c528b..2b927d7311e0 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS द्वारा सेट किया गया स्थान"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"सभी सूचनाएं साफ़ करें."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"स्क्रीन सेवर सक्रिय करें"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index 2226aa8936ca..5cd66d339141 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Lokaciju utvrdio GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Brisanje svih obavijesti."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Aktivirajte čuvar zaslona"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 87a9d4553b71..65a04b8273b4 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"A GPS beállította a helyet"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Minden értesítés törlése"</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Képernyővédő aktiválása"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index f24613242f5c..3611da253569 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Lokasi yang disetel oleh GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Menghapus semua pemberitahuan."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Aktifkan tirai layar"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index a72537709be9..c2c78567cc07 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -141,4 +141,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Posizione stabilita dal GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Cancella tutte le notifiche."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Attiva screensaver"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 03fba7e4ced9..17f5a36e2736 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"מיקום מוגדר על ידי GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"נקה את כל ההתראות."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"הפעלת שומר מסך"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 4818ca925eb8..203fe9cb8c83 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -141,4 +141,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPSにより現在地が設定されました"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"通知をすべて消去。"</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"スクリーンセーバーを有効にする"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 33219128ed1d..5350cd1cf620 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS에서 위치 설정"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"모든 알림 지우기"</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"스크린 세이버 활성화"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index 831fa411a214..a30dd5a5e249 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS nustatyta vieta"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Išvalyti visus pranešimus."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Aktyvinti ekrano užsklandą"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index 158c85001f76..0461ccdecd17 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS iestatītā atrašanās vieta"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Notīrīt visus paziņojumus"</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Aktivizēt ekrānsaudzētāju"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index 899a204764f0..dc5128a99aa5 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Lokasi ditetapkan oleh GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Padamkan semua pemberitahuan."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Aktifkan gambar skrin"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index c7b272a76ea0..39b622eaa544 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Posisjon angitt av GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Fjern alle varslinger."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Aktiver skjermbeskytter"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index e05e2c9849e9..444b05ba4a86 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Locatie bepaald met GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Alle meldingen wissen."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Schermbeveiliging inschakelen"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 0618eb5a425e..646993f4acb8 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -139,4 +139,5 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Lokalizacja ustawiona według GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Usuń wszystkie powiadomienia."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Włącz wygaszacz ekranu."</string> + <string name="status_bar_notification_inspect_item_title" msgid="1163547729015390250">"O aplikacji"</string> </resources> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 6a278ba4c657..876eb79917ee 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Localização definida por GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Limpar todas as notificações."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Ativar proteção de ecrã"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 23a2ba5b7542..500ee2b8337e 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -141,4 +141,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Local definido por GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Limpar todas as notificações."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Ativar proteção de tela"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-rm/strings.xml b/packages/SystemUI/res/values-rm/strings.xml index 3062d483e608..917306a34769 100644 --- a/packages/SystemUI/res/values-rm/strings.xml +++ b/packages/SystemUI/res/values-rm/strings.xml @@ -248,4 +248,6 @@ <skip /> <!-- no translation found for dreams_dock_launcher (3541196417659166245) --> <skip /> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index b778e4dc3f7a..0e7509ca8a95 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Locaţie setată prin GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Ştergeţi toate notificările."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Activaţi screensaverul"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index 3753309bd72a..23eb1d2f0dbf 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -141,4 +141,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Местоположение установлено с помощью GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Удалить все уведомления"</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Активация заставки экрана"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index 599f99c28693..a729cce6e184 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -141,4 +141,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Poloha nastavená pomocou GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Vymazať všetky upozornenia."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Aktivovať šetrič obrazovky"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index fb229e2ea03c..6da01c77af29 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Lokacija nastavljena z GPS-om"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Izbriši vsa obvestila."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Vklop ohranjevalnika zaslona"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index fb7c21a3dc8f..3586b8456d84 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Локацију је подесио GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Обриши сва обавештења."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Активирање чувара екрана"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 8eaa12652a62..ed731065bc41 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Platsen har identifierats av GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Ta bort alla meddelanden."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Aktivera skärmsläckare"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 19bd4abc14d0..16ccca3bad86 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -137,4 +137,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Mahali pamewekwa na GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Futa arifa zote."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Amilisha hifadhi ya skrini"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sw600dp/colors.xml b/packages/SystemUI/res/values-sw600dp/colors.xml deleted file mode 100644 index a7a70c3f41e9..000000000000 --- a/packages/SystemUI/res/values-sw600dp/colors.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <drawable name="status_bar_background">#000000</drawable> - <drawable name="notification_icon_area_smoke">#aa000000</drawable> -</resources> - diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml deleted file mode 100644 index 8c1ac55460d5..000000000000 --- a/packages/SystemUI/res/values-sw600dp/dimens.xml +++ /dev/null @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - * Copyright (c) 2010, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. -*/ ---> -<resources> - <!-- The width of the ticker, including the icon --> - <dimen name="notification_ticker_width">360dp</dimen> - <!-- Status bar panel bottom offset (height of status bar - overlap) --> - <dimen name="status_bar_panel_bottom_offset">36dp</dimen> - <!-- gap on either side of status bar notification icons --> - <dimen name="status_bar_icon_padding">8dp</dimen> - <!-- The width of the notification panel window --> - <dimen name="notification_panel_width">512dp</dimen> - <!-- The minimum height of the notification panel window --> - <dimen name="notification_panel_min_height">770dp</dimen> - <!-- Bottom margin (from display edge) for status bar panels --> - <dimen name="panel_float">56dp</dimen> - - <!-- Recent Applications parameters --> - <!-- How far the thumbnail for a recent app appears from left edge --> - <dimen name="status_bar_recents_thumbnail_left_margin">28dp</dimen> - <!-- Upper width limit for application icon --> - <dimen name="status_bar_recents_app_icon_max_width">64dp</dimen> - <!-- Upper height limit for application icon --> - <dimen name="status_bar_recents_app_icon_max_height">64dp</dimen> - - <!-- Size of application icon --> - <dimen name="status_bar_recents_thumbnail_width">208dp</dimen> - <dimen name="status_bar_recents_thumbnail_height">130dp</dimen> - - <!-- Width of recents panel --> - <dimen name="status_bar_recents_width">600dp</dimen> - <!-- Padding for text descriptions --> - <dimen name="status_bar_recents_text_description_padding">8dp</dimen> - <!-- Size of application label text --> - <dimen name="status_bar_recents_app_label_text_size">18dip</dimen> - <!-- Size of application description text --> - <dimen name="status_bar_recents_app_description_text_size">18dip</dimen> - <!-- Width of application label text --> - <dimen name="status_bar_recents_app_label_width">97dip</dimen> - <!-- Left margin for application label --> - <dimen name="status_bar_recents_app_label_left_margin">16dip</dimen> - <!-- Size of fading edge for text --> - <dimen name="status_bar_recents_text_fading_edge_length">20dip</dimen> - <!-- Size of fading edge for scrolling --> - <dimen name="status_bar_recents_scroll_fading_edge_length">10dip</dimen> - <!-- Margin between recents container and glow on the right --> - <dimen name="status_bar_recents_right_glow_margin">100dip</dimen> - - <!-- Where to place the app icon over the thumbnail --> - <dimen name="status_bar_recents_app_icon_left_margin">0dp</dimen> - <dimen name="status_bar_recents_app_icon_top_margin">8dp</dimen> - - <!-- size at which Notification icons will be drawn in the status bar --> - <dimen name="status_bar_icon_drawing_size">24dip</dimen> - - <!-- opacity at which Notification icons will be drawn in the status bar --> - <item type="dimen" name="status_bar_icon_drawing_alpha">100%</item> - - <!-- The width of the view containing non-menu status bar icons --> - <dimen name="navigation_key_width">80dip</dimen> - - <!-- The width of the view containing the menu status bar icon --> - <dimen name="navigation_menu_key_width">40dip</dimen> -</resources> diff --git a/packages/SystemUI/res/values-sw720dp/config.xml b/packages/SystemUI/res/values-sw720dp/config.xml index 56b8e54b18f1..8af700a87d7f 100644 --- a/packages/SystemUI/res/values-sw720dp/config.xml +++ b/packages/SystemUI/res/values-sw720dp/config.xml @@ -21,5 +21,13 @@ for different hardware and product builds. --> <resources> <integer name="config_maxNotificationIcons">5</integer> + + <!-- Whether we're using the tablet-optimized recents interface (we use this + value at runtime for some things) --> + <bool name="config_recents_interface_for_tablets">true</bool> + + <!-- Whether recents thumbnails should stretch in both x and y to fill their + ImageView --> + <bool name="config_recents_thumbnail_image_fits_to_xy">true</bool> </resources> diff --git a/packages/SystemUI/res/values-sw720dp/dimens.xml b/packages/SystemUI/res/values-sw720dp/dimens.xml index b16b1e80cb57..36cbabf0172f 100644 --- a/packages/SystemUI/res/values-sw720dp/dimens.xml +++ b/packages/SystemUI/res/values-sw720dp/dimens.xml @@ -27,5 +27,59 @@ <!-- The width of the view containing the menu status bar icon --> <dimen name="navigation_menu_key_width">80dip</dimen> + + <!-- ======================================== --> + <!-- The following resources were recently moved from sw600dp; there may + be situations where they don't sync up perfectly with + PhoneStatusBar/TabletStatusBar. --> + <!-- ======================================== --> + + <!-- The width of the ticker, including the icon --> + <dimen name="notification_ticker_width">360dp</dimen> + <!-- Status bar panel bottom offset (height of status bar - overlap) --> + <dimen name="status_bar_panel_bottom_offset">36dp</dimen> + <!-- gap on either side of status bar notification icons --> + <dimen name="status_bar_icon_padding">8dp</dimen> + <!-- The width of the notification panel window --> + <dimen name="notification_panel_width">512dp</dimen> + <!-- The minimum height of the notification panel window --> + <dimen name="notification_panel_min_height">770dp</dimen> + <!-- Bottom margin (from display edge) for status bar panels --> + <dimen name="panel_float">56dp</dimen> + + <!-- Recent Applications parameters --> + <!-- How far the thumbnail for a recent app appears from left edge --> + <dimen name="status_bar_recents_thumbnail_left_margin">28dp</dimen> + <!-- Upper width limit for application icon --> + <dimen name="status_bar_recents_app_icon_max_width">64dp</dimen> + <!-- Upper height limit for application icon --> + <dimen name="status_bar_recents_app_icon_max_height">64dp</dimen> + + <!-- Size of application icon --> + <dimen name="status_bar_recents_thumbnail_width">208dp</dimen> + <dimen name="status_bar_recents_thumbnail_height">130dp</dimen> + + <!-- Width of recents panel --> + <dimen name="status_bar_recents_width">600dp</dimen> + <!-- Padding for text descriptions --> + <dimen name="status_bar_recents_text_description_padding">8dp</dimen> + <!-- Size of application label text --> + <dimen name="status_bar_recents_app_label_text_size">18dip</dimen> + <!-- Size of application description text --> + <dimen name="status_bar_recents_app_description_text_size">18dip</dimen> + <!-- Width of application label text --> + <dimen name="status_bar_recents_app_label_width">97dip</dimen> + <!-- Left margin for application label --> + <dimen name="status_bar_recents_app_label_left_margin">16dip</dimen> + <!-- Size of fading edge for text --> + <dimen name="status_bar_recents_text_fading_edge_length">20dip</dimen> + <!-- Size of fading edge for scrolling --> + <dimen name="status_bar_recents_scroll_fading_edge_length">10dip</dimen> + <!-- Margin between recents container and glow on the right --> + <dimen name="status_bar_recents_right_glow_margin">100dip</dimen> + + <!-- Where to place the app icon over the thumbnail --> + <dimen name="status_bar_recents_app_icon_left_margin">0dp</dimen> + <dimen name="status_bar_recents_app_icon_top_margin">8dp</dimen> </resources> diff --git a/packages/SystemUI/res/values-sw600dp/donottranslate.xml b/packages/SystemUI/res/values-sw720dp/donottranslate.xml index 09960673a53e..09960673a53e 100644 --- a/packages/SystemUI/res/values-sw600dp/donottranslate.xml +++ b/packages/SystemUI/res/values-sw720dp/donottranslate.xml diff --git a/packages/SystemUI/res/values-sw600dp/styles.xml b/packages/SystemUI/res/values-sw720dp/styles.xml index f3d4a0f88b92..f3d4a0f88b92 100644 --- a/packages/SystemUI/res/values-sw600dp/styles.xml +++ b/packages/SystemUI/res/values-sw720dp/styles.xml diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 82c5dd71e0fb..0e3344e1bd09 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"ตำแหน่งที่กำหนดโดย GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"ล้างการแจ้งเตือนทั้งหมด"</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"เปิดโปรแกรมรักษาหน้าจอ"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index 2054121e8f19..7b294ac0c30a 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Lokasyong itinatakda ng GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"I-clear ang lahat ng notification."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"I-activate ang screen saver"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index ca422f7e26f1..f0da20ef60e3 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Konum GPS ile belirlendi"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Tüm bildirimleri temizle"</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Ekran koruyucuyu etkinleştir"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 8a1340074de3..c76798c88e7f 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Місцезнаходження встановлено за допомогою GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Очистити всі сповіщення."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Активувати заставку"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index 05ab87c3f777..35ac6817c613 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Vị trí đặt bởi GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Xóa tất cả thông báo."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Kích hoạt trình bảo vệ màn hình"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-xhdpi/dimens.xml b/packages/SystemUI/res/values-xhdpi/dimens.xml index aa75c207ebf6..303841a8045f 100644 --- a/packages/SystemUI/res/values-xhdpi/dimens.xml +++ b/packages/SystemUI/res/values-xhdpi/dimens.xml @@ -19,9 +19,9 @@ <!-- thickness (height) of each notification row, including any separators or padding --> <!-- note: this is the same value as in values/dimens.xml; the value is overridden in values-hdpi/dimens.xml and so we need to re-assert the general value here --> - <dimen name="notification_height">65dp</dimen> + <dimen name="notification_height">68dp</dimen> <!-- thickness (height) of dividers between each notification row --> <!-- same as in values/dimens.xml; see note at notification_height --> - <dimen name="notification_divider_height">1dp</dimen> + <dimen name="notification_divider_height">2dp</dimen> </resources> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index c862d742151d..996119c62112 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -141,4 +141,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"已通过 GPS 确定位置"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"清除所有通知。"</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"激活屏幕保护程序"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 399890b16a7e..d07535208176 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -141,4 +141,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS 已定位"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"清除所有通知。"</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"啟用螢幕保護程式"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 91f65663b329..9c02a2735685 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -139,4 +139,6 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Indawo ihlelwe i-GPS"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Susa zonke izaziso."</string> <string name="dreams_dock_launcher" msgid="3541196417659166245">"Yenza ukuthi iskrini seyiva sisebenze"</string> + <!-- no translation found for status_bar_notification_inspect_item_title (1163547729015390250) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml index 56d1295fc18e..48fb21f76dff 100644 --- a/packages/SystemUI/res/values/attrs.xml +++ b/packages/SystemUI/res/values/attrs.xml @@ -32,5 +32,8 @@ <declare-styleable name="NotificationRowLayout"> <attr name="rowHeight" format="dimension" /> </declare-styleable> + <declare-styleable name="RecentsPanelView"> + <attr name="recentItemLayout" format="reference" /> + </declare-styleable> </resources> diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index c8e3fad7ede6..9257195869a3 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -18,8 +18,6 @@ --> <resources> <drawable name="notification_number_text_color">#ffffffff</drawable> - <drawable name="notification_item_background_color">#ff111111</drawable> - <drawable name="notification_item_background_color_pressed">#ff257390</drawable> <drawable name="ticker_background_color">#ff1d1d1d</drawable> <drawable name="status_bar_background">#ff000000</drawable> <drawable name="status_bar_recents_app_thumbnail_background">#88000000</drawable> @@ -31,4 +29,9 @@ <drawable name="recents_callout_line">#99ffffff</drawable> <drawable name="notification_item_background_legacy_color">#ffaaaaaa</drawable> <drawable name="intruder_bg_pressed">#ff33B5E5</drawable> + + <!-- ==================== system bar only ==================== --> + <drawable name="system_bar_background">#ff000000</drawable> + <!-- the darkening filter applied to notifications --> + <drawable name="notification_icon_area_smoke">#aa000000</drawable> </resources> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index f786e8665ddd..b8e8fe4f83a9 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -50,7 +50,7 @@ <dimen name="navigation_bar_deadzone_size">12dp</dimen> <!-- thickness (height) of each notification row, including any separators or padding --> - <dimen name="notification_height">65dp</dimen> + <dimen name="notification_height">68dp</dimen> <!-- Height of notification icons in the status bar --> <dimen name="status_bar_icon_size">@*android:dimen/status_bar_icon_size</dimen> @@ -72,7 +72,7 @@ <dimen name="status_bar_icon_padding">0dp</dimen> <!-- thickness (height) of dividers between each notification row --> - <dimen name="notification_divider_height">1dp</dimen> + <dimen name="notification_divider_height">4dp</dimen> <!-- Notification drawer tuning parameters (phone UI) --> <!-- Initial velocity of the shade when expanding on its own --> diff --git a/packages/SystemUI/res/values/ids.xml b/packages/SystemUI/res/values/ids.xml new file mode 100644 index 000000000000..2a4c5fd0b23f --- /dev/null +++ b/packages/SystemUI/res/values/ids.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<resources> + <item type="id" name="expandable_tag" /> +</resources> diff --git a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java index aa289da11ce0..6141eadbcf15 100644 --- a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java +++ b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java @@ -32,17 +32,28 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { public interface Callback { View getChildAtPosition(MotionEvent ev); View getChildAtPosition(float x, float y); + boolean canChildBeExpanded(View v); } private static final String TAG = "ExpandHelper"; protected static final boolean DEBUG = false; private static final long EXPAND_DURATION = 250; + // amount of overstretch for maximum brightness expressed in U + // 2f: maximum brightness is stretching a 1U to 3U, or a 4U to 6U + private static final float STRETCH_INTERVAL = 2f; + + // level of glow for a touch, without overstretch + // overstretch fills the range (GLOW_BASE, 1.0] + private static final float GLOW_BASE = 0.5f; + @SuppressWarnings("unused") private Context mContext; private boolean mStretching; private View mCurrView; + private View mCurrViewTopGlow; + private View mCurrViewBottomGlow; private float mOldHeight; private float mNaturalHeight; private float mInitialTouchSpan; @@ -53,7 +64,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { private int mSmallSize; private int mLargeSize; - + private float mMaximumStretch; private class ViewScaler { View mView; @@ -62,7 +73,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { mView = v; } public void setHeight(float h) { - Log.v(TAG, "SetHeight: setting to " + h); + if (DEBUG) Log.v(TAG, "SetHeight: setting to " + h); ViewGroup.LayoutParams lp = mView.getLayoutParams(); lp.height = (int)h; mView.setLayoutParams(lp); @@ -94,6 +105,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { public ExpandHelper(Context context, Callback callback, int small, int large) { mSmallSize = small; + mMaximumStretch = mSmallSize * STRETCH_INTERVAL; mLargeSize = large; mContext = context; mCallback = callback; @@ -120,10 +132,16 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { float h = Math.abs(detector.getCurrentSpanY()); if (DEBUG) Log.d(TAG, "current span is: " + h); h = h + mOldHeight - mInitialTouchSpan; + float target = h; + if (DEBUG) Log.d(TAG, "target is: " + target); h = h<mSmallSize?mSmallSize:(h>mLargeSize?mLargeSize:h); h = h>mNaturalHeight?mNaturalHeight:h; if (DEBUG) Log.d(TAG, "scale continues: h=" + h); mScaler.setHeight(h); + float stretch = (float) Math.abs((target - h) / mMaximumStretch); + float strength = 1f / (1f + (float) Math.pow(Math.E, -1 * ((8f * stretch) - 5f))); + if (DEBUG) Log.d(TAG, "stretch: " + stretch + " strength: " + strength); + setGlow(GLOW_BASE + strength * (1f - GLOW_BASE)); return true; } @@ -136,6 +154,14 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { } }); } + public void setGlow(float glow) { + if (mCurrViewTopGlow != null) { + mCurrViewTopGlow.setAlpha(glow); + } + if (mCurrViewBottomGlow != null) { + mCurrViewBottomGlow.setAlpha(glow); + } + } public boolean onInterceptTouchEvent(MotionEvent ev) { if (DEBUG) Log.d(TAG, "interceptTouch: act=" + (ev.getAction()) + @@ -154,7 +180,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { case MotionEvent.ACTION_UP: case MotionEvent.ACTION_CANCEL: mStretching = false; - mCurrView = null; + clearView(); break; } return true; @@ -163,14 +189,20 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { if (v != null) { if (DEBUG) Log.d(TAG, "scale begins on view: " + v); mStretching = true; - mCurrView = v; + setView(v); + setGlow(GLOW_BASE); mScaler.setView(v); mOldHeight = mScaler.getHeight(); - mNaturalHeight = mScaler.getNaturalHeight(mLargeSize); + if (mCallback.canChildBeExpanded(v)) { + if (DEBUG) Log.d(TAG, "working on an expandable child"); + mNaturalHeight = mScaler.getNaturalHeight(mLargeSize); + } else { + if (DEBUG) Log.d(TAG, "working on a non-expandable child"); + mNaturalHeight = mOldHeight; + } if (DEBUG) Log.d(TAG, "got mOldHeight: " + mOldHeight + " mNaturalHeight: " + mNaturalHeight); v.getParent().requestDisallowInterceptTouchEvent(true); - if (DEBUG) v.setBackgroundColor(0xFFFFFF00); } return mStretching; } @@ -183,11 +215,33 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { } else { h = (force || h < mNaturalHeight) ? mSmallSize : mNaturalHeight; } - if (DEBUG) mCurrView.setBackgroundColor(0); + if (DEBUG && mCurrView != null) mCurrView.setBackgroundColor(0); mAnimation = ObjectAnimator.ofFloat(mScaler, "height", h).setDuration(EXPAND_DURATION); mAnimation.start(); mStretching = false; + setGlow(0f); + clearView(); + } + + private void clearView() { mCurrView = null; + mCurrViewTopGlow = null; + mCurrViewBottomGlow = null; + } + + private void setView(View v) { + mCurrView = null; + if (v instanceof ViewGroup) { + ViewGroup g = (ViewGroup) v; + mCurrViewTopGlow = g.findViewById(R.id.top_glow); + mCurrViewBottomGlow = g.findViewById(R.id.bottom_glow); + if (DEBUG) { + String debugLog = "Looking for glows: " + + (mCurrViewTopGlow != null ? "found top " : "didn't find top") + + (mCurrViewBottomGlow != null ? "found bottom " : "didn't find bottom"); + Log.v(TAG, debugLog); + } + } } @Override diff --git a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java index 724679f38c11..c60c8064a83a 100644 --- a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java +++ b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java @@ -155,6 +155,11 @@ public class ImageWallpaper extends WallpaperService { } } + public DrawableEngine() { + super(); + setFixedSizeAllowed(true); + } + @Override public void onCreate(SurfaceHolder surfaceHolder) { if (DEBUG) { diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java index 5d6e31578529..f19ab24cc94c 100644 --- a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java @@ -24,6 +24,7 @@ import android.content.Context; import android.content.Intent; import android.content.res.Configuration; import android.content.res.Resources; +import android.content.res.TypedArray; import android.graphics.Bitmap; import android.graphics.Matrix; import android.graphics.Shader.TileMode; @@ -89,6 +90,7 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener private TaskDescriptionAdapter mListAdapter; private int mThumbnailWidth; private boolean mFitThumbnailToXY; + private int mRecentItemLayoutId; public static interface OnRecentsPanelVisibilityChangedListener { public void onRecentsPanelVisibilityChanged(boolean visible); @@ -142,7 +144,7 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener } public View createView(ViewGroup parent) { - View convertView = mInflater.inflate(R.layout.status_bar_recent_item, parent, false); + View convertView = mInflater.inflate(mRecentItemLayoutId, parent, false); ViewHolder holder = new ViewHolder(); holder.thumbnailView = convertView.findViewById(R.id.app_thumbnail); holder.thumbnailViewImage = @@ -421,6 +423,11 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener super(context, attrs, defStyle); mContext = context; updateValuesFromResources(); + + TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.RecentsPanelView, + defStyle, 0); + + mRecentItemLayoutId = a.getResourceId(R.styleable.RecentsPanelView_recentItemLayout, 0); } public void updateValuesFromResources() { @@ -432,6 +439,7 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener @Override protected void onFinishInflate() { super.onFinishInflate(); + mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); mRecentsContainer = (ViewGroup) findViewById(R.id.recents_container); mStatusBarTouchProxy = (StatusBarTouchProxy) findViewById(R.id.status_bar_touch_proxy); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index 3803092111b9..19306a950311 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -213,7 +213,7 @@ public abstract class BaseStatusBar extends SystemUI implements if (version > 0 && version < Build.VERSION_CODES.GINGERBREAD) { content.setBackgroundResource(R.drawable.notification_row_legacy_bg); } else { - content.setBackgroundResource(R.drawable.notification_row_bg); + content.setBackgroundResource(com.android.internal.R.drawable.notification_bg); } } } @@ -284,7 +284,7 @@ public abstract class BaseStatusBar extends SystemUI implements protected abstract WindowManager.LayoutParams getRecentsLayoutParams( LayoutParams layoutParams); - protected void updateRecentsPanel() { + protected void updateRecentsPanel(int recentsResId) { // Recents Panel boolean visible = false; ArrayList<TaskDescription> recentTasksList = null; @@ -301,7 +301,7 @@ public abstract class BaseStatusBar extends SystemUI implements // Provide RecentsPanelView with a temporary parent to allow layout params to work. LinearLayout tmpRoot = new LinearLayout(mContext); mRecentsPanel = (RecentsPanelView) LayoutInflater.from(mContext).inflate( - R.layout.status_bar_recent_panel, tmpRoot, false); + recentsResId, tmpRoot, false); mRecentsPanel.setRecentTasksLoader(mRecentTasksLoader); mRecentTasksLoader.setRecentsPanel(mRecentsPanel); mRecentsPanel.setOnTouchListener( @@ -397,12 +397,15 @@ public abstract class BaseStatusBar extends SystemUI implements // XXX: temporary: while testing big notifications, auto-expand all of them ViewGroup.LayoutParams lp = row.getLayoutParams(); + Boolean expandable = Boolean.FALSE; if (large != null) { lp.height = ViewGroup.LayoutParams.WRAP_CONTENT; + expandable = Boolean.TRUE; } else { lp.height = minHeight; } row.setLayoutParams(lp); + row.setTag(R.id.expandable_tag, expandable); workAroundBadLayerDrawableOpacity(row); View vetoButton = updateNotificationVetoButton(row, sbn); vetoButton.setContentDescription(mContext.getString( diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java index 5582b0f6c9e3..11e067f54881 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -275,11 +275,6 @@ public class NavigationBarView extends LinearLayout { ? findViewById(R.id.rot90) : findViewById(R.id.rot270); - for (View v : mRotatedViews) { - // this helps avoid drawing artifacts with glowing navigation keys - ViewGroup group = (ViewGroup) v.findViewById(R.id.nav_buttons); - group.setMotionEventSplittingEnabled(false); - } mCurrentView = mRotatedViews[Surface.ROTATION_0]; } 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 da98c8075a03..61500e9bc3d2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -288,6 +288,7 @@ public class PhoneStatusBar extends BaseStatusBar { try { boolean showNav = mWindowManager.hasNavigationBar(); + if (DEBUG) Slog.v(TAG, "hasNavigationBar=" + showNav); if (showNav) { mNavigationBarView = (NavigationBarView) View.inflate(context, R.layout.navigation_bar, null); @@ -388,9 +389,8 @@ public class PhoneStatusBar extends BaseStatusBar { return lp; } - @Override protected void updateRecentsPanel() { - super.updateRecentsPanel(); + super.updateRecentsPanel(R.layout.status_bar_recent_panel); // Make .03 alpha the minimum so you always see the item a bit-- slightly below // .03, the item disappears entirely (as if alpha = 0) and that discontinuity looks // a bit jarring @@ -422,6 +422,7 @@ public class PhoneStatusBar extends BaseStatusBar { // For small-screen devices (read: phones) that lack hardware navigation buttons private void addNavigationBar() { + if (DEBUG) Slog.v(TAG, "addNavigationBar: about to add " + mNavigationBarView); if (mNavigationBarView == null) return; prepareNavigationBarView(); 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 5c38db58b7de..93803d983ec9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NotificationRowLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NotificationRowLayout.java @@ -165,6 +165,12 @@ public class NotificationRowLayout return (veto != null && veto.getVisibility() != View.GONE); } + public boolean canChildBeExpanded(View v) { + Object isExpandable = v.getTag(R.id.expandable_tag); + return isExpandable != null && isExpandable instanceof Boolean && + ((Boolean)isExpandable).booleanValue(); + } + public void onChildDismissed(View v) { final View veto = v.findViewById(R.id.veto); if (veto != null && veto.getVisibility() != View.GONE && mRemoveViews) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java index 2171329a5e1e..8924087cf2ef 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java @@ -225,7 +225,7 @@ public class InputMethodsPanel extends LinearLayout implements StatusBarPanel, } final CharSequence imiName = getIMIName(imi); final Drawable icon = getSubtypeIcon(imi, subtype); - final View view = View.inflate(mContext, R.layout.status_bar_input_methods_item, null); + final View view = View.inflate(mContext, R.layout.system_bar_input_methods_item, null); final ImageView subtypeIcon = (ImageView)view.findViewById(R.id.item_icon); final TextView itemTitle = (TextView)view.findViewById(R.id.item_title); final TextView itemSubtitle = (TextView)view.findViewById(R.id.item_subtitle); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java index 8e58649ecffc..b82e1d0a066f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java @@ -344,7 +344,7 @@ public class NotificationPanel extends RelativeLayout implements StatusBarPanel, // NB: it will be invisible until you show it void addSettingsView() { LayoutInflater infl = LayoutInflater.from(getContext()); - mSettingsView = infl.inflate(R.layout.status_bar_settings_view, mContentFrame, false); + mSettingsView = infl.inflate(R.layout.system_bar_settings_view, mContentFrame, false); mSettingsView.setVisibility(View.GONE); mContentFrame.addView(mSettingsView); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java index c868f78825e5..7b3b745e7e7b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java @@ -225,7 +225,7 @@ public class TabletStatusBar extends BaseStatusBar implements // Notification Panel mNotificationPanel = (NotificationPanel)View.inflate(context, - R.layout.status_bar_notification_panel, null); + R.layout.system_bar_notification_panel, null); mNotificationPanel.setBar(this); mNotificationPanel.show(false, false); mNotificationPanel.setOnTouchListener( @@ -286,7 +286,7 @@ public class TabletStatusBar extends BaseStatusBar implements // Notification preview window if (NOTIFICATION_PEEK_ENABLED) { mNotificationPeekWindow = (NotificationPeekPanel) View.inflate(context, - R.layout.status_bar_notification_peek, null); + R.layout.system_bar_notification_peek, null); mNotificationPeekWindow.setBar(this); mNotificationPeekRow = (ViewGroup) mNotificationPeekWindow.findViewById(R.id.content); @@ -330,7 +330,7 @@ public class TabletStatusBar extends BaseStatusBar implements // Input methods Panel mInputMethodsPanel = (InputMethodsPanel) View.inflate(context, - R.layout.status_bar_input_methods_panel, null); + R.layout.system_bar_input_methods_panel, null); mInputMethodsPanel.setHardKeyboardEnabledChangeListener(this); mInputMethodsPanel.setOnTouchListener(new TouchOutsideListener( MSG_CLOSE_INPUT_METHODS_PANEL, mInputMethodsPanel)); @@ -353,7 +353,7 @@ public class TabletStatusBar extends BaseStatusBar implements // Compatibility mode selector panel mCompatModePanel = (CompatModePanel) View.inflate(context, - R.layout.status_bar_compat_mode_panel, null); + R.layout.system_bar_compat_mode_panel, null); mCompatModePanel.setOnTouchListener(new TouchOutsideListener( MSG_CLOSE_COMPAT_MODE_PANEL, mCompatModePanel)); mCompatModePanel.setTrigger(mCompatModeButton); @@ -465,7 +465,7 @@ public class TabletStatusBar extends BaseStatusBar implements loadDimens(); final TabletStatusBarView sb = (TabletStatusBarView)View.inflate( - context, R.layout.status_bar, null); + context, R.layout.system_bar, null); mStatusBarView = sb; sb.setHandler(mHandler); @@ -647,7 +647,7 @@ public class TabletStatusBar extends BaseStatusBar implements } protected void updateRecentsPanel() { - super.updateRecentsPanel(); + super.updateRecentsPanel(R.layout.system_bar_recent_panel); mRecentsPanel.setStatusBarView(mStatusBarView); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java index e93a32bc1689..754441c56b49 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java @@ -264,7 +264,7 @@ public class TabletTicker iconId = R.id.left_icon; } if (n.tickerView != null) { - group = (ViewGroup)inflater.inflate(R.layout.status_bar_ticker_panel, null, false); + group = (ViewGroup)inflater.inflate(R.layout.system_bar_ticker_panel, null, false); ViewGroup content = (FrameLayout) group.findViewById(R.id.ticker_expanded); View expanded = null; Exception exception = null; @@ -285,7 +285,7 @@ public class TabletTicker ViewGroup.LayoutParams.MATCH_PARENT); content.addView(expanded, lp); } else if (n.tickerText != null) { - group = (ViewGroup)inflater.inflate(R.layout.status_bar_ticker_compat, mWindow, false); + group = (ViewGroup)inflater.inflate(R.layout.system_bar_ticker_compat, mWindow, false); final Drawable icon = StatusBarIconView.getIcon(mContext, new StatusBarIcon(notification.pkg, n.icon, n.iconLevel, 0, n.tickerText)); ImageView iv = (ImageView)group.findViewById(iconId); diff --git a/policy/src/com/android/internal/policy/impl/BiometricSensorUnlock.java b/policy/src/com/android/internal/policy/impl/BiometricSensorUnlock.java index e2c317d82b60..c36e1481adb0 100644 --- a/policy/src/com/android/internal/policy/impl/BiometricSensorUnlock.java +++ b/policy/src/com/android/internal/policy/impl/BiometricSensorUnlock.java @@ -19,9 +19,6 @@ package com.android.internal.policy.impl; import android.view.View; interface BiometricSensorUnlock { - // Returns 'true' if the biometric sensor is available and is selected by user. - public boolean installedAndSelected(); - // Returns 'true' if the biometric sensor has started its unlock procedure but has not yet // accepted or rejected the user. public boolean isRunning(); diff --git a/policy/src/com/android/internal/policy/impl/FaceUnlock.java b/policy/src/com/android/internal/policy/impl/FaceUnlock.java index 09a1c8b4e3b8..ac86141fb413 100644 --- a/policy/src/com/android/internal/policy/impl/FaceUnlock.java +++ b/policy/src/com/android/internal/policy/impl/FaceUnlock.java @@ -77,12 +77,6 @@ public class FaceUnlock implements BiometricSensorUnlock, Handler.Callback { mHandler = new Handler(this); } - // Indicates whether FaceLock is in use - public boolean installedAndSelected() { - return (mLockPatternUtils.usingBiometricWeak() && - mLockPatternUtils.isBiometricWeakInstalled()); - } - public boolean isRunning() { return mServiceRunning; } @@ -106,28 +100,26 @@ public class FaceUnlock implements BiometricSensorUnlock, Handler.Callback { // Tells FaceLock to stop and then unbinds from the FaceLock service public boolean stop() { boolean wasRunning = false; - if (installedAndSelected()) { - stopUi(); - - if (mBoundToService) { - wasRunning = true; - if (DEBUG) Log.d(TAG, "before unbind from FaceLock service"); - if (mService != null) { - try { - mService.unregisterCallback(mFaceLockCallback); - } catch (RemoteException e) { - // Not much we can do - } + stopUi(); + + if (mBoundToService) { + wasRunning = true; + if (DEBUG) Log.d(TAG, "before unbind from FaceLock service"); + if (mService != null) { + try { + mService.unregisterCallback(mFaceLockCallback); + } catch (RemoteException e) { + // Not much we can do } - mContext.unbindService(mConnection); - if (DEBUG) Log.d(TAG, "after unbind from FaceLock service"); - mBoundToService = false; - } else { - // This is usually not an error when this happens. Sometimes we will tell it to - // unbind multiple times because it's called from both onWindowFocusChanged and - // onDetachedFromWindow. - if (DEBUG) Log.d(TAG, "Attempt to unbind from FaceLock when not bound"); } + mContext.unbindService(mConnection); + if (DEBUG) Log.d(TAG, "after unbind from FaceLock service"); + mBoundToService = false; + } else { + // This is usually not an error when this happens. Sometimes we will tell it to + // unbind multiple times because it's called from both onWindowFocusChanged and + // onDetachedFromWindow. + if (DEBUG) Log.d(TAG, "Attempt to unbind from FaceLock when not bound"); } return wasRunning; @@ -145,7 +137,6 @@ public class FaceUnlock implements BiometricSensorUnlock, Handler.Callback { (failedBackupAttempts >= LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT); if (tooManyFaceUnlockTries) Log.i(TAG, "tooManyFaceUnlockTries: " + tooManyFaceUnlockTries); if (mUpdateMonitor.getPhoneState() == TelephonyManager.CALL_STATE_IDLE - && installedAndSelected() && !suppressBiometricUnlock && !tooManyFaceUnlockTries && !backupIsTimedOut) { @@ -170,15 +161,11 @@ public class FaceUnlock implements BiometricSensorUnlock, Handler.Callback { // Takes care of FaceLock area when layout is created public void initializeAreaView(View topView) { - if (installedAndSelected()) { - mAreaView = topView.findViewById(R.id.faceLockAreaView); - if (mAreaView == null) { - Log.e(TAG, "Layout does not have areaView and FaceLock is enabled"); - } else { - show(0); - } + mAreaView = topView.findViewById(R.id.faceLockAreaView); + if (mAreaView == null) { + Log.e(TAG, "Layout does not have areaView and FaceLock is enabled"); } else { - mAreaView = null; // Set to null if not using FaceLock + show(0); } } @@ -236,18 +223,16 @@ public class FaceUnlock implements BiometricSensorUnlock, Handler.Callback { // Binds to FaceLock service. This call does not tell it to start, but it causes the service // to call the onServiceConnected callback, which then starts FaceLock. private void bind() { - if (installedAndSelected()) { - if (!mBoundToService) { - if (DEBUG) Log.d(TAG, "before bind to FaceLock service"); - mContext.bindService(new Intent(IFaceLockInterface.class.getName()), - mConnection, - Context.BIND_AUTO_CREATE, - mLockPatternUtils.getCurrentUser()); - if (DEBUG) Log.d(TAG, "after bind to FaceLock service"); - mBoundToService = true; - } else { - Log.w(TAG, "Attempt to bind to FaceLock when already bound"); - } + if (!mBoundToService) { + if (DEBUG) Log.d(TAG, "before bind to FaceLock service"); + mContext.bindService(new Intent(IFaceLockInterface.class.getName()), + mConnection, + Context.BIND_AUTO_CREATE, + mLockPatternUtils.getCurrentUser()); + if (DEBUG) Log.d(TAG, "after bind to FaceLock service"); + mBoundToService = true; + } else { + Log.w(TAG, "Attempt to bind to FaceLock when already bound"); } } @@ -289,41 +274,37 @@ public class FaceUnlock implements BiometricSensorUnlock, Handler.Callback { // Tells the FaceLock service to start displaying its UI and perform recognition private void startUi(IBinder windowToken, int x, int y, int w, int h) { - if (installedAndSelected()) { - synchronized (mServiceRunningLock) { - if (!mServiceRunning) { - if (DEBUG) Log.d(TAG, "Starting FaceLock"); - try { - mService.startUi(windowToken, x, y, w, h, - mLockPatternUtils.isBiometricWeakLivelinessEnabled()); - } catch (RemoteException e) { - Log.e(TAG, "Caught exception starting FaceLock: " + e.toString()); - return; - } - mServiceRunning = true; - } else { - if (DEBUG) Log.w(TAG, "startUi() attempted while running"); + synchronized (mServiceRunningLock) { + if (!mServiceRunning) { + if (DEBUG) Log.d(TAG, "Starting FaceLock"); + try { + mService.startUi(windowToken, x, y, w, h, + mLockPatternUtils.isBiometricWeakLivelinessEnabled()); + } catch (RemoteException e) { + Log.e(TAG, "Caught exception starting FaceLock: " + e.toString()); + return; } + mServiceRunning = true; + } else { + if (DEBUG) Log.w(TAG, "startUi() attempted while running"); } } } // Tells the FaceLock service to stop displaying its UI and stop recognition private void stopUi() { - if (installedAndSelected()) { - // Note that attempting to stop FaceLock when it's not running is not an issue. - // FaceLock can return, which stops it and then we try to stop it when the - // screen is turned off. That's why we check. - synchronized (mServiceRunningLock) { - if (mServiceRunning) { - try { - if (DEBUG) Log.d(TAG, "Stopping FaceLock"); - mService.stopUi(); - } catch (RemoteException e) { - Log.e(TAG, "Caught exception stopping FaceLock: " + e.toString()); - } - mServiceRunning = false; + // Note that attempting to stop FaceLock when it's not running is not an issue. + // FaceLock can return, which stops it and then we try to stop it when the + // screen is turned off. That's why we check. + synchronized (mServiceRunningLock) { + if (mServiceRunning) { + try { + if (DEBUG) Log.d(TAG, "Stopping FaceLock"); + mService.stopUi(); + } catch (RemoteException e) { + Log.e(TAG, "Caught exception stopping FaceLock: " + e.toString()); } + mServiceRunning = false; } } } diff --git a/policy/src/com/android/internal/policy/impl/GlobalActions.java b/policy/src/com/android/internal/policy/impl/GlobalActions.java index aeb518cfdc6b..cd6da853458c 100644 --- a/policy/src/com/android/internal/policy/impl/GlobalActions.java +++ b/policy/src/com/android/internal/policy/impl/GlobalActions.java @@ -48,6 +48,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; +import android.widget.AdapterView; import android.widget.BaseAdapter; import android.widget.ImageView; import android.widget.TextView; @@ -181,6 +182,11 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac ShutdownThread.shutdown(mContext, true); } + public boolean onLongPress() { + ShutdownThread.rebootSafeMode(mContext, true); + return true; + } + public boolean showDuringKeyguard() { return true; } @@ -242,6 +248,15 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac final AlertDialog dialog = ab.create(); dialog.getListView().setItemsCanFocus(true); + dialog.getListView().setLongClickable(true); + dialog.getListView().setOnItemLongClickListener( + new AdapterView.OnItemLongClickListener() { + @Override + public boolean onItemLongClick(AdapterView<?> parent, View view, int position, + long id) { + return mAdapter.getItem(position).onLongPress(); + } + }); dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG); dialog.setOnDismissListener(this); @@ -365,6 +380,8 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac void onPress(); + public boolean onLongPress(); + /** * @return whether this action should appear in the dialog when the keygaurd * is showing. @@ -406,6 +423,10 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac abstract public void onPress(); + public boolean onLongPress() { + return false; + } + public View create( Context context, View convertView, ViewGroup parent, LayoutInflater inflater) { View v = inflater.inflate(R.layout.global_actions_item, parent, false); @@ -530,6 +551,10 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac changeStateFromPress(nowOn); } + public boolean onLongPress() { + return false; + } + public boolean isEnabled() { return !mState.inTransition(); } @@ -599,6 +624,10 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac public void onPress() { } + public boolean onLongPress() { + return false; + } + public boolean showDuringKeyguard() { return true; } diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java index 10c338108f9c..7e2985deb5dc 100644 --- a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java +++ b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java @@ -111,7 +111,7 @@ public class LockPatternKeyguardView extends KeyguardViewBase { private boolean mRequiresSim; // True if the biometric unlock should not be displayed. For example, if there is an overlay on // lockscreen or the user is plugging in / unplugging the device. - private boolean mSupressBiometricUnlock; + private boolean mSuppressBiometricUnlock; //True if a dialog is currently displaying on top of this window //Unlike other overlays, this does not close with a power button cycle private boolean mHasDialog = false; @@ -310,15 +310,17 @@ public class LockPatternKeyguardView extends KeyguardViewBase { } public void takeEmergencyCallAction() { - mSupressBiometricUnlock = true; + mSuppressBiometricUnlock = true; - if (mBiometricUnlock.installedAndSelected() && mBiometricUnlock.isRunning()) { - // Continue covering backup lock until dialer comes up or call is resumed - mBiometricUnlock.show(BIOMETRIC_AREA_EMERGENCY_DIALER_TIMEOUT); - } + if (mBiometricUnlock != null) { + if (mBiometricUnlock.isRunning()) { + // Continue covering backup lock until dialer comes up or call is resumed + mBiometricUnlock.show(BIOMETRIC_AREA_EMERGENCY_DIALER_TIMEOUT); + } - // The biometric unlock must be stopped if it is running when emergency call is pressed - mBiometricUnlock.stop(); + // We must ensure the biometric unlock is stopped when emergency call is pressed + mBiometricUnlock.stop(); + } pokeWakelock(EMERGENCY_CALL_TIMEOUT); if (TelephonyManager.getDefault().getCallState() @@ -410,6 +412,12 @@ public class LockPatternKeyguardView extends KeyguardViewBase { } }; + // Indicates whether a biometric unlock method is in use + private boolean isBiometricUnlockInstalledAndSelected() { + return (mLockPatternUtils.usingBiometricWeak() && + mLockPatternUtils.isBiometricWeakInstalled()); + } + /** * @param context Used to inflate, and create views. * @param callback Keyguard callback object for pokewakelock(), etc. @@ -423,18 +431,23 @@ public class LockPatternKeyguardView extends KeyguardViewBase { LockPatternUtils lockPatternUtils, KeyguardWindowController controller) { super(context, callback); - mBiometricUnlock = new FaceUnlock(context, updateMonitor, lockPatternUtils, - mKeyguardScreenCallback); mConfiguration = context.getResources().getConfiguration(); mEnableFallback = false; mRequiresSim = TextUtils.isEmpty(SystemProperties.get("keyguard.no_require_sim")); mUpdateMonitor = updateMonitor; mLockPatternUtils = lockPatternUtils; mWindowController = controller; - mSupressBiometricUnlock = false; + mSuppressBiometricUnlock = false; mPluggedIn = mUpdateMonitor.isDevicePluggedIn(); mScreenOn = ((PowerManager)context.getSystemService(Context.POWER_SERVICE)).isScreenOn(); + // If the biometric unlock is not being used, we don't bother constructing it. Then we can + // simply check if it is null when deciding whether we should make calls to it. + if (isBiometricUnlockInstalledAndSelected()) { + mBiometricUnlock = new FaceUnlock(context, updateMonitor, lockPatternUtils, + mKeyguardScreenCallback); + } + mUpdateMonitor.registerInfoCallback(mInfoCallback); /** @@ -530,8 +543,11 @@ public class LockPatternKeyguardView extends KeyguardViewBase { if (DEBUG) Log.d(TAG, "screen off"); mScreenOn = false; mForgotPattern = false; - mSupressBiometricUnlock = - mUpdateMonitor.getPhoneState() != TelephonyManager.CALL_STATE_IDLE || mHasDialog; + if (mBiometricUnlock != null) { + mSuppressBiometricUnlock = + mUpdateMonitor.getPhoneState() != TelephonyManager.CALL_STATE_IDLE + || mHasDialog; + } // Emulate activity life-cycle for both lock and unlock screen. if (mLockScreen != null) { @@ -543,8 +559,10 @@ public class LockPatternKeyguardView extends KeyguardViewBase { saveWidgetState(); - // The biometric unlock must stop when screen turns off. - mBiometricUnlock.stop(); + if (mBiometricUnlock != null) { + // The biometric unlock must stop when screen turns off. + mBiometricUnlock.stop(); + } } @Override @@ -561,7 +579,9 @@ public class LockPatternKeyguardView extends KeyguardViewBase { restoreWidgetState(); - if (startBiometricUnlock) mBiometricUnlock.start(mSupressBiometricUnlock); + if (mBiometricUnlock != null && startBiometricUnlock) { + mBiometricUnlock.start(mSuppressBiometricUnlock); + } } private void saveWidgetState() { @@ -587,6 +607,7 @@ public class LockPatternKeyguardView extends KeyguardViewBase { @Override public void onWindowFocusChanged (boolean hasWindowFocus) { if (DEBUG) Log.d(TAG, hasWindowFocus ? "focused" : "unfocused"); + boolean startBiometricUnlock = false; // Start the biometric unlock if and only if the screen is both on and focused synchronized(mBiometricUnlockStartupLock) { @@ -594,12 +615,16 @@ public class LockPatternKeyguardView extends KeyguardViewBase { mWindowFocused = hasWindowFocus; } if (!hasWindowFocus) { - mSupressBiometricUnlock = true; - mBiometricUnlock.stop(); - mBiometricUnlock.hide(); + if (mBiometricUnlock != null) { + mSuppressBiometricUnlock = true; + mBiometricUnlock.stop(); + mBiometricUnlock.hide(); + } } else { mHasDialog = false; - if (startBiometricUnlock) mBiometricUnlock.start(mSupressBiometricUnlock); + if (mBiometricUnlock != null && startBiometricUnlock) { + mBiometricUnlock.start(mSuppressBiometricUnlock); + } } } @@ -613,7 +638,7 @@ public class LockPatternKeyguardView extends KeyguardViewBase { ((KeyguardScreen) mUnlockScreen).onResume(); } - if (!mBiometricUnlock.installedAndSelected() || mSupressBiometricUnlock) { + if (mBiometricUnlock != null && mSuppressBiometricUnlock) { mBiometricUnlock.hide(); } } @@ -648,9 +673,11 @@ public class LockPatternKeyguardView extends KeyguardViewBase { removeCallbacks(mRecreateRunnable); - // When view is hidden, we need to stop the biometric unlock - // e.g., when device becomes unlocked - mBiometricUnlock.stop(); + if (mBiometricUnlock != null) { + // When view is hidden, we need to stop the biometric unlock + // e.g., when device becomes unlocked + mBiometricUnlock.stop(); + } super.onDetachedFromWindow(); } @@ -667,20 +694,22 @@ public class LockPatternKeyguardView extends KeyguardViewBase { InfoCallbackImpl mInfoCallback = new InfoCallbackImpl() { - /** - * When somebody plugs in or unplugs the device, we don't want to display the biometric - * unlock. - */ @Override public void onRefreshBatteryInfo(boolean showBatteryInfo, boolean pluggedIn, int batteryLevel) { - mSupressBiometricUnlock |= mPluggedIn != pluggedIn; - mPluggedIn = pluggedIn; - // If it's already running, don't close it down: the unplug didn't start it - if (!mBiometricUnlock.isRunning()) { + // When someone plugs in or unplugs the device, we hide the biometric sensor area and + // suppress its startup for the next onScreenTurnedOn(). Since plugging/unplugging + // causes the screen to turn on, the biometric unlock would start if it wasn't + // suppressed. + // + // However, if the biometric unlock is already running, we do not want to interrupt it. + if (mBiometricUnlock != null && mPluggedIn != pluggedIn + && !mBiometricUnlock.isRunning()) { mBiometricUnlock.stop(); mBiometricUnlock.hide(); + mSuppressBiometricUnlock = true; } + mPluggedIn = pluggedIn; } @Override @@ -694,8 +723,8 @@ public class LockPatternKeyguardView extends KeyguardViewBase { @Override public void onPhoneStateChanged(int phoneState) { if (DEBUG) Log.d(TAG, "phone state: " + phoneState); - if(phoneState == TelephonyManager.CALL_STATE_RINGING) { - mSupressBiometricUnlock = true; + if (mBiometricUnlock != null && phoneState == TelephonyManager.CALL_STATE_RINGING) { + mSuppressBiometricUnlock = true; mBiometricUnlock.stop(); mBiometricUnlock.hide(); } @@ -703,7 +732,9 @@ public class LockPatternKeyguardView extends KeyguardViewBase { @Override public void onUserChanged(int userId) { - mBiometricUnlock.stop(); + if (mBiometricUnlock != null) { + mBiometricUnlock.stop(); + } mLockPatternUtils.setCurrentUser(userId); updateScreen(getInitialMode(), true); } @@ -766,7 +797,9 @@ public class LockPatternKeyguardView extends KeyguardViewBase { mUnlockScreen = null; } mUpdateMonitor.removeCallback(this); - mBiometricUnlock.cleanUp(); + if (mBiometricUnlock != null) { + mBiometricUnlock.cleanUp(); + } } private boolean isSecure() { @@ -816,10 +849,13 @@ public class LockPatternKeyguardView extends KeyguardViewBase { final UnlockMode unlockMode = getUnlockMode(); if (mode == Mode.UnlockScreen && unlockMode != UnlockMode.Unknown) { if (force || mUnlockScreen == null || unlockMode != mUnlockScreenMode) { - boolean restartBiometricUnlock = mBiometricUnlock.stop(); + boolean restartBiometricUnlock = false; + if (mBiometricUnlock != null) { + restartBiometricUnlock = mBiometricUnlock.stop(); + } recreateUnlockScreen(unlockMode); - if (restartBiometricUnlock) { - mBiometricUnlock.start(mSupressBiometricUnlock); + if (mBiometricUnlock != null && restartBiometricUnlock) { + mBiometricUnlock.start(mSuppressBiometricUnlock); } } } @@ -933,8 +969,10 @@ public class LockPatternKeyguardView extends KeyguardViewBase { throw new IllegalArgumentException("unknown unlock mode " + unlockMode); } initializeTransportControlView(unlockView); - // Only shows view if the biometric unlock is enabled - mBiometricUnlock.initializeAreaView(unlockView); + + if (mBiometricUnlock != null) { + mBiometricUnlock.initializeAreaView(unlockView); + } mUnlockScreenMode = unlockMode; return unlockView; diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index b22a10974359..cc663c2c5091 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -310,8 +310,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { WindowState mNavigationBar = null; boolean mHasNavigationBar = false; boolean mCanHideNavigationBar = false; - boolean mNavigationBarOnBottom = true; - int mNavigationBarWidth = 0, mNavigationBarHeight = 0; + boolean mNavigationBarCanMove = false; // can the navigation bar ever move to the side? + boolean mNavigationBarOnBottom = true; // is the navigation bar on the bottom *right now*? + int[] mNavigationBarHeightForRotation = new int[4]; + int[] mNavigationBarWidthForRotation = new int[4]; WindowState mKeyguard = null; KeyguardViewMediator mKeyguardMediator; @@ -972,19 +974,38 @@ public class PhoneWindowManager implements WindowManagerPolicy { mStatusBarHeight = mContext.getResources().getDimensionPixelSize( com.android.internal.R.dimen.status_bar_height); - mNavigationBarHeight = mContext.getResources().getDimensionPixelSize( - com.android.internal.R.dimen.navigation_bar_height); - mNavigationBarWidth = mContext.getResources().getDimensionPixelSize( - com.android.internal.R.dimen.navigation_bar_width); - - // Determine whether the status bar can hide based on the size - // of the screen. We assume sizes >= 600dp are tablets where we - // will use the system bar. - // XXX: This will change to 720dp soon. + + mNavigationBarHeightForRotation[Surface.ROTATION_0] = + mNavigationBarHeightForRotation[Surface.ROTATION_90] = + mNavigationBarHeightForRotation[Surface.ROTATION_180] = + mNavigationBarHeightForRotation[Surface.ROTATION_270] = + mContext.getResources().getDimensionPixelSize( + com.android.internal.R.dimen.navigation_bar_height); + mNavigationBarWidthForRotation[Surface.ROTATION_0] = + mNavigationBarWidthForRotation[Surface.ROTATION_90] = + mNavigationBarWidthForRotation[Surface.ROTATION_180] = + mNavigationBarWidthForRotation[Surface.ROTATION_270] = + mContext.getResources().getDimensionPixelSize( + com.android.internal.R.dimen.navigation_bar_width); + + // SystemUI (status bar) layout policy int shortSizeDp = shortSize * DisplayMetrics.DENSITY_DEFAULT / DisplayMetrics.DENSITY_DEVICE; - mHasSystemNavBar = shortSizeDp >= 600; + + if (shortSizeDp < 600) { + // 0-599dp: "phone" UI with a separate status & navigation bar + mHasSystemNavBar = false; + mNavigationBarCanMove = true; + } else if (shortSizeDp < 720) { + // 600-719dp: "phone" UI with modifications for larger screens + mHasSystemNavBar = false; + mNavigationBarCanMove = false; + } else { + // 720dp: "tablet" UI with a single combined status & navigation bar + mHasSystemNavBar = true; + mNavigationBarCanMove = false; + } if (!mHasSystemNavBar) { mHasNavigationBar = mContext.getResources().getBoolean( @@ -1007,7 +1028,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { int longSizeDp = longSize * DisplayMetrics.DENSITY_DEFAULT / DisplayMetrics.DENSITY_DEVICE; - int barHeightDp = mNavigationBarHeight + int barHeightDp = mNavigationBarHeightForRotation[mLandscapeRotation] * DisplayMetrics.DENSITY_DEFAULT / DisplayMetrics.DENSITY_DEVICE; int aspect = ((shortSizeDp-barHeightDp) * 16) / longSizeDp; @@ -1354,8 +1375,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (mHasNavigationBar) { // For a basic navigation bar, when we are in landscape mode we place // the navigation bar to the side. - if (fullWidth > fullHeight) { - return fullWidth - mNavigationBarWidth; + if (mNavigationBarCanMove && fullWidth > fullHeight) { + return fullWidth - mNavigationBarWidthForRotation[rotation]; } } return fullWidth; @@ -1364,13 +1385,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { public int getNonDecorDisplayHeight(int fullWidth, int fullHeight, int rotation) { if (mHasSystemNavBar) { // For the system navigation bar, we always place it at the bottom. - return fullHeight - mNavigationBarHeight; + return fullHeight - mNavigationBarHeightForRotation[rotation]; } if (mHasNavigationBar) { // For a basic navigation bar, when we are in portrait mode we place // the navigation bar to the bottom. - if (fullWidth < fullHeight) { - return fullHeight - mNavigationBarHeight; + if (!mNavigationBarCanMove || fullWidth < fullHeight) { + return fullHeight - mNavigationBarHeightForRotation[rotation]; } } return fullHeight; @@ -2181,10 +2202,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { // size. We need to do this directly, instead of relying on // it to bubble up from the nav bar, because this needs to // change atomically with screen rotations. - mNavigationBarOnBottom = !mHasNavigationBar || displayWidth < displayHeight; + mNavigationBarOnBottom = (!mNavigationBarCanMove || displayWidth < displayHeight); if (mNavigationBarOnBottom) { // It's a system nav bar or a portrait screen; nav bar goes on bottom. - int top = displayHeight - mNavigationBarHeight; + int top = displayHeight - mNavigationBarHeightForRotation[displayRotation]; if (mHdmiPlugged) { if (top > mExternalDisplayHeight) { top = mExternalDisplayHeight; @@ -2202,7 +2223,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } else { // Landscape screen; nav bar goes to the right. - int left = displayWidth - mNavigationBarWidth; + int left = displayWidth - mNavigationBarWidthForRotation[displayRotation]; if (mHdmiPlugged) { if (left > mExternalDisplayWidth) { left = mExternalDisplayWidth; diff --git a/services/input/InputDispatcher.cpp b/services/input/InputDispatcher.cpp index da3548f07e28..dad4ef4bd785 100644 --- a/services/input/InputDispatcher.cpp +++ b/services/input/InputDispatcher.cpp @@ -970,14 +970,17 @@ void InputDispatcher::resumeAfterTargetsNotReadyTimeoutLocked(nsecs_t newTimeout // Give up. mInputTargetWaitTimeoutExpired = true; - // Release the touch targets. - mTouchState.reset(); - // Input state will not be realistic. Mark it out of sync. if (inputChannel.get()) { ssize_t connectionIndex = getConnectionIndexLocked(inputChannel); if (connectionIndex >= 0) { sp<Connection> connection = mConnectionsByFd.valueAt(connectionIndex); + sp<InputWindowHandle> windowHandle = connection->inputWindowHandle; + + if (windowHandle != NULL) { + mTouchState.removeWindow(windowHandle); + } + if (connection->status == Connection::STATUS_NORMAL) { CancelationOptions options(CancelationOptions::CANCEL_ALL_EVENTS, "application not responding"); @@ -4146,6 +4149,15 @@ void InputDispatcher::TouchState::addOrUpdateWindow(const sp<InputWindowHandle>& touchedWindow.pointerIds = pointerIds; } +void InputDispatcher::TouchState::removeWindow(const sp<InputWindowHandle>& windowHandle) { + for (size_t i = 0; i < windows.size(); i++) { + if (windows.itemAt(i).windowHandle == windowHandle) { + windows.removeAt(i); + return; + } + } +} + void InputDispatcher::TouchState::filterNonAsIsTouchWindows() { for (size_t i = 0 ; i < windows.size(); ) { TouchedWindow& window = windows.editItemAt(i); diff --git a/services/input/InputDispatcher.h b/services/input/InputDispatcher.h index 91f7554d5b06..07ca9d525c93 100644 --- a/services/input/InputDispatcher.h +++ b/services/input/InputDispatcher.h @@ -926,6 +926,7 @@ private: void copyFrom(const TouchState& other); void addOrUpdateWindow(const sp<InputWindowHandle>& windowHandle, int32_t targetFlags, BitSet32 pointerIds); + void removeWindow(const sp<InputWindowHandle>& windowHandle); void filterNonAsIsTouchWindows(); sp<InputWindowHandle> getFirstForegroundWindowHandle() const; bool isSlippery() const; diff --git a/services/input/InputReader.cpp b/services/input/InputReader.cpp index 4cc3d44623f3..6022f107ec89 100644 --- a/services/input/InputReader.cpp +++ b/services/input/InputReader.cpp @@ -918,7 +918,7 @@ void InputDevice::dump(String8& dump) { getDeviceInfo(& deviceInfo); dump.appendFormat(INDENT "Device %d: %s\n", deviceInfo.getId(), - deviceInfo.getName().string()); + deviceInfo.getDisplayName().string()); dump.appendFormat(INDENT2 "Generation: %d\n", mGeneration); dump.appendFormat(INDENT2 "IsExternal: %s\n", toString(mIsExternal)); dump.appendFormat(INDENT2 "Sources: 0x%08x\n", deviceInfo.getSources()); @@ -972,6 +972,16 @@ void InputDevice::configure(nsecs_t when, const InputReaderConfiguration* config } } + if (!changes || (changes & InputReaderConfiguration::CHANGE_DEVICE_ALIAS)) { + if (!(mClasses & INPUT_DEVICE_CLASS_VIRTUAL)) { + String8 alias = mContext->getPolicy()->getDeviceAlias(mIdentifier); + if (mAlias != alias) { + mAlias = alias; + bumpGeneration(); + } + } + } + size_t numMappers = mMappers.size(); for (size_t i = 0; i < numMappers; i++) { InputMapper* mapper = mMappers[i]; @@ -1039,7 +1049,7 @@ void InputDevice::timeoutExpired(nsecs_t when) { } void InputDevice::getDeviceInfo(InputDeviceInfo* outDeviceInfo) { - outDeviceInfo->initialize(mId, mGeneration, mIdentifier.name, mIdentifier.descriptor); + outDeviceInfo->initialize(mId, mGeneration, mIdentifier, mAlias); size_t numMappers = mMappers.size(); for (size_t i = 0; i < numMappers; i++) { @@ -1292,12 +1302,17 @@ void CursorScrollAccumulator::finishSync() { // --- TouchButtonAccumulator --- TouchButtonAccumulator::TouchButtonAccumulator() : - mHaveBtnTouch(false) { + mHaveBtnTouch(false), mHaveStylus(false) { clearButtons(); } void TouchButtonAccumulator::configure(InputDevice* device) { mHaveBtnTouch = device->hasKey(BTN_TOUCH); + mHaveStylus = device->hasKey(BTN_TOOL_PEN) + || device->hasKey(BTN_TOOL_RUBBER) + || device->hasKey(BTN_TOOL_BRUSH) + || device->hasKey(BTN_TOOL_PENCIL) + || device->hasKey(BTN_TOOL_AIRBRUSH); } void TouchButtonAccumulator::reset(InputDevice* device) { @@ -1421,6 +1436,10 @@ bool TouchButtonAccumulator::isHovering() const { return mHaveBtnTouch && !mBtnTouch; } +bool TouchButtonAccumulator::hasStylus() const { + return mHaveStylus; +} + // --- RawPointerAxes --- @@ -1572,16 +1591,19 @@ void SingleTouchMotionAccumulator::process(const RawEvent* rawEvent) { // --- MultiTouchMotionAccumulator --- MultiTouchMotionAccumulator::MultiTouchMotionAccumulator() : - mCurrentSlot(-1), mSlots(NULL), mSlotCount(0), mUsingSlotsProtocol(false) { + mCurrentSlot(-1), mSlots(NULL), mSlotCount(0), mUsingSlotsProtocol(false), + mHaveStylus(false) { } MultiTouchMotionAccumulator::~MultiTouchMotionAccumulator() { delete[] mSlots; } -void MultiTouchMotionAccumulator::configure(size_t slotCount, bool usingSlotsProtocol) { +void MultiTouchMotionAccumulator::configure(InputDevice* device, + size_t slotCount, bool usingSlotsProtocol) { mSlotCount = slotCount; mUsingSlotsProtocol = usingSlotsProtocol; + mHaveStylus = device->hasAbsoluteAxis(ABS_MT_TOOL_TYPE); delete[] mSlots; mSlots = new Slot[slotCount]; @@ -1713,6 +1735,10 @@ void MultiTouchMotionAccumulator::finishSync() { } } +bool MultiTouchMotionAccumulator::hasStylus() const { + return mHaveStylus; +} + // --- MultiTouchMotionAccumulator::Slot --- @@ -2872,10 +2898,16 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) { && mConfig.pointerGesturesEnabled) { mSource = AINPUT_SOURCE_MOUSE; mDeviceMode = DEVICE_MODE_POINTER; + if (hasStylus()) { + mSource |= AINPUT_SOURCE_STYLUS; + } } else if (mParameters.deviceType == Parameters::DEVICE_TYPE_TOUCH_SCREEN && mParameters.associatedDisplayId >= 0) { mSource = AINPUT_SOURCE_TOUCHSCREEN; mDeviceMode = DEVICE_MODE_DIRECT; + if (hasStylus()) { + mSource |= AINPUT_SOURCE_STYLUS; + } } else { mSource = AINPUT_SOURCE_TOUCHPAD; mDeviceMode = DEVICE_MODE_UNSCALED; @@ -5786,6 +5818,10 @@ void SingleTouchInputMapper::configureRawPointerAxes() { getAbsoluteAxisInfo(ABS_TILT_Y, &mRawPointerAxes.tiltY); } +bool SingleTouchInputMapper::hasStylus() const { + return mTouchButtonAccumulator.hasStylus(); +} + // --- MultiTouchInputMapper --- @@ -5920,12 +5956,19 @@ void MultiTouchInputMapper::configureRawPointerAxes() { getDeviceName().string(), slotCount, MAX_SLOTS); slotCount = MAX_SLOTS; } - mMultiTouchMotionAccumulator.configure(slotCount, true /*usingSlotsProtocol*/); + mMultiTouchMotionAccumulator.configure(getDevice(), + slotCount, true /*usingSlotsProtocol*/); } else { - mMultiTouchMotionAccumulator.configure(MAX_POINTERS, false /*usingSlotsProtocol*/); + mMultiTouchMotionAccumulator.configure(getDevice(), + MAX_POINTERS, false /*usingSlotsProtocol*/); } } +bool MultiTouchInputMapper::hasStylus() const { + return mMultiTouchMotionAccumulator.hasStylus() + || mTouchButtonAccumulator.hasStylus(); +} + // --- JoystickInputMapper --- diff --git a/services/input/InputReader.h b/services/input/InputReader.h index e5897e7051ee..8257dbcef097 100644 --- a/services/input/InputReader.h +++ b/services/input/InputReader.h @@ -70,6 +70,9 @@ struct InputReaderConfiguration { // The keyboard layouts must be reloaded. CHANGE_KEYBOARD_LAYOUTS = 1 << 4, + // The device name alias supplied by the may have changed for some devices. + CHANGE_DEVICE_ALIAS = 1 << 5, + // All devices must be reopened. CHANGE_MUST_REOPEN = 1 << 31, }; @@ -228,6 +231,9 @@ public: /* Gets the keyboard layout for a particular input device. */ virtual sp<KeyCharacterMap> getKeyboardLayoutOverlay(const String8& inputDeviceDescriptor) = 0; + + /* Gets a user-supplied alias for a particular input device, or an empty string if none. */ + virtual String8 getDeviceAlias(const InputDeviceIdentifier& identifier) = 0; }; @@ -507,6 +513,12 @@ public: return getEventHub()->hasScanCode(mId, code); } + bool hasAbsoluteAxis(int32_t code) { + RawAbsoluteAxisInfo info; + getEventHub()->getAbsoluteAxisInfo(mId, code, &info); + return info.valid; + } + bool isKeyPressed(int32_t code) { return getEventHub()->getScanCodeState(mId, code) == AKEY_STATE_DOWN; } @@ -522,6 +534,7 @@ private: int32_t mId; int32_t mGeneration; InputDeviceIdentifier mIdentifier; + String8 mAlias; uint32_t mClasses; Vector<InputMapper*> mMappers; @@ -627,9 +640,11 @@ public: int32_t getToolType() const; bool isToolActive() const; bool isHovering() const; + bool hasStylus() const; private: bool mHaveBtnTouch; + bool mHaveStylus; bool mBtnTouch; bool mBtnStylus; @@ -817,10 +832,11 @@ public: MultiTouchMotionAccumulator(); ~MultiTouchMotionAccumulator(); - void configure(size_t slotCount, bool usingSlotsProtocol); + void configure(InputDevice* device, size_t slotCount, bool usingSlotsProtocol); void reset(InputDevice* device); void process(const RawEvent* rawEvent); void finishSync(); + bool hasStylus() const; inline size_t getSlotCount() const { return mSlotCount; } inline const Slot* getSlot(size_t index) const { return &mSlots[index]; } @@ -830,6 +846,7 @@ private: Slot* mSlots; size_t mSlotCount; bool mUsingSlotsProtocol; + bool mHaveStylus; void clearSlots(int32_t initialSlot); }; @@ -1257,6 +1274,7 @@ protected: virtual void parseCalibration(); virtual void resolveCalibration(); virtual void dumpCalibration(String8& dump); + virtual bool hasStylus() const = 0; virtual void syncTouch(nsecs_t when, bool* outHavePointerIds) = 0; @@ -1605,6 +1623,7 @@ public: protected: virtual void syncTouch(nsecs_t when, bool* outHavePointerIds); virtual void configureRawPointerAxes(); + virtual bool hasStylus() const; private: SingleTouchMotionAccumulator mSingleTouchMotionAccumulator; @@ -1622,6 +1641,7 @@ public: protected: virtual void syncTouch(nsecs_t when, bool* outHavePointerIds); virtual void configureRawPointerAxes(); + virtual bool hasStylus() const; private: MultiTouchMotionAccumulator mMultiTouchMotionAccumulator; diff --git a/services/input/tests/InputReader_test.cpp b/services/input/tests/InputReader_test.cpp index a4b75854b463..0f755aecd544 100644 --- a/services/input/tests/InputReader_test.cpp +++ b/services/input/tests/InputReader_test.cpp @@ -174,6 +174,10 @@ private: virtual sp<KeyCharacterMap> getKeyboardLayoutOverlay(const String8& inputDeviceDescriptor) { return NULL; } + + virtual String8 getDeviceAlias(const InputDeviceIdentifier& identifier) { + return String8::empty(); + } }; @@ -1081,7 +1085,7 @@ TEST_F(InputReaderTest, GetInputDevices) { ASSERT_EQ(1U, inputDevices.size()); ASSERT_EQ(1, inputDevices[0].getId()); - ASSERT_STREQ("keyboard", inputDevices[0].getName().string()); + ASSERT_STREQ("keyboard", inputDevices[0].getIdentifier().name.string()); ASSERT_EQ(AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC, inputDevices[0].getKeyboardType()); ASSERT_EQ(AINPUT_SOURCE_KEYBOARD, inputDevices[0].getSources()); ASSERT_EQ(size_t(0), inputDevices[0].getMotionRanges().size()); @@ -1090,7 +1094,7 @@ TEST_F(InputReaderTest, GetInputDevices) { inputDevices = mFakePolicy->getInputDevices(); ASSERT_EQ(1U, inputDevices.size()); ASSERT_EQ(1, inputDevices[0].getId()); - ASSERT_STREQ("keyboard", inputDevices[0].getName().string()); + ASSERT_STREQ("keyboard", inputDevices[0].getIdentifier().name.string()); ASSERT_EQ(AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC, inputDevices[0].getKeyboardType()); ASSERT_EQ(AINPUT_SOURCE_KEYBOARD, inputDevices[0].getSources()); ASSERT_EQ(size_t(0), inputDevices[0].getMotionRanges().size()); @@ -1311,7 +1315,7 @@ TEST_F(InputDeviceTest, WhenNoMappersAreRegistered_DeviceIsIgnored) { InputDeviceInfo info; mDevice->getDeviceInfo(&info); ASSERT_EQ(DEVICE_ID, info.getId()); - ASSERT_STREQ(DEVICE_NAME, info.getName().string()); + ASSERT_STREQ(DEVICE_NAME, info.getIdentifier().name.string()); ASSERT_EQ(AINPUT_KEYBOARD_TYPE_NONE, info.getKeyboardType()); ASSERT_EQ(AINPUT_SOURCE_UNKNOWN, info.getSources()); @@ -1381,7 +1385,7 @@ TEST_F(InputDeviceTest, WhenMappersAreRegistered_DeviceIsNotIgnoredAndForwardsRe InputDeviceInfo info; mDevice->getDeviceInfo(&info); ASSERT_EQ(DEVICE_ID, info.getId()); - ASSERT_STREQ(DEVICE_NAME, info.getName().string()); + ASSERT_STREQ(DEVICE_NAME, info.getIdentifier().name.string()); ASSERT_EQ(AINPUT_KEYBOARD_TYPE_ALPHABETIC, info.getKeyboardType()); ASSERT_EQ(uint32_t(AINPUT_SOURCE_KEYBOARD | AINPUT_SOURCE_TOUCHSCREEN), info.getSources()); diff --git a/services/java/com/android/server/AppWidgetService.java b/services/java/com/android/server/AppWidgetService.java index eb024e94245c..bf958a587c69 100644 --- a/services/java/com/android/server/AppWidgetService.java +++ b/services/java/com/android/server/AppWidgetService.java @@ -28,6 +28,7 @@ import android.content.IntentFilter; import android.content.ServiceConnection; import android.content.pm.PackageManager; import android.os.Binder; +import android.os.Bundle; import android.os.IBinder; import android.os.RemoteException; import android.util.Pair; @@ -260,6 +261,16 @@ class AppWidgetService extends IAppWidgetService.Stub return getImplForUser().getAppWidgetViews(appWidgetId); } + @Override + public void updateAppWidgetExtras(int appWidgetId, Bundle extras) { + getImplForUser().updateAppWidgetExtras(appWidgetId, extras); + } + + @Override + public Bundle getAppWidgetExtras(int appWidgetId) { + return getImplForUser().getAppWidgetExtras(appWidgetId); + } + static int[] getAppWidgetIds(Provider p) { int instancesSize = p.instances.size(); int appWidgetIds[] = new int[instancesSize]; diff --git a/services/java/com/android/server/AppWidgetServiceImpl.java b/services/java/com/android/server/AppWidgetServiceImpl.java index b24823ea06c2..3b43b9b6f884 100644 --- a/services/java/com/android/server/AppWidgetServiceImpl.java +++ b/services/java/com/android/server/AppWidgetServiceImpl.java @@ -113,6 +113,7 @@ class AppWidgetServiceImpl { int appWidgetId; Provider provider; RemoteViews views; + Bundle extras; Host host; } @@ -760,6 +761,38 @@ class AppWidgetServiceImpl { } } + public void updateAppWidgetExtras(int appWidgetId, Bundle extras) { + synchronized (mAppWidgetIds) { + ensureStateLoadedLocked(); + AppWidgetId id = lookupAppWidgetIdLocked(appWidgetId); + + if (id == null) { + return; + } + Provider p = id.provider; + id.extras = extras; + + // send the broacast saying that this appWidgetId has been deleted + Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_EXTRAS_CHANGED); + intent.setComponent(p.info.provider); + intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, id.appWidgetId); + intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_EXTRAS, extras); + mContext.sendBroadcast(intent, mUserId); + } + } + + public Bundle getAppWidgetExtras(int appWidgetId) { + synchronized (mAppWidgetIds) { + ensureStateLoadedLocked(); + AppWidgetId id = lookupAppWidgetIdLocked(appWidgetId); + if (id != null && id.extras != null) { + return id.extras; + } else { + return Bundle.EMPTY; + } + } + } + public void partiallyUpdateAppWidgetIds(int[] appWidgetIds, RemoteViews views) { if (appWidgetIds == null) { return; diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java index d8e3d5963964..eb33060fc2a3 100644 --- a/services/java/com/android/server/DevicePolicyManagerService.java +++ b/services/java/com/android/server/DevicePolicyManagerService.java @@ -451,7 +451,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { public DevicePolicyManagerService(Context context) { mContext = context; mMonitor = new MyPackageMonitor(); - mMonitor.register(context, true); + mMonitor.register(context, null, true); mWakeLock = ((PowerManager)context.getSystemService(Context.POWER_SERVICE)) .newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "DPM"); IntentFilter filter = new IntentFilter(); diff --git a/services/java/com/android/server/DeviceStorageMonitorService.java b/services/java/com/android/server/DeviceStorageMonitorService.java index b943c0996c55..0ed5189dd0e9 100644 --- a/services/java/com/android/server/DeviceStorageMonitorService.java +++ b/services/java/com/android/server/DeviceStorageMonitorService.java @@ -26,6 +26,7 @@ import android.content.pm.IPackageDataObserver; import android.content.pm.IPackageManager; import android.os.Binder; import android.os.Environment; +import android.os.FileObserver; import android.os.Handler; import android.os.Message; import android.os.Process; @@ -91,6 +92,7 @@ public class DeviceStorageMonitorService extends Binder { private Intent mStorageFullIntent; private Intent mStorageNotFullIntent; private CachePackageDataObserver mClearCacheObserver; + private final CacheFileDeletedObserver mCacheFileDeletedObserver; private static final int _TRUE = 1; private static final int _FALSE = 0; private long mMemLowThreshold; @@ -324,6 +326,9 @@ public class DeviceStorageMonitorService extends Binder { mMemLowThreshold = getMemThreshold(); mMemFullThreshold = getMemFullThreshold(); checkMemory(true); + + mCacheFileDeletedObserver = new CacheFileDeletedObserver(); + mCacheFileDeletedObserver.startWatching(); } @@ -419,4 +424,15 @@ public class DeviceStorageMonitorService extends Binder { public boolean isMemoryLow() { return mLowMemFlag; } + + public static class CacheFileDeletedObserver extends FileObserver { + public CacheFileDeletedObserver() { + super(Environment.getDownloadCacheDirectory().getAbsolutePath(), FileObserver.DELETE); + } + + @Override + public void onEvent(int event, String path) { + EventLogTags.writeCacheFileDeleted(path); + } + } } diff --git a/services/java/com/android/server/EventLogTags.logtags b/services/java/com/android/server/EventLogTags.logtags index 0bcec2e3b3a5..249513f2f4ed 100644 --- a/services/java/com/android/server/EventLogTags.logtags +++ b/services/java/com/android/server/EventLogTags.logtags @@ -36,7 +36,7 @@ option java_package com.android.server # --------------------------- -# DeviceStorageMonitoryService.java +# DeviceStorageMonitorService.java # --------------------------- # The disk space free on the /data partition, in bytes 2744 free_storage_changed (data|2|2) @@ -44,6 +44,8 @@ option java_package com.android.server 2745 low_storage (data|2|2) # disk space free on the /data, /system, and /cache partitions in bytes 2746 free_storage_left (data|2|2),(system|2|2),(cache|2|2) +# file on cache partition was deleted +2748 cache_file_deleted (path|3) # --------------------------- diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index a474cec77d09..43c22924210f 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -594,7 +594,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } mImListManager = new InputMethodAndSubtypeListManager(context, this); - (new MyPackageMonitor()).register(mContext, true); + (new MyPackageMonitor()).register(mContext, null, true); IntentFilter screenOnOffFilt = new IntentFilter(); screenOnOffFilt.addAction(Intent.ACTION_SCREEN_ON); diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java index 8cb9d99be32b..d651111e25f9 100644 --- a/services/java/com/android/server/LocationManagerService.java +++ b/services/java/com/android/server/LocationManagerService.java @@ -511,7 +511,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run com.android.internal.R.string.config_networkLocationProvider); mGeocodeProviderPackageName = resources.getString( com.android.internal.R.string.config_geocodeProvider); - mPackageMonitor.register(context, true); + mPackageMonitor.register(context, null, true); if (LOCAL_LOGV) { Slog.v(TAG, "Constructed LocationManager Service"); diff --git a/services/java/com/android/server/RecognitionManagerService.java b/services/java/com/android/server/RecognitionManagerService.java index 85224d89eb6c..3567cfc7a22d 100644 --- a/services/java/com/android/server/RecognitionManagerService.java +++ b/services/java/com/android/server/RecognitionManagerService.java @@ -65,7 +65,7 @@ public class RecognitionManagerService extends Binder { RecognitionManagerService(Context context) { mContext = context; mMonitor = new MyPackageMonitor(); - mMonitor.register(context, true); + mMonitor.register(context, null, true); } public void systemReady() { diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 02c4d5a9cdb2..729c3f3cacf2 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -726,6 +726,7 @@ class ServerThread extends Thread { final StatusBarManagerService statusBarF = statusBar; final DreamManagerService dreamyF = dreamy; final InputManagerService inputManagerF = inputManager; + final BluetoothService bluetoothF = bluetooth; // We now tell the activity manager it is okay to run third party // code. It will call back into us once it has gotten to the state @@ -838,7 +839,7 @@ class ServerThread extends Thread { reportWtf("making DreamManagerService ready", e); } try { - if (inputManagerF != null) inputManagerF.systemReady(); + if (inputManagerF != null) inputManagerF.systemReady(bluetoothF); } catch (Throwable e) { reportWtf("making InputManagerService ready", e); } diff --git a/services/java/com/android/server/TextServicesManagerService.java b/services/java/com/android/server/TextServicesManagerService.java index 106bb3e65119..499ff7a730b0 100644 --- a/services/java/com/android/server/TextServicesManagerService.java +++ b/services/java/com/android/server/TextServicesManagerService.java @@ -77,7 +77,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { mSystemReady = false; mContext = context; mMonitor = new TextServicesMonitor(); - mMonitor.register(context, true); + mMonitor.register(context, null, true); synchronized (mSpellCheckerMap) { buildSpellCheckerMapLocked(context, mSpellCheckerList, mSpellCheckerMap); } diff --git a/services/java/com/android/server/WallpaperManagerService.java b/services/java/com/android/server/WallpaperManagerService.java index 6d83f3090c44..d97d335a1d5c 100644 --- a/services/java/com/android/server/WallpaperManagerService.java +++ b/services/java/com/android/server/WallpaperManagerService.java @@ -295,7 +295,7 @@ class WallpaperManagerService extends IWallpaperManager.Stub { || !wallpaper.wallpaperComponent.getPackageName().equals(packageName)) { continue; } - doPackagesChanged(true, wallpaper); + doPackagesChangedLocked(true, wallpaper); } } } @@ -315,66 +315,68 @@ class WallpaperManagerService extends IWallpaperManager.Stub { @Override public boolean onHandleForceStop(Intent intent, String[] packages, int uid, boolean doit) { - boolean changed = false; - for (int i = 0; i < mWallpaperMap.size(); i++) { - WallpaperData wallpaper = mWallpaperMap.valueAt(i); - boolean res = doPackagesChanged(doit, wallpaper); - changed |= res; + synchronized (mLock) { + boolean changed = false; + for (int i = 0; i < mWallpaperMap.size(); i++) { + WallpaperData wallpaper = mWallpaperMap.valueAt(i); + boolean res = doPackagesChangedLocked(doit, wallpaper); + changed |= res; + } + return changed; } - return changed; } @Override public void onSomePackagesChanged() { - for (int i = 0; i < mWallpaperMap.size(); i++) { - WallpaperData wallpaper = mWallpaperMap.valueAt(i); - doPackagesChanged(true, wallpaper); + synchronized (mLock) { + for (int i = 0; i < mWallpaperMap.size(); i++) { + WallpaperData wallpaper = mWallpaperMap.valueAt(i); + doPackagesChangedLocked(true, wallpaper); + } } } - boolean doPackagesChanged(boolean doit, WallpaperData wallpaper) { + boolean doPackagesChangedLocked(boolean doit, WallpaperData wallpaper) { boolean changed = false; - synchronized (mLock) { - if (wallpaper.wallpaperComponent != null) { - int change = isPackageDisappearing(wallpaper.wallpaperComponent - .getPackageName()); - if (change == PACKAGE_PERMANENT_CHANGE - || change == PACKAGE_TEMPORARY_CHANGE) { - changed = true; - if (doit) { - Slog.w(TAG, "Wallpaper uninstalled, removing: " - + wallpaper.wallpaperComponent); - clearWallpaperLocked(false, wallpaper.userId); - } - } - } - if (wallpaper.nextWallpaperComponent != null) { - int change = isPackageDisappearing(wallpaper.nextWallpaperComponent - .getPackageName()); - if (change == PACKAGE_PERMANENT_CHANGE - || change == PACKAGE_TEMPORARY_CHANGE) { - wallpaper.nextWallpaperComponent = null; - } - } - if (wallpaper.wallpaperComponent != null - && isPackageModified(wallpaper.wallpaperComponent.getPackageName())) { - try { - mContext.getPackageManager().getServiceInfo( - wallpaper.wallpaperComponent, 0); - } catch (NameNotFoundException e) { - Slog.w(TAG, "Wallpaper component gone, removing: " + if (wallpaper.wallpaperComponent != null) { + int change = isPackageDisappearing(wallpaper.wallpaperComponent + .getPackageName()); + if (change == PACKAGE_PERMANENT_CHANGE + || change == PACKAGE_TEMPORARY_CHANGE) { + changed = true; + if (doit) { + Slog.w(TAG, "Wallpaper uninstalled, removing: " + wallpaper.wallpaperComponent); clearWallpaperLocked(false, wallpaper.userId); } } - if (wallpaper.nextWallpaperComponent != null - && isPackageModified(wallpaper.nextWallpaperComponent.getPackageName())) { - try { - mContext.getPackageManager().getServiceInfo( - wallpaper.nextWallpaperComponent, 0); - } catch (NameNotFoundException e) { - wallpaper.nextWallpaperComponent = null; - } + } + if (wallpaper.nextWallpaperComponent != null) { + int change = isPackageDisappearing(wallpaper.nextWallpaperComponent + .getPackageName()); + if (change == PACKAGE_PERMANENT_CHANGE + || change == PACKAGE_TEMPORARY_CHANGE) { + wallpaper.nextWallpaperComponent = null; + } + } + if (wallpaper.wallpaperComponent != null + && isPackageModified(wallpaper.wallpaperComponent.getPackageName())) { + try { + mContext.getPackageManager().getServiceInfo( + wallpaper.wallpaperComponent, 0); + } catch (NameNotFoundException e) { + Slog.w(TAG, "Wallpaper component gone, removing: " + + wallpaper.wallpaperComponent); + clearWallpaperLocked(false, wallpaper.userId); + } + } + if (wallpaper.nextWallpaperComponent != null + && isPackageModified(wallpaper.nextWallpaperComponent.getPackageName())) { + try { + mContext.getPackageManager().getServiceInfo( + wallpaper.nextWallpaperComponent, 0); + } catch (NameNotFoundException e) { + wallpaper.nextWallpaperComponent = null; } } return changed; @@ -387,7 +389,7 @@ class WallpaperManagerService extends IWallpaperManager.Stub { mIWindowManager = IWindowManager.Stub.asInterface( ServiceManager.getService(Context.WINDOW_SERVICE)); mMonitor = new MyPackageMonitor(); - mMonitor.register(context, true); + mMonitor.register(context, null, true); WALLPAPER_BASE_DIR.mkdirs(); loadSettingsLocked(0); } diff --git a/services/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/java/com/android/server/accessibility/AccessibilityManagerService.java index 66758164a5f6..e980ccc9bbba 100644 --- a/services/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -23,6 +23,7 @@ import android.Manifest; import android.accessibilityservice.AccessibilityService; import android.accessibilityservice.AccessibilityServiceInfo; import android.accessibilityservice.IAccessibilityServiceClient; +import android.accessibilityservice.IAccessibilityServiceClientCallback; import android.accessibilityservice.IAccessibilityServiceConnection; import android.app.PendingIntent; import android.content.BroadcastReceiver; @@ -40,8 +41,10 @@ import android.hardware.input.InputManager; import android.net.Uri; import android.os.Binder; import android.os.Build; +import android.os.Bundle; import android.os.Handler; import android.os.IBinder; +import android.os.Looper; import android.os.Message; import android.os.RemoteException; import android.os.ServiceManager; @@ -55,7 +58,9 @@ import android.view.IWindow; import android.view.InputDevice; import android.view.KeyCharacterMap; import android.view.KeyEvent; +import android.view.View; import android.view.accessibility.AccessibilityEvent; +import android.view.accessibility.AccessibilityInteractionClient; import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.IAccessibilityInteractionConnection; @@ -64,6 +69,8 @@ import android.view.accessibility.IAccessibilityManager; import android.view.accessibility.IAccessibilityManagerClient; import com.android.internal.content.PackageMonitor; +import com.android.internal.os.HandlerCaller; +import com.android.internal.os.HandlerCaller.Callback; import com.android.server.accessibility.TouchExplorer.GestureListener; import com.android.server.wm.WindowManagerService; @@ -78,6 +85,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.concurrent.atomic.AtomicInteger; /** * This class is instantiated by the system as a system level service and can be @@ -97,10 +105,12 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub private static final String FUNCTION_REGISTER_UI_TEST_AUTOMATION_SERVICE = "registerUiTestAutomationService"; - private static int sIdCounter = 0; - private static final int OWN_PROCESS_ID = android.os.Process.myPid(); + private static final int UNDEFINED = -1; + + private static int sIdCounter = 0; + private static int sNextWindowId; final Context mContext; @@ -145,6 +155,10 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub private Service mUiAutomationService; + private GestureHandler mGestureHandler; + + private int mDefaultGestureHandlingHelperServiceId = UNDEFINED; + /** * Handler for delayed event dispatch. */ @@ -269,11 +283,11 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub }; // package changes - monitor.register(context, true); + monitor.register(context, null, true); // boot completed IntentFilter bootFiler = new IntentFilter(Intent.ACTION_BOOT_COMPLETED); - mContext.registerReceiver(monitor, bootFiler); + mContext.registerReceiver(monitor, bootFiler, null, monitor.getRegisteredHandler()); } /** @@ -471,26 +485,60 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub } @Override - public void onGesture(int gestureId) { + public boolean onGesture(int gestureId) { + // Lazily instantiate the gesture handler. + if (mGestureHandler == null) { + mGestureHandler = new GestureHandler(); + } synchronized (mLock) { - final boolean dispatched = notifyGestureLocked(gestureId, false); - if (!dispatched) { - notifyGestureLocked(gestureId, true); + boolean handled = notifyGestureLocked(gestureId, false); + if (!handled) { + handled = notifyGestureLocked(gestureId, true); + } + if (!handled) { + mGestureHandler.scheduleHandleGestureDefault(gestureId); } + return handled; + } + } + + private Service getDefaultGestureHandlingHelperService() { + // Since querying of screen content is done through the + // AccessibilityInteractionClient which talks to an + // IAccessibilityServiceConnection implementation we create a proxy + // Service when necessary to enable interaction with the remote + // view tree. Note that this service is just a stateless proxy + // that does not get any events or interrupts. + if (mDefaultGestureHandlingHelperServiceId == UNDEFINED) { + ComponentName name = new ComponentName("android", + "DefaultGestureHandlingHelperService"); + AccessibilityServiceInfo info = new AccessibilityServiceInfo(); + Service service = new Service(name, info, true); + mDefaultGestureHandlingHelperServiceId = service.mId; + AccessibilityInteractionClient.getInstance().addConnection( + mDefaultGestureHandlingHelperServiceId, service); + return service; + } else { + return (Service) AccessibilityInteractionClient.getInstance() + .getConnection(mDefaultGestureHandlingHelperServiceId); } } private boolean notifyGestureLocked(int gestureId, boolean isDefault) { - final int serviceCount = mServices.size(); - for (int i = 0; i < serviceCount; i++) { + // TODO: Now we are giving the gestures to the last enabled + // service that can handle them which is the last one + // in our list since we write the last enabled as the + // last record in the enabled services setting. Ideally, + // the user should make the call which service handles + // gestures. However, only one service should handle + // gestrues to avoid user frustration when different + // bahiour is observed from different combinations of + // enabled accessibility services. + for (int i = mServices.size() - 1; i >= 0; i--) { Service service = mServices.get(i); - if (service.mIsDefault == isDefault) { - try { - service.mServiceInterface.onGesture(gestureId); - return true; - } catch (RemoteException re) { - Slog.e(LOG_TAG, "Error dispatching gesture."); - } + if (service.mCanHandleGestures && service.mIsDefault == isDefault) { + mGestureHandler.scheduleHandleGesture(gestureId, service.mServiceInterface); + return true; } } return false; @@ -935,6 +983,212 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub } } + class GestureHandler extends IAccessibilityServiceClientCallback.Stub + implements Runnable, Callback { + + private static final String THREAD_NAME = "AccessibilityGestureHandler"; + + private static final long TIMEOUT_INTERACTION_MILLIS = 5000; + + private static final int MSG_HANDLE_GESTURE = 1; + + private static final int MSG_HANDLE_GESTURE_DEFAULT = 2; + + private final AtomicInteger mInteractionCounter = new AtomicInteger(); + + private final Object mGestureLock = new Object(); + + private HandlerCaller mHandlerCaller; + + private volatile int mInteractionId = -1; + + private volatile boolean mGestureResult; + + public GestureHandler() { + synchronized (mGestureLock) { + Thread worker = new Thread(this, THREAD_NAME); + worker.start(); + while (mHandlerCaller == null) { + try { + mGestureLock.wait(); + } catch (InterruptedException ie) { + /* ignore */ + } + } + } + } + + @Override + public void run() { + Looper.prepare(); + synchronized (mGestureLock) { + mHandlerCaller = new HandlerCaller(mContext, Looper.myLooper(), this); + mGestureLock.notifyAll(); + } + Looper.loop(); + } + + @Override + public void setGestureResult(int gestureId, boolean handled, int interactionId) { + synchronized (mGestureLock) { + if (interactionId > mInteractionId) { + mGestureResult = handled; + mInteractionId = interactionId; + } + mGestureLock.notifyAll(); + } + } + + @Override + public void executeMessage(Message message) { + final int type = message.what; + switch (type) { + case MSG_HANDLE_GESTURE: { + IAccessibilityServiceClient service = + (IAccessibilityServiceClient) message.obj; + final int gestureId = message.arg1; + final int interactionId = message.arg2; + + try { + service.onGesture(gestureId, this, interactionId); + } catch (RemoteException re) { + Slog.e(LOG_TAG, "Error dispatching a gesture to a client.", re); + return; + } + + long waitTimeMillis = 0; + final long startTimeMillis = SystemClock.uptimeMillis(); + synchronized (mGestureLock) { + while (true) { + try { + // Did we get the expected callback? + if (mInteractionId == interactionId) { + break; + } + // Did we get an obsolete callback? + if (mInteractionId > interactionId) { + break; + } + // Did we time out? + final long elapsedTimeMillis = + SystemClock.uptimeMillis() - startTimeMillis; + waitTimeMillis = TIMEOUT_INTERACTION_MILLIS - elapsedTimeMillis; + if (waitTimeMillis <= 0) { + break; + } + mGestureLock.wait(waitTimeMillis); + } catch (InterruptedException ie) { + /* ignore */ + } + } + handleGestureIfNeededAndResetLocked(gestureId); + } + } break; + case MSG_HANDLE_GESTURE_DEFAULT: { + final int gestureId = message.arg1; + handleGestureDefault(gestureId); + } break; + default: { + throw new IllegalArgumentException("Unknown message type: " + type); + } + } + } + + private void handleGestureIfNeededAndResetLocked(int gestureId) { + if (!mGestureResult) { + handleGestureDefault(gestureId); + } + mGestureResult = false; + mInteractionId = -1; + } + + public void scheduleHandleGesture(int gestureId, IAccessibilityServiceClient service) { + final int interactionId = mInteractionCounter.incrementAndGet(); + mHandlerCaller.obtainMessageIIO(MSG_HANDLE_GESTURE, gestureId, interactionId, + service).sendToTarget(); + } + + public void scheduleHandleGestureDefault(int gestureId) { + final int interactionId = mInteractionCounter.incrementAndGet(); + mHandlerCaller.obtainMessageI(MSG_HANDLE_GESTURE_DEFAULT, gestureId).sendToTarget(); + } + + private void handleGestureDefault(int gestureId) { + Service service = getDefaultGestureHandlingHelperService(); + + // Global actions. + switch (gestureId) { + case AccessibilityService.GESTURE_SWIPE_DOWN_AND_LEFT: { + service.performGlobalAction(AccessibilityService.GLOBAL_ACTION_BACK); + } return; + case AccessibilityService.GESTURE_SWIPE_DOWN_AND_RIGHT: { + service.performGlobalAction(AccessibilityService.GLOBAL_ACTION_HOME); + } return; + case AccessibilityService.GESTURE_SWIPE_UP_AND_LEFT: { + service.performGlobalAction(AccessibilityService.GLOBAL_ACTION_RECENTS); + } return; + case AccessibilityService.GESTURE_SWIPE_UP_AND_RIGHT: { + service.performGlobalAction(AccessibilityService.GLOBAL_ACTION_NOTIFICATIONS); + } return; + } + + AccessibilityInteractionClient client = AccessibilityInteractionClient.getInstance(); + + AccessibilityNodeInfo root = client.getRootInActiveWindow(service.mId); + if (root == null) { + return; + } + + AccessibilityNodeInfo current = root.findFocus( + AccessibilityNodeInfo.FOCUS_ACCESSIBILITY); + if (current == null) { + current = root; + } + + // Local actions. + AccessibilityNodeInfo next = null; + switch (gestureId) { + case AccessibilityService.GESTURE_SWIPE_UP: { + next = current.focusSearch(View.ACCESSIBILITY_FOCUS_OUT); + } break; + case AccessibilityService.GESTURE_SWIPE_DOWN: { + next = current.focusSearch(View.ACCESSIBILITY_FOCUS_IN); + } break; + case AccessibilityService.GESTURE_SWIPE_LEFT: { + // TODO: Implement the RTL support. +// if (mLayoutDirection == View.LAYOUT_DIRECTION_LTR) { + next = current.focusSearch(View.ACCESSIBILITY_FOCUS_BACKWARD); +// } else { // LAYOUT_DIRECTION_RTL +// next = current.focusSearch(View.ACCESSIBILITY_FOCUS_FORWARD); +// } + } break; + case AccessibilityService.GESTURE_SWIPE_RIGHT: { + // TODO: Implement the RTL support. +// if (mLayoutDirection == View.LAYOUT_DIRECTION_LTR) { + next = current.focusSearch(View.ACCESSIBILITY_FOCUS_FORWARD); +// } else { // LAYOUT_DIRECTION_RTL +// next = current.focusSearch(View.ACCESSIBILITY_FOCUS_BACKWARD); +// } + } break; + case AccessibilityService.GESTURE_SWIPE_UP_AND_DOWN: { + next = current.focusSearch(View.ACCESSIBILITY_FOCUS_UP); + } break; + case AccessibilityService.GESTURE_SWIPE_DOWN_AND_UP: { + next = current.focusSearch(View.ACCESSIBILITY_FOCUS_DOWN); + } break; + case AccessibilityService.GESTURE_SWIPE_LEFT_AND_RIGHT: { + next = current.focusSearch(View.ACCESSIBILITY_FOCUS_LEFT); + } break; + case AccessibilityService.GESTURE_SWIPE_RIGHT_AND_LEFT: { + next = current.focusSearch(View.ACCESSIBILITY_FOCUS_RIGHT); + } break; + } + if (next != null && !next.equals(current)) { + next.performAction(AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS); + } + } + } + /** * This class represents an accessibility service. It stores all per service * data required for the service management, provides API for starting/stopping the @@ -971,6 +1225,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub boolean mCanRetrieveScreenContent; + boolean mCanHandleGestures; + boolean mIsAutomation; final Rect mTempBounds = new Rect(); @@ -987,6 +1243,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub mIsAutomation = isAutomation; if (!isAutomation) { mCanRetrieveScreenContent = accessibilityServiceInfo.getCanRetrieveWindowContent(); + mCanHandleGestures = accessibilityServiceInfo.getCanHandleGestures(); mIntent = new Intent().setComponent(mComponentName); mIntent.putExtra(Intent.EXTRA_CLIENT_LABEL, com.android.internal.R.string.accessibility_binding_label); @@ -995,6 +1252,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub } else { mCanRetrieveScreenContent = true; mIncludeNotImportantViews = true; + mCanHandleGestures = true; } setDynamicallyConfigurableProperties(accessibilityServiceInfo); } @@ -1290,7 +1548,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub @Override public boolean performAccessibilityAction(int accessibilityWindowId, - long accessibilityNodeId, int action, int interactionId, + long accessibilityNodeId, int action, Bundle arguments, int interactionId, IAccessibilityInteractionConnectionCallback callback, long interrogatingTid) { final int resolvedWindowId = resolveAccessibilityWindowId(accessibilityWindowId); IAccessibilityInteractionConnection connection = null; @@ -1311,8 +1569,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub final int flags = (mIncludeNotImportantViews) ? AccessibilityNodeInfo.INCLUDE_NOT_IMPORTANT_VIEWS : 0; final int interrogatingPid = Binder.getCallingPid(); - connection.performAccessibilityAction(accessibilityNodeId, action, interactionId, - callback, flags, interrogatingPid, interrogatingTid); + connection.performAccessibilityAction(accessibilityNodeId, action, arguments, + interactionId, callback, flags, interrogatingPid, interrogatingTid); } catch (RemoteException re) { if (DEBUG) { Slog.e(LOG_TAG, "Error calling performAccessibilityAction()"); @@ -1323,7 +1581,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub return true; } - public boolean perfromGlobalAction(int action) { + public boolean performGlobalAction(int action) { switch (action) { case AccessibilityService.GLOBAL_ACTION_BACK: { sendDownAndUpKeyEvents(KeyEvent.KEYCODE_BACK); @@ -1441,7 +1699,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub | AccessibilityNodeInfo.ACTION_SELECT | AccessibilityNodeInfo.ACTION_CLEAR_SELECTION | AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS - | AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS; + | AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS + | AccessibilityNodeInfo.ACTION_NEXT_AT_GRANULARITY + | AccessibilityNodeInfo.ACTION_PREVIOUS_AT_GRANULARITY; private static final int RETRIEVAL_ALLOWING_EVENT_TYPES = AccessibilityEvent.TYPE_VIEW_CLICKED diff --git a/services/java/com/android/server/accessibility/TouchExplorer.java b/services/java/com/android/server/accessibility/TouchExplorer.java index 5d01c7710bf9..39012e6ee253 100644 --- a/services/java/com/android/server/accessibility/TouchExplorer.java +++ b/services/java/com/android/server/accessibility/TouchExplorer.java @@ -152,7 +152,7 @@ public class TouchExplorer { * * @param gestureId The gesture id. */ - public void onGesture(int gestureId); + public boolean onGesture(int gestureId); } /** diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index ad13c41b4703..24bab99a3398 100644 --- a/services/java/com/android/server/am/ActivityStack.java +++ b/services/java/com/android/server/am/ActivityStack.java @@ -16,6 +16,9 @@ package com.android.server.am; +import static android.Manifest.permission.START_ANY_ACTIVITY; +import static android.content.pm.PackageManager.PERMISSION_GRANTED; + import com.android.internal.app.HeavyWeightSwitcherActivity; import com.android.internal.os.BatteryStatsImpl; import com.android.server.am.ActivityManagerService.PendingActivityLaunch; @@ -2407,9 +2410,11 @@ final class ActivityStack { return err; } - final int perm = mService.checkComponentPermission(aInfo.permission, callingPid, + final int startAnyPerm = mService.checkPermission( + START_ANY_ACTIVITY, callingPid, callingUid); + final int componentPerm = mService.checkComponentPermission(aInfo.permission, callingPid, callingUid, aInfo.applicationInfo.uid, aInfo.exported); - if (perm != PackageManager.PERMISSION_GRANTED) { + if (startAnyPerm != PERMISSION_GRANTED && componentPerm != PERMISSION_GRANTED) { if (resultRecord != null) { sendActivityResultLocked(-1, resultRecord, resultWho, requestCode, diff --git a/services/java/com/android/server/am/UsageStatsService.java b/services/java/com/android/server/am/UsageStatsService.java index e810e3c5bf51..ba65f3984782 100644 --- a/services/java/com/android/server/am/UsageStatsService.java +++ b/services/java/com/android/server/am/UsageStatsService.java @@ -656,7 +656,7 @@ public final class UsageStatsService extends IUsageStats.Stub { } } }; - mPackageMonitor.register(mContext, true); + mPackageMonitor.register(mContext, null, true); filterHistoryStats(); } diff --git a/services/java/com/android/server/input/InputManagerService.java b/services/java/com/android/server/input/InputManagerService.java index a4ed31c040af..189a9c726746 100644 --- a/services/java/com/android/server/input/InputManagerService.java +++ b/services/java/com/android/server/input/InputManagerService.java @@ -26,6 +26,8 @@ import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlSerializer; import android.Manifest; +import android.bluetooth.BluetoothAdapter; +import android.bluetooth.BluetoothDevice; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -56,6 +58,7 @@ import android.os.Process; import android.os.RemoteException; import android.provider.Settings; import android.provider.Settings.SettingNotFoundException; +import android.server.BluetoothService; import android.util.Log; import android.util.Slog; import android.util.SparseArray; @@ -106,6 +109,7 @@ public class InputManagerService extends IInputManager.Stub implements Watchdog. private final Callbacks mCallbacks; private final InputManagerHandler mHandler; private boolean mSystemReady; + private BluetoothService mBluetoothService; // Persistent data store. Must be locked each time during use. private final PersistentDataStore mDataStore = new PersistentDataStore(); @@ -167,6 +171,7 @@ public class InputManagerService extends IInputManager.Stub implements Watchdog. int repeat, int token); private static native void nativeCancelVibrate(int ptr, int deviceId, int token); private static native void nativeReloadKeyboardLayouts(int ptr); + private static native void nativeReloadDeviceAliases(int ptr); private static native String nativeDump(int ptr); private static native void nativeMonitor(int ptr); @@ -217,12 +222,12 @@ public class InputManagerService extends IInputManager.Stub implements Watchdog. updateShowTouchesFromSettings(); } - public void systemReady() { + public void systemReady(BluetoothService bluetoothService) { if (DEBUG) { Slog.d(TAG, "System ready."); } + mBluetoothService = bluetoothService; mSystemReady = true; - reloadKeyboardLayouts(); IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED); filter.addAction(Intent.ACTION_PACKAGE_REMOVED); @@ -237,12 +242,30 @@ public class InputManagerService extends IInputManager.Stub implements Watchdog. reloadKeyboardLayouts(); } }, filter, null, mHandler); + + filter = new IntentFilter(BluetoothDevice.ACTION_ALIAS_CHANGED); + mContext.registerReceiver(new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + if (DEBUG) { + Slog.d(TAG, "Bluetooth alias changed, reloading device names."); + } + reloadDeviceAliases(); + } + }, filter, null, mHandler); + + reloadKeyboardLayouts(); + reloadDeviceAliases(); } private void reloadKeyboardLayouts() { nativeReloadKeyboardLayouts(mPtr); } + private void reloadDeviceAliases() { + nativeReloadDeviceAliases(mPtr); + } + public void setDisplaySize(int displayId, int width, int height, int externalWidth, int externalHeight) { if (width <= 0 || height <= 0 || externalWidth <= 0 || externalHeight <= 0) { @@ -1121,6 +1144,15 @@ public class InputManagerService extends IInputManager.Stub implements Watchdog. return result; } + // Native callback. + private String getDeviceAlias(String uniqueId) { + if (mBluetoothService != null && + BluetoothAdapter.checkBluetoothAddress(uniqueId)) { + return mBluetoothService.getRemoteAlias(uniqueId); + } + return null; + } + /** * Callback interface implemented by the Window Manager. diff --git a/services/java/com/android/server/net/NetworkPolicyManagerService.java b/services/java/com/android/server/net/NetworkPolicyManagerService.java index 1e17067a1530..52d50195f863 100644 --- a/services/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/java/com/android/server/net/NetworkPolicyManagerService.java @@ -30,6 +30,8 @@ import static android.net.ConnectivityManager.TYPE_ETHERNET; import static android.net.ConnectivityManager.TYPE_MOBILE; import static android.net.ConnectivityManager.TYPE_WIFI; import static android.net.ConnectivityManager.TYPE_WIMAX; +import static android.net.ConnectivityManager.isNetworkTypeMobile; +import static android.net.NetworkPolicy.CYCLE_NONE; import static android.net.NetworkPolicy.LIMIT_DISABLED; import static android.net.NetworkPolicy.SNOOZE_NEVER; import static android.net.NetworkPolicy.WARNING_DISABLED; @@ -48,6 +50,14 @@ import static android.net.NetworkTemplate.MATCH_MOBILE_ALL; import static android.net.NetworkTemplate.MATCH_WIFI; import static android.net.NetworkTemplate.buildTemplateMobileAll; import static android.net.TrafficStats.MB_IN_BYTES; +import static android.net.wifi.WifiInfo.removeDoubleQuotes; +import static android.net.wifi.WifiManager.CHANGE_REASON_ADDED; +import static android.net.wifi.WifiManager.CHANGE_REASON_REMOVED; +import static android.net.wifi.WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION; +import static android.net.wifi.WifiManager.EXTRA_CHANGE_REASON; +import static android.net.wifi.WifiManager.EXTRA_NETWORK_INFO; +import static android.net.wifi.WifiManager.EXTRA_WIFI_CONFIGURATION; +import static android.net.wifi.WifiManager.EXTRA_WIFI_INFO; import static android.telephony.TelephonyManager.SIM_STATE_READY; import static android.text.format.DateUtils.DAY_IN_MILLIS; import static com.android.internal.util.ArrayUtils.appendInt; @@ -84,10 +94,14 @@ import android.net.INetworkPolicyListener; import android.net.INetworkPolicyManager; import android.net.INetworkStatsService; import android.net.NetworkIdentity; +import android.net.NetworkInfo; import android.net.NetworkPolicy; import android.net.NetworkQuotaInfo; import android.net.NetworkState; import android.net.NetworkTemplate; +import android.net.wifi.WifiConfiguration; +import android.net.wifi.WifiInfo; +import android.net.wifi.WifiManager; import android.os.Binder; import android.os.Environment; import android.os.Handler; @@ -355,6 +369,17 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { mContext.registerReceiver(mSnoozeWarningReceiver, snoozeWarningFilter, MANAGE_NETWORK_POLICY, mHandler); + // listen for configured wifi networks to be removed + final IntentFilter wifiConfigFilter = new IntentFilter(CONFIGURED_NETWORKS_CHANGED_ACTION); + mContext.registerReceiver( + mWifiConfigReceiver, wifiConfigFilter, CONNECTIVITY_INTERNAL, mHandler); + + // listen for wifi state changes to catch metered hint + final IntentFilter wifiStateFilter = new IntentFilter( + WifiManager.NETWORK_STATE_CHANGED_ACTION); + mContext.registerReceiver( + mWifiStateReceiver, wifiStateFilter, CONNECTIVITY_INTERNAL, mHandler); + } private IProcessObserver mProcessObserver = new IProcessObserver.Stub() { @@ -463,6 +488,73 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { }; /** + * Receiver that watches for {@link WifiConfiguration} to be changed. + */ + private BroadcastReceiver mWifiConfigReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + // on background handler thread, and verified CONNECTIVITY_INTERNAL + // permission above. + + final int reason = intent.getIntExtra(EXTRA_CHANGE_REASON, CHANGE_REASON_ADDED); + if (reason == CHANGE_REASON_REMOVED) { + final WifiConfiguration config = intent.getParcelableExtra( + EXTRA_WIFI_CONFIGURATION); + final NetworkTemplate template = NetworkTemplate.buildTemplateWifi( + removeDoubleQuotes(config.SSID)); + synchronized (mRulesLock) { + if (mNetworkPolicy.containsKey(template)) { + mNetworkPolicy.remove(template); + writePolicyLocked(); + } + } + } + } + }; + + /** + * Receiver that watches {@link WifiInfo} state changes to infer metered + * state. Ignores hints when policy is user-defined. + */ + private BroadcastReceiver mWifiStateReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + // on background handler thread, and verified CONNECTIVITY_INTERNAL + // permission above. + + // ignore when not connected + final NetworkInfo netInfo = intent.getParcelableExtra(EXTRA_NETWORK_INFO); + if (!netInfo.isConnected()) return; + + final WifiInfo info = intent.getParcelableExtra(EXTRA_WIFI_INFO); + final boolean meteredHint = info.getMeteredHint(); + + final NetworkTemplate template = NetworkTemplate.buildTemplateWifi( + removeDoubleQuotes(info.getSSID())); + synchronized (mRulesLock) { + NetworkPolicy policy = mNetworkPolicy.get(template); + if (policy == null && meteredHint) { + // policy doesn't exist, and AP is hinting that it's + // metered: create an inferred policy. + policy = new NetworkPolicy(template, CYCLE_NONE, Time.TIMEZONE_UTC, + WARNING_DISABLED, LIMIT_DISABLED, SNOOZE_NEVER, SNOOZE_NEVER, + meteredHint, true); + addNetworkPolicyLocked(policy); + + } else if (policy != null && policy.inferred) { + // policy exists, and was inferred: update its current + // metered state. + policy.metered = meteredHint; + + // since this is inferred for each wifi session, just update + // rules without persisting. + updateNetworkRulesLocked(); + } + } + } + }; + + /** * Observer that watches for {@link INetworkManagementService} alerts. */ private INetworkManagementEventObserver mAlertObserver = new NetworkAlertObserver() { @@ -974,9 +1066,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { final String cycleTimezone = time.timezone; final NetworkTemplate template = buildTemplateMobileAll(subscriberId); - mNetworkPolicy.put(template, new NetworkPolicy(template, cycleDay, cycleTimezone, - warningBytes, LIMIT_DISABLED, SNOOZE_NEVER, SNOOZE_NEVER, true, true)); - writePolicyLocked(); + final NetworkPolicy policy = new NetworkPolicy(template, cycleDay, cycleTimezone, + warningBytes, LIMIT_DISABLED, SNOOZE_NEVER, SNOOZE_NEVER, true, true); + addNetworkPolicyLocked(policy); } } @@ -1269,6 +1361,15 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { } } + private void addNetworkPolicyLocked(NetworkPolicy policy) { + mNetworkPolicy.put(policy.template, policy); + + updateNetworkEnabledLocked(); + updateNetworkRulesLocked(); + updateNotificationsLocked(); + writePolicyLocked(); + } + @Override public NetworkPolicy[] getNetworkPolicies() { mContext.enforceCallingOrSelfPermission(MANAGE_NETWORK_POLICY, TAG); @@ -1402,6 +1503,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { if (policy != null) { return policy.metered; } else { + final int type = state.networkInfo.getType(); + if (isNetworkTypeMobile(type) || type == TYPE_WIMAX) { + return true; + } return false; } } diff --git a/services/java/com/android/server/net/NetworkStatsService.java b/services/java/com/android/server/net/NetworkStatsService.java index 2a67e02db289..f53e9570d7a6 100644 --- a/services/java/com/android/server/net/NetworkStatsService.java +++ b/services/java/com/android/server/net/NetworkStatsService.java @@ -420,6 +420,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub { @Override public INetworkStatsSession openSession() { mContext.enforceCallingOrSelfPermission(READ_NETWORK_USAGE_HISTORY, TAG); + assertBandwidthControlEnabled(); // return an IBinder which holds strong references to any loaded stats // for its lifetime; when caller closes only weak references remain. @@ -486,6 +487,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub { @Override public long getNetworkTotalBytes(NetworkTemplate template, long start, long end) { mContext.enforceCallingOrSelfPermission(READ_NETWORK_USAGE_HISTORY, TAG); + assertBandwidthControlEnabled(); return mDevStatsCached.getSummary(template, start, end).getTotalBytes(); } @@ -494,6 +496,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub { if (Binder.getCallingUid() != uid) { mContext.enforceCallingOrSelfPermission(ACCESS_NETWORK_STATE, TAG); } + assertBandwidthControlEnabled(); // TODO: switch to data layer stats once kernel exports // for now, read network layer stats and flatten across all ifaces @@ -565,6 +568,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub { @Override public void forceUpdate() { mContext.enforceCallingOrSelfPermission(READ_NETWORK_USAGE_HISTORY, TAG); + assertBandwidthControlEnabled(); final long token = Binder.clearCallingIdentity(); try { @@ -1039,6 +1043,12 @@ public class NetworkStatsService extends INetworkStatsService.Stub { } }; + private void assertBandwidthControlEnabled() { + if (!isBandwidthControlEnabled()) { + throw new IllegalStateException("Bandwidth module disabled"); + } + } + private boolean isBandwidthControlEnabled() { try { return mNetworkManager.isBandwidthControlEnabled(); diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index b97d7fd66a7a..6891b76aabef 100644 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -6067,10 +6067,23 @@ public class PackageManagerService extends IPackageManager.Stub { Intent.FLAG_GRANT_READ_URI_PERMISSION); ret = imcs.copyResource(packageURI, out); } finally { - try { if (out != null) out.close(); } catch (IOException e) {} + IoUtils.closeQuietly(out); mContext.revokeUriPermission(packageURI, Intent.FLAG_GRANT_READ_URI_PERMISSION); } + if (isFwdLocked()) { + final File destResourceFile = new File(getResourcePath()); + + // Copy the public files + try { + PackageHelper.extractPublicFiles(codeFileName, destResourceFile); + } catch (IOException e) { + Slog.e(TAG, "Couldn't create a new zip file for the public parts of a" + + " forward-locked app."); + destResourceFile.delete(); + return PackageManager.INSTALL_FAILED_INSUFFICIENT_STORAGE; + } + } return ret; } @@ -6086,21 +6099,29 @@ public class PackageManagerService extends IPackageManager.Stub { cleanUp(); return false; } else { - // Rename based on packageName - File codeFile = new File(getCodePath()); - String apkName = getNextCodePath(oldCodePath, pkgName, ".apk"); - File desFile = new File(installDir, apkName + ".apk"); - if (!codeFile.renameTo(desFile)) { + final File oldCodeFile = new File(getCodePath()); + final File oldResourceFile = new File(getResourcePath()); + + // Rename APK file based on packageName + final String apkName = getNextCodePath(oldCodePath, pkgName, ".apk"); + final File newCodeFile = new File(installDir, apkName + ".apk"); + if (!oldCodeFile.renameTo(newCodeFile)) { + return false; + } + codeFileName = newCodeFile.getPath(); + + // Rename public resource file if it's forward-locked. + final File newResFile = new File(getResourcePathFromCodePath()); + if (isFwdLocked() && !oldResourceFile.renameTo(newResFile)) { return false; } - // Reset paths since the file has been renamed. - codeFileName = desFile.getPath(); resourceFileName = getResourcePathFromCodePath(); - // Set permissions + + // Attempt to set permissions if (!setPermissions()) { - // Failed setting permissions. return false; } + return true; } } @@ -6116,11 +6137,26 @@ public class PackageManagerService extends IPackageManager.Stub { return resourceFileName; } - String getResourcePathFromCodePath() { - String codePath = getCodePath(); - if ((flags & PackageManager.INSTALL_FORWARD_LOCK) != 0) { - String apkNameOnly = getApkName(codePath); - return mAppInstallDir.getPath() + "/" + apkNameOnly + ".zip"; + private String getResourcePathFromCodePath() { + final String codePath = getCodePath(); + if (isFwdLocked()) { + final StringBuilder sb = new StringBuilder(); + + sb.append(mAppInstallDir.getPath()); + sb.append('/'); + sb.append(getApkName(codePath)); + sb.append(".zip"); + + /* + * If our APK is a temporary file, mark the resource as a + * temporary file as well so it can be cleaned up after + * catastrophic failure. + */ + if (codePath.endsWith(".tmp")) { + sb.append(".tmp"); + } + + return sb.toString(); } else { return codePath; } @@ -6941,15 +6977,6 @@ public class PackageManagerService extends IPackageManager.Stub { // TODO Gross hack but fix later. Ideally move this to be a post installation // check after alloting uid. if (isForwardLocked(newPackage)) { - File destResourceFile = new File(newPackage.applicationInfo.publicSourceDir); - try { - extractPublicFiles(newPackage, destResourceFile); - } catch (IOException e) { - Slog.e(TAG, "Couldn't create a new zip file for the public parts of a" + - " forward-locked app."); - destResourceFile.delete(); - return PackageManager.INSTALL_FAILED_INSUFFICIENT_STORAGE; - } retCode = mInstaller.setForwardLockPerm(getApkName(newPackage.mPath), newPackage.applicationInfo.uid); } else { @@ -6986,67 +7013,6 @@ public class PackageManagerService extends IPackageManager.Stub { return (pkg.applicationInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0; } - private void extractPublicFiles(PackageParser.Package newPackage, - File publicZipFile) throws IOException { - final FileOutputStream fstr = new FileOutputStream(publicZipFile); - final ZipOutputStream publicZipOutStream = new ZipOutputStream(fstr); - try { - final ZipFile privateZip = new ZipFile(newPackage.mPath); - try { - // Copy manifest, resources.arsc and res directory to public zip - - final Enumeration<? extends ZipEntry> privateZipEntries = privateZip.entries(); - while (privateZipEntries.hasMoreElements()) { - final ZipEntry zipEntry = privateZipEntries.nextElement(); - final String zipEntryName = zipEntry.getName(); - if ("AndroidManifest.xml".equals(zipEntryName) - || "resources.arsc".equals(zipEntryName) - || zipEntryName.startsWith("res/")) { - copyZipEntry(zipEntry, privateZip, publicZipOutStream); - } - } - } finally { - try { privateZip.close(); } catch (IOException e) { } - } - - publicZipOutStream.finish(); - publicZipOutStream.flush(); - FileUtils.sync(fstr); - publicZipOutStream.close(); - FileUtils.setPermissions(publicZipFile.getAbsolutePath(), FileUtils.S_IRUSR - | FileUtils.S_IWUSR | FileUtils.S_IRGRP | FileUtils.S_IROTH, -1, -1); - } finally { - IoUtils.closeQuietly(publicZipOutStream); - } - } - - private static void copyZipEntry(ZipEntry zipEntry, - ZipFile inZipFile, - ZipOutputStream outZipStream) throws IOException { - byte[] buffer = new byte[4096]; - int num; - - ZipEntry newEntry; - if (zipEntry.getMethod() == ZipEntry.STORED) { - // Preserve the STORED method of the input entry. - newEntry = new ZipEntry(zipEntry); - } else { - // Create a new entry so that the compressed len is recomputed. - newEntry = new ZipEntry(zipEntry.getName()); - } - outZipStream.putNextEntry(newEntry); - - final InputStream data = inZipFile.getInputStream(zipEntry); - try { - while ((num = data.read(buffer)) > 0) { - outZipStream.write(buffer, 0, num); - } - outZipStream.flush(); - } finally { - IoUtils.closeQuietly(data); - } - } - private void deleteTempPackageFiles() { FilenameFilter filter = new FilenameFilter() { public boolean accept(File dir, String name) { diff --git a/services/java/com/android/server/pm/Settings.java b/services/java/com/android/server/pm/Settings.java index 35b6bdefd3f5..d0152782f39d 100644 --- a/services/java/com/android/server/pm/Settings.java +++ b/services/java/com/android/server/pm/Settings.java @@ -2300,12 +2300,15 @@ final class Settings { } private List<UserInfo> getAllUsers() { + long id = Binder.clearCallingIdentity(); try { return AppGlobals.getPackageManager().getUsers(); } catch (RemoteException re) { // Local to system process, shouldn't happen } catch (NullPointerException npe) { // packagemanager not yet initialized + } finally { + Binder.restoreCallingIdentity(id); } return null; } @@ -2347,6 +2350,7 @@ final class Settings { final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); final Date date = new Date(); boolean printedSomething = false; + List<UserInfo> users = getAllUsers(); for (final PackageSetting ps : mPackages.values()) { if (packageName != null && !packageName.equals(ps.realName) && !packageName.equals(ps.name)) { @@ -2447,7 +2451,6 @@ final class Settings { pw.print(" haveGids="); pw.println(ps.haveGids); pw.print(" pkgFlags=0x"); pw.print(Integer.toHexString(ps.pkgFlags)); pw.print(" installStatus="); pw.print(ps.installStatus); - List<UserInfo> users = getAllUsers(); for (UserInfo user : users) { pw.print(" User "); pw.print(user.id); pw.print(": "); pw.print(" stopped="); diff --git a/services/java/com/android/server/usb/UsbSettingsManager.java b/services/java/com/android/server/usb/UsbSettingsManager.java index 0baafbb2bf72..7dde34033861 100644 --- a/services/java/com/android/server/usb/UsbSettingsManager.java +++ b/services/java/com/android/server/usb/UsbSettingsManager.java @@ -370,7 +370,7 @@ class UsbSettingsManager { synchronized (mLock) { readSettingsLocked(); } - mPackageMonitor.register(context, true); + mPackageMonitor.register(context, null, true); } private void readPreference(XmlPullParser parser) diff --git a/services/java/com/android/server/wm/DimAnimator.java b/services/java/com/android/server/wm/DimAnimator.java index b08c864826c3..f9f9d1a51cfc 100644 --- a/services/java/com/android/server/wm/DimAnimator.java +++ b/services/java/com/android/server/wm/DimAnimator.java @@ -42,10 +42,17 @@ class DimAnimator { DimAnimator (SurfaceSession session) { if (mDimSurface == null) { try { - mDimSurface = new Surface(session, 0, + if (WindowManagerService.DEBUG_SURFACE_TRACE) { + mDimSurface = new WindowStateAnimator.SurfaceTrace(session, 0, "DimAnimator", -1, 16, 16, PixelFormat.OPAQUE, Surface.FX_SURFACE_DIM); + } else { + mDimSurface = new Surface(session, 0, + "DimAnimator", + -1, 16, 16, PixelFormat.OPAQUE, + Surface.FX_SURFACE_DIM); + } if (WindowManagerService.SHOW_TRANSACTIONS || WindowManagerService.SHOW_SURFACE_ALLOC) Slog.i(WindowManagerService.TAG, " DIM " + mDimSurface + ": CREATE"); diff --git a/services/java/com/android/server/wm/WindowAnimator.java b/services/java/com/android/server/wm/WindowAnimator.java index 7611a0ffbd7d..f946f6cc5634 100644 --- a/services/java/com/android/server/wm/WindowAnimator.java +++ b/services/java/com/android/server/wm/WindowAnimator.java @@ -75,6 +75,9 @@ public class WindowAnimator { DimAnimator mDimAnimator = null; DimAnimator.Parameters mDimParams = null; + static final int WALLPAPER_ACTION_PENDING = 1; + int mPendingActions; + WindowAnimator(final WindowManagerService service, final Context context, final WindowManagerPolicy policy) { mService = service; @@ -364,7 +367,9 @@ public class WindowAnimator { for (int i=unForceHiding.size()-1; i>=0; i--) { Animation a = mPolicy.createForceHideEnterAnimation(wallpaperInUnForceHiding); if (a != null) { - unForceHiding.get(i).setAnimation(a); + final WindowStateAnimator winAnimator = unForceHiding.get(i); + winAnimator.setAnimation(a); + winAnimator.mAnimationIsEntrance = true; } } } @@ -421,13 +426,16 @@ public class WindowAnimator { mWindowAnimationBackgroundColor = 0; updateWindowsAndWallpaperLocked(); + if ((mPendingLayoutChanges & WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER) != 0) { + mPendingActions |= WALLPAPER_ACTION_PENDING; + } if (mTokenMayBeDrawn) { testTokenMayBeDrawnLocked(); } } - void animate() { + synchronized void animate() { mPendingLayoutChanges = 0; mCurrentTime = SystemClock.uptimeMillis(); mBulkUpdateParams = 0; @@ -554,4 +562,8 @@ public class WindowAnimator { mAnimDh = animDh; } } + + synchronized void clearPendingActions() { + mPendingActions = 0; + } } diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index b4a458ff65c2..ff41899d5c2a 100755 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -34,6 +34,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG; import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; import com.android.internal.app.IBatteryStats; +import com.android.internal.app.ShutdownThread; import com.android.internal.policy.PolicyManager; import com.android.internal.policy.impl.PhoneWindowManager; import com.android.internal.view.IInputContext; @@ -461,6 +462,10 @@ public class WindowManagerService extends IWindowManager.Stub int mCurDisplayHeight = 0; int mAppDisplayWidth = 0; int mAppDisplayHeight = 0; + int mSmallestDisplayWidth = 0; + int mSmallestDisplayHeight = 0; + int mLargestDisplayWidth = 0; + int mLargestDisplayHeight = 0; int mRotation = 0; int mForcedAppOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; @@ -1625,9 +1630,7 @@ public class WindowManagerService extends IWindowManager.Stub "Found wallpaper activity: #" + i + "=" + w); foundW = w; foundI = i; - if (w == mWallpaperTarget && ((w.mAppToken != null - && w.mAppToken.mAppAnimator.animation != null) - || w.mWinAnimator.mAnimation != null)) { + if (w == mWallpaperTarget && w.mWinAnimator.isAnimating()) { // The current wallpaper target is animating, so we'll // look behind it for another possible target and figure // out what is going on below. @@ -6068,12 +6071,21 @@ public class WindowManagerService extends IWindowManager.Stub return config; } - private int reduceConfigWidthSize(int curSize, int rotation, float density, int dw, int dh) { - int size = (int)(mPolicy.getConfigDisplayWidth(dw, dh, rotation) / density); - if (size < curSize) { - curSize = size; + private void adjustDisplaySizeRanges(int rotation, int dw, int dh) { + final int width = mPolicy.getConfigDisplayWidth(dw, dh, rotation); + if (width < mSmallestDisplayWidth) { + mSmallestDisplayWidth = width; + } + if (width > mLargestDisplayWidth) { + mLargestDisplayWidth = width; + } + final int height = mPolicy.getConfigDisplayHeight(dw, dh, rotation); + if (height < mSmallestDisplayHeight) { + mSmallestDisplayHeight = height; + } + if (height > mLargestDisplayHeight) { + mLargestDisplayHeight = height; } - return curSize; } private int reduceConfigLayout(int curLayout, int rotation, float density, @@ -6155,7 +6167,7 @@ public class WindowManagerService extends IWindowManager.Stub return curLayout; } - private void computeSmallestWidthAndScreenLayout(boolean rotated, int dw, int dh, + private void computeSizeRangesAndScreenLayout(boolean rotated, int dw, int dh, float density, Configuration outConfig) { // We need to determine the smallest width that will occur under normal // operation. To this, start with the base screen size and compute the @@ -6169,17 +6181,21 @@ public class WindowManagerService extends IWindowManager.Stub unrotDw = dw; unrotDh = dh; } - int sw = reduceConfigWidthSize(unrotDw, Surface.ROTATION_0, density, unrotDw, unrotDh); - sw = reduceConfigWidthSize(sw, Surface.ROTATION_90, density, unrotDh, unrotDw); - sw = reduceConfigWidthSize(sw, Surface.ROTATION_180, density, unrotDw, unrotDh); - sw = reduceConfigWidthSize(sw, Surface.ROTATION_270, density, unrotDh, unrotDw); + mSmallestDisplayWidth = 1<<30; + mSmallestDisplayHeight = 1<<30; + mLargestDisplayWidth = 0; + mLargestDisplayHeight = 0; + adjustDisplaySizeRanges(Surface.ROTATION_0, unrotDw, unrotDh); + adjustDisplaySizeRanges(Surface.ROTATION_90, unrotDh, unrotDw); + adjustDisplaySizeRanges(Surface.ROTATION_180, unrotDw, unrotDh); + adjustDisplaySizeRanges(Surface.ROTATION_270, unrotDh, unrotDw); int sl = Configuration.SCREENLAYOUT_SIZE_XLARGE | Configuration.SCREENLAYOUT_LONG_YES; sl = reduceConfigLayout(sl, Surface.ROTATION_0, density, unrotDw, unrotDh); sl = reduceConfigLayout(sl, Surface.ROTATION_90, density, unrotDh, unrotDw); sl = reduceConfigLayout(sl, Surface.ROTATION_180, density, unrotDw, unrotDh); sl = reduceConfigLayout(sl, Surface.ROTATION_270, density, unrotDh, unrotDw); - outConfig.smallestScreenWidthDp = sw; + outConfig.smallestScreenWidthDp = (int)(mSmallestDisplayWidth / density); outConfig.screenLayout = sl; } @@ -6289,7 +6305,7 @@ public class WindowManagerService extends IWindowManager.Stub / dm.density); config.screenHeightDp = (int)(mPolicy.getConfigDisplayHeight(dw, dh, mRotation) / dm.density); - computeSmallestWidthAndScreenLayout(rotated, dw, dh, dm.density, config); + computeSizeRangesAndScreenLayout(rotated, dw, dh, dm.density, config); config.compatScreenWidthDp = (int)(config.screenWidthDp / mCompatibleScreenScale); config.compatScreenHeightDp = (int)(config.screenHeightDp / mCompatibleScreenScale); @@ -6490,6 +6506,13 @@ public class WindowManagerService extends IWindowManager.Stub KeyEvent.KEYCODE_VOLUME_DOWN); mSafeMode = menuState > 0 || sState > 0 || dpadState > 0 || trackballState > 0 || volumeDownState > 0; + try { + if (SystemProperties.getInt(ShutdownThread.REBOOT_SAFEMODE_PROPERTY, 0) != 0) { + mSafeMode = true; + SystemProperties.set(ShutdownThread.REBOOT_SAFEMODE_PROPERTY, ""); + } + } catch (IllegalArgumentException e) { + } if (mSafeMode) { Log.i(TAG, "SAFE MODE ENABLED (menu=" + menuState + " s=" + sState + " dpad=" + dpadState + " trackball=" + trackballState + ")"); @@ -6601,6 +6624,7 @@ public class WindowManagerService extends IWindowManager.Stub public static final int SET_WALLPAPER_OFFSET = ANIMATOR_WHAT_OFFSET + 2; public static final int SET_DIM_PARAMETERS = ANIMATOR_WHAT_OFFSET + 3; public static final int SET_MOVE_ANIMATION = ANIMATOR_WHAT_OFFSET + 4; + public static final int CLEAR_PENDING_ACTIONS = ANIMATOR_WHAT_OFFSET + 5; private Session mLastReportedHold; @@ -7053,7 +7077,8 @@ public class WindowManagerService extends IWindowManager.Stub } if (doRequest) { - requestTraversalLocked(); + mH.sendEmptyMessage(CLEAR_PENDING_ACTIONS); + performLayoutAndPlaceSurfacesLocked(); } } break; @@ -7094,6 +7119,11 @@ public class WindowManagerService extends IWindowManager.Stub scheduleAnimationLocked(); break; } + + case CLEAR_PENDING_ACTIONS: { + mAnimator.clearPendingActions(); + break; + } } if (DEBUG_WINDOW_TRACE) { Slog.v(TAG, "handleMessage: exit"); @@ -7199,6 +7229,15 @@ public class WindowManagerService extends IWindowManager.Stub } } + public void getCurrentSizeRange(Point smallestSize, Point largestSize) { + synchronized(mDisplaySizeLock) { + smallestSize.x = mSmallestDisplayWidth; + smallestSize.y = mSmallestDisplayHeight; + largestSize.x = mLargestDisplayWidth; + largestSize.y = mLargestDisplayHeight; + } + } + public void setForcedDisplaySize(int longDimen, int shortDimen) { synchronized(mWindowMap) { int width, height; @@ -9391,14 +9430,25 @@ public class WindowManagerService extends IWindowManager.Stub pw.println(); if (mDisplay != null) { pw.print(" Display: init="); pw.print(mInitialDisplayWidth); pw.print("x"); - pw.print(mInitialDisplayHeight); pw.print(" base="); - pw.print(mBaseDisplayWidth); pw.print("x"); pw.print(mBaseDisplayHeight); + pw.print(mInitialDisplayHeight); + if (mInitialDisplayWidth != mBaseDisplayWidth + || mInitialDisplayHeight != mBaseDisplayHeight) { + pw.print(" base="); + pw.print(mBaseDisplayWidth); pw.print("x"); pw.print(mBaseDisplayHeight); + } + final int rawWidth = mDisplay.getRawWidth(); + final int rawHeight = mDisplay.getRawHeight(); + if (rawWidth != mCurDisplayWidth || rawHeight != mCurDisplayHeight) { + pw.print(" raw="); pw.print(rawWidth); pw.print("x"); pw.print(rawHeight); + } pw.print(" cur="); pw.print(mCurDisplayWidth); pw.print("x"); pw.print(mCurDisplayHeight); pw.print(" app="); pw.print(mAppDisplayWidth); pw.print("x"); pw.print(mAppDisplayHeight); - pw.print(" raw="); pw.print(mDisplay.getRawWidth()); - pw.print("x"); pw.println(mDisplay.getRawHeight()); + pw.print(" rng="); pw.print(mSmallestDisplayWidth); + pw.print("x"); pw.print(mSmallestDisplayHeight); + pw.print("-"); pw.print(mLargestDisplayWidth); + pw.print("x"); pw.println(mLargestDisplayHeight); } else { pw.println(" NO DISPLAY"); } diff --git a/services/java/com/android/server/wm/WindowStateAnimator.java b/services/java/com/android/server/wm/WindowStateAnimator.java index 0cebee76bf56..74e3304b02fd 100644 --- a/services/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/java/com/android/server/wm/WindowStateAnimator.java @@ -186,6 +186,7 @@ class WindowStateAnimator { if (mAnimation != null) { mAnimation.cancel(); mAnimation = null; + mLocalAnimating = false; destroySurfaceLocked(); } } @@ -262,9 +263,6 @@ class WindowStateAnimator { // If the display is frozen, and there is a pending animation, // clear it and make sure we run the cleanup code. mAnimating = true; - mLocalAnimating = true; - mAnimation.cancel(); - mAnimation = null; } if (!mAnimating && !mLocalAnimating) { @@ -878,11 +876,14 @@ class WindowStateAnimator { ": " + mWin.mShownFrame + ", alpha=" + mTransformation.getAlpha() + ", mShownAlpha=" + mShownAlpha); return; + } else if (mWin.mIsWallpaper && + (mAnimator.mPendingActions & WindowAnimator.WALLPAPER_ACTION_PENDING) != 0) { + return; } if (WindowManagerService.localLOGV) Slog.v( - TAG, "computeShownFrameLocked: " + this + - " not attached, mAlpha=" + mAlpha); + TAG, "computeShownFrameLocked: " + this + + " not attached, mAlpha=" + mAlpha); mWin.mShownFrame.set(mWin.mFrame); if (mWin.mXOffset != 0 || mWin.mYOffset != 0) { mWin.mShownFrame.offset(mWin.mXOffset, mWin.mYOffset); @@ -920,19 +921,19 @@ class WindowStateAnimator { mSurfaceH = height; } - if (mSurfaceX != w.mShownFrame.left - || mSurfaceY != w.mShownFrame.top) { + final float left = w.mShownFrame.left; + final float top = w.mShownFrame.top; + if (mSurfaceX != left || mSurfaceY != top) { try { if (WindowManagerService.SHOW_TRANSACTIONS) WindowManagerService.logSurface(w, - "POS " + w.mShownFrame.left - + ", " + w.mShownFrame.top, null); - mSurfaceX = w.mShownFrame.left; - mSurfaceY = w.mShownFrame.top; - mSurface.setPosition(w.mShownFrame.left, w.mShownFrame.top); + "POS " + left + ", " + top, null); + mSurfaceX = left; + mSurfaceY = top; + mSurface.setPosition(left, top); } catch (RuntimeException e) { Slog.w(TAG, "Error positioning surface of " + w - + " pos=(" + w.mShownFrame.left - + "," + w.mShownFrame.top + ")", e); + + " pos=(" + left + + "," + top + ")", e); if (!recoveringMemory) { mService.reclaimSomeSurfaceMemoryLocked(this, "position", true); } @@ -1177,12 +1178,7 @@ class WindowStateAnimator { // will do an animation to reveal it from behind the // starting window, so there is no need for it to also // be doing its own stuff. - if (mAnimation != null) { - mAnimation.cancel(); - mAnimation = null; - // Make sure we clean up the animation. - mAnimating = true; - } + clearAnimation(); mService.mFinishedStarting.add(mWin.mAppToken); mService.mH.sendEmptyMessage(H.FINISHED_STARTING); } @@ -1286,6 +1282,7 @@ class WindowStateAnimator { if (WindowManagerService.DEBUG_ANIM) Slog.v(TAG, "applyAnimation: win=" + this + " anim=" + anim + " attr=0x" + Integer.toHexString(attr) + + " a=" + a + " mAnimation=" + mAnimation + " isEntrance=" + isEntrance); if (a != null) { diff --git a/services/jni/com_android_server_input_InputManagerService.cpp b/services/jni/com_android_server_input_InputManagerService.cpp index b361a267f472..b2a24292c02b 100644 --- a/services/jni/com_android_server_input_InputManagerService.cpp +++ b/services/jni/com_android_server_input_InputManagerService.cpp @@ -83,6 +83,7 @@ static struct { jmethodID getPointerLayer; jmethodID getPointerIcon; jmethodID getKeyboardLayoutOverlay; + jmethodID getDeviceAlias; } gServiceClassInfo; static struct { @@ -183,7 +184,6 @@ public: void setSystemUiVisibility(int32_t visibility); void setPointerSpeed(int32_t speed); void setShowTouches(bool enabled); - void reloadKeyboardLayouts(); /* --- InputReaderPolicyInterface implementation --- */ @@ -191,6 +191,7 @@ public: virtual sp<PointerControllerInterface> obtainPointerController(int32_t deviceId); virtual void notifyInputDevicesChanged(const Vector<InputDeviceInfo>& inputDevices); virtual sp<KeyCharacterMap> getKeyboardLayoutOverlay(const String8& inputDeviceDescriptor); + virtual String8 getDeviceAlias(const InputDeviceIdentifier& identifier); /* --- InputDispatcherPolicyInterface implementation --- */ @@ -551,6 +552,21 @@ sp<KeyCharacterMap> NativeInputManager::getKeyboardLayoutOverlay( return result; } +String8 NativeInputManager::getDeviceAlias(const InputDeviceIdentifier& identifier) { + JNIEnv* env = jniEnv(); + + ScopedLocalRef<jstring> uniqueIdObj(env, env->NewStringUTF(identifier.uniqueId.string())); + ScopedLocalRef<jstring> aliasObj(env, jstring(env->CallObjectMethod(mServiceObj, + gServiceClassInfo.getDeviceAlias, uniqueIdObj.get()))); + String8 result; + if (aliasObj.get()) { + ScopedUtfChars aliasChars(env, aliasObj.get()); + result.setTo(aliasChars.c_str()); + } + checkAndClearExceptionFromCallback(env, "getDeviceAlias"); + return result; +} + void NativeInputManager::notifySwitch(nsecs_t when, int32_t switchCode, int32_t switchValue, uint32_t policyFlags) { #if DEBUG_INPUT_DISPATCHER_POLICY @@ -757,11 +773,6 @@ void NativeInputManager::setShowTouches(bool enabled) { InputReaderConfiguration::CHANGE_SHOW_TOUCHES); } -void NativeInputManager::reloadKeyboardLayouts() { - mInputManager->getReader()->requestRefreshConfiguration( - InputReaderConfiguration::CHANGE_KEYBOARD_LAYOUTS); -} - bool NativeInputManager::isScreenOn() { return android_server_PowerManagerService_isScreenOn(); } @@ -1296,7 +1307,16 @@ static void nativeReloadKeyboardLayouts(JNIEnv* env, jclass clazz, jint ptr) { NativeInputManager* im = reinterpret_cast<NativeInputManager*>(ptr); - im->reloadKeyboardLayouts(); + im->getInputManager()->getReader()->requestRefreshConfiguration( + InputReaderConfiguration::CHANGE_KEYBOARD_LAYOUTS); +} + +static void nativeReloadDeviceAliases(JNIEnv* env, + jclass clazz, jint ptr) { + NativeInputManager* im = reinterpret_cast<NativeInputManager*>(ptr); + + im->getInputManager()->getReader()->requestRefreshConfiguration( + InputReaderConfiguration::CHANGE_DEVICE_ALIAS); } static jstring nativeDump(JNIEnv* env, jclass clazz, jint ptr) { @@ -1366,6 +1386,8 @@ static JNINativeMethod gInputManagerMethods[] = { (void*) nativeCancelVibrate }, { "nativeReloadKeyboardLayouts", "(I)V", (void*) nativeReloadKeyboardLayouts }, + { "nativeReloadDeviceAliases", "(I)V", + (void*) nativeReloadDeviceAliases }, { "nativeDump", "(I)Ljava/lang/String;", (void*) nativeDump }, { "nativeMonitor", "(I)V", @@ -1464,6 +1486,9 @@ int register_android_server_InputManager(JNIEnv* env) { GET_METHOD_ID(gServiceClassInfo.getKeyboardLayoutOverlay, clazz, "getKeyboardLayoutOverlay", "(Ljava/lang/String;)[Ljava/lang/String;"); + GET_METHOD_ID(gServiceClassInfo.getDeviceAlias, clazz, + "getDeviceAlias", "(Ljava/lang/String;)Ljava/lang/String;"); + // InputDevice FIND_CLASS(gInputDeviceClassInfo.clazz, "android/view/InputDevice"); diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp index 16ddd911560d..d3b667f13d04 100644 --- a/services/sensorservice/SensorService.cpp +++ b/services/sensorservice/SensorService.cpp @@ -316,7 +316,7 @@ void SensorService::sortEventBuffer(sensors_event_t* buffer, size_t count) static int cmp(void const* lhs, void const* rhs) { sensors_event_t const* l = static_cast<sensors_event_t const*>(lhs); sensors_event_t const* r = static_cast<sensors_event_t const*>(rhs); - return r->timestamp - l->timestamp; + return l->timestamp - r->timestamp; } }; qsort(buffer, count, sizeof(sensors_event_t), compar::cmp); diff --git a/telephony/java/android/telephony/CellBroadcastMessage.java b/telephony/java/android/telephony/CellBroadcastMessage.java new file mode 100644 index 000000000000..36c238d8acd2 --- /dev/null +++ b/telephony/java/android/telephony/CellBroadcastMessage.java @@ -0,0 +1,422 @@ +/* + * Copyright (C) 2011 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package android.telephony; + +import android.content.ContentValues; +import android.content.Context; +import android.database.Cursor; +import android.graphics.Typeface; +import android.os.Parcel; +import android.os.Parcelable; +import android.provider.Telephony; +import android.telephony.SmsCbCmasInfo; +import android.telephony.SmsCbEtwsInfo; +import android.telephony.SmsCbLocation; +import android.telephony.SmsCbMessage; +import android.text.Spannable; +import android.text.SpannableStringBuilder; +import android.text.format.DateUtils; +import android.text.style.StyleSpan; + +/** + * Application wrapper for {@link SmsCbMessage}. This is Parcelable so that + * decoded broadcast message objects can be passed between running Services. + * New broadcasts are received by the CellBroadcastReceiver app, which exports + * the database of previously received broadcasts at "content://cellbroadcasts/". + * The "android.permission.READ_CELL_BROADCASTS" permission is required to read + * from the ContentProvider, and writes to the database are not allowed.<p> + * + * Use {@link #createFromCursor} to create CellBroadcastMessage objects from rows + * in the database cursor returned by the ContentProvider. + * + * {@hide} + */ +public class CellBroadcastMessage implements Parcelable { + + /** Identifier for getExtra() when adding this object to an Intent. */ + public static final String SMS_CB_MESSAGE_EXTRA = + "com.android.cellbroadcastreceiver.SMS_CB_MESSAGE"; + + /** SmsCbMessage. */ + private final SmsCbMessage mSmsCbMessage; + + private final long mDeliveryTime; + private boolean mIsRead; + + public CellBroadcastMessage(SmsCbMessage message) { + mSmsCbMessage = message; + mDeliveryTime = System.currentTimeMillis(); + mIsRead = false; + } + + private CellBroadcastMessage(SmsCbMessage message, long deliveryTime, boolean isRead) { + mSmsCbMessage = message; + mDeliveryTime = deliveryTime; + mIsRead = isRead; + } + + private CellBroadcastMessage(Parcel in) { + mSmsCbMessage = new SmsCbMessage(in); + mDeliveryTime = in.readLong(); + mIsRead = (in.readInt() != 0); + } + + /** Parcelable: no special flags. */ + public int describeContents() { + return 0; + } + + public void writeToParcel(Parcel out, int flags) { + mSmsCbMessage.writeToParcel(out, flags); + out.writeLong(mDeliveryTime); + out.writeInt(mIsRead ? 1 : 0); + } + + public static final Parcelable.Creator<CellBroadcastMessage> CREATOR + = new Parcelable.Creator<CellBroadcastMessage>() { + public CellBroadcastMessage createFromParcel(Parcel in) { + return new CellBroadcastMessage(in); + } + + public CellBroadcastMessage[] newArray(int size) { + return new CellBroadcastMessage[size]; + } + }; + + /** + * Create a CellBroadcastMessage from a row in the database. + * @param cursor an open SQLite cursor pointing to the row to read + * @return the new CellBroadcastMessage + * @throws IllegalArgumentException if one of the required columns is missing + */ + public static CellBroadcastMessage createFromCursor(Cursor cursor) { + int geoScope = cursor.getInt( + cursor.getColumnIndexOrThrow(Telephony.CellBroadcasts.GEOGRAPHICAL_SCOPE)); + int serialNum = cursor.getInt( + cursor.getColumnIndexOrThrow(Telephony.CellBroadcasts.SERIAL_NUMBER)); + int category = cursor.getInt( + cursor.getColumnIndexOrThrow(Telephony.CellBroadcasts.SERVICE_CATEGORY)); + String language = cursor.getString( + cursor.getColumnIndexOrThrow(Telephony.CellBroadcasts.LANGUAGE_CODE)); + String body = cursor.getString( + cursor.getColumnIndexOrThrow(Telephony.CellBroadcasts.MESSAGE_BODY)); + int format = cursor.getInt( + cursor.getColumnIndexOrThrow(Telephony.CellBroadcasts.MESSAGE_FORMAT)); + int priority = cursor.getInt( + cursor.getColumnIndexOrThrow(Telephony.CellBroadcasts.MESSAGE_PRIORITY)); + + String plmn; + int plmnColumn = cursor.getColumnIndex(Telephony.CellBroadcasts.PLMN); + if (plmnColumn != -1 && !cursor.isNull(plmnColumn)) { + plmn = cursor.getString(plmnColumn); + } else { + plmn = null; + } + + int lac; + int lacColumn = cursor.getColumnIndex(Telephony.CellBroadcasts.LAC); + if (lacColumn != -1 && !cursor.isNull(lacColumn)) { + lac = cursor.getInt(lacColumn); + } else { + lac = -1; + } + + int cid; + int cidColumn = cursor.getColumnIndex(Telephony.CellBroadcasts.CID); + if (cidColumn != -1 && !cursor.isNull(cidColumn)) { + cid = cursor.getInt(cidColumn); + } else { + cid = -1; + } + + SmsCbLocation location = new SmsCbLocation(plmn, lac, cid); + + SmsCbEtwsInfo etwsInfo; + int etwsWarningTypeColumn = cursor.getColumnIndex( + Telephony.CellBroadcasts.ETWS_WARNING_TYPE); + if (etwsWarningTypeColumn != -1 && !cursor.isNull(etwsWarningTypeColumn)) { + int warningType = cursor.getInt(etwsWarningTypeColumn); + etwsInfo = new SmsCbEtwsInfo(warningType, false, false, null); + } else { + etwsInfo = null; + } + + SmsCbCmasInfo cmasInfo; + int cmasMessageClassColumn = cursor.getColumnIndex( + Telephony.CellBroadcasts.CMAS_MESSAGE_CLASS); + if (cmasMessageClassColumn != -1 && !cursor.isNull(cmasMessageClassColumn)) { + int messageClass = cursor.getInt(cmasMessageClassColumn); + + int cmasCategory; + int cmasCategoryColumn = cursor.getColumnIndex( + Telephony.CellBroadcasts.CMAS_CATEGORY); + if (cmasCategoryColumn != -1 && !cursor.isNull(cmasCategoryColumn)) { + cmasCategory = cursor.getInt(cmasCategoryColumn); + } else { + cmasCategory = SmsCbCmasInfo.CMAS_CATEGORY_UNKNOWN; + } + + int responseType; + int cmasResponseTypeColumn = cursor.getColumnIndex( + Telephony.CellBroadcasts.CMAS_RESPONSE_TYPE); + if (cmasResponseTypeColumn != -1 && !cursor.isNull(cmasResponseTypeColumn)) { + responseType = cursor.getInt(cmasResponseTypeColumn); + } else { + responseType = SmsCbCmasInfo.CMAS_RESPONSE_TYPE_UNKNOWN; + } + + int severity; + int cmasSeverityColumn = cursor.getColumnIndex( + Telephony.CellBroadcasts.CMAS_SEVERITY); + if (cmasSeverityColumn != -1 && !cursor.isNull(cmasSeverityColumn)) { + severity = cursor.getInt(cmasSeverityColumn); + } else { + severity = SmsCbCmasInfo.CMAS_SEVERITY_UNKNOWN; + } + + int urgency; + int cmasUrgencyColumn = cursor.getColumnIndex( + Telephony.CellBroadcasts.CMAS_URGENCY); + if (cmasUrgencyColumn != -1 && !cursor.isNull(cmasUrgencyColumn)) { + urgency = cursor.getInt(cmasUrgencyColumn); + } else { + urgency = SmsCbCmasInfo.CMAS_URGENCY_UNKNOWN; + } + + int certainty; + int cmasCertaintyColumn = cursor.getColumnIndex( + Telephony.CellBroadcasts.CMAS_CERTAINTY); + if (cmasCertaintyColumn != -1 && !cursor.isNull(cmasCertaintyColumn)) { + certainty = cursor.getInt(cmasCertaintyColumn); + } else { + certainty = SmsCbCmasInfo.CMAS_CERTAINTY_UNKNOWN; + } + + cmasInfo = new SmsCbCmasInfo(messageClass, cmasCategory, responseType, severity, + urgency, certainty); + } else { + cmasInfo = null; + } + + SmsCbMessage msg = new SmsCbMessage(format, geoScope, serialNum, location, category, + language, body, priority, etwsInfo, cmasInfo); + + long deliveryTime = cursor.getLong(cursor.getColumnIndexOrThrow( + Telephony.CellBroadcasts.DELIVERY_TIME)); + boolean isRead = (cursor.getInt(cursor.getColumnIndexOrThrow( + Telephony.CellBroadcasts.MESSAGE_READ)) != 0); + + return new CellBroadcastMessage(msg, deliveryTime, isRead); + } + + /** + * Return a ContentValues object for insertion into the database. + * @return a new ContentValues object containing this object's data + */ + public ContentValues getContentValues() { + ContentValues cv = new ContentValues(16); + SmsCbMessage msg = mSmsCbMessage; + cv.put(Telephony.CellBroadcasts.GEOGRAPHICAL_SCOPE, msg.getGeographicalScope()); + SmsCbLocation location = msg.getLocation(); + if (location.getPlmn() != null) { + cv.put(Telephony.CellBroadcasts.PLMN, location.getPlmn()); + } + if (location.getLac() != -1) { + cv.put(Telephony.CellBroadcasts.LAC, location.getLac()); + } + if (location.getCid() != -1) { + cv.put(Telephony.CellBroadcasts.CID, location.getCid()); + } + cv.put(Telephony.CellBroadcasts.SERIAL_NUMBER, msg.getSerialNumber()); + cv.put(Telephony.CellBroadcasts.SERVICE_CATEGORY, msg.getServiceCategory()); + cv.put(Telephony.CellBroadcasts.LANGUAGE_CODE, msg.getLanguageCode()); + cv.put(Telephony.CellBroadcasts.MESSAGE_BODY, msg.getMessageBody()); + cv.put(Telephony.CellBroadcasts.DELIVERY_TIME, mDeliveryTime); + cv.put(Telephony.CellBroadcasts.MESSAGE_READ, mIsRead); + cv.put(Telephony.CellBroadcasts.MESSAGE_FORMAT, msg.getMessageFormat()); + cv.put(Telephony.CellBroadcasts.MESSAGE_PRIORITY, msg.getMessagePriority()); + + SmsCbEtwsInfo etwsInfo = mSmsCbMessage.getEtwsWarningInfo(); + if (etwsInfo != null) { + cv.put(Telephony.CellBroadcasts.ETWS_WARNING_TYPE, etwsInfo.getWarningType()); + } + + SmsCbCmasInfo cmasInfo = mSmsCbMessage.getCmasWarningInfo(); + if (cmasInfo != null) { + cv.put(Telephony.CellBroadcasts.CMAS_MESSAGE_CLASS, cmasInfo.getMessageClass()); + cv.put(Telephony.CellBroadcasts.CMAS_CATEGORY, cmasInfo.getCategory()); + cv.put(Telephony.CellBroadcasts.CMAS_RESPONSE_TYPE, cmasInfo.getResponseType()); + cv.put(Telephony.CellBroadcasts.CMAS_SEVERITY, cmasInfo.getSeverity()); + cv.put(Telephony.CellBroadcasts.CMAS_URGENCY, cmasInfo.getUrgency()); + cv.put(Telephony.CellBroadcasts.CMAS_CERTAINTY, cmasInfo.getCertainty()); + } + + return cv; + } + + /** + * Set or clear the "read message" flag. + * @param isRead true if the message has been read; false if not + */ + public void setIsRead(boolean isRead) { + mIsRead = isRead; + } + + public String getLanguageCode() { + return mSmsCbMessage.getLanguageCode(); + } + + public int getServiceCategory() { + return mSmsCbMessage.getServiceCategory(); + } + + public long getDeliveryTime() { + return mDeliveryTime; + } + + public String getMessageBody() { + return mSmsCbMessage.getMessageBody(); + } + + public boolean isRead() { + return mIsRead; + } + + public int getSerialNumber() { + return mSmsCbMessage.getSerialNumber(); + } + + public SmsCbCmasInfo getCmasWarningInfo() { + return mSmsCbMessage.getCmasWarningInfo(); + } + + public SmsCbEtwsInfo getEtwsWarningInfo() { + return mSmsCbMessage.getEtwsWarningInfo(); + } + + /** + * Return whether the broadcast is an emergency (PWS) message type. + * This includes lower priority test messages and Amber alerts. + * + * All public alerts show the flashing warning icon in the dialog, + * but only emergency alerts play the alert sound and speak the message. + * + * @return true if the message is PWS type; false otherwise + */ + public boolean isPublicAlertMessage() { + return mSmsCbMessage.isEmergencyMessage(); + } + + /** + * Returns whether the broadcast is an emergency (PWS) message type, + * including test messages, but excluding lower priority Amber alert broadcasts. + * + * @return true if the message is PWS type, excluding Amber alerts + */ + public boolean isEmergencyAlertMessage() { + if (!mSmsCbMessage.isEmergencyMessage()) { + return false; + } + SmsCbCmasInfo cmasInfo = mSmsCbMessage.getCmasWarningInfo(); + if (cmasInfo != null && + cmasInfo.getMessageClass() == SmsCbCmasInfo.CMAS_CLASS_CHILD_ABDUCTION_EMERGENCY) { + return false; + } + return true; + } + + /** + * Return whether the broadcast is an ETWS emergency message type. + * @return true if the message is ETWS emergency type; false otherwise + */ + public boolean isEtwsMessage() { + return mSmsCbMessage.isEtwsMessage(); + } + + /** + * Return whether the broadcast is a CMAS emergency message type. + * @return true if the message is CMAS emergency type; false otherwise + */ + public boolean isCmasMessage() { + return mSmsCbMessage.isCmasMessage(); + } + + /** + * Return the CMAS message class. + * @return the CMAS message class, e.g. {@link SmsCbCmasInfo#CMAS_CLASS_SEVERE_THREAT}, or + * {@link SmsCbCmasInfo#CMAS_CLASS_UNKNOWN} if this is not a CMAS alert + */ + public int getCmasMessageClass() { + if (mSmsCbMessage.isCmasMessage()) { + return mSmsCbMessage.getCmasWarningInfo().getMessageClass(); + } else { + return SmsCbCmasInfo.CMAS_CLASS_UNKNOWN; + } + } + + /** + * Return whether the broadcast is an ETWS popup alert. + * This method checks the message ID and the message code. + * @return true if the message indicates an ETWS popup alert + */ + public boolean isEtwsPopupAlert() { + SmsCbEtwsInfo etwsInfo = mSmsCbMessage.getEtwsWarningInfo(); + return etwsInfo != null && etwsInfo.isPopupAlert(); + } + + /** + * Return whether the broadcast is an ETWS emergency user alert. + * This method checks the message ID and the message code. + * @return true if the message indicates an ETWS emergency user alert + */ + public boolean isEtwsEmergencyUserAlert() { + SmsCbEtwsInfo etwsInfo = mSmsCbMessage.getEtwsWarningInfo(); + return etwsInfo != null && etwsInfo.isEmergencyUserAlert(); + } + + /** + * Return whether the broadcast is an ETWS test message. + * @return true if the message is an ETWS test message; false otherwise + */ + public boolean isEtwsTestMessage() { + SmsCbEtwsInfo etwsInfo = mSmsCbMessage.getEtwsWarningInfo(); + return etwsInfo != null && + etwsInfo.getWarningType() == SmsCbEtwsInfo.ETWS_WARNING_TYPE_TEST_MESSAGE; + } + + /** + * Return the abbreviated date string for the message delivery time. + * @param context the context object + * @return a String to use in the broadcast list UI + */ + public String getDateString(Context context) { + int flags = DateUtils.FORMAT_NO_NOON_MIDNIGHT | DateUtils.FORMAT_SHOW_TIME | + DateUtils.FORMAT_ABBREV_ALL | DateUtils.FORMAT_SHOW_DATE | + DateUtils.FORMAT_CAP_AMPM; + return DateUtils.formatDateTime(context, mDeliveryTime, flags); + } + + /** + * Return the date string for the message delivery time, suitable for text-to-speech. + * @param context the context object + * @return a String for populating the list item AccessibilityEvent for TTS + */ + public String getSpokenDateString(Context context) { + int flags = DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_SHOW_DATE; + return DateUtils.formatDateTime(context, mDeliveryTime, flags); + } +} diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java index fec01584dc63..df3278b2385a 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java @@ -91,8 +91,8 @@ public class GsmDataConnection extends DataConnection { int authType = mApn.authType; if (authType == -1) { - authType = (mApn.user != null) ? RILConstants.SETUP_DATA_AUTH_PAP_CHAP : - RILConstants.SETUP_DATA_AUTH_NONE; + authType = TextUtils.isEmpty(mApn.user) ? RILConstants.SETUP_DATA_AUTH_NONE + : RILConstants.SETUP_DATA_AUTH_PAP_CHAP; } String protocol; diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/CallbackProxy.java b/tests/DumpRenderTree/src/com/android/dumprendertree/CallbackProxy.java index 740f544c4d97..d74f5f759541 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/CallbackProxy.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/CallbackProxy.java @@ -487,7 +487,7 @@ public class CallbackProxy extends Handler implements EventSender, LayoutTestCon } public void setAppCacheMaximumSize(long size) { - WebStorage.getInstance().setAppCacheMaximumSize(size); + android.webkit.WebStorageClassic.getInstance().setAppCacheMaximumSize(size); } public void setCanOpenWindows() { diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java index 77c0a3fdc8eb..bbfbfc4365ac 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java @@ -257,12 +257,14 @@ public class TestShellActivity extends Activity implements LayoutTestController builder.setMessage("All tests finished. Exit?") .setCancelable(false) .setPositiveButton("Yes", new OnClickListener(){ - public void onClick(DialogInterface dialog, int which) { + @Override + public void onClick(DialogInterface dialog, int which) { TestShellActivity.this.finish(); } }) .setNegativeButton("No", new OnClickListener(){ - public void onClick(DialogInterface dialog, int which) { + @Override + public void onClick(DialogInterface dialog, int which) { dialog.cancel(); } }); @@ -370,6 +372,7 @@ public class TestShellActivity extends Activity implements LayoutTestController // ....................................... // LayoutTestController Functions + @Override public void dumpAsText(boolean enablePixelTests) { // Added after webkit update to r63859. See trac.webkit.org/changeset/63730. if (enablePixelTests) { @@ -384,6 +387,7 @@ public class TestShellActivity extends Activity implements LayoutTestController } } + @Override public void dumpChildFramesAsText() { mDumpDataType = DumpDataType.DUMP_AS_TEXT; mDumpChildFramesAsText = true; @@ -393,12 +397,14 @@ public class TestShellActivity extends Activity implements LayoutTestController } } + @Override public void waitUntilDone() { mWaitUntilDone = true; String url = mWebView.getUrl(); Log.v(LOGTAG, "waitUntilDone called: " + url); } + @Override public void notifyDone() { String url = mWebView.getUrl(); Log.v(LOGTAG, "notifyDone called: " + url); @@ -410,15 +416,18 @@ public class TestShellActivity extends Activity implements LayoutTestController } } + @Override public void display() { mWebView.invalidate(); } + @Override public void clearBackForwardList() { mWebView.clearHistory(); } + @Override public void dumpBackForwardList() { //printf("\n============== Back Forward List ==============\n"); // mWebHistory @@ -426,21 +435,25 @@ public class TestShellActivity extends Activity implements LayoutTestController } + @Override public void dumpChildFrameScrollPositions() { // TODO Auto-generated method stub } + @Override public void dumpEditingCallbacks() { // TODO Auto-generated method stub } + @Override public void dumpSelectionRect() { // TODO Auto-generated method stub } + @Override public void dumpTitleChanges() { if (!mDumpTitleChanges) { mTitleChanges = new StringBuffer(); @@ -448,6 +461,7 @@ public class TestShellActivity extends Activity implements LayoutTestController mDumpTitleChanges = true; } + @Override public void keepWebHistory() { if (!mKeepWebHistory) { mWebHistory = new Vector(); @@ -455,59 +469,71 @@ public class TestShellActivity extends Activity implements LayoutTestController mKeepWebHistory = true; } + @Override public void queueBackNavigation(int howfar) { // TODO Auto-generated method stub } + @Override public void queueForwardNavigation(int howfar) { // TODO Auto-generated method stub } + @Override public void queueLoad(String Url, String frameTarget) { // TODO Auto-generated method stub } + @Override public void queueReload() { mWebView.reload(); } + @Override public void queueScript(String scriptToRunInCurrentContext) { mWebView.loadUrl("javascript:"+scriptToRunInCurrentContext); } + @Override public void repaintSweepHorizontally() { // TODO Auto-generated method stub } + @Override public void setAcceptsEditing(boolean b) { // TODO Auto-generated method stub } + @Override public void setMainFrameIsFirstResponder(boolean b) { // TODO Auto-generated method stub } + @Override public void setWindowIsKey(boolean b) { // This is meant to show/hide the window. The best I can find // is setEnabled() mWebView.setEnabled(b); } + @Override public void testRepaint() { mWebView.invalidate(); } + @Override public void dumpDatabaseCallbacks() { Log.v(LOGTAG, "dumpDatabaseCallbacks called."); mDumpDatabaseCallbacks = true; } + @Override public void setCanOpenWindows() { Log.v(LOGTAG, "setCanOpenWindows called."); mCanOpenWindows = true; @@ -516,6 +542,7 @@ public class TestShellActivity extends Activity implements LayoutTestController /** * Sets the Geolocation permission state to be used for all future requests. */ + @Override public void setGeolocationPermission(boolean allow) { mIsGeolocationPermissionSet = true; mGeolocationPermission = allow; @@ -532,12 +559,14 @@ public class TestShellActivity extends Activity implements LayoutTestController } } + @Override public void setMockDeviceOrientation(boolean canProvideAlpha, double alpha, boolean canProvideBeta, double beta, boolean canProvideGamma, double gamma) { WebViewClassic.fromWebView(mWebView).setMockDeviceOrientation(canProvideAlpha, alpha, canProvideBeta, beta, canProvideGamma, gamma); } + @Override public void overridePreference(String key, boolean value) { // TODO: We should look up the correct WebView for the frame which // called the layoutTestController method. Currently, we just use the @@ -554,6 +583,7 @@ public class TestShellActivity extends Activity implements LayoutTestController } } + @Override public void setXSSAuditorEnabled (boolean flag) { mWebViewClassic.getSettings().setXSSAuditorEnabled(flag); } @@ -754,6 +784,7 @@ public class TestShellActivity extends Activity implements LayoutTestController && mWaitUntilDone && mStopOnRefError) { Log.w(LOGTAG, "Terminating test case on uncaught ReferenceError or TypeError."); mHandler.postDelayed(new Runnable() { + @Override public void run() { notifyDone(); } @@ -860,6 +891,8 @@ public class TestShellActivity extends Activity implements LayoutTestController settings.setXSSAuditorEnabled(false); settings.setPageCacheCapacity(0); settings.setProperty("use_minimal_memory", "false"); + settings.setAllowUniversalAccessFromFileURLs(true); + settings.setAllowFileAccessFromFileURLs(true); } private WebViewClassic mWebViewClassic; diff --git a/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestController.java b/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestController.java index e608e2d037b7..d0c59d3791be 100644 --- a/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestController.java +++ b/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestController.java @@ -66,7 +66,7 @@ public class LayoutTestController { public void setAppCacheMaximumSize(long size) { Log.i(LOG_TAG, "setAppCacheMaximumSize() called with: " + size); - WebStorage.getInstance().setAppCacheMaximumSize(size); + android.webkit.WebStorageClassic.getInstance().setAppCacheMaximumSize(size); } public void setCanOpenWindows() { diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java index 44d28fadd99b..85b67d51d13e 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java @@ -78,6 +78,10 @@ public class BridgeWindowManager implements IWindowManager { } @Override + public void getCurrentSizeRange(Point smallestSize, Point largestSize) { + } + + @Override public void getDisplaySize(Point arg0) throws RemoteException { } diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java index 7bb927b96ee0..30e4a2077897 100644 --- a/wifi/java/android/net/wifi/WifiInfo.java +++ b/wifi/java/android/net/wifi/WifiInfo.java @@ -68,9 +68,14 @@ public class WifiInfo implements Parcelable { private int mLinkSpeed; private InetAddress mIpAddress; - private String mMacAddress; + /** + * Flag indicating that AP has hinted that upstream connection is metered, + * and sensitive to heavy data transfers. + */ + private boolean mMeteredHint; + WifiInfo() { mSSID = null; mBSSID = null; @@ -96,6 +101,7 @@ public class WifiInfo implements Parcelable { mLinkSpeed = source.mLinkSpeed; mIpAddress = source.mIpAddress; mMacAddress = source.mMacAddress; + mMeteredHint = source.mMeteredHint; } } @@ -168,6 +174,16 @@ public class WifiInfo implements Parcelable { return mMacAddress; } + /** {@hide} */ + public void setMeteredHint(boolean meteredHint) { + mMeteredHint = meteredHint; + } + + /** {@hide} */ + public boolean getMeteredHint() { + return mMeteredHint; + } + void setNetworkId(int id) { mNetworkId = id; } @@ -248,6 +264,15 @@ public class WifiInfo implements Parcelable { } } + /** {@hide} */ + public static String removeDoubleQuotes(String string) { + final int length = string.length(); + if ((length > 1) && (string.charAt(0) == '"') && (string.charAt(length - 1) == '"')) { + return string.substring(1, length - 1); + } + return string; + } + @Override public String toString() { StringBuffer sb = new StringBuffer(); @@ -260,7 +285,8 @@ public class WifiInfo implements Parcelable { append(mSupplicantState == null ? none : mSupplicantState). append(", RSSI: ").append(mRssi). append(", Link speed: ").append(mLinkSpeed). - append(", Net ID: ").append(mNetworkId); + append(", Net ID: ").append(mNetworkId). + append(", Metered hint: ").append(mMeteredHint); return sb.toString(); } @@ -284,6 +310,7 @@ public class WifiInfo implements Parcelable { dest.writeString(getSSID()); dest.writeString(mBSSID); dest.writeString(mMacAddress); + dest.writeInt(mMeteredHint ? 1 : 0); mSupplicantState.writeToParcel(dest, flags); } @@ -303,6 +330,7 @@ public class WifiInfo implements Parcelable { info.setSSID(in.readString()); info.mBSSID = in.readString(); info.mMacAddress = in.readString(); + info.mMeteredHint = in.readInt() != 0; info.mSupplicantState = SupplicantState.CREATOR.createFromParcel(in); return info; } diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index 2f14098bda96..705e3c7a1ca8 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -1642,6 +1642,7 @@ public class WifiStateMachine extends StateMachine { mWifiInfo.setNetworkId(WifiConfiguration.INVALID_NETWORK_ID); mWifiInfo.setRssi(MIN_RSSI); mWifiInfo.setLinkSpeed(-1); + mWifiInfo.setMeteredHint(false); setNetworkDetailedState(DetailedState.DISCONNECTED); mWifiConfigStore.updateStatus(mLastNetworkId, DetailedState.DISCONNECTED); @@ -1713,6 +1714,7 @@ public class WifiStateMachine extends StateMachine { mWifiConfigStore.setIpConfiguration(mLastNetworkId, dhcpInfoInternal); InetAddress addr = NetworkUtils.numericToInetAddress(dhcpInfoInternal.ipAddress); mWifiInfo.setInetAddress(addr); + mWifiInfo.setMeteredHint(dhcpInfoInternal.hasMeteredHint()); if (getNetworkDetailedState() == DetailedState.CONNECTED) { //DHCP renewal in connected state LinkProperties linkProperties = dhcpInfoInternal.makeLinkProperties(); @@ -1735,6 +1737,7 @@ public class WifiStateMachine extends StateMachine { loge("IP configuration failed"); mWifiInfo.setInetAddress(null); + mWifiInfo.setMeteredHint(false); /** * If we've exceeded the maximum number of retries for DHCP * to a given network, disable the network diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java index c34c46459eb8..bfb91e2d4661 100644 --- a/wifi/java/android/net/wifi/WifiStateTracker.java +++ b/wifi/java/android/net/wifi/WifiStateTracker.java @@ -141,7 +141,7 @@ public class WifiStateTracker implements NetworkStateTracker { @Override public void setPolicyDataEnable(boolean enabled) { - Slog.w(TAG, "ignoring setPolicyDataEnable(" + enabled + ")"); + // ignored } /** diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pManager.java b/wifi/java/android/net/wifi/p2p/WifiP2pManager.java index df14bb9b4838..018e0a820f4f 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pManager.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pManager.java @@ -415,8 +415,8 @@ public class WifiP2pManager { /** * Passed with {@link ActionListener#onFailure}. * Indicates that the {@link #discoverServices} failed because no service - * requests are set. - * @hide + * requests are added. Use {@link #addServiceRequest} to add a service + * request. */ public static final int NO_SERVICE_REQUESTS = 3; |
