diff --git a/api/current.xml b/api/current.xml
index af12f9d849be6..13edee3952b37 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -93901,7 +93901,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
@@ -286938,6 +286938,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/FrameworkTest/res/layout/visibility_callback.xml b/tests/FrameworkTest/res/layout/visibility_callback.xml
new file mode 100644
index 0000000000000..8fd7c8faa984c
--- /dev/null
+++ b/tests/FrameworkTest/res/layout/visibility_callback.xml
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/FrameworkTest/src/com/android/frameworktest/view/VisibilityCallback.java b/tests/FrameworkTest/src/com/android/frameworktest/view/VisibilityCallback.java
new file mode 100644
index 0000000000000..c601f102756db
--- /dev/null
+++ b/tests/FrameworkTest/src/com/android/frameworktest/view/VisibilityCallback.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.frameworktest.view;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.widget.TextView;
+import com.android.frameworktest.R;
+
+import android.os.Bundle;
+import android.widget.Button;
+import android.view.View;
+import android.app.Activity;
+
+/**
+ * Exercise View's ability to change their visibility: GONE, INVISIBLE and
+ * VISIBLE.
+ */
+public class VisibilityCallback extends Activity {
+ private static final boolean DEBUG = false;
+
+ private MonitoredTextView mVictim;
+
+ @Override
+ protected void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ setContentView(R.layout.visibility_callback);
+
+ // Find the view whose visibility will change
+ mVictim = (MonitoredTextView)findViewById(R.id.victim);
+
+ // Find our buttons
+ Button visibleButton = (Button) findViewById(R.id.vis);
+ Button invisibleButton = (Button) findViewById(R.id.invis);
+ Button goneButton = (Button) findViewById(R.id.gone);
+
+ // Wire each button to a click listener
+ visibleButton.setOnClickListener(mVisibleListener);
+ invisibleButton.setOnClickListener(mInvisibleListener);
+ goneButton.setOnClickListener(mGoneListener);
+ }
+
+
+ View.OnClickListener mVisibleListener = new View.OnClickListener() {
+ public void onClick(View v) {
+ mVictim.setVisibility(View.VISIBLE);
+ }
+ };
+
+ View.OnClickListener mInvisibleListener = new View.OnClickListener() {
+ public void onClick(View v) {
+ mVictim.setVisibility(View.INVISIBLE);
+ }
+ };
+
+ View.OnClickListener mGoneListener = new View.OnClickListener() {
+ public void onClick(View v) {
+ mVictim.setVisibility(View.GONE);
+ }
+ };
+
+ public static class MonitoredTextView extends TextView {
+ private View mLastVisChangedView;
+ private int mLastChangedVisibility;
+
+ public MonitoredTextView(Context context) {
+ super(context);
+ }
+
+ public MonitoredTextView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ public MonitoredTextView(Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+ }
+
+ public View getLastVisChangedView() {
+ return mLastVisChangedView;
+ }
+
+ public int getLastChangedVisibility() {
+ return mLastChangedVisibility;
+ }
+
+ @Override
+ protected void onVisibilityChanged(View changedView, int visibility) {
+ mLastVisChangedView = changedView;
+ mLastChangedVisibility = visibility;
+
+ if (DEBUG) {
+ Log.d("viewVis", "visibility: " + visibility);
+ }
+ }
+ }
+}
diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/VisibilityCallbackTest.java b/tests/FrameworkTest/tests/src/com/android/frameworktest/view/VisibilityCallbackTest.java
new file mode 100644
index 0000000000000..6bef230ac7a1f
--- /dev/null
+++ b/tests/FrameworkTest/tests/src/com/android/frameworktest/view/VisibilityCallbackTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.frameworktest.view;
+
+import android.test.ActivityInstrumentationTestCase2;
+import android.test.UiThreadTest;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+import com.android.frameworktest.R;
+
+/**
+ * Exercises {@link android.view.View}'s ability to change visibility between
+ * GONE, VISIBLE and INVISIBLE.
+ */
+public class VisibilityCallbackTest extends ActivityInstrumentationTestCase2 {
+ private TextView mRefUp;
+ private TextView mRefDown;
+ private VisibilityCallback.MonitoredTextView mVictim;
+ private ViewGroup mParent;
+ private Button mVisible;
+ private Button mInvisible;
+ private Button mGone;
+
+ public VisibilityCallbackTest() {
+ super("com.android.frameworktest", VisibilityCallback.class);
+ }
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+
+ final VisibilityCallback a = getActivity();
+ mRefUp = (TextView) a.findViewById(R.id.refUp);
+ mRefDown = (TextView) a.findViewById(R.id.refDown);
+ mVictim = (VisibilityCallback.MonitoredTextView) a.findViewById(R.id.victim);
+ mParent = (ViewGroup) a.findViewById(R.id.parent);
+ mVisible = (Button) a.findViewById(R.id.vis);
+ mInvisible = (Button) a.findViewById(R.id.invis);
+ mGone = (Button) a.findViewById(R.id.gone);
+
+ mVictim.post(new Runnable() {
+ public void run() {
+ mVictim.setVisibility(View.INVISIBLE);
+ }
+ });
+ getInstrumentation().waitForIdleSync();
+ }
+
+ @MediumTest
+ @UiThreadTest
+ public void testSetUpConditions() throws Exception {
+ assertNotNull(mRefUp);
+ assertNotNull(mRefDown);
+ assertNotNull(mVictim);
+ assertNotNull(mVisible);
+ assertNotNull(mInvisible);
+ assertNotNull(mGone);
+
+ assertTrue(mVisible.hasFocus());
+ assertEquals(View.INVISIBLE, mVictim.getVisibility());
+ assertEquals(View.VISIBLE, mParent.getVisibility());
+ }
+
+ @MediumTest
+ @UiThreadTest
+ public void testDirect() throws Exception {
+ mVictim.setVisibility(View.VISIBLE);
+ assertEquals(View.VISIBLE, mVictim.getLastChangedVisibility());
+ assertEquals(mVictim, mVictim.getLastVisChangedView());
+
+ mVictim.setVisibility(View.INVISIBLE);
+ assertEquals(View.INVISIBLE, mVictim.getLastChangedVisibility());
+ assertEquals(mVictim, mVictim.getLastVisChangedView());
+
+ mVictim.setVisibility(View.GONE);
+ assertEquals(View.GONE, mVictim.getLastChangedVisibility());
+ assertEquals(mVictim, mVictim.getLastVisChangedView());
+ }
+
+ @MediumTest
+ @UiThreadTest
+ public void testChild() throws Exception {
+ mParent.setVisibility(View.INVISIBLE);
+ assertEquals(View.INVISIBLE, mVictim.getLastChangedVisibility());
+ assertEquals(mParent, mVictim.getLastVisChangedView());
+
+ mParent.setVisibility(View.GONE);
+ assertEquals(View.GONE, mVictim.getLastChangedVisibility());
+ assertEquals(mParent, mVictim.getLastVisChangedView());
+
+ mParent.setVisibility(View.VISIBLE);
+ assertEquals(View.VISIBLE, mVictim.getLastChangedVisibility());
+ assertEquals(mParent, mVictim.getLastVisChangedView());
+ }
+}