From f083bd43a0c6b7bf1b88775ac0f1d0bec1281a75 Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Tue, 2 Nov 2010 15:53:10 -0700 Subject: [PATCH 1/4] Monkey updates for new keyboard features. Add the new volume mute key as a system key. Use virtual keyboard during injection. Also fixed a deprecation warning for using an old Intent API. Bug: 2912307 Bug: 3221301 Change-Id: I056844509112727aa3541223f090cc500c55fc41 --- .../src/com/android/commands/monkey/MonkeyActivityEvent.java | 5 ++--- .../src/com/android/commands/monkey/MonkeySourceNetwork.java | 2 +- .../src/com/android/commands/monkey/MonkeySourceRandom.java | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cmds/monkey/src/com/android/commands/monkey/MonkeyActivityEvent.java b/cmds/monkey/src/com/android/commands/monkey/MonkeyActivityEvent.java index 262377a9f..4661d8cc5 100644 --- a/cmds/monkey/src/com/android/commands/monkey/MonkeyActivityEvent.java +++ b/cmds/monkey/src/com/android/commands/monkey/MonkeyActivityEvent.java @@ -22,7 +22,6 @@ import android.content.Intent; import android.os.Bundle; import android.os.RemoteException; import android.view.IWindowManager; -import android.util.Log; /** * monkey activity event @@ -57,7 +56,7 @@ public class MonkeyActivityEvent extends MonkeyEvent { public int injectEvent(IWindowManager iwm, IActivityManager iam, int verbose) { Intent intent = getEvent(); if (verbose > 0) { - System.out.println(":Switch: " + intent.toURI()); + System.out.println(":Switch: " + intent.toUri(0)); } if (mAlarmTime != 0){ @@ -75,7 +74,7 @@ public class MonkeyActivityEvent extends MonkeyEvent { } catch (SecurityException e) { if (verbose > 0) { System.out.println("** Permissions error starting activity " - + intent.toURI()); + + intent.toUri(0)); } return MonkeyEvent.INJECT_ERROR_SECURITY_EXCEPTION; } diff --git a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetwork.java b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetwork.java index a9a1db416..dbd616af1 100644 --- a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetwork.java +++ b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetwork.java @@ -294,7 +294,7 @@ public class MonkeySourceNetwork implements MonkeyEventSource { // Convert the string to an array of KeyEvent's for // the built in keymap. KeyCharacterMap keyCharacterMap = KeyCharacterMap. - load(KeyCharacterMap.BUILT_IN_KEYBOARD); + load(KeyCharacterMap.VIRTUAL_KEYBOARD); KeyEvent[] events = keyCharacterMap.getEvents(chars); // enqueue all the events we just got. diff --git a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java index a2fa7326a..ab785632b 100644 --- a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java +++ b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java @@ -48,7 +48,7 @@ public class MonkeySourceRandom implements MonkeyEventSource { private static final int[] SYS_KEYS = { KeyEvent.KEYCODE_HOME, KeyEvent.KEYCODE_BACK, KeyEvent.KEYCODE_CALL, KeyEvent.KEYCODE_ENDCALL, - KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, + KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE, KeyEvent.KEYCODE_MUTE, }; /** If a physical key exists? */ From 8dfaaa2ffd5a53146c035b2dc6ec904b7ad3da16 Mon Sep 17 00:00:00 2001 From: Chet Haase Date: Wed, 1 Dec 2010 07:58:12 -0800 Subject: [PATCH 2/4] Added new xml anim capabilities to AnimationLoading demo New xml capabilities for animators, so I added new functionality to the existing xml loading demo app Change-Id: Iba30dce28059031744ce23d1f79f41072a6a1e78 --- samples/ApiDemos/res/anim/animator_set.xml | 1 - samples/ApiDemos/res/anim/color_animator.xml | 23 +++++++++++ samples/ApiDemos/res/anim/object_animator.xml | 1 - .../apis/animation/AnimationLoading.java | 41 ++++++++++++------- .../android/apis/animation/ShapeHolder.java | 1 + 5 files changed, 51 insertions(+), 16 deletions(-) create mode 100644 samples/ApiDemos/res/anim/color_animator.xml diff --git a/samples/ApiDemos/res/anim/animator_set.xml b/samples/ApiDemos/res/anim/animator_set.xml index 1358de4e6..cab24c532 100644 --- a/samples/ApiDemos/res/anim/animator_set.xml +++ b/samples/ApiDemos/res/anim/animator_set.xml @@ -24,7 +24,6 @@ android:repeatMode="reverse"/> + + + diff --git a/samples/ApiDemos/res/anim/object_animator.xml b/samples/ApiDemos/res/anim/object_animator.xml index ea84aa745..863d42353 100644 --- a/samples/ApiDemos/res/anim/object_animator.xml +++ b/samples/ApiDemos/res/anim/object_animator.xml @@ -16,7 +16,6 @@ Date: Wed, 1 Dec 2010 16:08:52 -0800 Subject: [PATCH 3/4] API demo for new Activity.recreate() API. Change-Id: I56bd36edf2cd5cd9b6f95dd4a2b82571689c04d2 --- samples/ApiDemos/AndroidManifest.xml | 8 ++ .../ApiDemos/res/layout/activity_recreate.xml | 37 ++++++++++ samples/ApiDemos/res/values/strings.xml | 5 ++ .../android/apis/app/ActivityRecreate.java | 73 +++++++++++++++++++ 4 files changed, 123 insertions(+) create mode 100644 samples/ApiDemos/res/layout/activity_recreate.xml create mode 100644 samples/ApiDemos/src/com/example/android/apis/app/ActivityRecreate.java diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml index 361bf399d..eddada39b 100644 --- a/samples/ApiDemos/AndroidManifest.xml +++ b/samples/ApiDemos/AndroidManifest.xml @@ -151,6 +151,14 @@ + + + + + + + diff --git a/samples/ApiDemos/res/layout/activity_recreate.xml b/samples/ApiDemos/res/layout/activity_recreate.xml new file mode 100644 index 000000000..d55dfbded --- /dev/null +++ b/samples/ApiDemos/res/layout/activity_recreate.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + diff --git a/samples/ApiDemos/res/values/strings.xml b/samples/ApiDemos/res/values/strings.xml index 02b6beda0..e988a2f3b 100644 --- a/samples/ApiDemos/res/values/strings.xml +++ b/samples/ApiDemos/res/values/strings.xml @@ -80,6 +80,11 @@ App/Activity/Persistent State Demonstration of persistent activity state with getPreferences(0).edit() and getPreferences(0). + App/Activity/Recreate + Demonstration recreating an activity, to have + it reconstructed with significant new changes. In this case the theme is changed. + Recreate + App/Activity/Receive Result Pick a result to send, or BACK to cancel. Corky diff --git a/samples/ApiDemos/src/com/example/android/apis/app/ActivityRecreate.java b/samples/ApiDemos/src/com/example/android/apis/app/ActivityRecreate.java new file mode 100644 index 000000000..4c112b3c4 --- /dev/null +++ b/samples/ApiDemos/src/com/example/android/apis/app/ActivityRecreate.java @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.android.apis.app; + +import com.example.android.apis.R; +import com.example.android.apis.app.LocalServiceActivities.Controller; + +import android.app.Activity; +import android.content.Intent; +import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.view.View.OnClickListener; +import android.widget.Button; + +public class ActivityRecreate extends Activity { + int mCurTheme; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + if (savedInstanceState != null) { + mCurTheme = savedInstanceState.getInt("theme"); + + // Switch to a new theme different from last theme. + switch (mCurTheme) { + case android.R.style.Theme_Holo_Light: + mCurTheme = android.R.style.Theme_Holo_Dialog; + break; + case android.R.style.Theme_Holo_Dialog: + mCurTheme = android.R.style.Theme_Holo; + break; + default: + mCurTheme = android.R.style.Theme_Holo_Light; + break; + } + setTheme(mCurTheme); + } + + setContentView(R.layout.activity_recreate); + + // Watch for button clicks. + Button button = (Button)findViewById(R.id.recreate); + button.setOnClickListener(mRecreateListener); + } + + @Override + protected void onSaveInstanceState(Bundle savedInstanceState) { + super.onSaveInstanceState(savedInstanceState); + savedInstanceState.putInt("theme", mCurTheme); + } + + private OnClickListener mRecreateListener = new OnClickListener() { + public void onClick(View v) { + recreate(); + } + }; +} From 8f2e8f48b924ecc87086b8ab7af348031dd848c9 Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Wed, 1 Dec 2010 16:46:28 -0800 Subject: [PATCH 4/4] Add drag/drop demo to ApiDemos Drag/drop among four big dots on screen. Drags to a dot will have the identity of the originating dot put into a text field below the dots. In all cases, a text field to the right of the dots reports whether the drag ended in a successful drop. Attempting to start a drag from a dot reading "Drag ANR" should ANR and be cleaned up properly. Attempting to drop onto a dot reading "Drop ANR" should similarly ANR and be cleaned up properly. Drags from a dot labelled "Local" are restricted to targets within the app's own window -- they are not draggable to the system "shirt pocket" drop target, etc. A drop onto the same dot that it originated from will append text to that effect to the message that notes the dropped payload. This uses the "local state" convenience mechanism in startDrag() and DragEvent.getLocalState(). Change-Id: Ic5cd6a29186a84c91d3dc4187e83e7bcf530ba2f --- samples/ApiDemos/AndroidManifest.xml | 9 + samples/ApiDemos/res/layout/drag_layout.xml | 93 ++++++ samples/ApiDemos/res/values/attrs.xml | 13 + samples/ApiDemos/res/values/strings.xml | 6 + .../android/apis/view/DragAndDropDemo.java | 58 ++++ .../android/apis/view/DraggableDot.java | 266 ++++++++++++++++++ 6 files changed, 445 insertions(+) create mode 100644 samples/ApiDemos/res/layout/drag_layout.xml create mode 100644 samples/ApiDemos/src/com/example/android/apis/view/DragAndDropDemo.java create mode 100644 samples/ApiDemos/src/com/example/android/apis/view/DraggableDot.java diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml index eddada39b..b425eaa11 100644 --- a/samples/ApiDemos/AndroidManifest.xml +++ b/samples/ApiDemos/AndroidManifest.xml @@ -1864,6 +1864,15 @@ + + + + + + + diff --git a/samples/ApiDemos/res/layout/drag_layout.xml b/samples/ApiDemos/res/layout/drag_layout.xml new file mode 100644 index 000000000..0dd193d03 --- /dev/null +++ b/samples/ApiDemos/res/layout/drag_layout.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/ApiDemos/res/values/attrs.xml b/samples/ApiDemos/res/values/attrs.xml index 53f0034e8..4654d7e87 100644 --- a/samples/ApiDemos/res/values/attrs.xml +++ b/samples/ApiDemos/res/values/attrs.xml @@ -32,4 +32,17 @@ + + + + + + + + + + + + diff --git a/samples/ApiDemos/res/values/strings.xml b/samples/ApiDemos/res/values/strings.xml index e988a2f3b..4eb54c2a9 100644 --- a/samples/ApiDemos/res/values/strings.xml +++ b/samples/ApiDemos/res/values/strings.xml @@ -758,6 +758,12 @@ Cheese hunt Expand Iconify + + + Longpress on a dot to start a drag, then drop over another dot. The destination + dot will append the drag\'s textual conversion to the EditText. + + diff --git a/samples/ApiDemos/src/com/example/android/apis/view/DragAndDropDemo.java b/samples/ApiDemos/src/com/example/android/apis/view/DragAndDropDemo.java new file mode 100644 index 000000000..7e8c076e4 --- /dev/null +++ b/samples/ApiDemos/src/com/example/android/apis/view/DragAndDropDemo.java @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.android.apis.view; + +import com.example.android.apis.R; + +import android.app.Activity; +import android.os.Bundle; +import android.view.DragEvent; +import android.view.View; +import android.widget.TextView; + +public class DragAndDropDemo extends Activity { + TextView mResultText; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.drag_layout); + + TextView text = (TextView) findViewById(R.id.drag_text); + DraggableDot dot = (DraggableDot) findViewById(R.id.drag_dot_1); + dot.setReportView(text); + dot = (DraggableDot) findViewById(R.id.drag_dot_2); + dot.setReportView(text); + dot = (DraggableDot) findViewById(R.id.drag_dot_3); + dot.setReportView(text); + dot = (DraggableDot) findViewById(R.id.drag_dot_4); + dot.setReportView(text); + + mResultText = (TextView) findViewById(R.id.drag_result_text); + mResultText.setOnDragListener(new View.OnDragListener() { + @Override + public boolean onDrag(View v, DragEvent event) { + final int action = event.getAction(); + if (action == DragEvent.ACTION_DRAG_ENDED) { + final boolean dropped = event.getResult(); + mResultText.setText(dropped ? "Dropped!" : "No drop"); + } + return false; + } + }); + } +} \ No newline at end of file diff --git a/samples/ApiDemos/src/com/example/android/apis/view/DraggableDot.java b/samples/ApiDemos/src/com/example/android/apis/view/DraggableDot.java new file mode 100644 index 000000000..b715ba1a9 --- /dev/null +++ b/samples/ApiDemos/src/com/example/android/apis/view/DraggableDot.java @@ -0,0 +1,266 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.android.apis.view; + +import com.example.android.apis.R; + +import android.content.ClipData; +import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.*; +import android.os.SystemClock; +import android.text.TextPaint; +import android.util.AttributeSet; +import android.util.Log; +import android.view.DragEvent; +import android.view.View; +import android.widget.TextView; + +public class DraggableDot extends View { + static final String TAG = "DraggableDot"; + + private boolean mDragInProgress; + private boolean mHovering; + private boolean mAcceptsDrag; + TextView mReportView; + + private Paint mPaint; + private TextPaint mLegendPaint; + private Paint mGlow; + private static final int NUM_GLOW_STEPS = 10; + private static final int GREEN_STEP = 0x0000FF00 / NUM_GLOW_STEPS; + private static final int WHITE_STEP = 0x00FFFFFF / NUM_GLOW_STEPS; + private static final int ALPHA_STEP = 0xFF000000 / NUM_GLOW_STEPS; + + int mRadius; + int mAnrType; + boolean mLocalOnly; + CharSequence mLegend; + + static final int ANR_NONE = 0; + static final int ANR_THUMBNAIL = 1; + static final int ANR_DROP = 2; + + void sleepSixSeconds() { + // hang forever; good for producing ANRs + long start = SystemClock.uptimeMillis(); + do { + try { Thread.sleep(1000); } catch (InterruptedException e) {} + } while (SystemClock.uptimeMillis() < start + 6000); + } + + // Thumbnail builder that can ANR if desired + class ANRThumbBuilder extends DragThumbnailBuilder { + boolean mDoAnr; + + public ANRThumbBuilder(View view, boolean doAnr) { + super(view); + mDoAnr = doAnr; + } + + @Override + public void onDrawThumbnail(Canvas canvas) { + if (mDoAnr) { + sleepSixSeconds(); + } + super.onDrawThumbnail(canvas); + } + } + + public DraggableDot(Context context, AttributeSet attrs) { + super(context, attrs); + + setFocusable(true); + setClickable(true); + + mLegend = ""; + + mPaint = new Paint(); + mPaint.setAntiAlias(true); + mPaint.setStrokeWidth(6); + mPaint.setColor(0xFFD00000); + + mLegendPaint = new TextPaint(); + mLegendPaint.setAntiAlias(true); + mLegendPaint.setTextAlign(Paint.Align.CENTER); + mLegendPaint.setColor(0xFFF0F0FF); + + mGlow = new Paint(); + mGlow.setAntiAlias(true); + mGlow.setStrokeWidth(1); + mGlow.setStyle(Paint.Style.STROKE); + + // look up any layout-defined attributes + TypedArray a = context.obtainStyledAttributes(attrs, + R.styleable.DraggableDot); + + final int N = a.getIndexCount(); + for (int i = 0; i < N; i++) { + int attr = a.getIndex(i); + switch (attr) { + case R.styleable.DraggableDot_radius: { + mRadius = a.getDimensionPixelSize(attr, 0); + } break; + + case R.styleable.DraggableDot_legend: { + mLegend = a.getText(attr); + } break; + + case R.styleable.DraggableDot_anr: { + mAnrType = a.getInt(attr, 0); + } break; + + case R.styleable.DraggableDot_localOnly: { + mLocalOnly = a.getBoolean(attr, false); + } break; + } + } + + Log.i(TAG, "DraggableDot @ " + this + " : radius=" + mRadius + " legend='" + mLegend + + "' anr=" + mAnrType + " local=" + mLocalOnly); + + setOnLongClickListener(new View.OnLongClickListener() { + public boolean onLongClick(View v) { + ClipData data = ClipData.newPlainText("dot", null, "Dot : " + v.toString()); + v.startDrag(data, new ANRThumbBuilder(v, mAnrType == ANR_THUMBNAIL), + mLocalOnly, (Object)v); + return true; + } + }); + } + + void setReportView(TextView view) { + mReportView = view; + } + + @Override + protected void onDraw(Canvas canvas) { + float wf = getWidth(); + float hf = getHeight(); + final float cx = wf/2; + final float cy = hf/2; + wf -= getPaddingLeft() + getPaddingRight(); + hf -= getPaddingTop() + getPaddingBottom(); + float rad = (wf < hf) ? wf/2 : hf/2; + canvas.drawCircle(cx, cy, rad, mPaint); + + if (mLegend != null && mLegend.length() > 0) { + canvas.drawText(mLegend, 0, mLegend.length(), + cx, cy + mLegendPaint.getFontSpacing()/2, + mLegendPaint); + } + + // if we're in the middle of a drag, light up as a potential target + if (mDragInProgress && mAcceptsDrag) { + for (int i = NUM_GLOW_STEPS; i > 0; i--) { + int color = (mHovering) ? WHITE_STEP : GREEN_STEP; + color = i*(color | ALPHA_STEP); + mGlow.setColor(color); + canvas.drawCircle(cx, cy, rad, mGlow); + rad -= 0.5f; + canvas.drawCircle(cx, cy, rad, mGlow); + rad -= 0.5f; + } + } + } + + @Override + protected void onMeasure(int widthSpec, int heightSpec) { + int totalDiameter = 2*mRadius + getPaddingLeft() + getPaddingRight(); + setMeasuredDimension(totalDiameter, totalDiameter); + } + + /** + * Drag and drop + */ + @Override + public boolean onDragEvent(DragEvent event) { + boolean result = false; + switch (event.getAction()) { + case DragEvent.ACTION_DRAG_STARTED: { + // claim to accept any dragged content + Log.i(TAG, "Drag started, event=" + event); + // cache whether we accept the drag to return for LOCATION events + mDragInProgress = true; + mAcceptsDrag = result = true; + // Redraw in the new visual state if we are a potential drop target + if (mAcceptsDrag) { + invalidate(); + } + } break; + + case DragEvent.ACTION_DRAG_ENDED: { + Log.i(TAG, "Drag ended."); + if (mAcceptsDrag) { + invalidate(); + } + mDragInProgress = false; + mHovering = false; + } break; + + case DragEvent.ACTION_DRAG_LOCATION: { + // we returned true to DRAG_STARTED, so return true here + Log.i(TAG, "... seeing drag locations ..."); + result = mAcceptsDrag; + } break; + + case DragEvent.ACTION_DROP: { + Log.i(TAG, "Got a drop! dot=" + this + " event=" + event); + if (mAnrType == ANR_DROP) { + sleepSixSeconds(); + } + processDrop(event); + result = true; + } break; + + case DragEvent.ACTION_DRAG_ENTERED: { + Log.i(TAG, "Entered dot @ " + this); + mHovering = true; + invalidate(); + } break; + + case DragEvent.ACTION_DRAG_EXITED: { + Log.i(TAG, "Exited dot @ " + this); + mHovering = false; + invalidate(); + } break; + + default: + Log.i(TAG, "other drag event: " + event); + result = mAcceptsDrag; + break; + } + + return result; + } + + private void processDrop(DragEvent event) { + final ClipData data = event.getClipData(); + final int N = data.getItemCount(); + for (int i = 0; i < N; i++) { + ClipData.Item item = data.getItem(i); + Log.i(TAG, "Dropped item " + i + " : " + item); + if (mReportView != null) { + String text = item.coerceToText(getContext()).toString(); + if (event.getLocalState() == (Object) this) { + text += " : Dropped on self!"; + } + mReportView.setText(text); + } + } + } +} \ No newline at end of file