Merge "Removing duplicated tests that use hidden APIs" (686f20c2) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −1

Original line number	Diff line number	Diff line
		@@ -36,6 +36,8 @@ package android {
		field public static final java.lang.String CALL_PHONE = "android.permission.CALL_PHONE";
		field public static final java.lang.String CALL_PRIVILEGED = "android.permission.CALL_PRIVILEGED";
		field public static final java.lang.String CAMERA = "android.permission.CAMERA";
		field public static final java.lang.String CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY = "android.permission.CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY";
		field public static final java.lang.String CAN_REQUEST_TOUCH_EXPLORATION_MODE = "android.permission.CAN_REQUEST_TOUCH_EXPLORATION_MODE";
		field public static final java.lang.String CHANGE_COMPONENT_ENABLED_STATE = "android.permission.CHANGE_COMPONENT_ENABLED_STATE";
		field public static final java.lang.String CHANGE_CONFIGURATION = "android.permission.CHANGE_CONFIGURATION";
		field public static final java.lang.String CHANGE_NETWORK_STATE = "android.permission.CHANGE_NETWORK_STATE";
		@@ -141,6 +143,7 @@ package android {

		public static final class Manifest.permission_group {
		ctor public Manifest.permission_group();
		field public static final java.lang.String ACCESSIBILITY_FEATURES = "android.permission-group.ACCESSIBILITY_FEATURES";
		field public static final java.lang.String ACCOUNTS = "android.permission-group.ACCOUNTS";
		field public static final java.lang.String AFFECTS_BATTERY = "android.permission-group.AFFECTS_BATTERY";
		field public static final java.lang.String APP_INFO = "android.permission-group.APP_INFO";
		@@ -2104,7 +2107,8 @@ package android.accessibilityservice {
		field public static final int FEEDBACK_SPOKEN = 1; // 0x1
		field public static final int FEEDBACK_VISUAL = 8; // 0x8
		field public static final int FLAG_INCLUDE_NOT_IMPORTANT_VIEWS = 2; // 0x2
		field public static final int FLAG_REPORT_VIEW_IDS = 8; // 0x8
		field public static final int FLAG_REPORT_VIEW_IDS = 16; // 0x10
		field public static final int FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 8; // 0x8
		field public static final int FLAG_REQUEST_TOUCH_EXPLORATION_MODE = 4; // 0x4
		field public int eventTypes;
		field public int feedbackType;

core/tests/coretests/AndroidManifest.xml

+0 −7

Original line number	Diff line number	Diff line
		@@ -1241,13 +1241,6 @@
		</intent-filter>
		</activity>

		<activity android:name="android.accessibilityservice.InterrogationActivity">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
		</intent-filter>
		</activity>

		<activity android:name="android.animation.BasicAnimatorActivity">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />

core/tests/coretests/src/android/accessibilityservice/InterrogationActivity.java

deleted100644 → 0

+0 −47

Original line number	Diff line number	Diff line
		/**
		* 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.accessibilityservice;

		import android.app.Activity;
		import android.os.Bundle;
		import android.view.View;

		import com.android.frameworks.coretests.R;

		/**
		* Activity for testing the accessibility APIs for "interrogation" of
		* the screen content. These APIs allow exploring the screen and
		* requesting an action to be performed on a given view from an
		* AccessiiblityService.
		*/
		public class InterrogationActivity extends Activity {

		@Override
		public void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		setContentView(R.layout.interrogation_activity);

		findViewById(R.id.button5).setOnClickListener(new View.OnClickListener() {
		public void onClick(View v) {
		/* do nothing */
		}
		});
		findViewById(R.id.button5).setOnLongClickListener(new View.OnLongClickListener() {
		public boolean onLongClick(View v) {
		return true;
		}
		});
		}
		}

core/tests/coretests/src/android/accessibilityservice/InterrogationActivityTest.java

deleted100644 → 0

+0 −472

File deleted.

Preview size limit exceeded, changes collapsed.